feat 垂直测量无限测量

src/graphic/Controls/AddPoint.js

@@ -39,21 +39,28 @@ export default class AddPoint {
         this.setLocationByAll(newPoint.vectorId);
         newPoint.setLocationMode(Constant.allLocationMode);
         stateService.setEventName(LayerEvents.AddPoint);
-      } else if (Settings.selectLocationMode == Constant.normalLocationMode) {
+      } else if (
+        Settings.selectBasePointId != null && 
+        Settings.selectLocationMode == Constant.normalLocationMode
+        ) {
         newPoint = pointService.create(position);
         this.setLocationByNormal(newPoint.vectorId);
         newPoint.setLocationMode(Constant.normalLocationMode);
+
+      
+        stateService.setEventName(LayerEvents.AddPoint);
       } else if (
         Settings.selectBasePointId == null &&
         (Settings.selectLocationMode == Constant.angleLocationMode ||
           Settings.selectLocationMode == Constant.allLocationMode)
       ) {
-        return null;
+        // return null;
       }
       if (
         newPoint &&
         (newPoint.getLocationMode() == Constant.allLocationMode ||
-          newPoint.getLocationMode() == Constant.angleLocationMode) &&
+          newPoint.getLocationMode() == Constant.angleLocationMode || 
+          newPoint.getLocationMode() == Constant.normalLocationMode) &&
         newPoint.getCategory() == VectorCategory.Point.TestPoint
       ) {
         this.testPointIds.push(newPoint.vectorId);
@@ -181,6 +188,7 @@ export default class AddPoint {
   }
 
   deleteTestPoints() {
+    console.log(this.testPointIds)
     for (let i = 0; i < this.testPointIds.length; ++i) {
       pointService.deletePoint(this.testPointIds[i]);
     }

src/graphic/Layer.js

@@ -329,6 +329,7 @@ export default class Layer {
     }
     selectItem = stateService.getSelectItem();
     stateService.setDraggingItem(selectItem);
+    console.log(selectItem)
     // 清除上一个状态
     // 设置当前事件名称
     e.preventDefault();
@@ -937,7 +938,7 @@ export default class Layer {
       y: Y,
     });
     let needAutoRedraw = false;
-
+    console.error(eventName)
     switch (eventName) {
       case null:
         return;
@@ -1103,13 +1104,26 @@ export default class Layer {
         this.history.save();
         break;
       case LayerEvents.MovePoint:
-        needAutoRedraw = true;
-        if (draggingItem && draggingItem.vectorId) {
-          movePoint.finish(draggingItem.vectorId);
-          uiService.setSelectPointCategory(VectorCategory.Point.NormalPoint);
+        console.error(Settings)
+
+        if (
+          Settings.selectBasePointId != null &&
+          Settings.selectLocationMode == Constant.normalLocationMode 
+        ) {
+          this.uiControl.showConfirm();
+          needAutoRedraw = true;
+          elementService.hideAll();
+        }else{
+          needAutoRedraw = true;
+          if (draggingItem && draggingItem.vectorId) {
+            movePoint.finish(draggingItem.vectorId);
+            uiService.setSelectPointCategory(VectorCategory.Point.NormalPoint);
+          }
+          this.history.save();
+          elementService.hideAll();
         }
-        this.history.save();
-        elementService.hideAll();
+
+  
         break;
       case LayerEvents.MoveCurvePoint:
         needAutoRedraw = true;
@@ -1127,7 +1141,9 @@ export default class Layer {
         if (
           Settings.selectBasePointId != null &&
           (Settings.selectLocationMode == Constant.angleLocationMode ||
-            Settings.selectLocationMode == Constant.allLocationMode)
+            Settings.selectLocationMode == Constant.allLocationMode || 
+            Settings.selectLocationMode == Constant.normalLocationMode 
+          )
         ) {
           this.uiControl.showConfirm();
           needAutoRedraw = true;
@@ -1431,7 +1447,9 @@ export default class Layer {
         eventName == LayerEvents.AddPoint &&
         Settings.selectBasePointId != null &&
         (Settings.selectLocationMode == Constant.angleLocationMode ||
-          Settings.selectLocationMode == Constant.allLocationMode)
+          Settings.selectLocationMode == Constant.allLocationMode  ||
+          Settings.selectLocationMode == Constant.normalLocationMode 
+          )
       ) {
       } else {
         stateService.clearEventName();
@@ -1478,10 +1496,12 @@ export default class Layer {
       this.uiControl.graphicStateUI.canAngleLocationMode = true;
       this.uiControl.graphicStateUI.canAllLocationMode = true;
       this.uiControl.graphicStateUI.existsBaseLine = true;
+      this.uiControl.graphicStateUI.canVerticalMeasure = true;
     } else {
       this.uiControl.graphicStateUI.canAngleLocationMode = false;
       this.uiControl.graphicStateUI.canAllLocationMode = false;
       this.uiControl.graphicStateUI.existsBaseLine = false;
+      this.uiControl.graphicStateUI.canVerticalMeasure = false;
     }
   }