From 8852fba90f9389d8e14168d7a21cf62ca6f82607 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 16 Jun 2021 18:29:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(fix):=E5=85=B3=E8=81=94=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E9=9D=9E=E7=9B=B4=E8=BF=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=BB=9F=E4=B8=80=E5=AE=8C=E6=88=90=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E5=90=8C=E6=AD=A5=E5=90=8E=E6=89=8D=E8=83=BD=E5=85=B3?=
 =?UTF-8?q?=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/UnionView.vue | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/dataset/data/UnionView.vue b/frontend/src/views/dataset/data/UnionView.vue
index 8d63b7a93e..bf0d804456 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 :mode="1" @getTable="getTable" />
+            <dataset-group-selector :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>
@@ -161,7 +161,8 @@ export default {
       editUnion: false,
       sourceFieldOption: [],
       targetFieldOption: [],
-      targetTable: {}
+      targetTable: {},
+      customType: ['db', 'sql', 'excel']
     }
   },
   watch: {
@@ -191,11 +192,22 @@ export default {
     },
 
     showUnionEdit() {
-      this.union.sourceTableId = this.table.id
-      fieldList(this.table.id).then(response => {
-        this.sourceFieldOption = response.data
+      // 校验同步状态
+      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
+          })
+        }
       })
-      this.editUnion = true
     },
     saveUnion() {
       // console.log(this.union)