xushiting пре 2 година
родитељ
комит
5b843faee0

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

@@ -650,10 +650,7 @@ export default class UIControl {
                 this.menu_default()
                 break
             case 'download': //下载
-                this.layer.div.style.visibility = 'hidden'
-                this.menu_screenShot(value).then(() => {
-                    this.layer.div.style.visibility = 'visible'
-                })
+                this.menu_screenShot(value)
                 break
             case 'texture': //底图
                 this.showTexture = value

+ 8 - 6
src/views/draw-file/board/editCAD/Layer.js

@@ -42,6 +42,7 @@ export default class Layer {
         this.renderer = new Render(this)
         this.history = new History(this)
 
+        this.canvas = null;
         this.startX = null
         this.startY = null
     }
@@ -49,19 +50,20 @@ export default class Layer {
     //开始
     start(canvas,vectorData) {
         coordinate.init(canvas)
+        this.canvas = canvas;
         this.load.load(vectorData);
         this.bindEvents()
     }
 
     bindEvents() {
-        this.div.addEventListener('contextmenu', function (e) {
+        this.canvas.addEventListener('contextmenu', function (e) {
             e.preventDefault()
         })
-        this.div.addEventListener('mousedown', this.onMouseDown.bind(this))
-        this.div.addEventListener('mousemove', this.onMouseMove.bind(this))
-        this.div.addEventListener('mouseup', this.onMouseUp.bind(this))
-        this.div.addEventListener('mousewheel', this.onWheel.bind(this))
-        this.div.addEventListener('DOMMouseScroll', this.onWheel.bind(this))
+        this.canvas.addEventListener('mousedown', this.onMouseDown.bind(this))
+        this.canvas.addEventListener('mousemove', this.onMouseMove.bind(this))
+        this.canvas.addEventListener('mouseup', this.onMouseUp.bind(this))
+        this.canvas.addEventListener('mousewheel', this.onWheel.bind(this))
+        this.canvas.addEventListener('DOMMouseScroll', this.onWheel.bind(this))
     }
 
     onMouseDown(e) {

+ 3 - 0
src/views/draw-file/board/editCAD/Load.js

@@ -16,6 +16,9 @@ export default class Load {
     }
 
     load(floorsData) {
+        if(!floorsData){
+            return;
+        }
         for (let i = 0; i < floorsData.length; ++i) {
             let floor = floorsData[i]
             floorplanService.initFloor(i)