From a3018a79cb739e2bad55ff0ecf24970172738e3d Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 30 Jul 2024 16:45:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=8C=E7=BA=A7=E7=BA=A7=E8=81=94=E5=90=8E?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=9B=B4=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/QueryCascade.vue | 18 +++++++-----------
 .../v-query/QueryConditionConfiguration.vue   | 19 ++++++++++++++++---
 .../src/custom-component/v-query/Select.vue   |  3 +--
 3 files changed, 24 insertions(+), 16 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 9ac5b8d3a7..70ecfd081b 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
@@ -74,11 +74,6 @@ const init = (cascadeMap: cascadeMap, arr) => {
   deTypeMap.value = obj
   listByDsIds(datasetMap.value.map(ele => ele.value.split('--')[0]))
     .then(res => {
-      for (let i in res || {}) {
-        res[i] = res[i].filter(
-          ele => ele.deType === Object.values(cascadeMap).find(ele => ele.datasetId === i).deType
-        )
-      }
       optionsMap.value = res
     })
     .finally(() => {
@@ -248,13 +243,14 @@ defineExpose({
             style="width: 300px"
           >
             <el-option
-              v-for="item in datasetMap"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="itx in datasetMap"
+              :key="itx.value"
+              :label="itx.label"
+              :value="itx.value"
               :disabled="
-                disabledDatasetId.includes(item.value) ||
-                (!!ele.datasetId && deTypeMap[ele.datasetId] !== item.deType)
+                (disabledDatasetId.includes(itx.value) &&
+                  item.map(ele => ele.datasetId).includes(itx.value)) ||
+                (!!ele.datasetId && deTypeMap[ele.datasetId] !== itx.deType)
               "
             />
           </el-select>
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 4f0aea129d..2a52e277b2 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -792,6 +792,17 @@ const confirmClick = () => {
   })
   queryElement.value.propValue = []
   nextTick(() => {
+    conditions.value.forEach(itx => {
+      cascadeArr.forEach(ele => {
+        ele.forEach(item => {
+          if (item.datasetId.split('--')[1] === itx.id && itx.defaultValueCheck) {
+            const val = itx.mapValue
+            item.selectValue = Array.isArray(val) ? [...val] : val
+            item.currentSelectValue = Array.isArray(val) ? [...val] : val
+          }
+        })
+      })
+    })
     queryElement.value.cascade = cloneDeep(cascadeArr)
     cascadeArr = []
     queryElement.value.propValue = cloneDeep(conditions.value)
@@ -1379,9 +1390,11 @@ defineExpose({
               <el-checkbox :label="field.componentId"
                 ><el-icon class="component-type">
                   <Icon :name="canvasViewInfo[field.componentId].type"></Icon> </el-icon
-                ><span class="checkbox-name ellipsis">{{
-                  canvasViewInfo[field.componentId].title
-                }}</span></el-checkbox
+                ><span
+                  :title="canvasViewInfo[field.componentId].title"
+                  class="checkbox-name ellipsis"
+                  >{{ canvasViewInfo[field.componentId].title }}</span
+                ></el-checkbox
               >
               <span :title="field.name" class="dataset ellipsis">{{ field.name }}</span>
               <el-select
diff --git a/core/core-frontend/src/custom-component/v-query/Select.vue b/core/core-frontend/src/custom-component/v-query/Select.vue
index 34052b285f..b031cdb7c6 100644
--- a/core/core-frontend/src/custom-component/v-query/Select.vue
+++ b/core/core-frontend/src/custom-component/v-query/Select.vue
@@ -115,9 +115,8 @@ const setCascadeValueBack = val => {
       if (item.datasetId.split('--')[1] === config.value.id) {
         if (props.isConfig) {
           item.selectValue = Array.isArray(val) ? [...val] : val
-        } else {
-          item.currentSelectValue = Array.isArray(val) ? [...val] : val
         }
+        item.currentSelectValue = Array.isArray(val) ? [...val] : val
       }
     })
   })