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

code refactor

Browse Source
This commit is contained in:
MaysWind
2024-07-16 00:18:43 +08:00
parent 26e9a0ef2a
commit 453a9ff61c
2 changed files with 88 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/desktop/statistics/TransactionPage.vue
+2 -2
View File
@@ -448,7 +448,7 @@ export default {
} else if (this.queryAnalysisType === statisticsConstants.allAnalysisTypes.TrendAnalysis) { } else if (this.queryAnalysisType === statisticsConstants.allAnalysisTypes.TrendAnalysis) {
return this.$locale.formatUnixTimeToLongYearMonth(this.userStore, getYearMonthFirstUnixTime(this.query.trendChartStartYearMonth)); return this.$locale.formatUnixTimeToLongYearMonth(this.userStore, getYearMonthFirstUnixTime(this.query.trendChartStartYearMonth));
} else { } else {
return []; return '';
} }
}, },
queryEndTime() { queryEndTime() {
@@ -457,7 +457,7 @@ export default {
} else if (this.queryAnalysisType === statisticsConstants.allAnalysisTypes.TrendAnalysis) { } else if (this.queryAnalysisType === statisticsConstants.allAnalysisTypes.TrendAnalysis) {
return this.$locale.formatUnixTimeToLongYearMonth(this.userStore, getYearMonthLastUnixTime(this.query.trendChartEndYearMonth)); return this.$locale.formatUnixTimeToLongYearMonth(this.userStore, getYearMonthLastUnixTime(this.query.trendChartEndYearMonth));
} else { } else {
return []; return '';
} }
}, },
allAnalysisTypes() { allAnalysisTypes() {
src/views/mobile/statistics/TransactionPage.vue
+86 -46
View File
@@ -134,7 +134,7 @@
<f7-list v-else-if="!loading && categoricalAnalysisData && categoricalAnalysisData.items && categoricalAnalysisData.items.length"> <f7-list v-else-if="!loading && categoricalAnalysisData && categoricalAnalysisData.items && categoricalAnalysisData.items.length">
<f7-list-item class="statistics-list-item" <f7-list-item class="statistics-list-item"
:link="getItemLinkUrl(item)" :link="getTransactionItemLinkUrl(item)"
:key="idx" :key="idx"
v-for="(item, idx) in categoricalAnalysisData.items" v-for="(item, idx) in categoricalAnalysisData.items"
v-show="!item.hidden" v-show="!item.hidden"
@@ -187,13 +187,13 @@
</f7-popover> </f7-popover>
<f7-toolbar tabbar bottom class="toolbar-item-auto-size"> <f7-toolbar tabbar bottom class="toolbar-item-auto-size">
<f7-link :class="{ 'disabled': reloading || query.categoricalChartDateType === allDateRanges.All.type || query.chartDataType === allChartDataTypes.AccountTotalAssets.type || query.chartDataType === allChartDataTypes.AccountTotalLiabilities.type }" @click="shiftDateRange(query.categoricalChartStartTime, query.categoricalChartEndTime, -1)"> <f7-link :class="{ 'disabled': reloading || query.categoricalChartDateType === allDateRanges.All.type || query.chartDataType === allChartDataTypes.AccountTotalAssets.type || query.chartDataType === allChartDataTypes.AccountTotalLiabilities.type }" @click="shiftDateRange(-1)">
<f7-icon f7="arrow_left_square"></f7-icon> <f7-icon f7="arrow_left_square"></f7-icon>
</f7-link> </f7-link>
<f7-link :class="{ 'tabbar-text-with-ellipsis': true, 'disabled': reloading || query.chartDataType === allChartDataTypes.AccountTotalAssets.type || query.chartDataType === allChartDataTypes.AccountTotalLiabilities.type }" popover-open=".date-popover-menu"> <f7-link :class="{ 'tabbar-text-with-ellipsis': true, 'disabled': reloading || query.chartDataType === allChartDataTypes.AccountTotalAssets.type || query.chartDataType === allChartDataTypes.AccountTotalLiabilities.type }" popover-open=".date-popover-menu">
<span :class="{ 'tabbar-item-changed': query.maxTime > 0 || query.minTime > 0 }">{{ dateRangeName(query) }}</span> <span :class="{ 'tabbar-item-changed': query.maxTime > 0 || query.minTime > 0 }">{{ dateRangeName() }}</span>
</f7-link> </f7-link>
<f7-link :class="{ 'disabled': reloading || query.categoricalChartDateType === allDateRanges.All.type || query.chartDataType === allChartDataTypes.AccountTotalAssets.type || query.chartDataType === allChartDataTypes.AccountTotalLiabilities.type }" @click="shiftDateRange(query.categoricalChartStartTime, query.categoricalChartEndTime, 1)"> <f7-link :class="{ 'disabled': reloading || query.categoricalChartDateType === allDateRanges.All.type || query.chartDataType === allChartDataTypes.AccountTotalAssets.type || query.chartDataType === allChartDataTypes.AccountTotalLiabilities.type }" @click="shiftDateRange(1)">
<f7-icon f7="arrow_right_square"></f7-icon> <f7-icon f7="arrow_right_square"></f7-icon>
</f7-link> </f7-link>
<f7-link class="tabbar-text-with-ellipsis" :key="chartType.type" <f7-link class="tabbar-text-with-ellipsis" :key="chartType.type"
@@ -258,8 +258,8 @@ import { useStatisticsStore } from '@/stores/statistics.js';
import datetimeConstants from '@/consts/datetime.js'; import datetimeConstants from '@/consts/datetime.js';
import statisticsConstants from '@/consts/statistics.js'; import statisticsConstants from '@/consts/statistics.js';
import { getNameByKeyValue, limitText } from '@/lib/common.js' import { getNameByKeyValue, limitText } from '@/lib/common.js';
import { formatPercent } from '@/lib/numeral.js' import { formatPercent } from '@/lib/numeral.js';
import { import {
getShiftedDateRangeAndDateType, getShiftedDateRangeAndDateType,
getDateTypeByDateRange, getDateTypeByDateRange,
@@ -307,13 +307,25 @@ export default {
return this.$t(querySortingTypeName); return this.$t(querySortingTypeName);
}, },
queryStartTime() { queryStartTime() {
return this.$locale.formatUnixTimeToLongDateTime(this.userStore, this.query.categoricalChartStartTime); if (this.analysisType === statisticsConstants.allAnalysisTypes.CategoricalAnalysis) {
return this.$locale.formatUnixTimeToLongDateTime(this.userStore, this.query.categoricalChartStartTime);
} else {
return '';
}
}, },
queryEndTime() { queryEndTime() {
return this.$locale.formatUnixTimeToLongDateTime(this.userStore, this.query.categoricalChartEndTime); if (this.analysisType === statisticsConstants.allAnalysisTypes.CategoricalAnalysis) {
return this.$locale.formatUnixTimeToLongDateTime(this.userStore, this.query.categoricalChartEndTime);
} else {
return '';
}
}, },
allChartTypes() { allChartTypes() {
return this.$locale.getAllCategoricalChartTypes(); if (this.analysisType === statisticsConstants.allAnalysisTypes.CategoricalAnalysis) {
return this.$locale.getAllCategoricalChartTypes();
} else {
return [];
}
}, },
allCategoricalChartTypes() { allCategoricalChartTypes() {
return statisticsConstants.allCategoricalChartTypes; return statisticsConstants.allCategoricalChartTypes;
@@ -328,7 +340,11 @@ export default {
return datetimeConstants.allDateRanges; return datetimeConstants.allDateRanges;
}, },
allDateRangesArray() { allDateRangesArray() {
return this.$locale.getAllDateRanges(datetimeConstants.allDateRangeScenes.Normal, true); if (this.analysisType === statisticsConstants.allAnalysisTypes.CategoricalAnalysis) {
return this.$locale.getAllDateRanges(datetimeConstants.allDateRangeScenes.Normal, true);
} else {
return [];
}
}, },
showAccountBalance() { showAccountBalance() {
return this.settingsStore.appSettings.showAccountBalance; return this.settingsStore.appSettings.showAccountBalance;
@@ -365,7 +381,7 @@ export default {
created() { created() {
const self = this; const self = this;
self.statisticsStore.initTransactionStatisticsFilter(statisticsConstants.allAnalysisTypes.CategoricalAnalysis); self.statisticsStore.initTransactionStatisticsFilter(self.analysisType);
Promise.all([ Promise.all([
self.accountsStore.loadAllAccounts({ force: false }), self.accountsStore.loadAllAccounts({ force: false }),
@@ -464,15 +480,16 @@ export default {
}); });
this.showSortingTypePopover = false; this.showSortingTypePopover = false;
this.reload(null);
}, },
setDateFilter(dateType) { setDateFilter(dateType) {
if (dateType === this.allDateRanges.Custom.type) { // Custom if (this.analysisType === statisticsConstants.allAnalysisTypes.CategoricalAnalysis) {
this.showCustomDateRangeSheet = true; if (dateType === this.allDateRanges.Custom.type) { // Custom
this.showDatePopover = false; this.showCustomDateRangeSheet = true;
return; this.showDatePopover = false;
} else if (this.query.categoricalChartDateType === dateType) { return;
return; } else if (this.query.categoricalChartDateType === dateType) {
return;
}
} }
const dateRange = getDateRangeByDateType(dateType, this.firstDayOfWeek); const dateRange = getDateRangeByDateType(dateType, this.firstDayOfWeek);
@@ -481,57 +498,80 @@ export default {
return; return;
} }
this.statisticsStore.updateTransactionStatisticsFilter({ let changed = false;
categoricalChartDateType: dateRange.dateType,
categoricalChartStartTime: dateRange.minTime, if (this.analysisType === statisticsConstants.allAnalysisTypes.CategoricalAnalysis) {
categoricalChartEndTime: dateRange.maxTime changed = this.statisticsStore.updateTransactionStatisticsFilter({
}); categoricalChartDateType: dateRange.dateType,
categoricalChartStartTime: dateRange.minTime,
categoricalChartEndTime: dateRange.maxTime
});
}
this.showDatePopover = false; this.showDatePopover = false;
this.reload(null);
if (changed) {
this.reload(null);
}
}, },
setCustomDateFilter(startTime, endTime) { setCustomDateFilter(startTime, endTime) {
if (!startTime || !endTime) { if (!startTime || !endTime) {
return; return;
} }
const chartDateType = getDateTypeByDateRange(startTime, endTime, this.firstDayOfWeek, datetimeConstants.allDateRangeScenes.Normal); let changed = false;
this.statisticsStore.updateTransactionStatisticsFilter({ if (this.analysisType === statisticsConstants.allAnalysisTypes.CategoricalAnalysis) {
categoricalChartDateType: chartDateType, const chartDateType = getDateTypeByDateRange(startTime, endTime, this.firstDayOfWeek, datetimeConstants.allDateRangeScenes.Normal);
categoricalChartStartTime: startTime,
categoricalChartEndTime: endTime
});
this.showCustomDateRangeSheet = false; changed = this.statisticsStore.updateTransactionStatisticsFilter({
categoricalChartDateType: chartDateType,
categoricalChartStartTime: startTime,
categoricalChartEndTime: endTime
});
this.reload(null); this.showCustomDateRangeSheet = false;
}
if (changed) {
this.reload(null);
}
}, },
shiftDateRange(startTime, endTime, scale) { shiftDateRange(scale) {
if (this.query.categoricalChartDateType === this.allDateRanges.All.type) { if (this.query.categoricalChartDateType === this.allDateRanges.All.type) {
return; return;
} }
const newDateRange = getShiftedDateRangeAndDateType(startTime, endTime, scale, this.firstDayOfWeek, datetimeConstants.allDateRangeScenes.Normal); let changed = false;
this.statisticsStore.updateTransactionStatisticsFilter({ if (this.analysisType === statisticsConstants.allAnalysisTypes.CategoricalAnalysis) {
categoricalChartDateType: newDateRange.dateType, const newDateRange = getShiftedDateRangeAndDateType(this.query.categoricalChartStartTime, this.query.categoricalChartEndTime, scale, this.firstDayOfWeek, datetimeConstants.allDateRangeScenes.Normal);
categoricalChartStartTime: newDateRange.minTime,
categoricalChartEndTime: newDateRange.maxTime
});
this.reload(null); changed = this.statisticsStore.updateTransactionStatisticsFilter({
categoricalChartDateType: newDateRange.dateType,
categoricalChartStartTime: newDateRange.minTime,
categoricalChartEndTime: newDateRange.maxTime
});
}
if (changed) {
this.reload(null);
}
}, },
dateRangeName(query) { dateRangeName() {
if (query.chartDataType === this.allChartDataTypes.AccountTotalAssets.type || if (this.query.chartDataType === this.allChartDataTypes.AccountTotalAssets.type ||
query.chartDataType === this.allChartDataTypes.AccountTotalLiabilities.type) { this.query.chartDataType === this.allChartDataTypes.AccountTotalLiabilities.type) {
return this.$t(this.allDateRanges.All.name); return this.$t(this.allDateRanges.All.name);
} }
return this.$locale.getDateRangeDisplayName(this.userStore, query.categoricalChartDateType, query.categoricalChartStartTime, query.categoricalChartEndTime); if (this.analysisType === statisticsConstants.allAnalysisTypes.CategoricalAnalysis) {
return this.$locale.getDateRangeDisplayName(this.userStore, this.query.categoricalChartDateType, this.query.categoricalChartStartTime, this.query.categoricalChartEndTime);
} else {
return '';
}
}, },
clickPieChartItem(item) { clickPieChartItem(item) {
this.f7router.navigate(this.getItemLinkUrl(item)); this.f7router.navigate(this.getTransactionItemLinkUrl(item));
}, },
filterAccounts() { filterAccounts() {
this.f7router.navigate('/settings/filter/account?type=statisticsCurrent'); this.f7router.navigate('/settings/filter/account?type=statisticsCurrent');
@@ -567,7 +607,7 @@ export default {
getDisplayPercent(value, precision, lowPrecisionValue) { getDisplayPercent(value, precision, lowPrecisionValue) {
return formatPercent(value, precision, lowPrecisionValue); return formatPercent(value, precision, lowPrecisionValue);
}, },
getItemLinkUrl(item) { getTransactionItemLinkUrl(item) {
return `/transaction/list?${this.statisticsStore.getTransactionListPageParams(statisticsConstants.allAnalysisTypes.CategoricalAnalysis, item)}`; return `/transaction/list?${this.statisticsStore.getTransactionListPageParams(statisticsConstants.allAnalysisTypes.CategoricalAnalysis, item)}`;
} }
} }