From 251b6c3a2986d9be8f2b68d4468b87529560cc5b Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 23 Nov 2023 09:48:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B5=8C=E5=85=A5=E5=BC=8F=E7=9A=84?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=8B=EF=BC=8C=E9=83=A8=E5=88=86=E9=9D=99?=
 =?UTF-8?q?=E6=80=81=E8=B5=84=E6=BA=90=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/pages/panel/main.ts |  2 +-
 core/core-frontend/src/utils/imgUtils.ts   | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/pages/panel/main.ts b/core/core-frontend/src/pages/panel/main.ts
index f3c9fd6065..2d6c56c2b8 100644
--- a/core/core-frontend/src/pages/panel/main.ts
+++ b/core/core-frontend/src/pages/panel/main.ts
@@ -12,7 +12,7 @@ const formatterUrl = <T extends Node>(node: T, prefix: string) => {
       url = node.src
     }
 
-    if (url.includes(suffix)) {
+    if (url.includes(suffix) || url.includes('dataease-private')) {
       const currentUrlprefix = new URL(url).origin
       const newUrl = url.replace(currentUrlprefix, prefix)
       if (node instanceof HTMLLinkElement) {
diff --git a/core/core-frontend/src/utils/imgUtils.ts b/core/core-frontend/src/utils/imgUtils.ts
index a7f9b6c1ac..004d4738ea 100644
--- a/core/core-frontend/src/utils/imgUtils.ts
+++ b/core/core-frontend/src/utils/imgUtils.ts
@@ -10,19 +10,24 @@ const { canvasStyleData, componentData, canvasViewInfo, canvasViewDataInfo, dvIn
   storeToRefs(dvMainStore)
 const basePath = import.meta.env.VITE_API_BASEPATH
 
+export function formatterUrl(url: string) {
+  return url.replace('//de2api', '/de2api')
+}
 export function imgUrlTrans(url) {
   if (url) {
     if (typeof url === 'string' && url.indexOf('static-resource') > -1) {
       const rawUrl = url
         ? (basePath.endsWith('/') ? basePath.substring(0, basePath.length - 1) : basePath) + url
         : null
-      return window.DataEaseBi
-        ? `${window.DataEaseBi.baseUrl}${
-            rawUrl.startsWith('/api') ? rawUrl.slice(5) : rawUrl
-          }`.replace('com//', 'com/')
-        : rawUrl
+      return formatterUrl(
+        window.DataEaseBi
+          ? `${window.DataEaseBi.baseUrl}${
+              rawUrl.startsWith('/api') ? rawUrl.slice(5) : rawUrl
+            }`.replace('com//', 'com/')
+          : rawUrl
+      )
     } else {
-      return url.replace('com//', 'com/')
+      return formatterUrl(url.replace('com//', 'com/'))
     }
   }
 }