From ed3ddf8185fddbaeca229351ff251c763bfd0374 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 13 Apr 2023 15:22:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/FieldEdit.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index a326cd1be9..5ebbb78064 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -722,6 +722,7 @@
       :visible.sync="editCalcField"
       class="de-dialog-form de-center-dialog"
       width="980px"
+      :before-close="closeCalcField"
       :title="
         currEditField.id
           ? $t('dataset.edit_calc_field')
@@ -730,6 +731,7 @@
       append-to-body
     >
       <calc-field-edit
+        ref="calcFieldEdit"
         :param="param"
         :table-fields="tableFields"
         :field="currEditField"
@@ -893,6 +895,7 @@ export default {
 
     closeCalcField() {
       this.editCalcField = false
+      this.$refs.calcFieldEdit.resetField()
       this.initField()
     },
 

From 8c0cfd3eb6efa50facbae6de3fd0693cf05063e6 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 13 Apr 2023 15:42:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20SQL=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E5=BF=AB=E9=80=9F=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/Form.vue       | 13 ++++++++-----
 frontend/src/views/dataset/add/AddSQL.vue |  3 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/dataset/Form.vue b/frontend/src/views/dataset/Form.vue
index 73fe0d205c..9098a38b9e 100644
--- a/frontend/src/views/dataset/Form.vue
+++ b/frontend/src/views/dataset/Form.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="de-dataset-form">
-    <div class="top">
+    <div class="top" v-loading="loading">
       <span class="name">
         <i
           class="el-icon-arrow-left"
@@ -43,7 +43,6 @@
         <deBtn
           :disabled="['db', 'excel', 'api'].includes(datasetType) && !tableNum"
           type="primary"
-          :loading="loading"
           @click="datasetSave"
         >{{
           $t('commons.save')
@@ -58,6 +57,7 @@
         :origin-name="originName"
         :name-list="nameList"
         @setTableNum="(val) => (tableNum = val)"
+        @datasourceLoading="(val) => loading = val"
       />
     </div>
   </div>
@@ -80,9 +80,9 @@ export default {
     return {
       originName: '',
       tableNum: 0,
+      loading: false,
       showInput: false,
       editType: '',
-      loading: false,
       selectDatasets: [],
       tData: [],
       datasetType: '',
@@ -185,7 +185,6 @@ export default {
           return
         }
       }
-      this.loading = true
       this.$refs.addDataset.save()
     },
     handleClick() {
@@ -219,6 +218,7 @@ export default {
       )
     },
     initTable(id) {
+      this.loading = true
       post('/dataset/table/getWithPermission/' + id, null)
         .then((response) => {
           const { sceneId: id, id: tableId, name } = response.data || {}
@@ -234,7 +234,10 @@ export default {
             this.table.editType = +this.editType
           }
         })
-        .catch(() => {})
+        .catch(() => { })
+        .finally(() => {
+          this.loading = false
+        })
     },
     switchComponent(c) {
       switch (c) {
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index f3299c3907..7ec5d98da2 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -905,6 +905,7 @@ export default {
     initTableInfo() {
       const tableId = this.param.tableId || this.$route.query.id
       if (tableId) {
+        this.$emit('datasourceLoading', true)
         getTable(tableId).then((response) => {
           const table = response.data
           this.dataSource = table.dataSourceId
@@ -919,6 +920,8 @@ export default {
             ).sql
           }
           this.variables = JSON.parse(table.sqlVariableDetails)
+        }).finally(() => {
+          this.$emit('datasourceLoading', false)
         })
       }
     },