Ver código fonte

'取消场景设置Zorder属性'

zhangyu 4 anos atrás
pai
commit
c8c6ae91de

+ 0 - 7
src/components/mapClass/EditScence.ts

@@ -176,7 +176,6 @@ export class EditScence extends SGraphScene {
         }
         const item = new SLineMarkerItem(null, data);
         item.status = SItemStatus.Create;
-        item.zOrder = ItemOrder.lineOrder;
         item.selectable = true;
         this.addItem(item);
         // this.Markers.push(item);
@@ -200,7 +199,6 @@ export class EditScence extends SGraphScene {
         //设置状态
         item.selectable = true;
         item.status = SItemStatus.Create;
-        item.zOrder = ItemOrder.polylineOrder
         this.addItem(item);
         item.connect("finishCreated", this, this.finishCreated);
         this.grabItem = item;
@@ -237,7 +235,6 @@ export class EditScence extends SGraphScene {
         //设置状态
         item.selectable = true;
         item.status = SItemStatus.Create;
-        item.zOrder = ItemOrder.polylineOrder
         this.addItem(item);
         // this.Relations.push(item);
         item.connect("finishCreated", this, this.finishCreated);
@@ -294,7 +291,6 @@ export class EditScence extends SGraphScene {
         Polylines.selectable = true;
         //设置状态
         Polylines.status = SItemStatus.Create;
-        Polylines.zOrder = ItemOrder.polygonOrder;
         // Polylines.moveable = true;
         this.addItem(Polylines);
         Polylines.connect("finishCreated", this, this.finishCreated);
@@ -380,7 +376,6 @@ export class EditScence extends SGraphScene {
             }
         }
         const item = new SImageMarkerItem(null, data);
-        item.zOrder = ItemOrder.imageOrder;
         item.selectable = true;
         item.moveable = true;
         this.addItem(item);
@@ -417,7 +412,6 @@ export class EditScence extends SGraphScene {
         item.moveTo(event.x, event.y);
         item.selectable = true;
         item.moveable = true;
-        item.zOrder = ItemOrder.textOrder;
         this.addItem(item);
         this.Markers.push(item);
         this.grabItem = null;
@@ -463,7 +457,6 @@ export class EditScence extends SGraphScene {
         this.cmd = 'choice';
         item.selectable = true;
         item.moveable = true;
-        item.zOrder = ItemOrder.markOrder;
         this.addItem(item);
         this.Nodes.push(item);
         this.grabItem = null;

+ 2 - 1
src/lib/items/SFHFQZoneLegendItem.ts

@@ -1,5 +1,5 @@
 
-import { SGraphItem, SLineStyle } from "@saga-web/graph/lib";
+import { SGraphItem, SLineStyle, STextOrigin } from "@saga-web/graph/lib";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';
@@ -120,6 +120,7 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
      */
     constructor(parent: SGraphItem | null, data: Legend) {
         super(parent);
+        this.textItem.originPosition = STextOrigin.Centrum;
         this.textItem.isTransform = false;
         this.zOrder = ItemOrder.polygonOrder - 0.00005;
         this.data = data;

+ 3 - 1
src/lib/items/SSCPZZoneLegendItem.ts

@@ -1,5 +1,5 @@
 
-import { SGraphItem, SLineStyle } from "@saga-web/graph/lib";
+import { SGraphItem, SLineStyle, STextOrigin } from "@saga-web/graph/lib";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';
@@ -128,6 +128,7 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
      */
     constructor(parent: SGraphItem | null, data: Legend) {
         super(parent);
+        this.textItem.originPosition = STextOrigin.Centrum;
         this.textItem.isTransform = false;
         this.zOrder = ItemOrder.polygonOrder - 0.0005;
         this.data = data;
@@ -205,6 +206,7 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
     toData(): any {
         this.data.Pos = { X: this.x, Y: this.y };
         this.data.Name = this.name;
+        console.log(this.zOrder);
         this.data.Properties.Zorder = this.zOrder;
         this.data.Properties.FillColor = this.fillColor.value;
         this.data.Properties.StrokeColor = this.strokeColor.value;

+ 2 - 1
src/lib/items/SZoneLegendItem.ts

@@ -1,5 +1,5 @@
 
-import { SGraphItem, SLineStyle } from "@saga-web/graph/lib";
+import { SGraphItem, SLineStyle, STextOrigin } from "@saga-web/graph/lib";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';
@@ -120,6 +120,7 @@ export class SZoneLegendItem extends SPolygonItem {
      */
     constructor(parent: SGraphItem | null, data: Legend) {
         super(parent);
+        this.textItem.originPosition = STextOrigin.Centrum;
         this.textItem.isTransform = false;
         this.zOrder = ItemOrder.polygonOrder;
         this.data = data;