From 54006b924adcf89eff53fb5a26d7f7abc5329363 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 2 Nov 2023 13:58:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20SQL=E6=95=B0=E6=8D=AE=E9=9B=86=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E9=A9=AC=E4=B8=8A?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98=E6=8F=90=E7=A4=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=81=A2=E5=A4=8D=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/dataset/Form.vue          | 8 ++++----
 core/frontend/src/views/dataset/add/AddApi.vue    | 1 +
 core/frontend/src/views/dataset/add/AddCustom.vue | 1 +
 core/frontend/src/views/dataset/add/AddDB.vue     | 1 +
 core/frontend/src/views/dataset/add/AddExcel.vue  | 1 +
 core/frontend/src/views/dataset/add/AddSQL.vue    | 7 +++++--
 core/frontend/src/views/dataset/add/AddUnion.vue  | 1 +
 7 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/frontend/src/views/dataset/Form.vue b/core/frontend/src/views/dataset/Form.vue
index c2732e9f32..325e965cb3 100644
--- a/core/frontend/src/views/dataset/Form.vue
+++ b/core/frontend/src/views/dataset/Form.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="de-dataset-form">
-    <div class="top" v-loading="loading">
+    <div v-loading="saveDisabled" class="top">
       <span class="name">
         <i
           class="el-icon-arrow-left"
@@ -41,7 +41,7 @@
         >{{ $t('deDataset.selected') }} {{ tableNum }}
           {{ ['excel'].includes(datasetType) ? $t('deDataset.table') : $t('deDataset.item') }}</span>
         <deBtn
-          :disabled="['db', 'excel', 'api', 'union'].includes(datasetType) && !tableNum"
+          :disabled="(['db', 'excel', 'api', 'union'].includes(datasetType) && !tableNum)"
           type="primary"
           @click="datasetSave"
         >{{
@@ -56,8 +56,8 @@
         :param="table"
         :origin-name="originName"
         :name-list="nameList"
+        @setSaveDisabled="(val) => (saveDisabled = val)"
         @setTableNum="(val) => (tableNum = val)"
-        @datasourceLoading="(val) => loading = val"
       />
     </div>
   </div>
@@ -79,8 +79,8 @@ export default {
   data() {
     return {
       originName: '',
+      saveDisabled: true,
       tableNum: 0,
-      loading: false,
       showInput: false,
       editType: '',
       selectDatasets: [],
diff --git a/core/frontend/src/views/dataset/add/AddApi.vue b/core/frontend/src/views/dataset/add/AddApi.vue
index 0b90528090..6a0b73606b 100644
--- a/core/frontend/src/views/dataset/add/AddApi.vue
+++ b/core/frontend/src/views/dataset/add/AddApi.vue
@@ -321,6 +321,7 @@ export default {
     this.initDataSource()
     window.addEventListener('resize', this.calHeight)
     this.calHeight()
+    this.$emit('setSaveDisabled', false)
   },
   activated() {
     this.initDataSource()
diff --git a/core/frontend/src/views/dataset/add/AddCustom.vue b/core/frontend/src/views/dataset/add/AddCustom.vue
index e336ce4bb0..81c9ec38db 100644
--- a/core/frontend/src/views/dataset/add/AddCustom.vue
+++ b/core/frontend/src/views/dataset/add/AddCustom.vue
@@ -152,6 +152,7 @@ export default {
       this.getCustomTable()
       this.getUnionData()
     }
+    this.$emit('setSaveDisabled', false)
   },
   methods: {
     calHeight() {
diff --git a/core/frontend/src/views/dataset/add/AddDB.vue b/core/frontend/src/views/dataset/add/AddDB.vue
index c8f22d37b4..ae6e540b6e 100644
--- a/core/frontend/src/views/dataset/add/AddDB.vue
+++ b/core/frontend/src/views/dataset/add/AddDB.vue
@@ -343,6 +343,7 @@ export default {
     this.initDataSource()
     window.addEventListener('resize', this.calHeight)
     this.calHeight()
+    this.$emit('setSaveDisabled', false)
   },
   activated() {
     this.initDataSource()
diff --git a/core/frontend/src/views/dataset/add/AddExcel.vue b/core/frontend/src/views/dataset/add/AddExcel.vue
index 66aee823ff..a16422a4e0 100644
--- a/core/frontend/src/views/dataset/add/AddExcel.vue
+++ b/core/frontend/src/views/dataset/add/AddExcel.vue
@@ -316,6 +316,7 @@ export default {
   mounted() {
     window.addEventListener('resize', this.calHeight)
     this.calHeight()
+    this.$emit('setSaveDisabled', false)
   },
   created() {
     if (!this.param.tableId) {
diff --git a/core/frontend/src/views/dataset/add/AddSQL.vue b/core/frontend/src/views/dataset/add/AddSQL.vue
index 74d2b29c3f..2d76414a4e 100644
--- a/core/frontend/src/views/dataset/add/AddSQL.vue
+++ b/core/frontend/src/views/dataset/add/AddSQL.vue
@@ -905,8 +905,11 @@ export default {
 
     initTableInfo() {
       const tableId = this.param.tableId || this.$route.query.id
+      if (!tableId) {
+        this.$emit('setSaveDisabled', false)
+        return
+      }
       if (tableId) {
-        this.$emit('datasourceLoading', true)
         getTable(tableId).then((response) => {
           const table = response.data
           this.dataSource = table.dataSourceId
@@ -922,7 +925,7 @@ export default {
           }
           this.variables = JSON.parse(table.sqlVariableDetails)
         }).finally(() => {
-          this.$emit('datasourceLoading', false)
+          this.$emit('setSaveDisabled', false)
         })
       }
     },
diff --git a/core/frontend/src/views/dataset/add/AddUnion.vue b/core/frontend/src/views/dataset/add/AddUnion.vue
index afd8e8b94f..9e551bbd9b 100644
--- a/core/frontend/src/views/dataset/add/AddUnion.vue
+++ b/core/frontend/src/views/dataset/add/AddUnion.vue
@@ -229,6 +229,7 @@ export default {
   },
   mounted() {
     this.initTableData()
+    this.$emit('setSaveDisabled', false)
   },
   methods: {
     mousedownDrag() {