From 8ea018059d330a9d2575539077fd7ca7cc7a8297 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 16 Jun 2021 19:25:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(fix):=E5=85=B3=E8=81=94=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=BF=85=E9=A1=BB=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E7=9A=84=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/common/DatasetGroupSelector.vue   |  7 ++++-
 frontend/src/views/dataset/data/UnionView.vue | 30 +++++++++----------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue
index 0a82c28262..e1071ab0b3 100644
--- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue
+++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue
@@ -132,6 +132,11 @@ export default {
       type: Object,
       required: false,
       default: null
+    },
+    showMode: {
+      type: String,
+      required: false,
+      default: null
     }
   },
   data() {
@@ -283,7 +288,7 @@ export default {
         return
       }
       // check mode=1的数据集是否创建doris表
-      if (data.mode === 1) {
+      if (data.mode === 1 && !this.showMode) {
         post('/dataset/table/checkDorisTableIsExists/' + data.id, {}, false).then(response => {
           if (response.data) {
             this.$nextTick(function() {
diff --git a/frontend/src/views/dataset/data/UnionView.vue b/frontend/src/views/dataset/data/UnionView.vue
index bf0d804456..b5d4e2940c 100644
--- a/frontend/src/views/dataset/data/UnionView.vue
+++ b/frontend/src/views/dataset/data/UnionView.vue
@@ -92,7 +92,7 @@
             width="500"
             trigger="click"
           >
-            <dataset-group-selector :custom-type="customType" :mode="1" @getTable="getTable" />
+            <dataset-group-selector show-mode="union" :custom-type="customType" :mode="1" @getTable="getTable" />
             <el-button slot="reference" size="mini" style="width: 100%;">
               <p class="table-name-css" :title="targetTable.name || $t('dataset.pls_slc_union_table')">{{ targetTable.name || $t('dataset.pls_slc_union_table') }}</p>
             </el-button>
@@ -193,21 +193,21 @@ export default {
 
     showUnionEdit() {
       // 校验同步状态
-      post('/dataset/table/checkDorisTableIsExists/' + this.table.id, {}, true).then(response => {
-        if (response.data) {
-          this.union.sourceTableId = this.table.id
-          fieldList(this.table.id).then(response => {
-            this.sourceFieldOption = response.data
-          })
-          this.editUnion = true
-        } else {
-          this.$message({
-            type: 'error',
-            message: this.$t('dataset.invalid_table_check'),
-            showClose: true
-          })
-        }
+      // post('/dataset/table/checkDorisTableIsExists/' + this.table.id, {}, true).then(response => {
+      //   if (response.data) {
+      this.union.sourceTableId = this.table.id
+      fieldList(this.table.id).then(response => {
+        this.sourceFieldOption = response.data
       })
+      this.editUnion = true
+      //   } else {
+      //     this.$message({
+      //       type: 'error',
+      //       message: this.$t('dataset.invalid_table_check'),
+      //       showClose: true
+      //     })
+      //   }
+      // })
     },
     saveUnion() {
       // console.log(this.union)