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

code refactor

Browse Source
This commit is contained in:
MaysWind
2021-01-29 00:18:54 +08:00
parent 77adf24e64
commit 19451c22ee
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utils.js
+2 -2
View File
@@ -137,7 +137,7 @@ function getThisYearLastUnixTime() {
return moment.unix(getThisYearFirstUnixTime()).add(1, 'years').subtract(1, 'seconds').unix(); return moment.unix(getThisYearFirstUnixTime()).add(1, 'years').subtract(1, 'seconds').unix();
} }
function getShiftedtDateRange(minTime, maxTime, scale) { function getShiftedDateRange(minTime, maxTime, scale) {
const minDateTime = parseDateFromUnixTime(minTime); const minDateTime = parseDateFromUnixTime(minTime);
const maxDateTime = parseDateFromUnixTime(maxTime); const maxDateTime = parseDateFromUnixTime(maxTime);
@@ -548,7 +548,7 @@ export default {
getThisMonthLastUnixTime, getThisMonthLastUnixTime,
getThisYearFirstUnixTime, getThisYearFirstUnixTime,
getThisYearLastUnixTime, getThisYearLastUnixTime,
getShiftedtDateRange, getShiftedDateRange,
getDateRangeByDateType, getDateRangeByDateType,
copyObjectTo, copyObjectTo,
copyArrayTo, copyArrayTo,
src/views/mobile/statistics/Transaction.vue
+10 -10
View File
@@ -458,12 +458,12 @@ export default {
const self = this; const self = this;
const router = self.$f7router; const router = self.$f7router;
const dateParam = self.$utilities.getDateRangeByDateType(self.query.dateType); const dateRange = self.$utilities.getDateRangeByDateType(self.query.dateType);
self.$store.dispatch('initTransactionStatisticsFilter', { self.$store.dispatch('initTransactionStatisticsFilter', {
dateType: dateParam ? dateParam.dateType : undefined, dateType: dateRange ? dateRange.dateType : undefined,
startTime: dateParam ? dateParam.minTime : undefined, startTime: dateRange ? dateRange.minTime : undefined,
endTime: dateParam ? dateParam.maxTime : undefined, endTime: dateRange ? dateRange.maxTime : undefined,
}); });
Promise.all([ Promise.all([
@@ -524,16 +524,16 @@ export default {
return; return;
} }
const dateParam = this.$utilities.getDateRangeByDateType(dateType); const dateRange = this.$utilities.getDateRangeByDateType(dateType);
if (!dateParam) { if (!dateRange) {
return; return;
} }
this.$store.dispatch('updateTransactionStatisticsFilter', { this.$store.dispatch('updateTransactionStatisticsFilter', {
dateType: dateParam.dateType, dateType: dateRange.dateType,
startTime: dateParam.minTime, startTime: dateRange.minTime,
endTime: dateParam.maxTime endTime: dateRange.maxTime
}); });
this.showDatePopover = false; this.showDatePopover = false;
@@ -559,7 +559,7 @@ export default {
return; return;
} }
const newDateRange = this.$utilities.getShiftedtDateRange(startTime, endTime, scale); const newDateRange = this.$utilities.getShiftedDateRange(startTime, endTime, scale);
let newDateType = this.$constants.datetime.allDateRanges.Custom.type; let newDateType = this.$constants.datetime.allDateRanges.Custom.type;
for (let dateRangeField in this.$constants.datetime.allDateRanges) { for (let dateRangeField in this.$constants.datetime.allDateRanges) {
src/views/mobile/transactions/List.vue
+11 -11
View File
@@ -396,12 +396,12 @@ export default {
const self = this; const self = this;
const query = self.$f7route.query; const query = self.$f7route.query;
let dateParam = self.$utilities.getDateRangeByDateType(query.dateType ? parseInt(query.dateType) : undefined); let dateRange = self.$utilities.getDateRangeByDateType(query.dateType ? parseInt(query.dateType) : undefined);
if (!dateParam && if (!dateRange &&
query.dateType === self.$constants.datetime.allDateRanges.Custom.type.toString() && query.dateType === self.$constants.datetime.allDateRanges.Custom.type.toString() &&
parseInt(query.maxTime) > 0 && parseInt(query.minTime) > 0) { parseInt(query.maxTime) > 0 && parseInt(query.minTime) > 0) {
dateParam = { dateRange = {
dateType: parseInt(query.dateType), dateType: parseInt(query.dateType),
maxTime: parseInt(query.maxTime), maxTime: parseInt(query.maxTime),
minTime: parseInt(query.minTime) minTime: parseInt(query.minTime)
@@ -409,9 +409,9 @@ export default {
} }
this.$store.dispatch('initTransactionListFilter', { this.$store.dispatch('initTransactionListFilter', {
dateType: dateParam ? dateParam.dateType : undefined, dateType: dateRange ? dateRange.dateType : undefined,
maxTime: dateParam ? dateParam.maxTime : undefined, maxTime: dateRange ? dateRange.maxTime : undefined,
minTime: dateParam ? dateParam.minTime : undefined, minTime: dateRange ? dateRange.minTime : undefined,
type: parseInt(query.type) > 0 ? parseInt(query.type) : undefined, type: parseInt(query.type) > 0 ? parseInt(query.type) : undefined,
categoryId: query.categoryId, categoryId: query.categoryId,
accountId: query.accountId accountId: query.accountId
@@ -506,16 +506,16 @@ export default {
return; return;
} }
const dateParam = this.$utilities.getDateRangeByDateType(dateType); const dateRange = this.$utilities.getDateRangeByDateType(dateType);
if (!dateParam) { if (!dateRange) {
return; return;
} }
this.$store.dispatch('updateTransactionListFilter', { this.$store.dispatch('updateTransactionListFilter', {
dateType: dateParam.dateType, dateType: dateRange.dateType,
maxTime: dateParam.maxTime, maxTime: dateRange.maxTime,
minTime: dateParam.minTime minTime: dateRange.minTime
}); });
this.showDatePopover = false; this.showDatePopover = false;