From 64857adc037884aa0a0d7ed9fc714b3ebbfdc95d Mon Sep 17 00:00:00 2001
From: limengnan <420004014@qq.com>
Date: Fri, 27 Jun 2025 09:33:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9canvasInfo.watermarkInfo.sett?=
 =?UTF-8?q?ingContent-bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualization/dataVisualization.ts                   | 9 ++-------
 frontend/src/data-visualization/utils/canvasUtils.ts     | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/frontend/src/api/data-visualization/visualization/dataVisualization.ts b/frontend/src/api/data-visualization/visualization/dataVisualization.ts
index efb4753..d959063 100644
--- a/frontend/src/api/data-visualization/visualization/dataVisualization.ts
+++ b/frontend/src/api/data-visualization/visualization/dataVisualization.ts
@@ -20,16 +20,11 @@ export const findCopyResource = async (dvId, busiFlag): Promise<IResponse> => {
 }
 
 export const findById = async (
-  dvId,
-  busiFlag,
+  dvId:any,
+  busiFlag:any,
   attachInfo = { source: 'main', taskId: null }
 ): Promise<IResponse> => {
   let busiFlagResult = busiFlag
-  if (!busiFlagResult) {
-    await findDvType(dvId).then(res => {
-      busiFlagResult = res.data
-    })
-  }
   const data = { id: dvId, busiFlag: busiFlagResult, ...attachInfo }
   return request.post({ url: '/dataVisualization/findById', data })
 }
diff --git a/frontend/src/data-visualization/utils/canvasUtils.ts b/frontend/src/data-visualization/utils/canvasUtils.ts
index 8629128..b34d0fe 100644
--- a/frontend/src/data-visualization/utils/canvasUtils.ts
+++ b/frontend/src/data-visualization/utils/canvasUtils.ts
@@ -339,7 +339,7 @@ export function initCanvasDataPrepare(dvId, busiFlag, callBack) {
     const canvasInfo = res.data
     const watermarkInfo = {
       ...canvasInfo.watermarkInfo,
-      settingContent: JSON.parse(canvasInfo.watermarkInfo.settingContent)
+      // settingContent: JSON.parse(canvasInfo.watermarkInfo.settingContent)
     }
 
     const dvInfo = {