Merge pull request #5034 from dataease/dev

merge dev

frontend/src/components/canvas/customComponent/UserView.vue

@@ -322,6 +322,7 @@ export default {
       curFields: [],
       isFirstLoad: true, // 是否是第一次加载
       refId: null,
+      getDataLoading: false,
       chart: BASE_CHART_STRING,
       requestStatus: 'success',
       message: null,
@@ -491,6 +492,7 @@ export default {
       handler: function(val1, val2) {
         if (isChange(val1, val2) && !this.isFirstLoad) {
           this.getData(this.element.propValue.viewId)
+          this.getDataLoading = true
         }
       },
       deep: true
@@ -747,6 +749,7 @@ export default {
     },
     getData(id, cache = true, dataBroadcast = false) {
       if (id) {
+        if (this.getDataLoading) return
         this.requestStatus = 'waiting'
         this.message = null
 
@@ -845,6 +848,8 @@ export default {
           }
           this.isFirstLoad = false
           return true
+        }).finally(() => {
+          this.getDataLoading = false
         })
       }
     },

frontend/src/components/widget/deWidget/DeTabs.vue

@@ -423,7 +423,7 @@ export default {
           try {
             const targetRef = _this.$refs['canvasTabRef-' + _this.activeTabName]
             if (targetRef) {
-              targetRef[0].restore()
+              targetRef[0]?.restore()
             }
             _this.$refs[this.activeTabName][0].resizeChart()
           } catch (e) {
@@ -528,7 +528,7 @@ export default {
             _this.activeTabName = _this.element.options.tabList[nowIndex].name
             const targetRef = _this.$refs['canvasTabRef-' + _this.activeTabName]
             if (targetRef) {
-              targetRef[0].restore()
+              targetRef[0]?.restore()
             }
           });
         }, switchTime)

frontend/src/views/dataset/add/AddApi.vue

@@ -420,6 +420,7 @@ export default {
         this.openMessageSuccess('deDataset.cannot_be_duplicate', 'error')
         return
       }
+      if (this.loading) return
       this.loading = true
       const sceneId = this.param.id
       const dataSourceId = this.dataSource

frontend/src/views/dataset/add/AddDB.vue

@@ -439,6 +439,7 @@ export default {
         this.openMessageSuccess('deDataset.cannot_be_duplicate', 'error')
         return
       }
+      if (this.loading) return
       this.loading = true
       const sceneId = this.param.id
       const dataSourceId = this.dataSource

frontend/src/views/dataset/add/AddExcel.vue

@@ -591,6 +591,7 @@ export default {
         }
         this.handlerConfirm(options)
       } else {
+        if (this.loading) return
         this.loading = true
         post('/dataset/table/update', table)
           .then((response) => {

frontend/src/views/dataset/add/AddSQL.vue

@@ -1011,6 +1011,7 @@ export default {
         return
       }
       this.parseVariable()
+      if (this.loading) return
       this.loading = true
       const table = {
         id: this.param.tableId,

frontend/src/views/dataset/add/AddUnion.vue

@@ -261,6 +261,7 @@ export default {
         this.openMessageSuccess('dataset.char_can_not_more_50', 'error')
         return
       }
+      if (this.loading) return
       this.loading = true
       const table = {
         id: this.param.tableId,