From 3b1470d1c9b0151d5232f04b49d3196aac2e2c6d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 28 Jun 2024 13:45:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E6=97=B6=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=BB=84=E4=BB=B6=E5=AF=BC=E8=87=B4=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/api/staticResource.ts              | 1 +
 core/core-frontend/src/views/dashboard/index.vue          | 6 ++++++
 core/core-frontend/src/views/data-visualization/index.vue | 7 ++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/api/staticResource.ts b/core/core-frontend/src/api/staticResource.ts
index 6075c32ac4..c6a24483dc 100644
--- a/core/core-frontend/src/api/staticResource.ts
+++ b/core/core-frontend/src/api/staticResource.ts
@@ -7,6 +7,7 @@ export const uploadFile = (fileId: number | string, param) =>
   request.post({
     url: '/staticResource/upload/' + fileId,
     headersType: 'multipart/form-data',
+    loading: true,
     data: param
   })
 
diff --git a/core/core-frontend/src/views/dashboard/index.vue b/core/core-frontend/src/views/dashboard/index.vue
index dc688d0661..0ecccfacb1 100644
--- a/core/core-frontend/src/views/dashboard/index.vue
+++ b/core/core-frontend/src/views/dashboard/index.vue
@@ -28,6 +28,8 @@ import { Base64 } from 'js-base64'
 import CanvasCacheDialog from '@/components/visualization/CanvasCacheDialog.vue'
 import { deepCopy } from '@/utils/utils'
 const interactiveStore = interactiveStoreWithOut()
+import { useRequestStoreWithOut } from '@/store/modules/request'
+import { usePermissionStoreWithOut } from '@/store/modules/permission'
 const embeddedStore = useEmbedded()
 const { wsCache } = useCache()
 const canvasCacheOutRef = ref(null)
@@ -42,6 +44,8 @@ const eventCheck = e => {
 }
 const dvMainStore = dvMainStoreWithOut()
 const snapshotStore = snapshotStoreWithOut()
+const requestStore = useRequestStoreWithOut()
+const permissionStore = usePermissionStoreWithOut()
 const {
   fullscreenFlag,
   componentData,
@@ -233,6 +237,8 @@ onUnmounted(() => {
     <el-container
       class="dv-layout-container"
       :class="{ 'preview-content': editMode === 'preview' }"
+      v-loading="requestStore.loadingMap[permissionStore.currentPath]"
+      element-loading-background="rgba(0, 0, 0, 0)"
     >
       <!-- 中间画布 -->
       <main class="center" :class="{ 'de-screen-full': fullscreenFlag }">
diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index b184c4ca81..073924459d 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -40,6 +40,8 @@ import CanvasCacheDialog from '@/components/visualization/CanvasCacheDialog.vue'
 import { deepCopy } from '@/utils/utils'
 import DvPreview from '@/views/data-visualization/DvPreview.vue'
 import DeRuler from '@/custom-component/common/DeRuler.vue'
+import { useRequestStoreWithOut } from '@/store/modules/request'
+import { usePermissionStoreWithOut } from '@/store/modules/permission'
 const interactiveStore = interactiveStoreWithOut()
 const embeddedStore = useEmbedded()
 const { wsCache } = useCache()
@@ -66,7 +68,8 @@ const composeStore = composeStoreWithOut()
 const canvasCacheOutRef = ref(null)
 const deWRulerRef = ref(null)
 const deHRulerRef = ref(null)
-
+const requestStore = useRequestStoreWithOut()
+const permissionStore = usePermissionStoreWithOut()
 const {
   fullscreenFlag,
   componentData,
@@ -379,6 +382,8 @@ eventBus.on('handleNew', handleNew)
     <div class="custom-dv-divider" />
     <el-container
       v-if="loadFinish"
+      v-loading="requestStore.loadingMap[permissionStore.currentPath]"
+      element-loading-background="rgba(0, 0, 0, 0)"
       class="dv-layout-container"
       :class="{ 'preview-layout-container': previewStatus }"
     >