From cdba09d38d3e2882ab7da524bb647114b95567f6 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 17 Oct 2024 14:25:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E8=AE=BE=E7=BD=AE=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E6=B8=85=E9=99=A4=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E5=90=8E=E4=BE=9D=E7=84=B6=E5=AD=98=E7=95=99=E6=95=B0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue       | 15 +++++++++++++++
 .../src/custom-component/v-query/Time.vue         |  1 +
 2 files changed, 16 insertions(+)

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 9a2b132ec5..ef67c01d38 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -697,6 +697,21 @@ const setParameters = field => {
         curComponent.value.optionValueSource = 1
       }
     }
+    if (curComponent.value.displayType === '22') {
+      const isNumParameter = curComponent.value.checkedFields.some(ele => {
+        return curComponent.value.parameters?.some(
+          itx => [2, 3].includes(itx.deType) && curComponent.value.checkedFieldsMap[ele] === itx.id
+        )
+      })
+
+      const isSingle = curComponent.value.checkedFields.every(id => {
+        return !curComponent.value.checkedFieldsMapArr?.[id]?.length
+      })
+
+      if (isSingle && isNumParameter) {
+        curComponent.value.displayType = '2'
+      }
+    }
     setTypeChange()
   })
   setType()
diff --git a/core/core-frontend/src/custom-component/v-query/Time.vue b/core/core-frontend/src/custom-component/v-query/Time.vue
index 5fba978962..333972a3bf 100644
--- a/core/core-frontend/src/custom-component/v-query/Time.vue
+++ b/core/core-frontend/src/custom-component/v-query/Time.vue
@@ -79,6 +79,7 @@ const maxDate = new Date('2100/1/1')
 watch(
   () => config.value.defaultValue,
   val => {
+    if (props.isConfig) return
     const isMultiple = config.value.displayType === '7'
     if (isMultiple) {
       multiple.value = isMultiple