From 5d99219c7c8eb46ac977b2b3ad1a28a64a58caef Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 13 Apr 2023 12:33:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=85=AC=E5=85=B1=E8=BF=9E=E6=8E=A5):=20?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=E6=B2=A1=E6=9C=89=E9=81=AE=E7=BD=A9?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8C=89=E9=92=AE=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/customComponent/UserView.vue       | 10 +++++---
 .../canvas/customComponent/UserViewDialog.vue | 25 ++++++++++++-------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue
index f4f5e244b9..88dfff4408 100644
--- a/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/frontend/src/components/canvas/customComponent/UserView.vue
@@ -144,7 +144,7 @@
           v-if="showChartInfoType==='enlarge' && hasDataPermission('export',panelInfo.privileges)&& showChartInfo && showChartInfo.type !== 'symbol-map'"
           class="el-icon-picture-outline"
           size="mini"
-          :disabled ="imageDownloading"
+          :disabled="imageDownloading"
           @click="exportViewImg"
         >
           {{ $t('chart.export_img') }}
@@ -152,7 +152,7 @@
         <el-button
           v-if="showChartInfoType==='details' && hasDataPermission('export',panelInfo.privileges)"
           size="mini"
-          :disabled="$store.getters.loadingMap[$store.getters.currentPath]"
+          :disabled="$store.getters.loadingMap[$store.getters.currentPath] || dialogLoading"
           @click="exportExcel"
         >
           <svg-icon
@@ -308,6 +308,7 @@ export default {
   },
   data() {
     return {
+      dialogLoading: false,
       imageDownloading: false,
       innerRefreshTimer: null,
       mobileChartDetailsVisible: false,
@@ -601,7 +602,10 @@ export default {
       }
     },
     exportExcel() {
-      this.$refs['userViewDialog'].exportExcel()
+      this.dialogLoading = true
+      this.$refs['userViewDialog'].exportExcel(() => {
+        this.dialogLoading = false
+      })
     },
     exportViewImg() {
       this.imageDownloading = true
diff --git a/frontend/src/components/canvas/customComponent/UserViewDialog.vue b/frontend/src/components/canvas/customComponent/UserViewDialog.vue
index 9dfeda1a2a..db5ab9106b 100644
--- a/frontend/src/components/canvas/customComponent/UserViewDialog.vue
+++ b/frontend/src/components/canvas/customComponent/UserViewDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <de-container
-    v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
+    v-loading="$store.getters.loadingMap[$store.getters.currentPath] || linkLoading"
     :class="isAbsoluteContainer ? 'abs-container' : ''"
   >
     <de-main-container
@@ -120,7 +120,8 @@ export default {
     return {
       refId: null,
       element: {},
-      lastMapChart: null
+      lastMapChart: null,
+      linkLoading: false
     }
   },
   computed: {
@@ -239,28 +240,28 @@ export default {
   mounted() {
   },
   methods: {
-    exportExcel() {
+    exportExcel(callBack) {
       const _this = this
       if (this.isOnlyDetails) {
-        _this.exportExcelDownload()
+        _this.exportExcelDownload(null, null, null, callBack)
       } else {
         if (this.showChartCanvas) {
           html2canvas(document.getElementById('chartCanvas')).then(canvas => {
             const snapshot = canvas.toDataURL('image/jpeg', 1)
-            _this.exportExcelDownload(snapshot, canvas.width, canvas.height)
+            _this.exportExcelDownload(snapshot, canvas.width, canvas.height, callBack)
           })
         } else {
-          _this.exportExcelDownload()
+          _this.exportExcelDownload(null, null, null, callBack)
         }
       }
     },
     exportViewImg(callback) {
-      exportImg(this.chart.name,callback)
+      exportImg(this.chart.name, callback)
     },
     setLastMapChart(data) {
       this.lastMapChart = JSON.parse(JSON.stringify(data))
     },
-    exportExcelDownload(snapshot, width, height) {
+    exportExcelDownload(snapshot, width, height, callBack) {
       const excelHeader = JSON.parse(JSON.stringify(this.chart.data.fields)).map(item => item.name)
       const excelTypes = JSON.parse(JSON.stringify(this.chart.data.fields)).map(item => item.deType)
       const excelHeaderKeys = JSON.parse(JSON.stringify(this.chart.data.fields)).map(item => item.dataeaseName)
@@ -291,7 +292,7 @@ export default {
         })
       }
       const request = {
-        proxy:null,
+        proxy: null,
         viewId: this.chart.id,
         viewName: excelName,
         header: excelHeader,
@@ -309,6 +310,7 @@ export default {
       const linkToken = this.$store.getters.linkToken || getLinkToken()
       if (!token && linkToken) {
         method = exportDetails
+        this.linkLoading = true
       }
 
       if (this.panelInfo.proxy) {
@@ -323,6 +325,11 @@ export default {
         document.body.appendChild(link)
         link.click()
         document.body.removeChild(link)
+        this.linkLoading = false
+        callBack && callBack()
+      }).catch(() => {
+        this.linkLoading = false
+        callBack && callBack()
       })
     },