【杨琨】【添加二三维联动-绘制功能】

Author: killer1992

src/service/2DPlot/Draw/DrawPoint2D.js

@@ -30,6 +30,7 @@ export default class DrawPoint2D extends DrawObject {
 
   removeHooks() {
     this._plotLayer.interactive = false;
+    this._plotLayer._isDrawing = false;
     this._plotLayer.off("mouse:up", this.onMouseUp);
     super.removeHooks();
   }
@@ -44,7 +45,7 @@ export default class DrawPoint2D extends DrawObject {
       });
 
       object.setPnts([new Point(pnt[0],pnt[1])]);
-  
+      this._plotLayer._isDrawing = true;
       this._plotLayer.addPlot(object);
       this._plotLayer.requestRenderAll();
       this.fireFinishEvent({ plotObj2D: object });

src/service/2DPlot/Draw/DrawPolyline2D.js

@@ -38,6 +38,7 @@ export default class DrawPolyline2D extends DrawObject {
         this.m_fabricCanvas.interactive = true;
         this.m_fabricCanvas.off('mouse:move', this.onMouseMove);
         this.m_fabricCanvas.off('mouse:up', this.onMouseUp);
+        this.m_fabricCanvas._isDrawing = false;
         super.removeHooks();
     }
 
@@ -73,6 +74,7 @@ export default class DrawPolyline2D extends DrawObject {
                         canvas: this.m_fabricCanvas
                     });
                     this.m_fabricCanvas.addPlot(this.m_object);
+                    this.m_fabricCanvas._isDrawing = true;
                     addExtendLayersPlot(this.m_fabricCanvas._linkTool, this.m_object);
                 });
             }

src/service/2DPlot/PlotLayer2D.js

@@ -14,7 +14,7 @@ import SymbolManager from '../PlotBase/SymbolManager/SymbolManager';
 import FabricLineUtil from './EditTool/FabricLineUtil';
 import {addExtendLayersPlot, removeExtendLayersPlot} from "../3DPlot/Utils/PlotUtil";
 
-export default class PlotLayer2D {
+class PlotLayer2D {
     constructor() {
         // 标绘对象
         this.m_plotObjects = [];
@@ -30,6 +30,10 @@ export default class PlotLayer2D {
 
         //二三维联动工具
         this._linkTool = undefined;
+        //点击回调事件
+        this._pickPlot = undefined;
+        //是否在绘制图元，绘制途中不触发pick事件
+        this._isDrawing = false;
     }
 
     /**
@@ -428,3 +432,24 @@ export default class PlotLayer2D {
         this._fabricCanvas.requestRenderAll();
     }
 }
+
+Object.defineProperties(PlotLayer2D.prototype, {
+    pickPlot: {
+        get() {
+            return this._pickPlot;
+        },
+        set(v) {
+            let that = this;
+            this._pickPlot = v;
+            this.off("mouse:down");
+            this.on("mouse:down", function (result) {
+                result = result || {};
+                if(result.target && !that._isDrawing){
+                    that._pickPlot(result.target);
+                }
+            });
+        }
+    }
+});
+
+export default PlotLayer2D;