xushiting преди 2 години
родител
ревизия
2798616355
променени са 3 файла, в които са добавени 15 реда и са изтрити 5 реда
  1. 8 0
      src/graphic/Geometry/Geometry.js
  2. 2 0
      src/graphic/Layer.js
  3. 5 5
      src/graphic/ListenLayer.js

+ 8 - 0
src/graphic/Geometry/Geometry.js

@@ -108,6 +108,14 @@ export default class Geometry {
     this.style = style;
   }
 
+  getType() {
+    return this.type;
+  }
+
+  setType(type) {
+    this.type = type;
+  }
+
   // ptSrc: 圆上某点(初始点);
   // ptRotationCenter: 圆心点;
   // angle: 旋转角度°  -- [angle * M_PI / 180]:将角度换算为弧度

+ 2 - 0
src/graphic/Layer.js

@@ -183,6 +183,8 @@ export default class Layer {
       case LayerEvents.AddSVG:
         stateService.setEventName(LayerEvents.MoveSVG);
         addSVG.buildSVG(position);
+        addSVG.newSVG.setType(Settings.selectSVGType);
+
         stateService.setSelectItem(addSVG.newSVG.vectorId, VectorType.SVG, -1);
         addSVG.clear();
         break;

+ 5 - 5
src/graphic/ListenLayer.js

@@ -943,8 +943,8 @@ export default class ListenLayer {
           type: VectorType.SVG,
           index: -1,
         };
+        break;
       }
-      break;
     }
     return svgInfo;
   }
@@ -1151,6 +1151,10 @@ export default class ListenLayer {
       this.modifyPoint.index = info.ellipticInfo.index;
       this.modifyPoint.x = info.ellipticInfo.x;
       this.modifyPoint.y = info.ellipticInfo.y;
+    } else if (info && info.svgInfo.svgId) {
+      this.modifyPoint = {};
+      this.modifyPoint.svgId = info.svgInfo.svgId;
+      this.modifyPoint.index = info.svgInfo.index;
     } else if (info && info.roadPointInfo.linkedRoadPointIdX) {
       this.modifyPoint = {};
       this.modifyPoint.linkedRoadPointIdX =
@@ -1203,10 +1207,6 @@ export default class ListenLayer {
       this.modifyPoint.linkedPointIdY = info.pointInfo.linkedPointIdY;
       this.modifyPoint.y = info.pointInfo.y;
       this.modifyPoint.x = info.pointInfo.x;
-    } else if (info && info.svgInfo.svgId) {
-      this.modifyPoint = {};
-      this.modifyPoint.svgId = info.svgInfo.svgId;
-      this.modifyPoint.index = info.svgInfo.index;
     } else {
       this.modifyPoint = null;
     }