zhengchen.tao/ezbookkeeping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
MaysWind
2024-12-18 22:40:12 +08:00
parent c2b1adf588
commit e050f30efa
5 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stores/transaction.js
+6
View File
@@ -746,6 +746,7 @@ export const useTransactionsStore = defineStore('transactions', {
}
},
updateTransactionListFilter(filter) {
const accountsStore = useAccountsStore();
let changed = false;
if (filter && isNumber(filter.dateType) && this.transactionsFilter.dateType !== filter.dateType) {
@@ -775,6 +776,11 @@ export const useTransactionsStore = defineStore('transactions', {
if (filter && isString(filter.accountIds) && this.transactionsFilter.accountIds !== filter.accountIds) {
this.transactionsFilter.accountIds = filter.accountIds;
if (datetimeConstants.allBillingCycleDateRangesMap[this.transactionsFilter.dateType] && !accountsStore.getAccountStatementDate(this.transactionsFilter.accountIds)) {
this.transactionsFilter.dateType = datetimeConstants.allDateRanges.Custom.type;
}
changed = true;
}
src/views/desktop/common/cards/AccountFilterSettingsCard.vue
+2 -9
View File
@@ -152,7 +152,6 @@ import { useAccountsStore } from '@/stores/account.js';
import { useTransactionsStore } from '@/stores/transaction.js';
import { useStatisticsStore } from '@/stores/statistics.js';
import datetimeConstants from '@/consts/datetime.js';
import accountConstants from '@/consts/account.js';
import { copyObjectTo } from '@/lib/common.js';
import {
@@ -323,15 +322,9 @@ export default {
self.statisticsStore.updateTransactionStatisticsInvalidState(true);
}
} else if (this.type === 'transactionListCurrent') {
const filter = {
changed = self.transactionsStore.updateTransactionListFilter({
accountIds: isAllSelected ? '' : finalAccountIds
};
if (datetimeConstants.allBillingCycleDateRangesMap[self.transactionsStore.transactionsFilter.dateType] && !self.accountsStore.getAccountStatementDate(filter.accountIds)) {
filter.dateType = datetimeConstants.allDateRanges.Custom.type;
}
changed = self.transactionsStore.updateTransactionListFilter(filter);
});
if (changed) {
self.transactionsStore.updateTransactionListInvalidState(true);
src/views/desktop/transactions/ListPage.vue
+2 -8
View File
@@ -1432,15 +1432,9 @@ export default {
return;
}
const filter = {
const changed = this.transactionsStore.updateTransactionListFilter({
accountIds: accountIds
};
if (datetimeConstants.allBillingCycleDateRangesMap[this.query.dateType] && !this.accountsStore.getAccountStatementDate(accountIds)) {
filter.dateType = datetimeConstants.allDateRanges.Custom.type;
}
const changed = this.transactionsStore.updateTransactionListFilter(filter);
});
if (changed) {
this.loading = true;
src/views/mobile/settings/AccountFilterSettingsPage.vue
+2 -9
View File
@@ -136,7 +136,6 @@ import { useAccountsStore } from '@/stores/account.js';
import { useTransactionsStore } from '@/stores/transaction.js';
import { useStatisticsStore } from '@/stores/statistics.js';
import datetimeConstants from '@/consts/datetime.js';
import accountConstants from '@/consts/account.js';
import { copyObjectTo } from '@/lib/common.js';
import {
@@ -295,15 +294,9 @@ export default {
filterAccountIds: filteredAccountIds
});
} else if (this.type === 'transactionListCurrent') {
const filter = {
const changed = self.transactionsStore.updateTransactionListFilter({
accountIds: isAllSelected ? '' : finalAccountIds
};
if (datetimeConstants.allBillingCycleDateRangesMap[self.transactionsStore.transactionsFilter.dateType] && !self.accountsStore.getAccountStatementDate(filter.accountIds)) {
filter.dateType = datetimeConstants.allDateRanges.Custom.type;
}
const changed = self.transactionsStore.updateTransactionListFilter(filter);
});
if (changed) {
self.transactionsStore.updateTransactionListInvalidState(true);
src/views/mobile/transactions/ListPage.vue
+2 -8
View File
@@ -981,15 +981,9 @@ export default {
return;
}
const filter = {
const changed = this.transactionsStore.updateTransactionListFilter({
accountIds: accountIds
};
if (datetimeConstants.allBillingCycleDateRangesMap[this.query.dateType] && !this.accountsStore.getAccountStatementDate(accountIds)) {
filter.dateType = datetimeConstants.allDateRanges.Custom.type;
}
const changed = this.transactionsStore.updateTransactionListFilter(filter);
});
this.showAccountPopover = false;