diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue index aef709042f..b7effd3efe 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue @@ -72,6 +72,7 @@ const add = (type, child, logic) => { name: '', filterTypeTime: 'dateValue', timeValue: '', + timeType: 'year', dynamicTimeSetting: {}, deType: '' } diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/FilterFiled.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/FilterFiled.vue index e0e97e9251..a632b51d00 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/FilterFiled.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/FilterFiled.vue @@ -15,6 +15,7 @@ import { sysParamsIlns, fieldEnums } from '@/views/visualized/data/dataset/options.js' +import TimeSetDialog from '@/components/time-set-dialog/index.vue' import { iconFieldMap } from '@/components/icon-group/field-list' export interface Item { term: string @@ -27,6 +28,7 @@ export interface Item { filterTypeTime?: string timeValue: string dynamicTimeSetting?: SelectConfig + timeType?: string } type Props = { @@ -432,6 +434,17 @@ const addFields = () => { showTextArea.value = false } +const timeDialogRef = ref() +const showTimeDialog = (obj: any) => { + if (obj.deType !== 1) return + timeDialogRef.value.init(obj.timeType, obj.value) +} + +const saveTime = (type, value) => { + item.value.timeType = type + item.value.value = value +} + const emits = defineEmits(['update:item', 'del']) @@ -590,6 +603,19 @@ const emits = defineEmits(['update:item', 'del']) size="small" v-model="item.timeValue" /> +
@@ -709,6 +735,7 @@ const emits = defineEmits(['update:item', 'del']) +