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

fix(查询组件): 查询组件的时间范围默认预览 MySQL 数据源数据显示缺少一个月数据

Browse Source
This commit is contained in:
dataeaseShu
2025-05-13 10:13:03 +08:00
committed by xuwei-fit2cloud
parent 259e2fed31
commit a8793f7b52
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-frontend/src/custom-component/v-query/time-format.ts
View File

@@ -48,15 +48,15 @@ function getYearBeginning() {
return new Date(dayjs().startOf('year').format('YYYY/MM/DD HH:mm:ss'))
}
function getYearMonthRange(result, sort) {
function getYearMonthRange(result, sort, type) {
const [direction, scene] = (sort || '').split('-')
if (direction === 'start') {
return new Date(result.startOf('day').format('YYYY/MM/DD HH:mm:ss'))
return new Date(result.startOf(type).format('YYYY/MM/DD HH:mm:ss'))
} else if (direction === 'end') {
if (scene === 'config') {
return new Date(result.format('YYYY/MM/DD HH:mm:ss'))
} else if (scene === 'panel') {
return new Date(dayjs(result).endOf('day').format('YYYY/MM/DD HH:mm:ss'))
return new Date(dayjs(result).endOf(type).format('YYYY/MM/DD HH:mm:ss'))
}
}
}
@@ -75,7 +75,7 @@ function getCustomTime(
const result = dayjs()[type](timeNum, timeType === 'date' ? 'day' : timeType)
if (['monthrange', 'yearrange', 'daterange'].includes(timeGranularityMultiple)) {
return getYearMonthRange(result, sort)
return getYearMonthRange(result, sort, timeGranularityMultiple.split('range')[0])
}
if (!!arbitraryTime) {