mirror of
https://github.com/mayswind/ezbookkeeping.git
synced 2026-05-14 15:07:33 +08:00
make the time range not exceed the selected range when jumping from trend analysis chart to transaction list page
This commit is contained in:
@@ -18,6 +18,8 @@ import {
|
|||||||
isNumber
|
isNumber
|
||||||
} from '@/lib/common.js';
|
} from '@/lib/common.js';
|
||||||
import {
|
import {
|
||||||
|
getYearMonthFirstUnixTime,
|
||||||
|
getYearMonthLastUnixTime,
|
||||||
getAllYearsStartAndEndUnixTimes,
|
getAllYearsStartAndEndUnixTimes,
|
||||||
getAllQuartersStartAndEndUnixTimes,
|
getAllQuartersStartAndEndUnixTimes,
|
||||||
getAllMonthsStartAndEndUnixTimes,
|
getAllMonthsStartAndEndUnixTimes,
|
||||||
@@ -393,8 +395,25 @@ export default {
|
|||||||
const item = this.itemsMap[id];
|
const item = this.itemsMap[id];
|
||||||
const itemId = this.idField ? item[this.idField] : '';
|
const itemId = this.idField ? item[this.idField] : '';
|
||||||
const dateRange = this.allDateRanges[e.dataIndex];
|
const dateRange = this.allDateRanges[e.dataIndex];
|
||||||
const minUnixTime = dateRange.minUnixTime;
|
let minUnixTime = dateRange.minUnixTime;
|
||||||
const maxUnixTime = dateRange.maxUnixTime;
|
let maxUnixTime = dateRange.maxUnixTime;
|
||||||
|
|
||||||
|
if (this.startYearMonth) {
|
||||||
|
const startMinUnixTime = getYearMonthFirstUnixTime(this.startYearMonth);
|
||||||
|
|
||||||
|
if (startMinUnixTime > minUnixTime) {
|
||||||
|
minUnixTime = startMinUnixTime;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.endYearMonth) {
|
||||||
|
const endMaxUnixTime = getYearMonthLastUnixTime(this.endYearMonth);
|
||||||
|
|
||||||
|
if (endMaxUnixTime < maxUnixTime) {
|
||||||
|
maxUnixTime = endMaxUnixTime;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const dateRangeType = getDateTypeByDateRange(minUnixTime, maxUnixTime, this.userStore.currentUserFirstDayOfWeek, datetimeConstants.allDateRangeScenes.Normal);
|
const dateRangeType = getDateTypeByDateRange(minUnixTime, maxUnixTime, this.userStore.currentUserFirstDayOfWeek, datetimeConstants.allDateRangeScenes.Normal);
|
||||||
|
|
||||||
this.$emit('click', {
|
this.$emit('click', {
|
||||||
|
|||||||
Reference in New Issue
Block a user