From e47d5afb187f0164ce3e656c834ba259f4c1c0d2 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 11 Feb 2025 14:09:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=20#14731?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 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 5696b8832c..9752b758a4 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -1540,6 +1540,16 @@ const confirmClick = () => {
   })
 }
 
+const fieldsComputed = computed(() => {
+  return curComponent.value.dataset.fields.filter(ele => {
+    return (
+      ele.deType === +curComponent.value.displayType ||
+      ([0, 2, 3, 4].includes(ele.deType) && [0, 2].includes(+curComponent.value.displayType)) ||
+      (ele.deType === 7 && +curComponent.value.displayType === 0)
+    )
+  })
+})
+
 const cancelValueSource = () => {
   valueSource.value = cloneDeep(curComponent.value.valueSource)
   if (!valueSource.value.length) {
@@ -2966,12 +2976,7 @@ defineExpose({
                         </el-icon>
                       </template>
                       <el-option
-                        v-for="ele in curComponent.dataset.fields.filter(
-                          ele =>
-                            ele.deType === +curComponent.displayType ||
-                            ([3, 4].includes(ele.deType) && +curComponent.displayType === 2) ||
-                            (ele.deType === 7 && +curComponent.displayType === 0)
-                        )"
+                        v-for="ele in fieldsComputed"
                         :key="ele.id"
                         :label="ele.name"
                         :value="ele.id"