xushiting 1 gadu atpakaļ
vecāks
revīzija
b59a3f5f05

+ 2 - 0
src/view/case/draw/board/editCAD/Controls/UIControl.js

@@ -394,6 +394,8 @@ export default class UIControl {
         wallService.deleteWallCorner(item.vectorId);
       } else if (item.type == VectorType.CustomImage) {
         floorplanService.deleteCustomImage(item.vectorId);
+      } else if (item.type == VectorType.BgImage) {
+        floorplanService.deleteBgImage();
       }
       history.save();
       this.layer.renderer.autoRedraw();

+ 3 - 3
src/view/case/draw/board/editCAD/History/Change.js

@@ -547,17 +547,17 @@ export default class Change {
     const bgImage = floorplanService.getBgImage();
     const lastBgImage = this.lastData.bgImage;
     let item = {};
-    if (!lastBgImage&&!bgImage) {
+    if ((!lastBgImage||!lastBgImage.url)&&(!bgImage||!bgImage.geoType)) {
       return;
     }
-    else if (!lastBgImage&&bgImage) {
+    else if ((!lastBgImage||!lastBgImage.url)&&(bgImage&&bgImage.geoType)) {
       item = {
         handle: HistoryEvents.AddBgImage,
         bgImage: historyUtil.getDataForBgImage(bgImage),
       };
       this.elements.bgImage = item;
     } 
-    else if(lastBgImage&&!bgImage){
+    else if((lastBgImage&&lastBgImage.url)&&(!bgImage||!bgImage.geoType)){
       item = {
         handle: HistoryEvents.DeleteBgImage,
         bgImage: historyUtil.getDataForBgImage(this.lastData.bgImage),

+ 1 - 1
src/view/case/draw/board/editCAD/History/History.js

@@ -545,7 +545,7 @@ export default class History {
                 let vBgImage = await bgImageService.createBgImage(itemForBgImage.bgImage.url,itemForBgImage.bgImage.center, itemForBgImage.bgImage.id)
                 historyUtil.assignBgImageFromBgImage(vBgImage, itemForBgImage.bgImage)
             } else if (itemForBgImage.handle == HistoryEvents.DeleteBgImage) {
-                floorplanService.deleteBgImage(itemForBgImage.bgImage.id)
+                floorplanService.deleteBgImage()
             } else if (itemForBgImage.handle == HistoryEvents.ModifyBgImage) {
                 const currentBgImage = itemForBgImage.curBgImage
                 let preBgImage = floorplanService.getBgImage(itemForBgImage.curBgImage.id)

+ 2 - 2
src/view/case/draw/board/editCAD/Service/BgImageService.js

@@ -19,8 +19,8 @@ export default class BgImageService {
         return bgImage
     }
 
-    deleteBgImage(bgImageId) {
-        floorplanService.deleteBgImage(bgImageId)
+    deleteBgImage() {
+        floorplanService.deleteBgImage()
     }
 
     setBgImageInfo(bgImageInfo) {