From d97fc8c1517dda8092ba3cf54bdef4bc13db050f Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 26 Jun 2024 14:36:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20v2=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=95=B0=E6=8D=AE=E9=9B=86=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E6=95=B0=E6=8D=AE=E9=9B=86=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8CSQL=E6=95=B0=E6=8D=AE=E9=9B=86=E5=9C=A8?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E8=BF=87=E7=A8=8B=E4=B8=AD=E4=BC=9A=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E8=AF=A5=E6=95=B0=E6=8D=AE=E9=9B=86=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=20#9973?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualized/data/dataset/form/DatasetUnion.vue     |  1 -
 .../views/visualized/data/dataset/form/UnionEdit.vue  | 11 ++++++++++-
 .../src/views/visualized/data/dataset/form/index.vue  |  6 ++----
 .../src/views/visualized/data/dataset/form/util.ts    |  3 +++
 4 files changed, 15 insertions(+), 6 deletions(-)

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 89c492bafa..7172dd1996 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
@@ -16,7 +16,6 @@ import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
 const appearanceStore = useAppearanceStoreWithOut()
 const state = reactive({
   nodeList: [],
-  pathList: [],
   visualNode: null,
   visualNodeParent: null,
   visualPath: null
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/UnionEdit.vue b/core/core-frontend/src/views/visualized/data/dataset/form/UnionEdit.vue
index 5284811210..52a550ad2c 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/UnionEdit.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/UnionEdit.vue
@@ -32,7 +32,10 @@ const defaultNode = {
   unionType: 'left' as UnionType,
   unionFields: [],
   currentDsFields: [],
-  sqlVariableDetails: null
+  sqlVariableDetails: null,
+  confirm: false,
+  isShadow: false,
+  flag: ''
 }
 const parentField = ref<Field[]>([])
 const nodeField = ref<Field[]>([])
@@ -54,6 +57,12 @@ const clearState = () => {
 }
 
 const initState = () => {
+  node.confirm = false
+  node.isShadow = false
+  node.flag = ''
+  parent.confirm = false
+  parent.isShadow = false
+  parent.flag = ''
   Object.assign(node, cloneDeep(props.editArr[0]))
   Object.assign(parent, cloneDeep(props.editArr[1]))
   getFields()
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
index f65c060b53..7b14d9cf1e 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
@@ -1908,10 +1908,8 @@ const getDsIconName = data => {
     >
       <union-edit ref="fieldUnion" :editArr="state.editArr" />
       <template #footer>
-        <el-button secondary @click="closeEditUnion()">{{ t('dataset.cancel') }} </el-button>
-        <el-button type="primary" @click="confirmEditUnion()"
-          >{{ t('dataset.confirm') }}
-        </el-button>
+        <el-button secondary @click="closeEditUnion">{{ t('dataset.cancel') }} </el-button>
+        <el-button type="primary" @click="confirmEditUnion">{{ t('dataset.confirm') }} </el-button>
       </template>
     </el-drawer>
   </div>
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/util.ts b/core/core-frontend/src/views/visualized/data/dataset/form/util.ts
index fce9348faf..39330ec866 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/util.ts
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/util.ts
@@ -135,6 +135,9 @@ interface Node {
   sqlVariableDetails: string
   currentDsFields: Field[]
   children?: Node[]
+  confirm?: boolean
+  isShadow?: boolean
+  flag?: string
 }
 
 interface Field {