瀏覽代碼

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

bill 1 年之前
父節點
當前提交
8d99927721
共有 2 個文件被更改,包括 16 次插入0 次删除
  1. 12 0
      src/view/case/draw/board/editCAD/Controls/UIControl.js
  2. 4 0
      src/view/case/draw/board/editCAD/Layer.js

+ 12 - 0
src/view/case/draw/board/editCAD/Controls/UIControl.js

@@ -126,10 +126,16 @@ export default class UIControl{
         switch (item.type) {
             case VectorType.Tag:
                 const tag = floorplanService.getTag(item.vectorId)
+                if(!tag){
+                    return;
+                }
                 value = tag.value;
                 break;
             case VectorType.Table:
                 const table = floorplanService.getTable(item.vectorId)
+                if(!table){
+                    return;
+                }
                 const cellIds = table.cells;
                 value = [];
                 for(let i=0;i<cellIds.length;++i){
@@ -147,10 +153,16 @@ export default class UIControl{
                 break;
             case VectorType.Title:
                 const title = floorplanService.getTitle()
+                if(!title){
+                    return;
+                }
                 value = title.value;
                 break;
             case VectorType.Compass:
                 const compass = floorplanService.getCompass()
+                if(!compass){
+                    return;
+                }
                 value = compass.angle;
                 break;
         }

+ 4 - 0
src/view/case/draw/board/editCAD/Layer.js

@@ -533,6 +533,7 @@ export default class Layer {
     let eventName = stateService.getEventName();
     const draggingItem = stateService.getDraggingItem();
     let focusItem = null;
+
     if (draggingItem && draggingItem.vectorId) {
       if (
         mathUtil.getDistance(
@@ -933,15 +934,18 @@ export default class Layer {
         if (draggingItem && draggingItem.vectorId) {
           tagService.deleteTag(draggingItem.vectorId);
           this.uiControl.clearUI();
+          stateService.clearItems();
         }
       } else if (eventName == LayerEvents.AddTable) {
         if (draggingItem && draggingItem.vectorId) {
           tableService.deleteTable(draggingItem.vectorId);
           this.uiControl.clearUI();
+          stateService.clearItems();
         }
       } else if (eventName == LayerEvents.AddSign) {
         if (draggingItem && draggingItem.vectorId) {
           floorplanService.deleteSign(draggingItem.vectorId);
+          stateService.clearItems();
         }
       }
     } else {