Merge pull request #10521 from dataease/pr@dev-v2_st

fix(数据集): v2版本数据集操作，多个数据集关联时，SQL数据集在映射过程中会导致该数据集丢失 #9973

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

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()

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>

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 {