From 6208e27eb140667e8f6038c7c5513209175bf6d4 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 18 Jun 2024 15:44:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BB=84=E4=BB=B6=E7=BA=A7=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/QueryCascade.vue | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
index b866d14e5a..f43c0e67d3 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
@@ -40,7 +40,6 @@ const init = (cascadeMap: cascadeMap) => {
           ele => ele.deType === Object.values(cascadeMap).find(ele => ele.datasetId === i).deType
         )
       }
-      console.log('res', res)
       optionsMap.value = res
     })
     .finally(() => {
@@ -106,26 +105,32 @@ const addCascadeItem = item => {
     placeholder: item.length ? '' : '第一级无需配置被级联字段',
     id: guid()
   })
-  setPlaceholder(item.length - 1, item)
 }
 
-const setPlaceholder = (idx, item) => {
-  if (
-    item[idx] &&
-    item[idx - 1] &&
-    item[idx].datasetId &&
-    item[idx].datasetId === item[idx - 1].datasetId
-  ) {
-    item[idx].placeholder = '与上一级使用同一个数据集,无需配置被级联字段'
-    item[idx].fieldId = ''
-  }
+const setPlaceholder = () => {
+  cascadeList.value.forEach(ele => {
+    ele.forEach((item, idx) => {
+      if (idx) {
+        item.placeholder = ''
+      }
+      if (
+        item &&
+        ele[idx - 1] &&
+        item.datasetId &&
+        item.datasetId.split('--')[0] === ele[idx - 1].datasetId.split('--')[0]
+      ) {
+        item.placeholder = '与上一级使用同一个数据集,无需配置被级联字段'
+        item.fieldId = ''
+      }
+    })
+  })
 }
 
 const deleteCascade = (idx, item) => {
   item.splice(idx, 1)
   item[0].fieldId = ''
   item[0].placeholder = '第一级无需配置被级联字段'
-  setPlaceholder(idx, item)
+  setPlaceholder()
 }
 
 const addCascadeBlock = () => {
@@ -188,6 +193,7 @@ defineExpose({
           <el-select
             @visible-change="val => visibleChange(val, index, idx)"
             v-model="ele.datasetId"
+            @change="setPlaceholder"
             style="width: 300px"
           >
             <el-option