Merge branch 'master' of http://192.168.0.115:3000/bill/traffic-laser

src/graphic/Renderer/Draw.js

@@ -31,10 +31,12 @@ const help = {
           // item.type === VectorType[geoType] &&
           geoId === item.vectorId
         ) {
-          const style = Style[attr][geoType] || Style[attr][item.category]
-          if (Style[attr] && style) {
-            currentAttr = attr;
-            return style;
+          if (Style[attr]) {
+            const style = Style[attr][geoType] || Style[attr][item.category]
+            if (style) {
+              currentAttr = attr;
+              return style;
+            }
           }
         }
         return prev;
@@ -522,11 +524,6 @@ export default class Draw {
     }
     ctx.stroke();
     ctx.restore();
-
-    if ([Style.Focus.ArrowLine, Style.Select.ArrowLine].includes(style)) {
-      this.drawPoint(startReal);
-      this.drawPoint(endReal);
-    }
   }
 
   drawMagnifier(vector) {
@@ -751,15 +748,25 @@ export default class Draw {
     this.context.stroke();
     this.context.restore();
 
+    const drawPoints = () => {
+      // if (attr) {
+        this.drawPoint(dataService.getPoint(vector.startId))
+        this.drawPoint(dataService.getPoint(vector.endId))
+      // }
+    }
+
     switch (vector.category) {
       case VectorCategory.Line.ArrowLine:
         this.drawArrow(vector);
+        drawPoints()
         break
       case VectorCategory.Line.BaseLine:
         this.drawBaseLineLabel(vector)
+        drawPoints()
         break;
       case VectorCategory.Line.MeasureLine:
         this.drawLineText(vector, style.text)
+        drawPoints()
         break;
     }
 

src/sdk/laser/core/enter.js

@@ -489,10 +489,16 @@ var enter = ({
                     object: measure,
                     ...getMeasureFunction(measure, bus),
                 };
-
+                
                 measure.addEventListener("intersectNoPointcloud", () => {
                     bus.emit("invalidPoint");
                 });
+                measure.addEventListener("firstClick", () => {
+                    bus.emit("firstClickMarker");
+                });
+                
+                
+                
                 return ret;
             },
             quitMeasure() {