xushiting vor 2 Jahren
Ursprung
Commit
4fdd5825d3

+ 1 - 1
src/views/draw-file/board/editCAD/Controls/UIControl.js

@@ -105,7 +105,7 @@ export default class UIControl{
                     floorplanService.updateTitle(value);
                 }
                 else if(type == VectorType.BgImage){
-                    floorplanService.updateBgImage(value);
+                    floorplanService.updateBgImage(value,this.layer);
                 }
                 else if(type == VectorType.Compass){
                     floorplanService.updateCompass(value);

+ 3 - 4
src/views/draw-file/board/editCAD/Geometry/BgImage.js

@@ -12,16 +12,15 @@ export default class BgImage extends Geometry {
         this.setId(vectorId)
     }
 
-    setSrc(src){
+    setSrc(src,layer){
         console.log(src)
         this.src = src
         var img = new Image()
         img.src = src;
-        // img.crossOrigin=""
-        console.error(src)
+        img.crossOrigin=""
         img.onload = function () {
-            debugger;
             this.image = img;
+            layer.renderer.autoRedraw()
         }.bind(this)
     }
 }

+ 2 - 2
src/views/draw-file/board/editCAD/History/History.js

@@ -315,7 +315,7 @@ export default class History {
         if (itemForImage != null && itemForImage.handle == HistoryEvents.ModifyImage) {
             const preImage = itemForImage.preImage
             let curImage = floorplanService.getBgImage()
-            historyUtil.assignImageFromImage(curImage, preImage)
+            historyUtil.assignImageFromImage(curImage, preImage,this.layer)
         }
     }
 
@@ -504,7 +504,7 @@ export default class History {
         if (itemForImage != null && itemForImage.handle == HistoryEvents.ModifyImage) {
             const currentImage = itemForImage.curImage
             let preImage = floorplanService.getBgImage()
-            historyUtil.assignImageFromImage(preImage, currentImage)
+            historyUtil.assignImageFromImage(preImage, currentImage,this.layer)
         }
     }
 

+ 2 - 2
src/views/draw-file/board/editCAD/History/HistoryUtil.js

@@ -256,11 +256,11 @@ export default class HistoryUtil {
         floorplanService.updateTitle(titleInfo.value)
     }
 
-    assignImageFromImage(image1, image2) {
+    assignImageFromImage(image1, image2,layer) {
         const imageInfo = {}
         imageInfo.vectorId = image1.vectorId
         imageInfo.src = image2.src
-        floorplanService.updateBgImage(imageInfo.src)
+        floorplanService.updateBgImage(imageInfo.src,layer)
     }
 
     assignCompassFromCompass(compass1, compass2) {

+ 6 - 5
src/views/draw-file/board/editCAD/Service/FloorplanService.js

@@ -442,12 +442,13 @@ export class FloorplanService {
         floorplanData.floors[floor].image = image
     }
 
-    updateBgImage(value,floor){
-        if (floor == null || typeof floor == 'undefined') {
-            floor = this.currentFloor
-        }
+    updateBgImage(value,layer){
+        // if (floor == null || typeof floor == 'undefined') {
+        //     floor = this.currentFloor
+        // }
+        const floor = this.currentFloor
         const img = floorplanData.floors[floor].image
-        img.setSrc(value)
+        img.setSrc(value,layer)
     }
 
     getBgImage(floor) {