完成

src/view/case/draw/board/editCAD/Controls/UIControl.js

@@ -180,11 +180,11 @@ export default class UIControl {
         break;
       case "upload":
         if(type == VectorType.CustomImage){
-          customImageService.setCustomImageUrl(value.url);
-          const customImage = await customImageService.createCustomImage({
+          const customImage = await customImageService.createCustomImage(value.url,{
             x:0,
             y:0
           })
+
           //stateService.setEventName(LayerEvents.MoveCustomImage);
           let focusItem = {
             vectorId: customImage.vectorId,
@@ -194,8 +194,7 @@ export default class UIControl {
           this.showAttributes(focusItem);
         }  
         else if(type == VectorType.BgImage){
-          bgImageService.setBgImageUrl(value.url);
-          const bgImage = await bgImageService.createBgImage()
+          const bgImage = await bgImageService.createBgImage(value.url)
           //stateService.setEventName(LayerEvents.MoveBgImage);
           let focusItem = {
             vectorId: bgImage.vectorId,

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

@@ -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.url,item.customImage.center, item.customImage.vectorId)
+                let vCustomImage = await customImageService.createCustomImage(item.customImage.url,item.customImage.center, item.customImage.id)
                 historyUtil.assignCustomImageFromCustomImage(vCustomImage, item.customImage)
             } else if (item.handle == HistoryEvents.DeleteCustomImage) {
                 floorplanService.deleteCustomImage(item.customImage.id)

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

@@ -6,22 +6,16 @@ import Constant from '../Constant'
 
 export default class BgImageService {
     constructor() { 
-        this.url = null;
     }
 
-    setBgImageUrl(url){
-        this.url = url;
-    }
-
-    async createBgImage(center,vectorId) {
-        const bgImage = new BgImage(this.url, center,vectorId)
-        if(this.url){
-            const imageData = await floorplanService.loadImageData(this.url)
+    async createBgImage(url,center,vectorId) {
+        const bgImage = new BgImage(url, center,vectorId)
+        if(bgImage.url){
+            const imageData = await floorplanService.loadImageData(bgImage.url)
             bgImage.setImageData(imageData)
         }
 
         floorplanService.addBgImage(bgImage)
-        this.url = null;
         return bgImage
     }
 

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

@@ -11,8 +11,8 @@ export default class CustomImageService {
 
     async createCustomImage(url,center,vectorId) {
         const customImage = new CustomImage(url, center,vectorId)
-        if(this.url){
-            const imageData = await floorplanService.loadImageData(this.url)
+        if(customImage.url){
+            const imageData = await floorplanService.loadImageData(customImage.url)
             customImage.setImageData(imageData)
             customImage.width = imageData.width;
             customImage.height = imageData.height;
@@ -21,7 +21,6 @@ export default class CustomImageService {
         }
 
         floorplanService.addCustomImage(customImage)
-        this.url = null;
         return customImage
     }