Merge pull request #8144 from dataease/pr@dev@fix_water-init

fix(仪表板): 修复社区板仪表板因不支持水印设置导致的控制台报错问题

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;
+    }
 }

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(
+          if (userInfo.value && userInfo.value.model !== 'lose') {
-            dvInfo.value.watermarkInfo.settingContent,
+            activeWatermark(
-            userInfo.value,
+              dvInfo.value.watermarkInfo.settingContent,
-            waterDomId,
+              userInfo.value,
-            canvasId.value,
+              waterDomId,
-            dvInfo.value.selfWatermarkStatus,
+              canvasId.value,
-            scale
+              dvInfo.value.selfWatermarkStatus,
-          )
+              scale
+            )
+          }
         })
       }
     }

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(
+        if (userInfo.value && userInfo.value.model !== 'lose') {
-          dvInfo.value.watermarkInfo.settingContent,
+          activeWatermark(
-          userInfo.value,
+            dvInfo.value.watermarkInfo.settingContent,
-          waterDomId,
+            userInfo.value,
-          canvasId.value,
+            waterDomId,
-          dvInfo.value.selfWatermarkStatus,
+            canvasId.value,
-          scaleWidth.value / 100
+            dvInfo.value.selfWatermarkStatus,
-        )
+            scaleWidth.value / 100
+          )
+        }
       })
     }
   }

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;
 }