.

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

@@ -113,6 +113,8 @@ export default class UIControl{
         }
         history.save()
         stateService.clearFocusItem();
+        this.bus.emit('hideAttribute')
+        this.bus.emit('hideUI')
         this.layer.renderer.autoRedraw()
     }
 
@@ -141,6 +143,14 @@ export default class UIControl{
                     }
                 }
                 break;
+            case VectorType.Title:
+                const title = floorplanService.getTitle()
+                value = title.value;
+                break;
+            case VectorType.Compass:
+                const compass = floorplanService.getCompass()
+                value = compass.angle;
+                break;
         }
         this.bus.emit('showAttribute',{
             type:type,
@@ -206,15 +216,15 @@ export default class UIControl{
     exportJSON() {
         const json = {
             version: floorplanData.version,
-            floors: floors || floorplanData.floors,
+            floors: floorplanData.floors,
             currentId: floorplanService.getCurrentId(),
         }
         return json
     }
 
     downloadCadImg(canvas, filename) {
-        // 图片导出为 jpg 格式
-        var type = 'jpg'
+        // 图片导出为 png 格式
+        var type = 'png'
         var imgData = canvas.toDataURL(type, 1)
 
         let blobImg = this.base64ToBlob(imgData)
@@ -255,45 +265,6 @@ export default class UIControl{
         return new Blob([u8arr], { type: mime })
     }
 
-    /****************************************************************************针对菜单*******************************************************************************/
-
-    // execute(name, value) {
-    //     stateService.clearFocusItem()
-    //     stateService.clearSelectItem()
-    //     //this.layer.$xui.hideProps()
-    //     this.layer.uiControl.selectUI = null
-    //     switch (name) {
-    //         case 'recall': //撤销
-    //             this.menu_revoke()
-    //             break
-    //         case 'recover': //恢复
-    //             this.menu_recovery()
-    //             break
-    //         case 'default': //恢复默认
-    //             this.menu_default()
-    //             break
-    //         case 'download': //下载
-    //             this.menu_screenShot(value)
-    //             break
-    //         case 'texture': //底图
-    //             this.showTexture = value
-    //             this.layer.app.dom.querySelector('.player[name="main"]').style.visibility = this.showTexture ? 'visible' : 'hidden'
-    //             break
-    //         case 'clear': //清空
-    //             this.menu_clear()
-    //             break
-    //         case 'panos': //漫游点
-    //             this.menu_panos(value)
-    //             break
-    //         case 'rotate': //旋转
-    //             this.menu_rotate()
-    //             break
-    //         case 'flex': //适应视图
-    //             this.menu_flex()
-    //             break
-    //     }
-    // }
-
     //截图
     menu_screenShot(fileName) {
         this.menu_flex();

src/views/draw-file/board/editCAD/Geometry/Image.js

@@ -4,7 +4,7 @@ import Geometry from './Geometry'
 export default class Image extends Geometry {
     constructor(src,vectorId, floor) {
         super()
-        this.src = src?src:'https://4dkk.4dage.com/scene_view_data/SS-t-J49UDqjqbl/images/tiles/4k/0_skybox3.jpg';
+        this.src = src;
         //this.src = src;
         this.image = null;
         this.floor = floor?floor:0
@@ -17,7 +17,9 @@ export default class Image extends Geometry {
         var img = new Image()
         img.src = src;
         img.crossOrigin=""
-        img.onload = function () {}
+        img.onload = function () {
+            
+        }
         this.image = img;
     }
 }

src/views/draw-file/board/editCAD/Geometry/Table.js

@@ -105,7 +105,7 @@ export default class Table extends Geometry {
                 this.cells[item.rowIndex][item.colIndex] = cell.vectorId
             }
             cell.width = item.width
-            cell.height = item.width
+            cell.height = item.height
             cell.value = item.value
             cell.colIndex = item.colIndex
             cell.rowIndex = item.rowIndex

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

@@ -37,12 +37,8 @@ export default class History {
         this.setState()
         const historyState = historyService.getHistoryState()
         if (historyState.pre) {
-            //this.layer.$xui.toolbar.recall = true
+            this.bus.emit('undoAvailable', true)
         }
-        //this.layer.$xui.toolbar.recover = false
-        // //给UI发送事件
-        // // this.layer.emit('change')
-
         return change.elements
     }
 
@@ -308,7 +304,7 @@ export default class History {
     }
 
     goPreForTitle(itemForTitle) {
-        if (itemForTitle.handle == HistoryEvents.ModifyTitle) {
+        if (itemForTitle != null && itemForTitle.handle == HistoryEvents.ModifyTitle) {
             const preTitle = item.preTitle
             let curTitle = floorplanService.getTitle()
             historyUtil.assignTitleFromTitle(curTitle, preTitle)
@@ -316,7 +312,7 @@ export default class History {
     }
 
     goPreForImage(itemForImage) {
-        if (itemForImage.handle == HistoryEvents.ModifyImage) {
+        if (itemForImage != null && itemForImage.handle == HistoryEvents.ModifyImage) {
             const preImage = item.preImage
             let curImage = floorplanService.getBgImage()
             historyUtil.assignImageFromImage(curImage, preImage)
@@ -324,7 +320,7 @@ export default class History {
     }
 
     goPreForCompass(itemForCompass) {
-        if (itemForCompass.handle == HistoryEvents.ModifyCompass) {
+        if (itemForCompass != null && itemForCompass.handle == HistoryEvents.ModifyCompass) {
             const preCompass = item.preCompass
             let curCompass = floorplanService.getCompass()
             historyUtil.assignCompassFromCompass(curCompass, preCompass)
@@ -497,7 +493,7 @@ export default class History {
     }
 
     goNextForTitle(itemForTitle) {
-        if (itemForTitle.handle == HistoryEvents.ModifyTitle) {
+        if (itemForTitle != null && itemForTitle.handle == HistoryEvents.ModifyTitle) {
             const currentTitle = item.curTitle
             let preTitle = floorplanService.getTitle()
             historyUtil.assignTitleFromTitle(preTitle, currentTitle)
@@ -505,7 +501,7 @@ export default class History {
     }
 
     goNextForImage(itemForImage) {
-        if (itemForImage.handle == HistoryEvents.ModifyImage) {
+        if (itemForImage != null && itemForImage.handle == HistoryEvents.ModifyImage) {
             const currentImage = item.curImage
             let preImage = floorplanService.getBgImage()
             historyUtil.assignImageFromImage(preImage, currentImage)
@@ -513,7 +509,7 @@ export default class History {
     }
 
     goNextForCompass(itemForCompass) {
-        if (itemForCompass.handle == HistoryEvents.ModifyCompass) {
+        if (itemForCompass != null && itemForCompass.handle == HistoryEvents.ModifyCompass) {
             const currentCompass = item.curCompass
             let preCompass = floorplanService.getCompass()
             historyUtil.assignCompassFromCompass(preCompass, currentCompass)

src/views/draw-file/board/editCAD/Renderer/Draw.js

@@ -292,9 +292,9 @@ export default class Draw {
         this.context.closePath();
         this.context.stroke()
 
-        this.context.font = '24px Microsoft YaHei'
+        this.context.font = '12px Microsoft YaHei'
         const fontWidth = this.context.measureText(geometry.value).width
-        this.context.fillText(geometry.value, geometry.width/2 - fontWidth/2, geometry.height/2-2)
+        this.context.fillText(geometry.value, geometry.width/2 - fontWidth/2, geometry.height/2+6)
         this.context.restore()
     }