github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(查询组件): 时间查询组件设置动态日期本月的默认值则查询报错 #14445

Browse Source
This commit is contained in:
dataeaseShu 2025-01-02 10:09:28 +08:00 committed by fit2cloud-chenyw
parent c430323f88
commit 73e80dfc94
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
View File

@ -2062,8 +2062,11 @@ const timeGranularityChange = (val: string) => {
} }
const handleTimeTypeChange = () => { const handleTimeTypeChange = () => {
timeGranularityChange(curComponent.value.timeGranularity) if (curComponent.value.displayType === '1') {
timeGranularityMultipleChange(curComponent.value.timeGranularityMultiple) timeGranularityChange(curComponent.value.timeGranularity)
} else {
timeGranularityMultipleChange(curComponent.value.timeGranularityMultiple)
}
} }
const timeGranularityMultipleChange = (val: string) => { const timeGranularityMultipleChange = (val: string) => {

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

@ -17,9 +17,12 @@ function getThisMonth() {
return new Date(`${date.getFullYear()}/${date.getMonth() + 1}`) return new Date(`${date.getFullYear()}/${date.getMonth() + 1}`)
} }
function getLastStart(val = 'month' as ManipulateType) {
return new Date(dayjs().subtract(1, val).startOf(val).format('YYYY/MM/DD HH:mm:ss'))
}
function getLastMonth() { function getLastMonth() {
const date = new Date() return getLastStart()
return new Date(`${date.getFullYear()}/${date.getMonth()}`)
} }
function getNextMonth() { function getNextMonth() {