Просмотр исходного кода

Merge branch 'master' of http://39.106.8.246:3003/web/persagy-web

haojianlong 4 лет назад
Родитель
Сommit
fbf05e5cbc

+ 2 - 1
persagy-web-big-edit/src/items/SBaseEquipment.ts

@@ -28,7 +28,7 @@ import { SGraphItem, SAnchorItem } from "@persagy-web/graph/lib";
 import { SBaseIconTextEdit, SBaseTextEdit } from "@persagy-web/edit";
 import { SColor } from "@persagy-web/draw/lib";
 import { v1 as uuidv1 } from "uuid";
-import { Legend, svgTobase64 } from "@persagy-web/big/lib";
+import { Legend, svgTobase64,ItemOrder } from "@persagy-web/big/lib";
 
 /**
  * 编辑基础设备类
@@ -129,6 +129,7 @@ export class SBaseEquipment extends SBaseIconTextEdit {
                 item.moveTo(t.pos.x, t.pos.y);
                 return item;
             });
+            this.zOrder = ItemOrder.RelationOrder + 10;
         }
 
         // 该设备是否有信息点

+ 2 - 1
persagy-web-big-edit/src/items/SBasePipe.ts

@@ -29,7 +29,7 @@ import { SMouseEvent } from "@persagy-web/base/lib";
 import { SPoint, SColor } from "@persagy-web/draw";
 import { SLineStyle } from "@persagy-web/graph/";
 import { SBaseCirclePolylineEdit } from "@persagy-web/edit/lib";
-import { Relation } from "@persagy-web/big/lib";
+import { Relation,ItemOrder } from "@persagy-web/big/lib";
 
 /**
  * 编辑基础管道
@@ -179,6 +179,7 @@ export class SBasePipe extends SBaseCirclePolylineEdit {
                 this.radius = data.style.default.radius;
             }
         }
+        this.zOrder = ItemOrder.RelationOrder;
     }
 
     /**