From b686c101832b73ea5ec7aca230c70013cc09f14b Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 19 Aug 2022 15:06:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5=E5=8F=AF=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/CalcChartFieldEdit.vue | 6 +++++-
 frontend/src/views/dataset/data/CalcFieldEdit.vue    | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/chart/view/CalcChartFieldEdit.vue b/frontend/src/views/chart/view/CalcChartFieldEdit.vue
index 7bd7604af3..c3baf11714 100644
--- a/frontend/src/views/chart/view/CalcChartFieldEdit.vue
+++ b/frontend/src/views/chart/view/CalcChartFieldEdit.vue
@@ -209,6 +209,7 @@
           :disabled="!fieldForm.name || !fieldForm.originName"
           type="primary"
           size="mini"
+          :loading="loading"
           @click="saveCalcField"
         >{{ $t('dataset.confirm') }}
         </el-button>
@@ -302,7 +303,8 @@ export default {
       quotaData: [],
       functionData: [],
       tableFields: {},
-      name2Auto: []
+      name2Auto: [],
+      loading: false
     }
   },
   computed: {
@@ -446,8 +448,10 @@ export default {
         this.fieldForm.columnIndex = 0
         this.fieldForm.chartId = this.param.id
       }
+      this.loading = true
       post('/chart/field/save/' + this.panelInfo.id, { ...this.fieldForm, originName: this.setNameIdTrans('name', 'id', originName) }).then(response => {
         this.closeCalcField()
+        this.loading = false
       })
     },
 
diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue
index a6d85bb8cb..26103b7895 100644
--- a/frontend/src/views/dataset/data/CalcFieldEdit.vue
+++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue
@@ -171,7 +171,7 @@
     <el-row>
       <div class="dialog-button">
         <el-button size="mini" @click="closeCalcField">{{ $t('dataset.cancel') }}</el-button>
-        <el-button :disabled="!fieldForm.name || !fieldForm.originName" type="primary" size="mini" @click="saveCalcField">{{ $t('dataset.confirm') }}</el-button>
+        <el-button :disabled="!fieldForm.name || !fieldForm.originName" :loading="loading" type="primary" size="mini" @click="saveCalcField">{{ $t('dataset.confirm') }}</el-button>
       </div>
     </el-row>
   </el-row>
@@ -259,7 +259,8 @@ export default {
       dimensionData: [],
       quotaData: [],
       name2Auto: [],
-      functionData: []
+      functionData: [],
+      loading: false
     }
   },
   computed: {
@@ -396,9 +397,11 @@ export default {
         this.fieldForm.tableId = this.param.id
         this.fieldForm.columnIndex = this.tableFields.dimensionList.length + this.tableFields.quotaList.length
       }
+      this.loading = true
       post('/dataset/field/save', { ...this.fieldForm, originName: this.setNameIdTrans('name', 'id', originName) }).then(response => {
         localStorage.setItem('reloadDsData', 'true')
         this.closeCalcField()
+        this.loading = false
       })
     },