make the time range not exceed the selected range when jumping from trend analysis chart to transaction list page

This commit is contained in:
MaysWind
2024-11-08 17:59:18 +08:00
parent 7b96cd0447
commit 79fd9070e4
+21 -2
View File
@@ -18,6 +18,8 @@ import {
isNumber
} from '@/lib/common.js';
import {
getYearMonthFirstUnixTime,
getYearMonthLastUnixTime,
getAllYearsStartAndEndUnixTimes,
getAllQuartersStartAndEndUnixTimes,
getAllMonthsStartAndEndUnixTimes,
@@ -393,8 +395,25 @@ export default {
const item = this.itemsMap[id];
const itemId = this.idField ? item[this.idField] : '';
const dateRange = this.allDateRanges[e.dataIndex];
const minUnixTime = dateRange.minUnixTime;
const maxUnixTime = dateRange.maxUnixTime;
let minUnixTime = dateRange.minUnixTime;
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);
this.$emit('click', {