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

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

@@ -10,7 +10,7 @@ export default class MoveBgImage {
 
     moveFullBgImage(dx,dy, bgImageId) {
         let bgImage = floorplanService.getBgImage()
-        if(bgImage){
+        if(bgImage.url){
             bgImage.center = {
                 x:bgImage.center.x + dx * Constant.defaultZoom/coordinate.zoom,
                 y:bgImage.center.y + dy * Constant.defaultZoom/coordinate.zoom,

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

@@ -442,6 +442,7 @@ export default class UIControl {
     coordinate.setRatio(3)
     canvas.width = canvas.width * coordinate.ratio
     canvas.height = canvas.height * coordinate.ratio
+    stateService.clearItems();
     this.layer.renderer.autoRedrawForImg()
     setTimeout(() => {
       // let blobImg = this.downloadCadImg(canvas, filename)

src/view/case/draw/board/editCAD/Geometry/Table.js

@@ -96,6 +96,7 @@ export default class Table extends Geometry {
     }
 
     setValue(value) {
+        this.cells = []; 
         let maxCol = 0;
         let maxRow = 0;
         for(let i=0;i<value.length;++i){

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

@@ -182,14 +182,6 @@ export default class Layer {
         break;
       case LayerEvents.PanBackGround:
         break;
-      case LayerEvents.MoveBgImage:
-        needAutoRedraw = true;
-        if (draggingItem != null) {
-          moveCustomImage.moveFullCustomImage(dx, dy, draggingItem.vectorId);
-          this.lastX = X;
-          this.lastY = Y;
-        }
-        break;
       case LayerEvents.AddWall:
         stateService.clearDraggingItem();
         stateService.clearFocusItem();
@@ -581,6 +573,7 @@ export default class Layer {
         focusItem = null;
       }
       stateService.setFocusItem(focusItem);
+      this.uiControl.clearUI();
     }
 
     let position = coordinate.getXYFromScreen({

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

@@ -414,7 +414,7 @@ export default class ListenLayer {
         }
 
         const bgImage = floorplanService.getBgImage()
-        if(bgImage){
+        if(bgImage && bgImage.url){
             const location = bgImage.isContain(position)
             if (location) {
                 result.bgImageInfo = {
@@ -761,7 +761,7 @@ export default class ListenLayer {
             stateService.setSelectItem(this.customImageInfo.customImageId, customImage.geoType, this.customImageInfo.state)
         } else if (this.bgImageInfo.bgImageId != null && this.bgImageInfo.state != null) {
             const bgImage = floorplanService.getBgImage()
-            if(bgImage){
+            if(bgImage.url){
                 stateService.setSelectItem(this.bgImageInfo.bgImageId, bgImage.geoType, this.bgImageInfo.state)
             }
         }