Selaa lähdekoodia

当url带有skyeye-file-upload时就不要加imgUrl的前缀了

louhangfei 1 vuosi sitten
vanhempi
commit
1c9598342a

+ 3 - 1
src/components/Upload/src/BasicUpload.vue

@@ -133,7 +133,9 @@
   //组装完整图片地址
   function getImgUrl(url: string): string {
     const { imgUrl } = globSetting;
-    return /(^http|https:\/\/)/g.test(url) ? url : `${imgUrl}${url}`;
+    return /(^http|https:\/\/)/g.test(url) || url.includes('skyeye-file-upload')
+      ? url
+      : `${imgUrl}${url}`;
   }
 
   function checkFileType(fileType: string) {

+ 3 - 1
src/views/map-config/mini-map/MapBase/KonvaMap.vue

@@ -353,7 +353,9 @@
   const addBg = (imgBg) => {
     return new Promise((resolve) => {
       bgImgUrl.value = imgBg;
-      bgImg.src = urlJoin(globSetting.imgUrl!, imgBg) as string;
+      bgImg.src = imgBg.includes('skyeye-file-upload')
+        ? imgBg
+        : (urlJoin(globSetting.imgUrl!, imgBg) as string);
       bgImg.onload = () => {
         bgConfig.value.width = bgImg.width;
         bgConfig.value.height = bgImg.height;

+ 3 - 2
src/views/page-config/component/mapContainer/MapContainerSmall.vue

@@ -52,8 +52,9 @@
 
   const addBg = () => {
     return new Promise((resolve) => {
-      const imgUrl = urlJoin(globSetting.imgUrl!, props.bgImageUrl);
-      console.log('imgUrlPromise', imgUrl);
+      const imgUrl = props.bgImageUrl.includes('skyeye-file-upload')
+        ? props.bgImageUrl
+        : urlJoin(globSetting.imgUrl!, props.bgImageUrl);
 
       const tempImg = new Image();
       tempImg.src = imgUrl;

+ 3 - 1
src/views/page-config/stores/useMapEditor.ts

@@ -47,7 +47,9 @@ export const useMapEditor = defineStore('home-map-ediotr', () => {
 
   const addBg = () => {
     return new Promise((resolve) => {
-      const imgUrl = urlJoin(globSetting.imgUrl!, bgImg.value);
+      const imgUrl = bgImg.value.includes('skyeye-file-upload')
+        ? bgImg.value
+        : urlJoin(globSetting.imgUrl!, bgImg.value);
 
       const tempImg = new Image();
       tempImg.onload = () => {