From 30979ec86865e941ff0d90d8f5cdb47c23f62187 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 25 Mar 2024 16:41:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E5=BD=93?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=95=B0=E6=8D=AE=E9=9B=86=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=95=B0=E6=8D=AE=E9=9B=86=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=90=8E=EF=BC=8C=E9=82=A3=E4=B9=88=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E5=8F=B3=E4=BE=A7=E7=9A=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/zh-CN.ts       |  2 +-
 .../data/dataset/form/DatasetUnion.vue        | 64 +++++++++++++++----
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index dd39d879f8..0e89056ecf 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -1107,7 +1107,7 @@ export default {
     select_year: '选择年',
     sql_variable_limit_1: '1、SQL 变量只能在 WHERE 条件中使用',
     sql_variable_limit_2:
-      "2、示例：select * from table_name where column_name1='${'{'}param_name1{'}'}' and column_name2 in (${'{'}param_name2{'}'})",
+      "2、示例:select * from table_name where column_name1='${'{'}param_name1{'}'}' and column_name2 in (${'{'}param_name2{'}'})",
     select_month: '选择月',
     select_date: '选择日期',
     select_time: '选择时间',
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
index 038a9fc44b..52a7a03483 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
@@ -163,14 +163,24 @@ const saveSqlNode = (val: SqlNode, cb) => {
         info: state.visualNode.info,
         tableName,
         type: 'sql'
-      }).then(res => {
-        ;((res as unknown as Field[]) || []).forEach(ele => {
-          ele.checked = true
-        })
-        state.nodeList[0].currentDsFields = cloneDeep(res)
-        cb?.()
-        confirmEditUnion()
       })
+        .then(res => {
+          const idOriginNameMap = allfields.value.reduce((pre, next) => {
+            pre[`${next.datasetTableId}${next.originName}`] = next.id
+            return pre
+          }, {})
+          nodeField.value = res as unknown as Field[]
+          nodeField.value.forEach(ele => {
+            ele.id = idOriginNameMap[`${id}${ele.originName}`]
+            ele.checked = true
+          })
+          state.nodeList[0].currentDsFields = cloneDeep(res)
+          cb?.()
+          confirmEditUnion()
+        })
+        .finally(() => {
+          editUnion.value = true
+        })
       confirm()
     }
     return
@@ -212,6 +222,12 @@ const changeNodeFields = val => {
 }
 
 const closeEditUnion = () => {
+  const [fir] = state.nodeList
+  if (fir.isShadow) {
+    delete fir.isShadow
+    state.nodeList = []
+    emits('addComplete')
+  }
   editUnion.value = false
 }
 let num = +new Date()
@@ -242,6 +258,10 @@ const delUpdateDsFields = (id, arr: Node[]) => {
 
 const confirmEditUnion = () => {
   delUpdateDsFields(currentNode.value.id, state.nodeList)
+  const [fir] = state.nodeList
+  if (fir.isShadow) {
+    delete fir.isShadow
+  }
   closeEditUnion()
   nextTick(() => {
     emits('updateAllfields')
@@ -675,6 +695,7 @@ const drop_handler = ev => {
     state.nodeList.push({
       tableName,
       type,
+      isShadow: true,
       datasourceId,
       id: guid(),
       ...extraData
@@ -688,13 +709,22 @@ const drop_handler = ev => {
       info: currentNode.value.info,
       tableName,
       type
-    }).then(res => {
-      ;((res as unknown as Field[]) || []).forEach(ele => {
-        ele.checked = true
-      })
-      state.nodeList[0].currentDsFields = cloneDeep(res)
-      confirmEditUnion()
     })
+      .then(res => {
+        const idOriginNameMap = allfields.value.reduce((pre, next) => {
+          pre[`${next.datasetTableId}${next.originName}`] = next.id
+          return pre
+        }, {})
+        nodeField.value = res as unknown as Field[]
+        nodeField.value.forEach(ele => {
+          ele.id = idOriginNameMap[`${currentNode.value.id}${ele.originName}`]
+          ele.checked = true
+        })
+        state.nodeList[0].currentDsFields = cloneDeep(res)
+      })
+      .finally(() => {
+        editUnion.value = true
+      })
     nextTick(() => {
       emits('addComplete')
     })
@@ -945,7 +975,13 @@ const emits = defineEmits(['addComplete', 'joinEditor', 'updateAllfields'])
       </span>
     </template>
   </el-dialog>
-  <el-drawer v-model="editUnion" custom-class="union-item-drawer" size="600px" direction="rtl">
+  <el-drawer
+    :before-close="closeEditUnion"
+    v-model="editUnion"
+    custom-class="union-item-drawer"
+    size="600px"
+    direction="rtl"
+  >
     <template #header v-if="currentNode">
       <div class="info">
         <span class="name">{{ currentNode.tableName }}</span>