|
@@ -17,9 +17,9 @@ 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();
|
|
|
for (let key in parent) {
|
|
|
let line = dataService.getLine(key);
|
|
@@ -55,8 +55,12 @@ export default class MovePoint {
|
|
|
) {
|
|
|
pointService.mergePoint(pointId, listenLayer.modifyPoint.linkedPointId);
|
|
|
Settings.selectBasePointId = null;
|
|
|
- } else if (category == VectorCategory.Point.BasePoint) {
|
|
|
+ } else if (
|
|
|
+ category == VectorCategory.Point.BasePoint &&
|
|
|
+ Settings.basePointIds.includes(pointId) //兼容拖动综合定位法testPoint与basePoint重合
|
|
|
+ ) {
|
|
|
Settings.selectBasePointId = pointId;
|
|
|
+
|
|
|
} else {
|
|
|
Settings.selectBasePointId = null;
|
|
|
}
|
|
@@ -153,6 +157,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,
|