Merge pull request #8145 from dataease/pr@v2.3@fix_water-init

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

Dockerfile

@@ -11,13 +11,9 @@ ADD staticResource/ /opt/dataease2.0/data/static-resource/
 WORKDIR /opt/apps
 
 ADD core/core-backend/target/CoreApplication.jar /opt/apps/app.jar
-ADD de-xpack/xpack-permissions/target/xpack-permissions-$IMAGE_TAG.jar /opt/apps/xpack-permission.jar
-ADD de-xpack/xpack-base/target/xpack-base-$IMAGE_TAG.jar /opt/apps/xpack-base.jar
-ADD de-xpack/xpack-sync/target/xpack-sync-$IMAGE_TAG.jar /opt/apps/xpack-sync.jar
 
 ENV JAVA_APP_JAR=/opt/apps/app.jar
 
 HEALTHCHECK --interval=15s --timeout=5s --retries=20 --start-period=30s CMD curl -f 127.0.0.1:8100
 
-
-CMD java -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/dataease2.0/logs/dump.hprof -Dloader.path=/opt/apps/xpack-permission.jar,/opt/apps/xpack-base.jar,/opt/apps/xpack-sync.jar -jar /opt/apps/app.jar
+CMD java -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/dataease2.0/logs/dump.hprof -jar /opt/apps/app.jar

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/.npmrc

@@ -1 +1 @@
-registry=https://registry.npm.taobao.org/
+registry=https://registry.npmmirror.com/

core/core-frontend/pom.xml

@@ -38,7 +38,7 @@
         <version>${frontend-maven-plugin.version}</version>
         <executions>
           <!--首次打包需要放开-->
-          <!--<execution>
+          <execution>
             <id>install node and npm</id>
             <goals>
               <goal>install-node-and-npm</goal>
@@ -47,9 +47,9 @@
               <nodeVersion>v16.15.0</nodeVersion>
               <npmVersion>8.5.5</npmVersion>
             </configuration>
-          </execution>-->
+          </execution>
           <!--前端组件有更新需要放开-->
-          <!--<execution>
+          <execution>
             <id>npm install</id>
             <goals>
               <goal>npm</goal>
@@ -57,7 +57,7 @@
             <configuration>
               <arguments>install</arguments>
             </configuration>
-          </execution>-->
+          </execution>
 
           <execution>
             <id>npm run build</id>

core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue

@@ -214,25 +214,14 @@ watch(
 )
 
 const initWatermark = (waterDomId = 'editor-canvas-main') => {
-  if (
-    dvInfo.value.watermarkInfo &&
-    dvInfo.value.watermarkInfo.settingContent &&
-    isMainCanvas(canvasId.value)
-  ) {
-    const scale = dashboardActive.value ? 1 : curScale.value
-    if (userInfo.value) {
-      activeWatermark(
-        dvInfo.value.watermarkInfo.settingContent,
-        userInfo.value,
-        waterDomId,
-        canvasId.value,
-        dvInfo.value.selfWatermarkStatus,
-        scale
-      )
-    } else {
-      const method = personInfoApi
-      method().then(res => {
-        userInfo.value = res.data
+  try {
+    if (
+      dvInfo.value.watermarkInfo &&
+      dvInfo.value.watermarkInfo.settingContent &&
+      isMainCanvas(canvasId.value)
+    ) {
+      const scale = dashboardActive.value ? 1 : curScale.value
+      if (userInfo.value && userInfo.value.model !== 'lose') {
         activeWatermark(
           dvInfo.value.watermarkInfo.settingContent,
           userInfo.value,
@@ -241,8 +230,25 @@ const initWatermark = (waterDomId = 'editor-canvas-main') => {
           dvInfo.value.selfWatermarkStatus,
           scale
         )
-      })
+      } else {
+        const method = personInfoApi
+        method().then(res => {
+          userInfo.value = res.data
+          if (userInfo.value && userInfo.value.model !== 'lose') {
+            activeWatermark(
+              dvInfo.value.watermarkInfo.settingContent,
+              userInfo.value,
+              waterDomId,
+              canvasId.value,
+              dvInfo.value.selfWatermarkStatus,
+              scale
+            )
+          }
+        })
+      }
     }
+  } catch (e) {
+    console.warn('Watermarks are not supported!')
   }
 }
 

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

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