From 0a2a3d2a9bea1d617a7cb24231b136666bb205d8 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 13 Oct 2025 13:34:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(xpack):=20=E7=AD=9B=E9=80=89=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=B2=92=E5=BA=A6=EF=BC=8C=E7=84=B6=E5=90=8E?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8E=A7=E4=BB=B6=E7=9A=84=E5=BD=A2=E5=BC=8F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filter/auth-tree-chart/AuthTree.vue       |  1 +
 .../filter/auth-tree-chart/FilterFiled.vue    | 27 +++++++++++++++++++
 .../editor/filter/auth-tree-chart/RowAuth.vue |  6 +++++
 .../editor/filter/auth-tree/AuthTree.vue      |  1 +
 .../editor/filter/auth-tree/RowAuth.vue       |  8 ++++--
 .../data/dataset/auth-tree/AuthTree.vue       |  1 +
 .../data/dataset/auth-tree/FilterFiled.vue    |  1 +
 .../data/dataset/auth-tree/RowAuth.vue        |  8 ++++--
 8 files changed, 49 insertions(+), 4 deletions(-)

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'])
 </script>
 
@@ -590,6 +603,19 @@ const emits = defineEmits(['update:item', 'del'])
                 size="small"
                 v-model="item.timeValue"
             /></el-tooltip>
+            <el-tooltip
+              class="item"
+              v-if="item.deType === 1 && item.filterTypeTime !== 'dynamicDate'"
+              effect="light"
+              :content="item.value"
+              placement="top"
+              ><el-input
+                readonly
+                @click="showTimeDialog(item)"
+                class="w70 mar5"
+                size="small"
+                v-model="item.value"
+            /></el-tooltip>
             <el-input v-else class="w70 mar5" size="small" v-model="item.value" />
             <div class="bottom-line"></div>
           </template>
@@ -709,6 +735,7 @@ const emits = defineEmits(['update:item', 'del'])
       </template>
     </el-dialog>
   </div>
+  <TimeSetDialog @saveTime="saveTime" ref="timeDialogRef"></TimeSetDialog>
 </template>
 
 <style lang="less" scoped>
diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/RowAuth.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/RowAuth.vue
index 4c1abac6b1..a8d6aa0684 100644
--- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/RowAuth.vue
+++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/RowAuth.vue
@@ -172,6 +172,7 @@ const dfsInit = arr => {
         fieldId,
         filterType,
         term,
+        timeType,
         value,
         field
       } = ele
