center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat(查询组件): 日期查询组件可设置查询的起始日期 #6005

Browse Source
This commit is contained in:
dataeaseShu 2024-03-19 17:47:44 +08:00
parent 412025fb7f
commit a3160e5eba
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/core-frontend/src/custom-component/v-query/DynamicTimeFiltering.vue
View File

@ -40,10 +40,18 @@ const props = defineProps({
const { config } = toRefs(props)
const timeConfig = computed(() => {
const { relativeToCurrent, intervalType, timeNum, relativeToCurrentType, around } = config.value
const {
relativeToCurrent,
regularOrTrends,
intervalType,
timeNum,
relativeToCurrentType,
around
} = config.value
return {
relativeToCurrent,
timeNum,
regularOrTrends,
intervalType,
relativeToCurrentType,
around,
@ -69,7 +77,14 @@ const timeInterval = computed<DatePickType>(() => {
})
const init = () => {
const { relativeToCurrent, timeNum, relativeToCurrentType, around } = timeConfig.value
const { relativeToCurrent, regularOrTrends, timeNum, relativeToCurrentType, around } =
timeConfig.value
if (regularOrTrends === 'fixed') {
if (!!config.value.regularOrTrendsValue && !Array.isArray(config.value.regularOrTrendsValue))
return
config.value.regularOrTrendsValue = new Date()
return
}
if (relativeToCurrent === 'custom') {
config.value.regularOrTrendsValue = getAround(
relativeToCurrentType,

16
core/core-frontend/src/custom-component/v-query/DynamicTimeRangeFiltering.vue
View File

@ -51,6 +51,7 @@ const timeConfig = computed(() => {
relativeToCurrentType,
around,
intervalType,
regularOrTrends,
timeGranularity,
timeNumRange,
relativeToCurrentTypeRange,
@ -61,6 +62,7 @@ const timeConfig = computed(() => {
relativeToCurrentType,
around,
intervalType,
regularOrTrends,
timeGranularity,
timeNumRange,
relativeToCurrentTypeRange,
@ -89,11 +91,25 @@ const init = () => {
timeNum,
relativeToCurrentType,
around,
regularOrTrends,
timeNumRange,
relativeToCurrentTypeRange,
aroundRange
} = timeConfig.value
if (regularOrTrends === 'fixed') {
if (
Array.isArray(config.value.regularOrTrendsValue) &&
!!config.value.regularOrTrendsValue.length
)
return
config.value.regularOrTrendsValue = [
getAround(relativeToCurrentTypeRange, 'add', 0),
getAround(relativeToCurrentTypeRange, 'add', 1)
]
return
}
const startTime = getAround(relativeToCurrentType, around === 'f' ? 'subtract' : 'add', timeNum)
const endTime = getAround(
relativeToCurrentTypeRange,