Merge branch 'master' of http://192.168.0.115:3000/bill/public-fuse

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

@@ -594,7 +594,6 @@ export default class Layer {
       case LayerEvents.MoveWallPoint:
         if (focusItem == null) {
           needAutoRedraw = true;
-          elementService.hideAll();
           let point = floorplanService.getPoint(draggingItem.vectorId);
           if (point) {
             listenLayer.start(point, draggingItem.vectorId, point.parent);
@@ -641,6 +640,7 @@ export default class Layer {
         } else {
           this.uiControl.showAttributes(focusItem);
         }
+        elementService.hideAll();
         break;
       case LayerEvents.AddingWall:
         needAutoRedraw = true;

src/view/case/draw/board/editCAD/Renderer/Draw.js

@@ -909,9 +909,9 @@ export default class Draw {
 
             this.context.translate(pt.x, pt.y)
             this.context.scale(geometry.scale,geometry.scale)
-            this.context.translate(-1*geometry.ratio*geometry.width/2, -1*geometry.ratio*geometry.height/2)
+            this.context.translate(-1*geometry.ratio*geometry.width/2*coordinate.ratio, -1*geometry.ratio*geometry.height/2*coordinate.ratio)
             this.context.rotate((geometry.angle / 180) * Math.PI)
-            this.context.translate(geometry.ratio*geometry.width/2, geometry.ratio*geometry.height/2)
+            this.context.translate(geometry.ratio*geometry.width/2*coordinate.ratio, geometry.ratio*geometry.height/2*coordinate.ratio)
             
 
             if(geometry.image == null)