mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-17 00:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove compatibility code for migration

Browse Source
This commit is contained in:
MaysWind
2025-02-09 16:51:21 +08:00
parent f2c043a299
commit 0e4cd10376
20 changed files with 171 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/base/accounts/AccountEditPageBase.ts
+3 -3
View File
@@ -144,10 +144,10 @@ export function useAccountEditPageBaseBase() {
account.value.from(newAccount);
subAccounts.value = [];
if (newAccount.childrenAccounts && newAccount.childrenAccounts.length > 0) {
for (let i = 0; i < newAccount.childrenAccounts.length; i++) {
if (newAccount.subAccounts && newAccount.subAccounts.length > 0) {
for (let i = 0; i < newAccount.subAccounts.length; i++) {
const subAccount = account.value.createNewSubAccount(userStore.currentUserDefaultCurrency, getCurrentUnixTime());
subAccount.from(newAccount.childrenAccounts[i]);
subAccount.from(newAccount.subAccounts[i]);
subAccounts.value.push(subAccount);
}
src/views/base/settings/CategoryFilterSettingPageBase.ts
+1 -1
View File
@@ -109,7 +109,7 @@ export function useCategoryFilterSettingPageBase(type?: string, allowCategoryTyp
const category = transactionCategoriesStore.allTransactionCategoriesMap[categoryId];
if (category && (!category.secondaryCategories || !category.secondaryCategories.length)) {
if (category && (!category.subCategories || !category.subCategories.length)) {
allCategoryIds[category.id] = false;
} else if (category) {
selectAllSubCategories(allCategoryIds, category, false);
src/views/desktop/accounts/ListPage.vue
+1 -1
View File
@@ -184,7 +184,7 @@
<span>{{ tt('All') }}</span>
</v-btn>
<v-btn :key="subAccount.id" :value="subAccount.id"
v-for="subAccount in element.childrenAccounts"
v-for="subAccount in element.subAccounts"
v-show="showHidden || !subAccount.hidden">
<ItemIcon size="1.5rem" icon-type="account" :icon-id="subAccount.icon"
:color="subAccount.color" :hidden-status="subAccount.hidden" />
src/views/desktop/categories/ListPage.vue
+1 -1
View File
@@ -267,7 +267,7 @@ const secondaryCategories = computed<TransactionCategory[]>(() => {
return [];
}
return transactionCategoriesStore.allTransactionCategoriesMap[primaryCategoryId.value].secondaryCategories || [];
return transactionCategoriesStore.allTransactionCategoriesMap[primaryCategoryId.value].subCategories || [];
});
const hasSubCategories = computed<boolean>(() => {
src/views/desktop/transactions/ListPage.vue
+4 -4
View File
@@ -234,7 +234,7 @@
</v-list-item>
<template :key="subCategory.id"
v-for="subCategory in category.secondaryCategories">
v-for="subCategory in category.subCategories">
<v-divider v-if="!subCategory.hidden || query.categoryIds === subCategory.id" />
<v-list-item class="text-sm" density="compact"
:value="subCategory.id"
@@ -978,9 +978,9 @@ function getCategoryListItemCheckedClass(category: TransactionCategory, queryCat
};
}
if (category.secondaryCategories) {
for (let i = 0; i < category.secondaryCategories.length; i++) {
if (queryCategoryIds && queryCategoryIds[category.secondaryCategories[i].id]) {
if (category.subCategories) {
for (let i = 0; i < category.subCategories.length; i++) {
if (queryCategoryIds && queryCategoryIds[category.subCategories[i].id]) {
return {
'list-item-selected': true,
'has-children-item-selected': true
src/views/desktop/transactions/list/dialogs/BatchReplaceDialog.vue
+3 -3
View File
@@ -32,7 +32,7 @@
<v-col cols="12">
<two-column-select primary-key-field="id" primary-value-field="id" primary-title-field="name"
primary-icon-field="icon" primary-icon-type="category" primary-color-field="color"
primary-hidden-field="hidden" primary-sub-items-field="secondaryCategories"
primary-hidden-field="hidden" primary-sub-items-field="subCategories"
secondary-key-field="id" secondary-value-field="id" secondary-title-field="name"
secondary-icon-field="icon" secondary-icon-type="category" secondary-color-field="color"
secondary-hidden-field="hidden"
@@ -49,7 +49,7 @@
</two-column-select>
<two-column-select primary-key-field="id" primary-value-field="id" primary-title-field="name"
primary-icon-field="icon" primary-icon-type="category" primary-color-field="color"
primary-hidden-field="hidden" primary-sub-items-field="secondaryCategories"
primary-hidden-field="hidden" primary-sub-items-field="subCategories"
secondary-key-field="id" secondary-value-field="id" secondary-title-field="name"
secondary-icon-field="icon" secondary-icon-type="category" secondary-color-field="color"
secondary-hidden-field="hidden"
@@ -66,7 +66,7 @@
</two-column-select>
<two-column-select primary-key-field="id" primary-value-field="id" primary-title-field="name"
primary-icon-field="icon" primary-icon-type="category" primary-color-field="color"
primary-hidden-field="hidden" primary-sub-items-field="secondaryCategories"
primary-hidden-field="hidden" primary-sub-items-field="subCategories"
secondary-key-field="id" secondary-value-field="id" secondary-title-field="name"
secondary-icon-field="icon" secondary-icon-type="category" secondary-color-field="color"
secondary-hidden-field="hidden"
src/views/desktop/transactions/list/dialogs/EditDialog.vue
+3 -3
View File
@@ -108,7 +108,7 @@
<v-col cols="12" md="12" v-if="transaction.type === TransactionType.Expense">
<two-column-select primary-key-field="id" primary-value-field="id" primary-title-field="name"
primary-icon-field="icon" primary-icon-type="category" primary-color-field="color"
primary-hidden-field="hidden" primary-sub-items-field="secondaryCategories"
primary-hidden-field="hidden" primary-sub-items-field="subCategories"
secondary-key-field="id" secondary-value-field="id" secondary-title-field="name"
secondary-icon-field="icon" secondary-icon-type="category" secondary-color-field="color"
secondary-hidden-field="hidden"
@@ -126,7 +126,7 @@
<v-col cols="12" md="12" v-if="transaction.type === TransactionType.Income">
<two-column-select primary-key-field="id" primary-value-field="id" primary-title-field="name"
primary-icon-field="icon" primary-icon-type="category" primary-color-field="color"
primary-hidden-field="hidden" primary-sub-items-field="secondaryCategories"
primary-hidden-field="hidden" primary-sub-items-field="subCategories"
secondary-key-field="id" secondary-value-field="id" secondary-title-field="name"
secondary-icon-field="icon" secondary-icon-type="category" secondary-color-field="color"
secondary-hidden-field="hidden"
@@ -144,7 +144,7 @@
<v-col cols="12" md="12" v-if="transaction.type === TransactionType.Transfer">
<two-column-select primary-key-field="id" primary-value-field="id" primary-title-field="name"
primary-icon-field="icon" primary-icon-type="category" primary-color-field="color"
primary-hidden-field="hidden" primary-sub-items-field="secondaryCategories"
primary-hidden-field="hidden" primary-sub-items-field="subCategories"
secondary-key-field="id" secondary-value-field="id" secondary-title-field="name"
secondary-icon-field="icon" secondary-icon-type="category" secondary-color-field="color"
secondary-hidden-field="hidden"
src/views/desktop/transactions/list/dialogs/ImportDialog.vue
+3 -3
View File
@@ -312,7 +312,7 @@
<two-column-select density="compact" variant="plain"
primary-key-field="id" primary-value-field="id" primary-title-field="name"
primary-icon-field="icon" primary-icon-type="category" primary-color-field="color"
primary-hidden-field="hidden" primary-sub-items-field="secondaryCategories"
primary-hidden-field="hidden" primary-sub-items-field="subCategories"
secondary-key-field="id" secondary-value-field="id" secondary-title-field="name"
secondary-icon-field="icon" secondary-icon-type="category" secondary-color-field="color"
secondary-hidden-field="hidden"
@@ -330,7 +330,7 @@
<two-column-select density="compact" variant="plain"
primary-key-field="id" primary-value-field="id" primary-title-field="name"
primary-icon-field="icon" primary-icon-type="category" primary-color-field="color"
primary-hidden-field="hidden" primary-sub-items-field="secondaryCategories"
primary-hidden-field="hidden" primary-sub-items-field="subCategories"
secondary-key-field="id" secondary-value-field="id" secondary-title-field="name"
secondary-icon-field="icon" secondary-icon-type="category" secondary-color-field="color"
secondary-hidden-field="hidden"
@@ -348,7 +348,7 @@
<two-column-select density="compact" variant="plain"
primary-key-field="id" primary-value-field="id" primary-title-field="name"
primary-icon-field="icon" primary-icon-type="category" primary-color-field="color"
primary-hidden-field="hidden" primary-sub-items-field="secondaryCategories"
primary-hidden-field="hidden" primary-sub-items-field="subCategories"
secondary-key-field="id" secondary-value-field="id" secondary-title-field="name"
secondary-icon-field="icon" secondary-icon-type="category" secondary-color-field="color"
secondary-hidden-field="hidden"
src/views/mobile/accounts/ListPage.vue
+1 -1
View File
@@ -120,7 +120,7 @@
:title="subAccount.name" :footer="subAccount.comment" :after="accountBalance(subAccount)"
:link="!sortable ? '/transaction/list?accountIds=' + subAccount.id : null"
:key="subAccount.id"
v-for="subAccount in account.childrenAccounts"
v-for="subAccount in account.subAccounts"
v-show="showHidden || !subAccount.hidden"
>
<template #media>
src/views/mobile/categories/ListPage.vue
+1 -1
View File
@@ -139,7 +139,7 @@ const categories = computed<TransactionCategory[]>(() => {
return [];
}
return transactionCategoriesStore.allTransactionCategoriesMap[primaryCategoryId.value].secondaryCategories || [];
return transactionCategoriesStore.allTransactionCategoriesMap[primaryCategoryId.value].subCategories || [];
} else {
return [];
}
src/views/mobile/transactions/EditPage.vue
+3 -3
View File
@@ -114,7 +114,7 @@
</template>
<tree-view-selection-sheet primary-key-field="id" primary-title-field="name"
primary-icon-field="icon" primary-icon-type="category" primary-color-field="color"
primary-hidden-field="hidden" primary-sub-items-field="secondaryCategories"
primary-hidden-field="hidden" primary-sub-items-field="subCategories"
secondary-key-field="id" secondary-value-field="id" secondary-title-field="name"
secondary-icon-field="icon" secondary-icon-type="category" secondary-color-field="color"
secondary-hidden-field="hidden"
@@ -146,7 +146,7 @@
</template>
<tree-view-selection-sheet primary-key-field="id" primary-title-field="name"
primary-icon-field="icon" primary-icon-type="category" primary-color-field="color"
primary-hidden-field="hidden" primary-sub-items-field="secondaryCategories"
primary-hidden-field="hidden" primary-sub-items-field="subCategories"
secondary-key-field="id" secondary-value-field="id" secondary-title-field="name"
secondary-icon-field="icon" secondary-icon-type="category" secondary-color-field="color"
secondary-hidden-field="hidden"
@@ -178,7 +178,7 @@
</template>
<tree-view-selection-sheet primary-key-field="id" primary-title-field="name"
primary-icon-field="icon" primary-icon-type="category" primary-color-field="color"
primary-hidden-field="hidden" primary-sub-items-field="secondaryCategories"
primary-hidden-field="hidden" primary-sub-items-field="subCategories"
secondary-key-field="id" secondary-value-field="id" secondary-title-field="name"
secondary-icon-field="icon" secondary-icon-type="category" secondary-color-field="color"
secondary-hidden-field="hidden"
src/views/mobile/transactions/ListPage.vue
+4 -4
View File
@@ -344,7 +344,7 @@
<f7-list-item :title="subCategory.name"
:class="{ 'list-item-selected': query.categoryIds === subCategory.id, 'item-in-multiple-selection': queryAllFilterCategoryIdsCount > 1 && queryAllFilterCategoryIds[subCategory.id] }"
:key="subCategory.id"
v-for="subCategory in category.secondaryCategories"
v-for="subCategory in category.subCategories"
v-show="!subCategory.hidden || query.categoryIds === subCategory.id"
@click="changeCategoryFilter(subCategory.id)"
>
@@ -661,9 +661,9 @@ function getCategoryListItemCheckedClass(category: TransactionCategory, queryCat
};
}
if (category.secondaryCategories) {
for (let i = 0; i < category.secondaryCategories.length; i++) {
if (queryCategoryIds && queryCategoryIds[category.secondaryCategories[i].id]) {
if (category.subCategories) {
for (let i = 0; i < category.subCategories.length; i++) {
if (queryCategoryIds && queryCategoryIds[category.subCategories[i].id]) {
return {
'list-item-checked': true
};