From e3953cd0b4ddc760733cb9cd19e80978c94dd737 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 27 Jun 2024 18:29:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E7=BA=A7=E8=81=94=E9=85=8D=E7=BD=AE=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/v-query/QueryCascade.vue           | 3 ++-
 .../v-query/QueryConditionConfiguration.vue                 | 2 +-
 core/core-frontend/src/custom-component/v-query/Select.vue  | 6 +++---
 3 files changed, 6 insertions(+), 5 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 7b2bd80cf0..674f06ecce 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
@@ -60,7 +60,8 @@ const setCascadeArrBack = () => {
   }
 }
 
-const init = (cascadeMap: cascadeMap) => {
+const init = (cascadeMap: cascadeMap, arr) => {
+  cascadeList.value = cloneDeep(arr)
   datasetMap.value = Object.values(cascadeMap).map(ele => ({
     label: ele.name,
     deType: ele.deType,
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 9d1ba30e8e..44c927beb0 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -497,7 +497,7 @@ const openCascadeDialog = () => {
       }
       return pre
     }, {})
-  cascadeDialog.value.init(cascadeMap)
+  cascadeDialog.value.init(cascadeMap, cascadeArr)
 }
 
 const indexCascade = ' 一二三四五'
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 22da020ef1..59bddff66e 100644
--- a/core/core-frontend/src/custom-component/v-query/Select.vue
+++ b/core/core-frontend/src/custom-component/v-query/Select.vue
@@ -83,7 +83,7 @@ const cascade = computed(() => {
 
 const setDefaultMapValue = arr => {
   const { displayId, field } = config.value
-  if (!displayId) {
+  if (config.value.optionValueSource !== 1) {
     return []
   }
   let defaultMapValue = {}
@@ -92,8 +92,8 @@ const setDefaultMapValue = arr => {
     defaultMapValue[ele] = []
   })
   enumValueArr.forEach(ele => {
-    if (defaultMapValue[ele[displayId]]) {
-      defaultMapValue[ele[displayId]].push(ele[field?.id])
+    if (defaultMapValue[ele[displayId || field?.id]]) {
+      defaultMapValue[ele[displayId || field?.id]].push(ele[field?.id])
     }
   })
   Object.values(defaultMapValue).forEach(ele => {