.

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

@@ -9,6 +9,7 @@ import { elementService } from '../Service/ElementService'
 import { mathUtil } from '../MathUtil.js'
 import { wallService } from '../Service/WallService.js'
 import { tagService } from '../Service/TagService.js'
+import { tableService } from '../Service/TableService.js'
 import Constant from '../Constant'
 import { addWall } from '../Controls/AddWall'
 import { floorplanData } from '../FloorplanData.js'
@@ -281,5 +282,25 @@ export default class UIControl{
         coordinate.reSet()
         this.layer.renderer.autoRedraw()
     }
+
+    initTable(value1,value2){
+        let tableACenter = {
+            x:800,
+            y:550
+        }
+        tableACenter = coordinate.getXYFromScreen(tableACenter)
+
+        let tableBCenter = {
+            x:800,
+            y:250
+        }
+        tableBCenter = coordinate.getXYFromScreen(tableBCenter)
+
+        let tableA = tableService.createTable(tableACenter)
+        tableA.setValue(value1)
+
+        let tableB = tableService.createTable(tableBCenter)
+        tableB.setValue(value2)
+    }
     /******************************************************************************************************************************************************************/
 }

src/views/draw-file/board/editCAD/FloorplanData.js

@@ -21,9 +21,12 @@ export default class FloorplanData {
         this.floors[floorNum].icons = {}
         this.floors[floorNum].signs = {}
 
-        this.floors[floorNum].title = new Title();
-        this.floors[floorNum].image = new Image();
-        this.floors[floorNum].compass = new Compass();
+        // this.floors[floorNum].title = new Title();
+        // this.floors[floorNum].image = new Image();
+        // this.floors[floorNum].compass = new Compass();
+        this.floors[floorNum].title = {};
+        this.floors[floorNum].image = {};
+        this.floors[floorNum].compass = {};
     }
 }
 

src/views/draw-file/board/editCAD/History/Change.js

@@ -72,7 +72,10 @@ export default class Change {
             this.elements.rectangles.length == 0 &&
             this.elements.circles.length == 0 &&
             this.elements.arrows.length == 0 &&
-            this.elements.icons.length == 0 
+            this.elements.icons.length == 0 &&
+            this.elements.title == null &&
+            this.elements.image == null &&
+            this.elements.compass == null
         ) {
             this.saveCurrentInfo()
             return false

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

@@ -305,7 +305,7 @@ export default class History {
 
     goPreForTitle(itemForTitle) {
         if (itemForTitle != null && itemForTitle.handle == HistoryEvents.ModifyTitle) {
-            const preTitle = item.preTitle
+            const preTitle = itemForTitle.preTitle
             let curTitle = floorplanService.getTitle()
             historyUtil.assignTitleFromTitle(curTitle, preTitle)
         }
@@ -313,7 +313,7 @@ export default class History {
 
     goPreForImage(itemForImage) {
         if (itemForImage != null && itemForImage.handle == HistoryEvents.ModifyImage) {
-            const preImage = item.preImage
+            const preImage = itemForImage.preImage
             let curImage = floorplanService.getBgImage()
             historyUtil.assignImageFromImage(curImage, preImage)
         }
@@ -321,7 +321,7 @@ export default class History {
 
     goPreForCompass(itemForCompass) {
         if (itemForCompass != null && itemForCompass.handle == HistoryEvents.ModifyCompass) {
-            const preCompass = item.preCompass
+            const preCompass = itemForCompass.preCompass
             let curCompass = floorplanService.getCompass()
             historyUtil.assignCompassFromCompass(curCompass, preCompass)
         }
@@ -494,7 +494,7 @@ export default class History {
 
     goNextForTitle(itemForTitle) {
         if (itemForTitle != null && itemForTitle.handle == HistoryEvents.ModifyTitle) {
-            const currentTitle = item.curTitle
+            const currentTitle = itemForTitle.curTitle
             let preTitle = floorplanService.getTitle()
             historyUtil.assignTitleFromTitle(preTitle, currentTitle)
         }
@@ -502,7 +502,7 @@ export default class History {
 
     goNextForImage(itemForImage) {
         if (itemForImage != null && itemForImage.handle == HistoryEvents.ModifyImage) {
-            const currentImage = item.curImage
+            const currentImage = itemForImage.curImage
             let preImage = floorplanService.getBgImage()
             historyUtil.assignImageFromImage(preImage, currentImage)
         }
@@ -510,7 +510,7 @@ export default class History {
 
     goNextForCompass(itemForCompass) {
         if (itemForCompass != null && itemForCompass.handle == HistoryEvents.ModifyCompass) {
-            const currentCompass = item.curCompass
+            const currentCompass = itemForCompass.curCompass
             let preCompass = floorplanService.getCompass()
             historyUtil.assignCompassFromCompass(preCompass, currentCompass)
         }

src/views/draw-file/board/editCAD/Load.js

@@ -21,6 +21,12 @@ export default class Load {
     load(floorsData) {
         if(!floorsData||!floorsData.floors){
             floorplanService.initFloor(0)
+            //添加标题
+            floorplanService.createTitle()
+            //添加指南针
+            floorplanService.createCompass()
+            //添加背景图片
+            floorplanService.createBgImage()
             return;
         }
         for (let i = 0; i < floorsData.length; ++i) {