From c9d7eed24acee3006315c752bcaebb998cb5d719 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 8 Oct 2024 17:24:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E7=AE=A1=E7=90=86=E8=B4=9F=E8=B4=A3=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A1=A8id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualized/data/dataset/form/DatasetUnion.vue |  9 ++++++++-
 .../views/visualized/data/dataset/form/index.vue  | 15 ++++++++-------
 2 files changed, 16 insertions(+), 8 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 3378ac7770..dd67167686 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
@@ -997,6 +997,7 @@ const confirmRename = () => {
       renameParam.name = ''
       renameParam.id = ''
       dialogRename.value = false
+      emits('reGetName')
     }
   })
 }
@@ -1038,7 +1039,13 @@ const handleActiveNode = ele => {
   handleCommand(ele, 'editerField')
 }
 
-const emits = defineEmits(['addComplete', 'joinEditor', 'updateAllfields', 'changeUpdate'])
+const emits = defineEmits([
+  'addComplete',
+  'joinEditor',
+  'updateAllfields',
+  'changeUpdate',
+  'reGetName'
+])
 </script>
 
 <template>
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 c0b4790bae..c1c0d16213 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
@@ -732,7 +732,7 @@ const dfsGetName = (list, name) => {
 
 const tabChange = val => {
   if (val === 'preview') return
-  dfsGetName(datasetDrag.value.getNodeList(), nameMap.value)
+  reGetName()
   allfields.value.forEach(ele => {
     if (!Array.isArray(ele.deTypeArr)) {
       ele.deTypeArr =
@@ -756,6 +756,10 @@ const addComplete = () => {
   }
   cancelMap['/datasetData/previewData']?.()
   datasetPreviewLoading.value = false
+  reGetName()
+}
+
+const reGetName = () => {
   dfsGetName(datasetDrag.value.getNodeList(), nameMap.value)
 }
 
@@ -1542,6 +1546,7 @@ const getDsIconName = data => {
           {{ t('data_set.be_reported_incorrectly') }}
         </div>
         <dataset-union
+          @reGetName="reGetName"
           @join-editor="joinEditor"
           @changeUpdate="changeUpdate"
           :maskShow="maskShow"
@@ -1761,9 +1766,7 @@ const getDsIconName = data => {
                     </el-table-column>
                     <el-table-column prop="datasetTableId" label="表名" width="240">
                       <template #default="scope">
-                        <div v-if="scope.row.extField === 0">
-                          {{ nameMap[scope.row.datasetTableId] }}
-                        </div>
+                        {{ scope.row.extField === 0 ? nameMap[scope.row.datasetTableId] : '' }}
                       </template>
                     </el-table-column>
                     <el-table-column prop="deType" :label="t('dataset.field_type')" width="200">
@@ -1948,9 +1951,7 @@ const getDsIconName = data => {
 
                     <el-table-column prop="datasetTableId" label="表名" width="240">
                       <template #default="scope">
-                        <div v-if="scope.row.extField === 0">
-                          {{ nameMap[scope.row.datasetTableId] }}
-                        </div>
+                        {{ scope.row.extField === 0 ? nameMap[scope.row.datasetTableId] : '' }}
                       </template>
                     </el-table-column>