jinx 2 年 前
コミット
5a07e74f1c
3 ファイル変更11 行追加12 行削除
  1. 6 6
      src/graphic/ListenLayer.js
  2. 0 1
      src/graphic/Renderer/Draw.js
  3. 5 5
      src/graphic/Renderer/Render.js

+ 6 - 6
src/graphic/ListenLayer.js

@@ -1319,12 +1319,6 @@ export default class ListenLayer {
         VectorType.Text,
         SelectState.Select
       );
-    } else if (this.modifyPoint.svgId) {
-      stateService.setSelectItem(
-        this.modifyPoint.svgId,
-        VectorType.SVG,
-        this.modifyPoint.index
-      );
     } else if (this.modifyPoint.magnifierId) {
       // if (this.modifyPoint.index == 0) {
       //点击隐藏的放大镜不显示
@@ -1336,6 +1330,12 @@ export default class ListenLayer {
       // } else {
       stateService.setSelectState(this.modifyPoint.index);
       // }
+    } else if (this.modifyPoint.svgId) {
+      stateService.setSelectItem(
+        this.modifyPoint.svgId,
+        VectorType.SVG,
+        this.modifyPoint.index
+      );
     } else if (this.modifyPoint.linkedEdgeId) {
       stateService.setSelectItem(
         this.modifyPoint.linkedEdgeId,

+ 0 - 1
src/graphic/Renderer/Draw.js

@@ -897,7 +897,6 @@ export default class Draw {
       ...vector.position,
       radius,
     });
-    console.log(vector);
     const pt = coordinate.getScreenXY(vector.position);
     // vector.setPopPosition();
     const target = {

+ 5 - 5
src/graphic/Renderer/Render.js

@@ -180,16 +180,16 @@ export default class Render {
       this.drawGeometry(texts[key]);
     }
 
-    const magnifiers = dataService.getMagnifiers();
-    for (const magnifiersKey in magnifiers) {
-      this.drawGeometry(magnifiers[magnifiersKey]);
-    }
-
     const svgs = dataService.getSVGs();
     for (const key in svgs) {
       this.drawGeometry(svgs[key]);
     }
 
+    const magnifiers = dataService.getMagnifiers();
+    for (const magnifiersKey in magnifiers) {
+      this.drawGeometry(magnifiers[magnifiersKey]);
+    }
+
     //this.drawGeometry(dataService.getImg());
     this.redrawElements();