.

src/view/case/draw/board/editCAD/History/History.js

@@ -88,7 +88,7 @@ export default class History {
 
     // 撤销
     async handleUndo() {
-        this.goPreState()
+        await this.goPreState()
         this.layer.renderer.autoRedraw()
         const historyState = historyService.getHistoryState()
         if (historyState.pre) {
@@ -105,7 +105,7 @@ export default class History {
 
     // 恢复
     async handleRedo() {
-        this.goNextState()
+        await this.goNextState()
         this.layer.renderer.autoRedraw()
         const historyState = historyService.getHistoryState()
         if (historyState.next) {
@@ -336,7 +336,7 @@ export default class History {
             if (itemForBgImage.handle == HistoryEvents.AddBgImage) {    
                 bgImageService.deleteBgImage()
             } else if (itemForBgImage.handle == HistoryEvents.DeleteBgImage) {
-                let newBgImage = await bgImageService.createBgImage(null,itemForBgImage.bgImage.id)
+                let newBgImage = await bgImageService.createBgImage(itemForBgImage.bgImage.url,itemForBgImage.bgImage.id)
                 historyUtil.assignBgImageFromBgImage(newBgImage, itemForBgImage.bgImage)
             } else if (itemForBgImage.handle == HistoryEvents.ModifyBgImage) {
                 const preBgImage = itemForBgImage.preBgImage
@@ -360,7 +360,7 @@ export default class History {
             if (item.handle == HistoryEvents.AddCustomImage) {  
                 customImageService.deleteCustomImage(item.customImage.id)
             } else if (item.handle == HistoryEvents.DeleteCustomImage) {
-                let newCustomImage = await customImageService.createCustomImage(item.customImage.center,item.customImage.id)
+                let newCustomImage = await customImageService.createCustomImage(item.customImage.url,item.customImage.center,item.customImage.id)
                 historyUtil.assignCustomImageFromCustomImage(newCustomImage, item.customImage)
             } else if (item.handle == HistoryEvents.ModifyCustomImage) {
                 const preCustomImage = item.preCustomImage
@@ -542,7 +542,7 @@ export default class History {
     async goNextForBgImage(itemForBgImage) {
         if(itemForBgImage){
             if (itemForBgImage.handle == HistoryEvents.AddBgImage) {
-                let vBgImage = await bgImageService.createBgImage(itemForBgImage.bgImage.center, itemForBgImage.bgImage.id)
+                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)
@@ -567,7 +567,7 @@ export default class History {
         for (let i = 0; i < itemForCustomImages.length; ++i) {
             const item = itemForCustomImages[i]
             if (item.handle == HistoryEvents.AddCustomImage) {
-                let vCustomImage = await customImageService.createCustomImage(item.customImage.center, item.customImage.vectorId)
+                let vCustomImage = await customImageService.createCustomImage(item.customImage.url,item.customImage.center, item.customImage.vectorId)
                 historyUtil.assignCustomImageFromCustomImage(vCustomImage, item.customImage)
             } else if (item.handle == HistoryEvents.DeleteCustomImage) {
                 floorplanService.deleteCustomImage(item.customImage.id)

src/view/case/draw/board/editCAD/Load.js

@@ -58,8 +58,7 @@ export default class Load {
             }
 
             for (let key in floor.customImages) {
-                let customImage = await customImageService.createCustomImage(floor.customImages[key].center, floor.customImages[key].vectorId)
-                customImage.setUrl(floor.customImages[key].url)
+                let customImage = await customImageService.createCustomImage(floor.customImages[key].url,floor.customImages[key].center, floor.customImages[key].vectorId)
                 customImage.setAngle(floor.customImages[key].angle)
                 customImage.setScale(floor.customImages[key].scale)
                 customImage.setRatio(floor.customImages[key].ratio)

src/view/case/draw/board/editCAD/Service/CustomImageService.js

@@ -7,15 +7,10 @@ import Constant from '../Constant'
 export default class CustomImageService {
     constructor() {
         this.defaultPix = 60;  
-        this.url = null;
-    }
-
-    setCustomImageUrl(url){
-        this.url = url;
     }
 
-    async createCustomImage(center,vectorId) {
-        const customImage = new CustomImage(this.url, center,vectorId)
+    async createCustomImage(url,center,vectorId) {
+        const customImage = new CustomImage(url, center,vectorId)
         if(this.url){
             const imageData = await floorplanService.loadImageData(this.url)
             customImage.setImageData(imageData)