@@ -181,6 +182,7 @@ const dfsInit = arr => {
         fieldId,
         filterType,
         term,
+        timeType,
         timeValue: getTimeValue(dynamicTimeSetting),
         filterTypeTime,
         dynamicTimeSetting,
@@ -204,6 +206,7 @@ const dfsSubmit = arr => {
         fieldId: '',
         filterType: '',
         term: '',
+        timeType: 'year',
         type: 'tree',
         value: '',
         filterTypeTime: 'dateValue',
@@ -220,6 +223,7 @@ const dfsSubmit = arr => {
         filterType,
         deType,
         term,
+        timeType,
         value,
         name,
         timeValue
@@ -234,6 +238,7 @@ const dfsSubmit = arr => {
           filterTypeTime,
           dynamicTimeSetting,
           term,
+          timeType,
           value,
           type: 'item',
           subTree: null
@@ -375,6 +380,7 @@ const addCondReal = (type, logic) => {
           value: '',
           enumValue: '',
           term: '',
+          timeType: 'year',
           filterType: 'logic',
           name: '',
           timeValue: '',
diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/AuthTree.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/AuthTree.vue
index 0de73aba7d..f5c278e83b 100644
--- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/AuthTree.vue
+++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/AuthTree.vue
@@ -70,6 +70,7 @@ const add = (type, child, logic) => {
           term: '',
           filterType: 'logic',
           name: '',
+          timeType: 'year',
           filterTypeTime: 'dateValue',
           timeValue: '',
           dynamicTimeSetting: {},
diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/RowAuth.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/RowAuth.vue
index 619937800c..72e60aa2e4 100644
--- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/RowAuth.vue
+++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/RowAuth.vue
@@ -93,13 +93,14 @@ const dfsInit = arr => {
       const child = dfsInit(items)
       elementList.push({ logic, child })
     } else {
-      const { enumValue, fieldId, filterType, term, value, timeValue, field } = ele
+      const { enumValue, fieldId, filterType, term, timeType, value, timeValue, field } = ele
       const { name, deType } = field || {}
       elementList.push({
         enumValue: enumValue.join(','),
         fieldId,
         filterType,
         term,
+        timeType,
         timeValue,
         value,
         name,
@@ -121,13 +122,14 @@ const dfsSubmit = arr => {
         fieldId: '',
         filterType: '',
         term: '',
+        timeType: 'year',
         type: 'tree',
         value: '',
         timeValue: '',
         subTree: { logic, items: subTree }
       })
     } else {
-      const { enumValue, fieldId, filterType, deType, term, value, name, timeValue } = ele
+      const { enumValue, fieldId, filterType, deType, term, value, timeType, name, timeValue } = ele
       errorDetected({ deType, enumValue, filterType, term, value, name, timeValue })
       if (fieldId) {
         items.push({
@@ -136,6 +138,7 @@ const dfsSubmit = arr => {
           timeValue,
           filterType,
           term,
+          timeType,
           value,
           type: 'item',
           subTree: null
@@ -278,6 +281,7 @@ const addCondReal = (type, logic) => {
           enumValue: '',
           term: '',
           filterType: 'logic',
+          timeType: 'year',
           name: '',
           timeValue: '',
           deType: ''
diff --git a/core/core-frontend/src/views/visualized/data/dataset/auth-tree/AuthTree.vue b/core/core-frontend/src/views/visualized/data/dataset/auth-tree/AuthTree.vue
index cc42e938db..7b72bd9116 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/auth-tree/AuthTree.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/auth-tree/AuthTree.vue
@@ -68,6 +68,7 @@ const add = (type, child, logic) => {
           value: '',
           enumValue: '',
           term: '',
+          timeType: 'year',
           filterType: 'logic',
           name: '',
           deType: ''
diff --git a/core/core-frontend/src/views/visualized/data/dataset/auth-tree/FilterFiled.vue b/core/core-frontend/src/views/visualized/data/dataset/auth-tree/FilterFiled.vue
index 925518d607..7195e8a3c6 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/auth-tree/FilterFiled.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/auth-tree/FilterFiled.vue
@@ -37,6 +37,7 @@ const props = withDefaults(defineProps<Props>(), {
     term: '',
     fieldId: '',
     filterType: '',
+    timeType: 'year',
     deType: 0,
     enumValue: '',
     name: '',
diff --git a/core/core-frontend/src/views/visualized/data/dataset/auth-tree/RowAuth.vue b/core/core-frontend/src/views/visualized/data/dataset/auth-tree/RowAuth.vue
index 0f1a8a4392..c94ac3c635 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/auth-tree/RowAuth.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/auth-tree/RowAuth.vue
@@ -77,7 +77,7 @@ const dfsInit = arr => {
       const child = dfsInit(items)
       elementList.push({ logic, child })
     } else {
-      const { enumValue, fieldId, filterType, term, value, field } = ele
+      const { enumValue, fieldId, filterType, term, timeType, value, field } = ele
       const { name, deType } = field || {}
       elementList.push({
         enumValue: enumValue.join(','),
@@ -85,6 +85,7 @@ const dfsInit = arr => {
         filterType,
         term,
         value,
+        timeType,
         name,
         deType
       })
@@ -104,12 +105,13 @@ const dfsSubmit = arr => {
         fieldId: '',
         filterType: '',
         term: '',
+        timeType: 'year',
         type: 'tree',
         value: '',
         subTree: { logic, items: subTree }
       })
     } else {
-      const { enumValue, fieldId, filterType, deType, term, value, name } = ele
+      const { enumValue, fieldId, filterType, deType, term, timeType, value, name } = ele
       errorDetected({ deType, enumValue, filterType, term, value, name })
       if (fieldId) {
         items.push({
@@ -117,6 +119,7 @@ const dfsSubmit = arr => {
           fieldId,
           filterType,
           term,
+          timeType,
           value,
           type: 'item',
           subTree: null
@@ -258,6 +261,7 @@ const addCondReal = (type, logic) => {
           value: '',
           enumValue: '',
           term: '',
+          timeType: 'year',
           filterType: 'logic',
           name: '',
           deType: ''