From a6c51e55ec2b68bc02a8399f2053cd5f239ca0c6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 23 Feb 2024 12:46:46 +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

---
 .../data-visualization/canvas/CanvasCore.vue  | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

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 86245c8ca3..970d1c04fa 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/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) {
         activeWatermark(
           dvInfo.value.watermarkInfo.settingContent,
           userInfo.value,
@@ -241,8 +230,23 @@ const initWatermark = (waterDomId = 'editor-canvas-main') => {
           dvInfo.value.selfWatermarkStatus,
           scale
         )
-      })
+      } else {
+        const method = personInfoApi
+        method().then(res => {
+          userInfo.value = res.data
+          activeWatermark(
+            dvInfo.value.watermarkInfo.settingContent,
+            userInfo.value,
+            waterDomId,
+            canvasId.value,
+            dvInfo.value.selfWatermarkStatus,
+            scale
+          )
+        })
+      }
     }
+  } catch (e) {
+    console.warn('Watermarks are not supported!')
   }
 }