From 8dfb9904b6102f85b0fcb92d79661fdef9a00660 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 24 Feb 2025 15:44:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E5=B7=B2=E6=9C=89=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AF=B9=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E7=BB=84=E4=BB=B6=E7=9A=84=E6=97=B6=E9=97=B4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=97=B6=EF=BC=8C=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E7=B1=BB=E5=9E=8B=E4=BC=9A=E5=8F=98?=
 =?UTF-8?q?=E6=88=90=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue   | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index 2da532bc27..f4ef293ba9 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -253,8 +253,6 @@ const showTypeError = computed(() => {
         return false
       }
       if (displayTypeField.type?.length !== field.type?.length) {
-        console.log('displayTypeField')
-
         return true
       }
     }
@@ -704,8 +702,15 @@ const setParameters = field => {
         curComponent.value.checkedFieldsMap[field.componentId]
     }
   })
+
+  const notChangeType =
+    curComponent.value.checkedFields.some(ele => {
+      return (
+        curComponent.value.checkedFieldsMapStart[ele] || curComponent.value.checkedFieldsMapEnd[ele]
+      )
+    }) && +curComponent.value.displayType === 7
   nextTick(() => {
-    if (isTimeParameter.value) {
+    if (isTimeParameter.value && !notChangeType) {
       const timeParameter = curComponent.value.parameters.find(ele => ele.deType === 1)
       curComponent.value.timeGranularity =
         typeTimeMap[timeParameter.type[1] || timeParameter.type[0]]
@@ -735,6 +740,8 @@ const setParameters = field => {
     }
     setTypeChange()
   })
+
+  if (notChangeType) return
   setType()
   if (curComponent.value.displayType === '9') {
     setTreeDefault()
@@ -773,6 +780,17 @@ const setType = () => {
       }
     }
   }
+
+  if (
+    curComponent.value.checkedFields.some(ele => {
+      return (
+        curComponent.value.checkedFieldsMapStart[ele] || curComponent.value.checkedFieldsMapEnd[ele]
+      )
+    }) &&
+    +curComponent.value.displayType === 1
+  ) {
+    curComponent.value.displayType = '7'
+  }
 }
 
 const setTypeChange = () => {