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

Merge pull request #7895 from dataease/pr@dev-v2_query_com

Browse Source 
fix(查询组件): 查询组件年bug测试
This commit is contained in:
dataeaseShu 2024-01-30 09:41:58 +08:00 committed by GitHub
commit 0f07e82637
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/core-frontend/src/custom-component/v-query/DynamicTimeRange.vue
View File

@ -149,6 +149,7 @@ const init = () => {
'end-config' 'end-config'
) )
console.log('startTime, endTime', startTime, endTime)
selectValue.value = [startTime, endTime] selectValue.value = [startTime, endTime]
} }
@ -164,7 +165,7 @@ const formatDate = computed(() => {
<template> <template>
<el-date-picker <el-date-picker
disabled disabled
v-if="rendering" v-if="rendering && config.timeGranularityMultiple !== 'yearrange'"
v-model="selectValue" v-model="selectValue"
:type="config.timeGranularityMultiple" :type="config.timeGranularityMultiple"
:prefix-icon="Calendar" :prefix-icon="Calendar"
@ -173,4 +174,15 @@ const formatDate = computed(() => {
:start-placeholder="$t('datasource.start_time')" :start-placeholder="$t('datasource.start_time')"
:end-placeholder="$t('datasource.end_time')" :end-placeholder="$t('datasource.end_time')"
/> />
<el-date-picker
v-else
disabled
v-model="selectValue"
type="yearrange"
:prefix-icon="Calendar"
format="YYYY"
:range-separator="$t('cron.to')"
:start-placeholder="$t('datasource.start_time')"
:end-placeholder="$t('datasource.end_time')"
/>
</template> </template>