From b63e5cef1a9f36ec99457cef997d951303801e85 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 16 Jul 2024 17:50:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6=E4=B8=8B=E6=8B=89=E6=A0=91=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue      | 16 ++++++++++------
 1 file changed, 10 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 9d4e98f5e3..c51ece128b 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -245,11 +245,10 @@ const setTreeDefault = () => {
     })
     if (checkId && tableId) {
       const componentObj = fields.value.find(ele => ele.componentId === comId)
-      const fieldArr = (
+      const fieldArr =
         curComponent.value.optionValueSource === 0
           ? componentObj?.fields?.dimensionList
-          : curComponent.value.dataset?.fields
-      ).filter(ele => ele.deType === +curComponent.value.field.deType)
+          : (fields.value.find(itx => itx.id === tableId) || {}).fields?.dimensionList
       fields.value.forEach(ele => {
         if (curComponent.value.checkedFields.includes(ele.componentId)) {
           if (datasetFieldList.value.find(itx => itx.id === ele.componentId)?.tableId === tableId) {
@@ -258,12 +257,14 @@ const setTreeDefault = () => {
         }
       })
       const fieldObj = fieldArr.find(element => element.id === checkId)
+      console.log(fieldObj, 'fieldObj', fieldArr, checkId)
+
       if (!!curComponent.value.treeFieldList.length) {
         const [fir] = curComponent.value.treeFieldList
-        if (fir.field !== checkId) {
+        if (fir && fir.field !== checkId) {
           curComponent.value.treeFieldList = [fieldObj]
         }
-      } else {
+      } else if (fieldObj) {
         curComponent.value.treeFieldList = [fieldObj]
       }
     }
@@ -1484,7 +1485,10 @@ defineExpose({
                   value="8"
                 />
                 <el-option
-                  :disabled="!['0', '8', '9'].includes(curComponent.displayType)"
+                  :disabled="
+                    !['0', '8', '9'].includes(curComponent.displayType) ||
+                    !!curComponent.parameters.length
+                  "
                   label="下拉树"
                   value="9"
                 />