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

fix the bug that cannot load more transaction after opening and clicking cancel button custom time range dialog

Browse Source
This commit is contained in:
MaysWind
2024-05-19 16:57:23 +08:00
parent 9906f1b1a7
commit cf120dbcbf
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/desktop/transactions/ListPage.vue
+9 -4
View File
@@ -331,8 +331,8 @@
</v-row> </v-row>
<date-range-selection-dialog :title="$t('Custom Date Range')" <date-range-selection-dialog :title="$t('Custom Date Range')"
:min-time="query.minTime" :min-time="customMinDatetime"
:max-time="query.maxTime" :max-time="customMaxDatetime"
v-model:show="showCustomDateRangeDialog" v-model:show="showCustomDateRangeDialog"
@dateRange:change="changeCustomDateFilter" /> @dateRange:change="changeCustomDateFilter" />
<edit-dialog ref="editDialog" :persistent="true" /> <edit-dialog ref="editDialog" :persistent="true" />
@@ -417,6 +417,8 @@ export default {
temporaryCountPerPage: null, temporaryCountPerPage: null,
totalCount: 1, totalCount: 1,
searchKeyword: '', searchKeyword: '',
customMinDatetime: 0,
customMaxDatetime: 0,
currentPageTransactions: [], currentPageTransactions: [],
categoryMenuState: false, categoryMenuState: false,
alwaysShowNav: mdAndUp.value, alwaysShowNav: mdAndUp.value,
@@ -768,8 +770,11 @@ export default {
if (recentDateRange.dateType === datetimeConstants.allDateRanges.Custom.type && if (recentDateRange.dateType === datetimeConstants.allDateRanges.Custom.type &&
!recentDateRange.minTime && !recentDateRange.maxTime) { // Custom !recentDateRange.minTime && !recentDateRange.maxTime) { // Custom
if (!this.query.minTime || !this.query.maxTime) { if (!this.query.minTime || !this.query.maxTime) {
this.query.maxTime = getActualUnixTimeForStore(getCurrentUnixTime(), this.currentTimezoneOffsetMinutes, getBrowserTimezoneOffsetMinutes()); this.customMaxDatetime = getActualUnixTimeForStore(getCurrentUnixTime(), this.currentTimezoneOffsetMinutes, getBrowserTimezoneOffsetMinutes());
this.query.minTime = getSpecifiedDayFirstUnixTime(this.query.maxTime); this.customMinDatetime = getSpecifiedDayFirstUnixTime(this.customMaxDatetime);
} else {
this.customMaxDatetime = this.query.maxTime;
this.customMinDatetime = this.query.minTime;
} }
this.showCustomDateRangeDialog = true; this.showCustomDateRangeDialog = true;
src/views/mobile/transactions/ListPage.vue
+9 -4
View File
@@ -274,8 +274,8 @@
</f7-popover> </f7-popover>
<date-range-selection-sheet :title="$t('Custom Date Range')" <date-range-selection-sheet :title="$t('Custom Date Range')"
:min-time="query.minTime" :min-time="customMinDatetime"
:max-time="query.maxTime" :max-time="customMaxDatetime"
v-model:show="showCustomDateRangeSheet" v-model:show="showCustomDateRangeSheet"
@dateRange:change="changeCustomDateFilter"> @dateRange:change="changeCustomDateFilter">
</date-range-selection-sheet> </date-range-selection-sheet>
@@ -454,6 +454,8 @@ export default {
loading: true, loading: true,
loadingError: null, loadingError: null,
loadingMore: false, loadingMore: false,
customMinDatetime: 0,
customMaxDatetime: 0,
transactionToDelete: null, transactionToDelete: null,
showDatePopover: false, showDatePopover: false,
showTypePopover: false, showTypePopover: false,
@@ -681,8 +683,11 @@ export default {
changeDateFilter(dateType) { changeDateFilter(dateType) {
if (dateType === this.allDateRanges.Custom.type) { // Custom if (dateType === this.allDateRanges.Custom.type) { // Custom
if (!this.query.minTime || !this.query.maxTime) { if (!this.query.minTime || !this.query.maxTime) {
this.query.maxTime = getActualUnixTimeForStore(getCurrentUnixTime(), this.currentTimezoneOffsetMinutes, getBrowserTimezoneOffsetMinutes()); this.customMaxDatetime = getActualUnixTimeForStore(getCurrentUnixTime(), this.currentTimezoneOffsetMinutes, getBrowserTimezoneOffsetMinutes());
this.query.minTime = getSpecifiedDayFirstUnixTime(this.query.maxTime); this.customMinDatetime = getSpecifiedDayFirstUnixTime(this.customMaxDatetime);
} else {
this.customMaxDatetime = this.query.maxTime;
this.customMinDatetime = this.query.minTime;
} }
this.showCustomDateRangeSheet = true; this.showCustomDateRangeSheet = true;