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

# Conflicts:
#	src/graphic/Controls/MovePoint.js

src/graphic/Controls/MovePoint.js

@@ -17,6 +17,7 @@ export default class MovePoint {
     if (point.getCategory() == VectorCategory.Point.TestPoint) {
       this.updatePositionByTestPoint(pointId);
     } else if (point.getCategory() == VectorCategory.Point.BasePoint) {
+
       this.updateBasePoint(pointId);
     } else {
       let parent = point.getParent();
@@ -76,6 +77,7 @@ export default class MovePoint {
       ) {
         pointService.mergePoint(pointId, listenLayer.modifyPoint.linkedPointId);
         Settings.selectBasePointId = null;
+
       } else {
         let point = dataService.getPoint(pointId);
         const parent = point.getParent();
@@ -187,6 +189,7 @@ export default class MovePoint {
     let startPoint = dataService.getPoint(lineGeometry.startId);
     let endPoint = dataService.getPoint(lineGeometry.endId);
     let line = mathUtil.createLine1(startPoint, endPoint);
+
     let join = mathUtil.getJoinLinePoint(testPoint, line);
     let testBasePoint = this.getTestBasePoint(
       basePoint.vectorId,

src/graphic/Renderer/Draw.js

@@ -933,9 +933,6 @@ export default class Draw {
         ...style,
         ...stylea
       }
-      // if (!attr) {
-      //   return;
-      // }
     }
 
     if (vector.color) {
@@ -955,22 +952,7 @@ export default class Draw {
       ctx.fill();
       ctx.restore();
     };
-    // let points = dataService.vectorData.points;
-    // Settings.basePointIds =[]
-    // for (let key in points) {
-    //   if (points[key].category == VectorCategory.Point.BasePoint) {
-    //     Settings.basePointIds.push(points[key].vectorId)
-    //   }
-    // }
-    // if(  Settings.basePointIds.length==1){
-    //   Settings.selectBasePointId =  Settings.basePointIds[0];
-    // }else{
-    //   // Settings.selectBasePointId =null
-    // }
-    let focusItem = stateService.getFocusItem()
-    // if (Settings.selectBasePointId === vector.vectorId && focusItem?.vectorId == vector.vectorId ) {
     if (Settings.selectBasePointId === vector.vectorId  ) {
-
       style = {
         ...style,
         strokeStyle: "rgba(255,255,255,1)",
@@ -981,7 +963,7 @@ export default class Draw {
       };
     }
 
-
+    console.log(vector, style, Settings.selectBasePointId)
     draw(style);
     if (style.out) {
       draw(style.out);