Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-editer into develop

YaolongHan 4 years ago
parent
commit
6e64d1cbd4

+ 1 - 1
src/components/baseEditer.vue

@@ -234,7 +234,7 @@ export default {
                 GraphElementId: "273d633cc5c54a4882794b34843d1a00",
                 AttachObjectIds: [],
                 Pos: { x: t.x, y: t.y },
-                OutLine: t.pointArr,
+                OutLine: t.pointArr[0],
                 Properties: {
                   strokeColor: "#3d73c0",
                   fillColor: "#eda986"

+ 2 - 0
src/lib/items/SImageLegendItem.ts

@@ -2,6 +2,7 @@
 import { SGraphItem } from "@saga-web/graph/lib";
 import { SIconTextItem } from '@saga-web/big/lib/items/SIconTextItem';
 import { Legend } from '../types/Legend';
+import { ItemOrder } from '@saga-web/big/lib';
 
 /**
  * 图例节点Item(图标类型)
@@ -30,6 +31,7 @@ export class SImageLegendItem extends SIconTextItem {
      */
     constructor(parent: SGraphItem | null, data: Legend) {
         super(parent);
+        this.zOrder = ItemOrder.markOrder;
         this.data = data;
         this.id = data.ID;
         this.name = data.Name;

+ 2 - 0
src/lib/items/SImageMarkerItem.ts

@@ -2,6 +2,7 @@
 import { SGraphItem, SImageItem, SImageShowType } from "@saga-web/graph/lib";
 import { SPainter } from "@saga-web/draw";
 import { Marker } from '../types/Marker';
+import { ItemOrder } from '@saga-web/big/lib';
 
 /**
  * 标识对象Item(图标类型)
@@ -20,6 +21,7 @@ export class SImageMarkerItem extends SImageItem {
      */
     constructor(parent: SGraphItem | null, data: Marker) {
         super(parent);
+        this.zOrder = ItemOrder.imageOrder;
         this.data = data;
         this.id = data.ID;
         this.name = data.Name;

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

@@ -1,7 +1,7 @@
 
 import { SGraphItem } from "@saga-web/graph/lib";
 import { SPoint } from "@saga-web/draw/lib";
-import { SLineItem } from '@saga-web/big/lib';
+import { SLineItem, ItemOrder } from '@saga-web/big/lib';
 import { Marker } from '../types/Marker';
 
 /**
@@ -21,6 +21,7 @@ export class SLineMarkerItem extends SLineItem {
      */
     constructor(parent: SGraphItem | null, data: Marker) {
         super(parent);
+        this.zOrder = ItemOrder.lineOrder;
         this.data = data;
         this.id = data.ID;
         this.name = data.Name;

+ 2 - 0
src/lib/items/STextMarkerItem.ts

@@ -2,6 +2,7 @@ import { SGraphItem, STextItem } from "@saga-web/graph/lib";
 import { SPainter, SColor,SFont } from "@saga-web/draw";
 import { Marker } from '../types/Marker';
 import { SLineStyle } from '../enums/SLineStyle';
+import { ItemOrder } from '@saga-web/big/lib';
 
 /**
  * 标识对象Item(文本类型)
@@ -40,6 +41,7 @@ export class STextMarkerItem extends STextItem {
      */
     constructor(parent: SGraphItem | null, data: Marker) {
         super(parent);
+        this.zOrder = ItemOrder.textOrder;
         this.data = data;
         this.id = data.ID;
         this.name = data.Name;

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

@@ -95,6 +95,7 @@ export class SZoneLegendItem extends SPolygonItem {
      */
     constructor(parent: SGraphItem | null, data: Legend) {
         super(parent);
+        this.zOrder = ItemOrder.polygonOrder;
         this.data = data;
         this.id = data.ID;
         this.name = data.Name;
@@ -124,7 +125,7 @@ export class SZoneLegendItem extends SPolygonItem {
                 this.fillColor = data.Properties.FillColor.includes('#') ? new SColor(data.Properties.FillColor) : new SColor(hexify(data.Properties.FillColor))
             }
             if (data.Properties.TextPos) {
-                this.textItem.moveTo(data.Properties.TextPos.x, data.Properties.TextPos.y);
+                this.textItem.moveTo(data.Properties.TextPos.X, data.Properties.TextPos.Y);
             }
             //    if( data.Properties.LineDash){
             //     this.LineDash =this._legend.Properties.LineDash
@@ -155,7 +156,7 @@ export class SZoneLegendItem extends SPolygonItem {
                 Y: pos.y
             }
         });
-        this.data.Properties.TextPos = this.textItem.pos;
+        this.data.Properties.TextPos = {X: this.textItem.x, Y: this.textItem.y};
         return this.data;
     }
 

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

@@ -1,4 +1,4 @@
-import { SPolylineItem } from '@saga-web/big/lib';
+import { SPolylineItem, ItemOrder } from '@saga-web/big/lib';
 import { SPainter, SColor } from '@saga-web/draw';
 import { SAnchorItem, SGraphItem } from '@saga-web/graph/lib';
 import { Relation } from '../types/Relation';
@@ -91,6 +91,7 @@ export class TipelineItem extends SPolylineItem {
 
   constructor(parent: SGraphItem | null, data: Relation) {
     super(parent, []);
+    this.zOrder = ItemOrder.polylineOrder;
     this.pointList = data.PointList.map(item => {
       return new SPoint(item.X, item.Y);
     });