From 2adbd392d34ca028621ab279e4dd42f9cdfe72d8 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Sat, 8 May 2021 10:36:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E8=A7=86=E5=9B=BE=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/UnionView.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/dataset/data/UnionView.vue b/frontend/src/views/dataset/data/UnionView.vue
index 40a122e619..ea3ab7eac6 100644
--- a/frontend/src/views/dataset/data/UnionView.vue
+++ b/frontend/src/views/dataset/data/UnionView.vue
@@ -85,12 +85,13 @@
 
         <el-col :span="6">
           <el-popover
+            ref="targetTable"
             placement="bottom"
-            width="400"
-            trigger="hover"
+            width="500"
+            trigger="click"
           >
             <dataset-group-selector @getTable="getTable" />
-            <el-button slot="reference" size="mini">{{ $t('dataset.pls_slc_union_table') }}</el-button>
+            <el-button slot="reference" size="mini">{{ targetTable.name || $t('dataset.pls_slc_union_table') }}</el-button>
           </el-popover>
 
           <el-select v-model="union.targetTableFieldId" :placeholder="$t('dataset.pls_slc_union_field')" filterable clearable size="mini">
@@ -154,7 +155,8 @@ export default {
       unionData: [],
       editUnion: false,
       sourceFieldOption: [],
-      targetFieldOption: []
+      targetFieldOption: [],
+      targetTable: {}
     }
   },
   watch: {
@@ -174,6 +176,7 @@ export default {
     },
 
     showUnionEdit() {
+      this.union.sourceTableId = this.table.id
       fieldList(this.table.id).then(response => {
         this.sourceFieldOption = response.data
       })
@@ -218,6 +221,7 @@ export default {
 
     edit(item) {
       this.union = JSON.parse(JSON.stringify(item))
+      this.targetTable.name = this.union.targetTableName
       fieldList(this.union.targetTableId).then(response => {
         this.targetFieldOption = response.data
         this.showUnionEdit()
@@ -241,11 +245,13 @@ export default {
     },
     getTable(param) {
       // console.log(param)
+      this.targetTable = param
       this.union.targetTableId = param.id
       this.union.targetTableFieldId = ''
       fieldList(param.id).then(response => {
         this.targetFieldOption = response.data
       })
+      this.$refs['targetTable'].doClose()
     }
   }
 }