From 94edbdddd14f7ddc5755e26e075543453ca4da0d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 6 Aug 2024 14:54:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/visualization/UserViewEnlarge.vue            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
index 26112cd5d5..522ffb9d7e 100644
--- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
+++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
@@ -41,6 +41,7 @@
         icon="Download"
         size="middle"
         :loading="exportLoading"
+        :disabled="requestStore.loadingMap[permissionStore.currentPath] > 0"
         @click="downloadViewDetails('view')"
       >
         导出Excel
@@ -53,6 +54,7 @@
         size="middle"
         :loading="exportLoading"
         @click="downloadViewDetails('dataset')"
+        :disabled="requestStore.loadingMap[permissionStore.currentPath] > 0"
       >
         导出原始明细
       </el-button>

From 158b8e98f6121c2bbf68f44f7db5a1e8a9b2b6ee Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 6 Aug 2024 16:02:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=92=8C=E5=9B=BE=E8=A1=A8=E6=94=BE=E5=A4=A7?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=B0=B4=E5=8D=B0=E8=A6=86=E7=9B=96=EF=BC=8C?=
 =?UTF-8?q?=E6=94=BE=E5=A4=A7=E5=AF=BC=E5=87=BA=E5=9B=BE=E7=89=87=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=BF=9E=E5=90=8C=E6=B0=B4=E5=8D=B0=E4=B8=80=E8=B5=B7?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualization/UserViewEnlarge.vue         | 39 +++++++++++++++++++
 .../src/components/watermark/watermark.ts     |  4 +-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
index 522ffb9d7e..53eb5f8fe7 100644
--- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
+++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
@@ -80,6 +80,7 @@
       v-if="dialogShow"
     >
       <div
+        id="enlarge-inner-content"
         class="enlarge-inner"
         :class="{
           'enlarge-inner-with-header': optType === 'details' && sourceViewType.includes('chart-mix')
@@ -144,6 +145,8 @@ import { ElMessage, ElButton } from 'element-plus-secondary'
 import { exportPivotExcel } from '@/views/chart/components/js/panel/common/common_table'
 import { useRequestStoreWithOut } from '@/store/modules/request'
 import { usePermissionStoreWithOut } from '@/store/modules/permission'
+import { activeWatermark } from '@/components/watermark/watermark'
+import { personInfoApi } from '@/api/user'
 const downLoading = ref(false)
 const dvMainStore = dvMainStoreWithOut()
 const dialogShow = ref(false)
@@ -161,6 +164,7 @@ const { dvInfo, editMode } = storeToRefs(dvMainStore)
 const exportLoading = ref(false)
 const sourceViewType = ref()
 const activeName = ref('left')
+const userInfo = ref(null)
 const DETAIL_CHART_ATTR: DeepPartial<ChartObj> = {
   render: 'antv',
   type: 'table-info',
@@ -264,6 +268,9 @@ const dialogInit = (canvasStyle, view, item, opt) => {
     }
     dataDetailsOpt()
   }
+  nextTick(() => {
+    initWatermark()
+  })
 }
 
 const dataDetailsOpt = () => {
@@ -357,6 +364,7 @@ const htmlToImage = () => {
   downLoading.value = true
   useEmitt().emitter.emit('renderChart-' + viewInfo.value.id)
   setTimeout(() => {
+    initWatermark()
     toPng(viewContainer.value)
       .then(dataUrl => {
         downLoading.value = false
@@ -365,15 +373,46 @@ const htmlToImage = () => {
         a.href = dataUrl
         a.click()
         useEmitt().emitter.emit('renderChart-' + viewInfo.value.id)
+        initWatermark()
       })
       .catch(error => {
         downLoading.value = false
+        initWatermark()
         useEmitt().emitter.emit('renderChart-' + viewInfo.value.id)
         console.error('oops, something went wrong!', error)
       })
   }, 500)
 }
 
+const initWatermark = () => {
+  if (dvInfo.value.watermarkInfo) {
+    if (userInfo.value && userInfo.value.model !== 'lose') {
+      activeWatermark(
+        dvInfo.value.watermarkInfo.settingContent,
+        userInfo.value,
+        'enlarge-inner-content',
+        'canvas-main',
+        dvInfo.value.selfWatermarkStatus,
+        0.5
+      )
+    } else {
+      personInfoApi().then(res => {
+        userInfo.value = res.data
+        if (userInfo.value && userInfo.value.model !== 'lose') {
+          activeWatermark(
+            dvInfo.value.watermarkInfo.settingContent,
+            userInfo.value,
+            'enlarge-inner-content',
+            'canvas-main',
+            dvInfo.value.selfWatermarkStatus,
+            0.5
+          )
+        }
+      })
+    }
+  }
+}
+
 defineExpose({
   dialogInit
 })
diff --git a/core/core-frontend/src/components/watermark/watermark.ts b/core/core-frontend/src/components/watermark/watermark.ts
index 880aa3460a..c8cf86db9b 100644
--- a/core/core-frontend/src/components/watermark/watermark.ts
+++ b/core/core-frontend/src/components/watermark/watermark.ts
@@ -121,7 +121,7 @@ export function watermark(settings, domId) {
       oTemp.appendChild(mask_div)
     }
   }
-  oTemp.setAttribute('id', 'de-watermark-server')
+  oTemp.setAttribute('id', domId + '-de-watermark-server')
   watermarkDom.appendChild(oTemp)
 }
 
@@ -154,7 +154,7 @@ export function activeWatermark(
   scale = 1
 ) {
   // 清理历史水印
-  const historyWatermarkDom = document.getElementById('de-watermark-server')
+  const historyWatermarkDom = document.getElementById(domId + '-de-watermark-server')
   if (historyWatermarkDom) {
     historyWatermarkDom.remove()
   }