From 45cd9cb300eff545a858502355fcda28f3870d52 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 23 Feb 2024 16:53:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=A4=BE=E5=8C=BA=E6=9D=BF=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=8D=E6=94=AF=E6=8C=81=E6=B0=B4=E5=8D=B0=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/SubstituteUserServer.java            | 13 ++++++++++++
 .../data-visualization/canvas/CanvasCore.vue  | 20 ++++++++++---------
 .../data-visualization/canvas/DePreview.vue   | 20 ++++++++++---------
 .../api/permissions/user/vo/UserFormVO.java   |  3 +++
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/substitute/permissions/user/SubstituteUserServer.java b/core/core-backend/src/main/java/io/dataease/substitute/permissions/user/SubstituteUserServer.java
index 04bec2eea8..a5c1493f42 100644
--- a/core/core-backend/src/main/java/io/dataease/substitute/permissions/user/SubstituteUserServer.java
+++ b/core/core-backend/src/main/java/io/dataease/substitute/permissions/user/SubstituteUserServer.java
@@ -1,6 +1,8 @@
 package io.dataease.substitute.permissions.user;
 
 
+import io.dataease.api.permissions.user.vo.UserFormVO;
+import io.dataease.utils.IPUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,4 +27,15 @@ public class SubstituteUserServer {
         result.put("language", "zh-CN");
         return result;
     }
+    @GetMapping("/personInfo")
+    public UserFormVO personInfo() {
+        UserFormVO userFormVO = new UserFormVO();
+        userFormVO.setId(1L);
+        userFormVO.setAccount("admin");
+        userFormVO.setName("管理员");
+        userFormVO.setIp(IPUtils.get());
+        // 当前模式为无XPack
+        userFormVO.setModel("lose");
+        return userFormVO;
+    }
 }
diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
index d2075a2872..4efea3e428 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
@@ -222,7 +222,7 @@ const initWatermark = (waterDomId = 'editor-canvas-main') => {
       isMainCanvas(canvasId.value)
     ) {
       const scale = dashboardActive.value ? 1 : curScale.value
-      if (userInfo.value) {
+      if (userInfo.value && userInfo.value.model !== 'lose') {
         activeWatermark(
           dvInfo.value.watermarkInfo.settingContent,
           userInfo.value,
@@ -235,14 +235,16 @@ const initWatermark = (waterDomId = 'editor-canvas-main') => {
         const method = personInfoApi
         method().then(res => {
           userInfo.value = res.data
-          activeWatermark(
-            dvInfo.value.watermarkInfo.settingContent,
-            userInfo.value,
-            waterDomId,
-            canvasId.value,
-            dvInfo.value.selfWatermarkStatus,
-            scale
-          )
+          if (userInfo.value && userInfo.value.model !== 'lose') {
+            activeWatermark(
+              dvInfo.value.watermarkInfo.settingContent,
+              userInfo.value,
+              waterDomId,
+              canvasId.value,
+              dvInfo.value.selfWatermarkStatus,
+              scale
+            )
+          }
         })
       }
     }
diff --git a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
index 3f8aa67cee..5b23bee7c3 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
@@ -190,7 +190,7 @@ const initRefreshTimer = () => {
 
 const initWatermark = (waterDomId = 'preview-canvas-main') => {
   if (dvInfo.value.watermarkInfo && isMainCanvas(canvasId.value)) {
-    if (userInfo.value) {
+    if (userInfo.value && userInfo.value.model !== 'lose') {
       activeWatermark(
         dvInfo.value.watermarkInfo.settingContent,
         userInfo.value,
@@ -203,14 +203,16 @@ const initWatermark = (waterDomId = 'preview-canvas-main') => {
       const method = personInfoApi
       method().then(res => {
         userInfo.value = res.data
-        activeWatermark(
-          dvInfo.value.watermarkInfo.settingContent,
-          userInfo.value,
-          waterDomId,
-          canvasId.value,
-          dvInfo.value.selfWatermarkStatus,
-          scaleWidth.value / 100
-        )
+        if (userInfo.value && userInfo.value.model !== 'lose') {
+          activeWatermark(
+            dvInfo.value.watermarkInfo.settingContent,
+            userInfo.value,
+            waterDomId,
+            canvasId.value,
+            dvInfo.value.selfWatermarkStatus,
+            scaleWidth.value / 100
+          )
+        }
       })
     }
   }
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java
index 71ac75fb92..851ab91999 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java
@@ -39,4 +39,7 @@ public class UserFormVO implements Serializable {
 
     @Schema(description = "IP")
     private String ip;
+
+    @Schema(description = "模式")
+    private String model;
 }