do not reload transaction list when filter is not changed actually

This commit is contained in:
MaysWind
2024-07-07 11:07:26 +08:00
parent 9eddab3dd8
commit 297f8b9987
8 changed files with 175 additions and 95 deletions
@@ -241,6 +241,7 @@ export default {
const router = self.f7router;
const filteredAccountIds = {};
let isAllSelected = true;
let finalAccountIds = '';
for (let accountId in self.filterAccountIds) {
@@ -252,6 +253,7 @@ export default {
if (!isAccountOrSubAccountsAllChecked(account, self.filterAccountIds)) {
filteredAccountIds[accountId] = true;
isAllSelected = false;
} else {
if (finalAccountIds.length > 0) {
finalAccountIds += ',';
@@ -268,10 +270,13 @@ export default {
filterAccountIds: filteredAccountIds
});
} else if (this.type === 'transactionListCurrent') {
self.transactionsStore.updateTransactionListFilter({
accountIds: finalAccountIds
const changed = self.transactionsStore.updateTransactionListFilter({
accountIds: isAllSelected ? '' : finalAccountIds
});
self.transactionsStore.updateTransactionListInvalidState(true);
if (changed) {
self.transactionsStore.updateTransactionListInvalidState(true);
}
}
router.back();
@@ -256,6 +256,7 @@ export default {
const router = self.f7router;
const filteredCategoryIds = {};
let isAllSelected = true;
let finalCategoryIds = '';
for (let categoryId in self.filterCategoryIds) {
@@ -267,6 +268,7 @@ export default {
if (!isCategoryOrSubCategoriesAllChecked(category, self.filterCategoryIds)) {
filteredCategoryIds[categoryId] = true;
isAllSelected = false;
} else {
if (finalCategoryIds.length > 0) {
finalCategoryIds += ',';
@@ -283,10 +285,13 @@ export default {
filterCategoryIds: filteredCategoryIds
});
} else if (this.type === 'transactionListCurrent') {
self.transactionsStore.updateTransactionListFilter({
categoryIds: finalCategoryIds
const changed = self.transactionsStore.updateTransactionListFilter({
categoryIds: isAllSelected ? '' : finalCategoryIds
});
self.transactionsStore.updateTransactionListInvalidState(true);
if (changed) {
self.transactionsStore.updateTransactionListInvalidState(true);
}
}
router.back();
@@ -162,10 +162,14 @@ export default {
return;
}
this.transactionsStore.updateTransactionListFilter({
const changed = this.transactionsStore.updateTransactionListFilter({
amountFilter: amountFilter
});
this.transactionsStore.updateTransactionListInvalidState(true);
if (changed) {
this.transactionsStore.updateTransactionListInvalidState(true);
}
router.back();
},
getDisplayAmount(value) {
+37 -16
View File
@@ -772,14 +772,17 @@ export default {
return;
}
this.transactionsStore.updateTransactionListFilter({
const changed = this.transactionsStore.updateTransactionListFilter({
dateType: dateRange.dateType,
maxTime: dateRange.maxTime,
minTime: dateRange.minTime
});
this.showDatePopover = false;
this.reload(null);
if (changed) {
this.reload(null);
}
},
changeCustomDateFilter(minTime, maxTime) {
if (!minTime || !maxTime) {
@@ -788,7 +791,7 @@ export default {
const dateType = getDateTypeByDateRange(minTime, maxTime, this.firstDayOfWeek, datetimeConstants.allDateRangeScenes.Normal);
this.transactionsStore.updateTransactionListFilter({
const changed = this.transactionsStore.updateTransactionListFilter({
dateType: dateType,
maxTime: maxTime,
minTime: minTime
@@ -796,7 +799,9 @@ export default {
this.showCustomDateRangeSheet = false;
this.reload(null);
if (changed) {
this.reload(null);
}
},
changeTypeFilter(type) {
if (this.query.type === type) {
@@ -825,37 +830,46 @@ export default {
}
}
this.transactionsStore.updateTransactionListFilter({
const changed = this.transactionsStore.updateTransactionListFilter({
type: type,
categoryIds: newCategoryFilter
});
this.showMorePopover = false;
this.reload(null);
if (changed) {
this.reload(null);
}
},
changeCategoryFilter(categoryIds) {
if (this.query.categoryIds === categoryIds) {
return;
}
this.transactionsStore.updateTransactionListFilter({
const changed = this.transactionsStore.updateTransactionListFilter({
categoryIds: categoryIds
});
this.showCategoryPopover = false;
this.reload(null);
if (changed) {
this.reload(null);
}
},
changeAccountFilter(accountIds) {
if (this.query.accountIds === accountIds) {
return;
}
this.transactionsStore.updateTransactionListFilter({
const changed = this.transactionsStore.updateTransactionListFilter({
accountIds: accountIds
});
this.showAccountPopover = false;
this.reload(null);
if (changed) {
this.reload(null);
}
},
changeAmountFilter(filterType) {
if (this.query.amountFilter === filterType) {
@@ -868,23 +882,28 @@ export default {
return;
}
this.transactionsStore.updateTransactionListFilter({
const changed = this.transactionsStore.updateTransactionListFilter({
amountFilter: filterType
});
this.showMorePopover = false;
this.reload(null);
if (changed) {
this.reload(null);
}
},
changeKeywordFilter(keyword) {
if (this.query.keyword === keyword) {
return;
}
this.transactionsStore.updateTransactionListFilter({
const changed = this.transactionsStore.updateTransactionListFilter({
keyword: keyword
});
this.reload(null);
if (changed) {
this.reload(null);
}
},
filterMultipleCategories() {
this.f7router.navigate('/settings/filter/category?type=transactionListCurrent');
@@ -939,13 +958,15 @@ export default {
const newDateRange = getShiftedDateRangeAndDateType(minTime, maxTime, scale, this.firstDayOfWeek, datetimeConstants.allDateRangeScenes.Normal);
this.transactionsStore.updateTransactionListFilter({
const changed = this.transactionsStore.updateTransactionListFilter({
dateType: newDateRange.dateType,
maxTime: newDateRange.maxTime,
minTime: newDateRange.minTime
});
this.reload(null);
if (changed) {
this.reload(null);
}
},
scrollPopoverToSelectedItem(event) {
scrollToSelectedItem(event.$el, '.popover-inner', 'li.list-item-selected');