Browse Source

格式整理;删除无用(备份)

haojianlong 4 years ago
parent
commit
0bf11c6e70
79 changed files with 164 additions and 1886 deletions
  1. 1 1
      persagy-web-big/src/config/ItemColor.ts
  2. 4 4
      persagy-web-big/src/enums/SGraphElementType.ts
  3. 3 3
      persagy-web-big/src/enums/SItemStatus.ts
  4. 1 1
      persagy-web-big/src/enums/SLineType.ts
  5. 3 3
      persagy-web-big/src/enums/SMarkerType.ts
  6. 3 3
      persagy-web-big/src/enums/SRelationDir.ts
  7. 4 4
      persagy-web-big/src/enums/SRelationState.ts
  8. 2 4
      persagy-web-big/src/factories/SItemFactory.ts
  9. 0 18
      persagy-web-big/src/index.ts
  10. 1 1
      persagy-web-big/src/items/SIconTextItem.ts
  11. 2 2
      persagy-web-big/src/items/SLayerItem.ts
  12. 2 2
      persagy-web-big/src/items/SLineItem.ts
  13. 2 2
      persagy-web-big/src/items/SPolygonItem.ts
  14. 1 1
      persagy-web-big/src/items/SPolylineItem.ts
  15. 3 3
      persagy-web-big/src/items/SRectSelectItem.ts
  16. 1 1
      persagy-web-big/src/items/STooltipItem.ts
  17. 7 6
      persagy-web-big/src/items/floor/SBoardItem.ts
  18. 9 10
      persagy-web-big/src/items/floor/SColumnItem.ts
  19. 0 34
      persagy-web-big/src/items/floor/SCompassItem.ts
  20. 9 10
      persagy-web-big/src/items/floor/SDoorItem.ts
  21. 0 34
      persagy-web-big/src/items/floor/SFloorItem.ts
  22. 7 8
      persagy-web-big/src/items/floor/SHighlightItem.ts
  23. 2 2
      persagy-web-big/src/items/floor/SSpaceItem.ts
  24. 14 47
      persagy-web-big/src/items/floor/SSpaceItemSS.ts
  25. 9 10
      persagy-web-big/src/items/floor/SVirtualWallItem.ts
  26. 10 11
      persagy-web-big/src/items/floor/SWallItem.ts
  27. 9 10
      persagy-web-big/src/items/floor/SWallItemSS.ts
  28. 9 10
      persagy-web-big/src/items/floor/SWindowItem.ts
  29. 17 17
      persagy-web-big/src/items/floor/ZoneItem.ts
  30. 0 52
      persagy-web-big/src/items/topology/SCurveRelation.ts
  31. 0 50
      persagy-web-big/src/items/topology/SImageLegendItem.ts
  32. 0 181
      persagy-web-big/src/items/topology/SImageMarkerItem.ts
  33. 0 135
      persagy-web-big/src/items/topology/SLineLegendItem.ts
  34. 0 135
      persagy-web-big/src/items/topology/SLineMarkerItem.ts
  35. 0 55
      persagy-web-big/src/items/topology/SLineRelation.ts
  36. 0 49
      persagy-web-big/src/items/topology/SNoneLegendItem.ts
  37. 0 65
      persagy-web-big/src/items/topology/SRelation.ts
  38. 0 150
      persagy-web-big/src/items/topology/STextMarkerItem.ts
  39. 0 68
      persagy-web-big/src/items/topology/SVerticalRelation.ts
  40. 0 50
      persagy-web-big/src/items/topology/SZoneLegendItem.ts
  41. 0 33
      persagy-web-big/src/parser/SBigParser.ts
  42. 0 33
      persagy-web-big/src/parser/SEquipParser.ts
  43. 0 44
      persagy-web-big/src/parser/SGeoParser.ts
  44. 0 33
      persagy-web-big/src/parser/STopologyParser.ts
  45. 0 40
      persagy-web-big/src/types/ElementData.ts
  46. 1 1
      persagy-web-big/src/types/Outline.ts
  47. 1 1
      persagy-web-big/src/types/PointToLine.ts
  48. 1 1
      persagy-web-big/src/types/TextData.ts
  49. 0 42
      persagy-web-big/src/types/geo/Features.ts
  50. 0 39
      persagy-web-big/src/types/geo/GeoJson.ts
  51. 0 38
      persagy-web-big/src/types/geo/Geometry.ts
  52. 0 55
      persagy-web-big/src/types/geo/Properties.ts
  53. 0 35
      persagy-web-big/src/types/geo/PropertyParent.ts
  54. 0 39
      persagy-web-big/src/types/topology/Anchor.ts
  55. 0 62
      persagy-web-big/src/types/topology/Legend.ts
  56. 0 53
      persagy-web-big/src/types/topology/Marker.ts
  57. 0 59
      persagy-web-big/src/types/topology/Relation.ts
  58. 1 1
      persagy-web-big/src/utils/SMathUtil.ts
  59. 1 1
      persagy-web-draw/src/SColor.ts
  60. 1 1
      persagy-web-draw/src/SPainter.ts
  61. 1 1
      persagy-web-draw/src/SPath2D.ts
  62. 1 1
      persagy-web-draw/src/engines/SPaintEngine.ts
  63. 1 1
      persagy-web-draw/src/engines/SSvgPaintEngine.ts
  64. 1 1
      persagy-web-draw/src/types/SPoint.ts
  65. 2 2
      persagy-web-graph/src/SGraphItem.ts
  66. 2 2
      persagy-web-graph/src/SGraphScene.ts
  67. 1 1
      persagy-web-graph/src/SGraphSelectContainer.ts
  68. 2 2
      persagy-web-graph/src/SGraphView.ts
  69. 1 1
      persagy-web-graph/src/commands/SGraphAddCommand.ts
  70. 1 1
      persagy-web-graph/src/commands/SGraphCommand.ts
  71. 2 2
      persagy-web-graph/src/commands/SGraphMoveCommand.ts
  72. 1 1
      persagy-web-graph/src/commands/SGraphPointListDelete.ts
  73. 1 1
      persagy-web-graph/src/commands/SGraphPointListInsert.ts
  74. 1 1
      persagy-web-graph/src/commands/SGraphPointListUpdate.ts
  75. 1 1
      persagy-web-graph/src/items/SAnchorItem.ts
  76. 1 1
      persagy-web-graph/src/items/SGraphLineItem.ts
  77. 1 1
      persagy-web-graph/src/items/SImageItem.ts
  78. 1 1
      persagy-web-graph/src/items/SObjectItem.ts
  79. 1 1
      persagy-web-graph/src/items/STextItem.ts

+ 1 - 1
persagy-web-big/src/config/ItemColor.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SColor } from "@persagy-web/draw/";
+import { SColor } from "@persagy-web/draw";
 
 
 /**
 /**
  * 接口item颜色配置
  * 接口item颜色配置

+ 4 - 4
persagy-web-big/src/enums/SGraphElementType.ts

@@ -30,12 +30,12 @@
  * @author  张宇
  * @author  张宇
  */
  */
 export enum SGraphElementType {
 export enum SGraphElementType {
-    /** 非图例    */
+    /** 非图例 */
     None,
     None,
-    /** 线类型    */
+    /** 线类型 */
     Line,
     Line,
-    /** 区域类型    */
+    /** 区域类型 */
     Zone,
     Zone,
-    /** 图类型    */
+    /** 图类型 */
     Image
     Image
 } // Enum SGraphElementType
 } // Enum SGraphElementType

+ 3 - 3
persagy-web-big/src/enums/SItemStatus.ts

@@ -27,12 +27,12 @@
 /**
 /**
  * item状态
  * item状态
  *
  *
- * @author
+ * @author  郝建龙
  */
  */
 export enum SItemStatus {
 export enum SItemStatus {
-    /** 标准状态    */
+    /** 标准状态 */
     Normal,
     Normal,
-    /** 编辑状态    */
+    /** 编辑状态 */
     Edit,
     Edit,
     /** 创建态 */
     /** 创建态 */
     Create
     Create

+ 1 - 1
persagy-web-big/src/enums/SLineType.ts

@@ -30,6 +30,6 @@
  * @author  张宇
  * @author  张宇
  */
  */
 export enum SLineType {
 export enum SLineType {
-    /** 直线    */
+    /** 直线 */
     Line
     Line
 } // Enum SLineType
 } // Enum SLineType

+ 3 - 3
persagy-web-big/src/enums/SMarkerType.ts

@@ -30,10 +30,10 @@
  * @author  张宇
  * @author  张宇
  */
  */
 export enum SMarkerType {
 export enum SMarkerType {
-    /** 图标    */
+    /** 图标 */
     Image,
     Image,
-    /** 线类型    */
+    /** 线类型 */
     Line,
     Line,
-    /** 文本类型    */
+    /** 文本类型 */
     Text
     Text
 } // Enum SMarkerType
 } // Enum SMarkerType

+ 3 - 3
persagy-web-big/src/enums/SRelationDir.ts

@@ -30,10 +30,10 @@
  * @author  张宇
  * @author  张宇
  */
  */
 export enum SRelationDir {
 export enum SRelationDir {
-    /** 无向    */
+    /** 无向 */
     Undirected,
     Undirected,
-    /** 正向(节点1到节点2)    */
+    /** 正向(节点1到节点2) */
     Forward,
     Forward,
-    /** 逆向(节点2到节点1)    */
+    /** 逆向(节点2到节点1) */
     Reverse
     Reverse
 } // Enum SRelationDir
 } // Enum SRelationDir

+ 4 - 4
persagy-web-big/src/enums/SRelationState.ts

@@ -27,14 +27,14 @@
 /**
 /**
  * 关系状态
  * 关系状态
  *
  *
- * @author
+ * @author  郝建龙
  */
  */
 export enum SRelationState {
 export enum SRelationState {
-    /** 标准状态    */
+    /** 标准状态 */
     Normal,
     Normal,
-    /** 动画撞他    */
+    /** 动画撞他 */
     Animation,
     Animation,
-    /** 编辑状态    */
+    /** 编辑状态 */
     Edit,
     Edit,
     /** 创建态 */
     /** 创建态 */
     Create
     Create

+ 2 - 4
persagy-web-big/src/factories/SItemFactory.ts

@@ -38,13 +38,11 @@ import { SWindowItem } from "../items/floor/SWindowItem";
 import { Casement } from "../types/floor/Casement";
 import { Casement } from "../types/floor/Casement";
 import { SZoneItem } from "../items/floor/ZoneItem";
 import { SZoneItem } from "../items/floor/ZoneItem";
 import { Zone } from "../types/floor/Zone";
 import { Zone } from "../types/floor/Zone";
-import { Legend } from "../types/topology/Legend";
-import { Marker } from "../types/topology/Marker";
-import { Relation } from "../types/topology/Relation";
 
 
 /**
 /**
  * item创建工厂
  * item创建工厂
  *
  *
+ * @author 郝建龙
  */
  */
 
 
 export class SItemFactory {
 export class SItemFactory {
@@ -123,4 +121,4 @@ export class SItemFactory {
     createZone(data: Zone): SZoneItem {
     createZone(data: Zone): SZoneItem {
         return new SZoneItem(null, data);
         return new SZoneItem(null, data);
     } // Function createZone()
     } // Function createZone()
-} // class SItemFactory
+} // Class SItemFactory

+ 0 - 18
persagy-web-big/src/index.ts

@@ -24,22 +24,13 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SCompassItem } from "./items/floor/SCompassItem";
-import { SCurveRelation } from "./items/topology/SCurveRelation";
-import { SFloorItem } from "./items/floor/SFloorItem";
 import { SLayerItem } from "./items/SLayerItem";
 import { SLayerItem } from "./items/SLayerItem";
-import { SLineRelation } from "./items/topology/SLineRelation";
-import { SRelation } from "./items/topology/SRelation";
 import { STooltipItem } from "./items/STooltipItem";
 import { STooltipItem } from "./items/STooltipItem";
-import { SVerticalRelation } from "./items/topology/SVerticalRelation";
 import { ItemColor } from "./config/ItemColor";
 import { ItemColor } from "./config/ItemColor";
 import { Transparency } from "./config/Transparency";
 import { Transparency } from "./config/Transparency";
 import { ItemOrder } from "./config/ItemOrder";
 import { ItemOrder } from "./config/ItemOrder";
 import { SItemFactory } from "./factories/SItemFactory";
 import { SItemFactory } from "./factories/SItemFactory";
-import { SBigParser } from "./parser/SBigParser";
-import { SEquipParser } from "./parser/SEquipParser";
 import { SZoneParser } from "./parser/SZoneParser";
 import { SZoneParser } from "./parser/SZoneParser";
-import { STopologyParser } from "./parser/STopologyParser";
 import { SFloorParser } from "./parser/SFloorParser";
 import { SFloorParser } from "./parser/SFloorParser";
 import { SParser } from "./parser/SParser";
 import { SParser } from "./parser/SParser";
 import { SIconTextItem } from "./items/SIconTextItem";
 import { SIconTextItem } from "./items/SIconTextItem";
@@ -52,26 +43,17 @@ import { SRectSelectItem } from "./items/SRectSelectItem";
 import { SBoardItem } from "./items/floor/SBoardItem";
 import { SBoardItem } from "./items/floor/SBoardItem";
 
 
 export {
 export {
-    SCompassItem,
-    SCurveRelation,
-    SFloorItem,
     SLayerItem,
     SLayerItem,
-    SLineRelation,
     SLineItem,
     SLineItem,
     SPolylineItem,
     SPolylineItem,
-    SRelation,
     STooltipItem,
     STooltipItem,
-    SVerticalRelation,
     ItemColor,
     ItemColor,
     ItemOrder,
     ItemOrder,
     Transparency,
     Transparency,
     SItemFactory,
     SItemFactory,
     SParser,
     SParser,
     SFloorParser,
     SFloorParser,
-    STopologyParser,
     SZoneParser,
     SZoneParser,
-    SEquipParser,
-    SBigParser,
     SIconTextItem,
     SIconTextItem,
     SRelationState,
     SRelationState,
     SItemStatus,
     SItemStatus,

+ 1 - 1
persagy-web-big/src/items/SIconTextItem.ts

@@ -30,7 +30,7 @@ import {
     STextItem,
     STextItem,
     SAnchorItem,
     SAnchorItem,
     SGraphItem
     SGraphItem
-} from "@persagy-web/graph/lib";
+} from "@persagy-web/graph";
 import { SItemStatus, ItemOrder } from "..";
 import { SItemStatus, ItemOrder } from "..";
 import { SMouseEvent } from "@persagy-web/base";
 import { SMouseEvent } from "@persagy-web/base";
 import { SSize, SRect, SPainter, SColor, SFont, SPoint } from "@persagy-web/draw";
 import { SSize, SRect, SPainter, SColor, SFont, SPoint } from "@persagy-web/draw";

+ 2 - 2
persagy-web-big/src/items/SLayerItem.ts

@@ -24,11 +24,11 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SFloorItem } from "./floor/SFloorItem";
+import { SGraphItem } from "@persagy-web/graph";
 
 
 /**
 /**
  *  编辑器图层-图层锁定,业务层组合使用
  *  编辑器图层-图层锁定,业务层组合使用
  *
  *
  * * @author  郝建龙(1061851420@qq.com)
  * * @author  郝建龙(1061851420@qq.com)
  */
  */
-export class SLayerItem extends SFloorItem {} // Class SLayerItem
+export class SLayerItem extends SGraphItem {} // Class SLayerItem

+ 2 - 2
persagy-web-big/src/items/SLineItem.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SColor, SLine, SPainter, SPoint, SRect } from "@persagy-web/draw/lib";
+import { SColor, SLine, SPainter, SPoint, SRect } from "@persagy-web/draw";
 import { SMouseButton, SMouseEvent, SUndoStack } from "@persagy-web/base";
 import { SMouseButton, SMouseEvent, SUndoStack } from "@persagy-web/base";
 import { SMathUtil } from "../utils/SMathUtil";
 import { SMathUtil } from "../utils/SMathUtil";
 import { SItemStatus } from "..";
 import { SItemStatus } from "..";
@@ -33,7 +33,7 @@ import {
     SGraphPointListInsert,
     SGraphPointListInsert,
     SGraphPointListUpdate,
     SGraphPointListUpdate,
     SLineStyle
     SLineStyle
-} from "@persagy-web/graph/lib";
+} from "@persagy-web/graph";
 
 
 /**
 /**
  * 直线item
  * 直线item

+ 2 - 2
persagy-web-big/src/items/SPolygonItem.ts

@@ -30,7 +30,7 @@ import {
     SGraphPointListInsert,
     SGraphPointListInsert,
     SGraphPointListUpdate,
     SGraphPointListUpdate,
     SLineStyle
     SLineStyle
-} from "@persagy-web/graph/lib";
+} from "@persagy-web/graph";
 import { SKeyCode, SMouseEvent, SUndoStack } from "@persagy-web/base/";
 import { SKeyCode, SMouseEvent, SUndoStack } from "@persagy-web/base/";
 import {
 import {
     SColor,
     SColor,
@@ -677,7 +677,7 @@ export class SPolygonItem extends SGraphItem {
             if (this.status == SItemStatus.Create) {
             if (this.status == SItemStatus.Create) {
                 last = this.pointList[this.pointList.length - 1];
                 last = this.pointList[this.pointList.length - 1];
             } else if (this.status == SItemStatus.Edit) {
             } else if (this.status == SItemStatus.Edit) {
-                if (this.curIndex > 1) {
+                if (this.curIndex > 0) {
                     last = this.pointList[this.curIndex - 1];
                     last = this.pointList[this.curIndex - 1];
                 }
                 }
             }
             }

+ 1 - 1
persagy-web-big/src/items/SPolylineItem.ts

@@ -33,7 +33,7 @@ import {
     SGraphPointListDelete,
     SGraphPointListDelete,
     SGraphPointListInsert,
     SGraphPointListInsert,
     SGraphPointListUpdate
     SGraphPointListUpdate
-} from "@persagy-web/graph/lib";
+} from "@persagy-web/graph";
 
 
 /**
 /**
  * 直线item
  * 直线item

+ 3 - 3
persagy-web-big/src/items/SRectSelectItem.ts

@@ -24,9 +24,9 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SGraphItem } from "@persagy-web/graph/lib";
-import { SPainter, SPoint, SRect } from "@persagy-web/draw/lib";
-import { SMouseEvent } from "@persagy-web/base/lib";
+import { SGraphItem } from "@persagy-web/graph";
+import { SPainter, SPoint, SRect } from "@persagy-web/draw";
+import { SMouseEvent } from "@persagy-web/base";
 import { ItemColor, ItemOrder } from "..";
 import { ItemColor, ItemOrder } from "..";
 
 
 /**
 /**

+ 1 - 1
persagy-web-big/src/items/STooltipItem.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { STextItem } from "@persagy-web/graph/lib";
+import { STextItem } from "@persagy-web/graph";
 
 
 /**
 /**
  * 提示框item
  * 提示框item

+ 7 - 6
persagy-web-big/src/items/floor/SBoardItem.ts

@@ -24,10 +24,10 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SPainter, SPath2D, SPoint, SColor } from "@persagy-web/draw/lib";
+import { SPainter, SPath2D, SPoint } from "@persagy-web/draw";
 import { Zone } from "../../types/floor/Zone";
 import { Zone } from "../../types/floor/Zone";
-import { ItemColor, ItemOrder } from "../..";
-import { SGraphItem } from "@persagy-web/graph/lib";
+import { ItemColor } from "../..";
+import { SGraphItem } from "@persagy-web/graph";
 
 
 /**
 /**
  * 建築輪廓item
  * 建築輪廓item
@@ -39,7 +39,7 @@ export class SBoardItem extends SGraphItem {
     data: Zone;
     data: Zone;
     /** 空间轮廓线坐标list */
     /** 空间轮廓线坐标list */
     readonly pointArr: SPoint[][][] = [];
     readonly pointArr: SPoint[][][] = [];
-    /** path */
+    /** path数组 */
     private pathList: SPath2D[] = [];
     private pathList: SPath2D[] = [];
 
 
     /**
     /**
@@ -80,8 +80,9 @@ export class SBoardItem extends SGraphItem {
     /**
     /**
      * 判断点是否在区域内
      * 判断点是否在区域内
      *
      *
-     * @param x
-     * @param y
+     * @param x x坐标
+     * @param y y坐标
+     * @return  是否在区域内
      */
      */
     contains(x: number, y: number): boolean {
     contains(x: number, y: number): boolean {
         return false;
         return false;

+ 9 - 10
persagy-web-big/src/items/floor/SColumnItem.ts

@@ -25,10 +25,9 @@
  */
  */
 
 
 import { Column } from "../../types/floor/Column";
 import { Column } from "../../types/floor/Column";
-import { SGraphItem } from "@persagy-web/graph/lib";
-import { SPainter, SPoint, SRect } from "@persagy-web/draw/lib";
-import { ItemOrder } from "../..";
-import { ItemColor } from "../..";
+import { SGraphItem } from "@persagy-web/graph";
+import { SPainter, SPoint, SRect } from "@persagy-web/draw";
+import { ItemColor, ItemOrder } from "../..";
 
 
 /**
 /**
  * 柱子item
  * 柱子item
@@ -36,17 +35,17 @@ import { ItemColor } from "../..";
  * @author  郝建龙
  * @author  郝建龙
  */
  */
 export class SColumnItem extends SGraphItem {
 export class SColumnItem extends SGraphItem {
-    /** 柱子数据    */
+    /** 柱子数据 */
     data: Column;
     data: Column;
-    /** X坐标最小值  */
+    /** X坐标最小值 */
     private minX = Number.MAX_SAFE_INTEGER;
     private minX = Number.MAX_SAFE_INTEGER;
-    /** X坐标最大值  */
+    /** X坐标最大值 */
     private maxX = Number.MIN_SAFE_INTEGER;
     private maxX = Number.MIN_SAFE_INTEGER;
-    /** Y坐标最小值  */
+    /** Y坐标最小值 */
     private minY = Number.MAX_SAFE_INTEGER;
     private minY = Number.MAX_SAFE_INTEGER;
-    /** Y坐标最大值  */
+    /** Y坐标最大值 */
     private maxY = Number.MIN_SAFE_INTEGER;
     private maxY = Number.MIN_SAFE_INTEGER;
-    /** 柱子轮廓线坐标list  */
+    /** 柱子轮廓线坐标list */
     private readonly pointArr: SPoint[][] = [];
     private readonly pointArr: SPoint[][] = [];
 
 
     /**
     /**

+ 0 - 34
persagy-web-big/src/items/floor/SCompassItem.ts

@@ -1,34 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { SGraphItem } from "@persagy-web/graph/lib";
-
-/**
- * 指南针item
- *
- * * @author  郝建龙(1061851420@qq.com)
- */
-export class SCompassItem extends SGraphItem {} // Class SCompassItem

+ 9 - 10
persagy-web-big/src/items/floor/SDoorItem.ts

@@ -25,11 +25,10 @@
  */
  */
 
 
 import { Door } from "../../types/floor/Door";
 import { Door } from "../../types/floor/Door";
-import { SPainter, SPoint, SRect } from "@persagy-web/draw/lib";
+import { SPainter, SPoint, SRect } from "@persagy-web/draw";
 import { SMathUtil } from "../../utils/SMathUtil";
 import { SMathUtil } from "../../utils/SMathUtil";
-import { ItemOrder } from "../..";
-import { ItemColor } from "../..";
-import { SGraphItem } from "@persagy-web/graph/lib";
+import { ItemOrder, ItemColor } from "../..";
+import { SGraphItem } from "@persagy-web/graph";
 
 
 /**
 /**
  * 门item
  * 门item
@@ -39,23 +38,23 @@ import { SGraphItem } from "@persagy-web/graph/lib";
 export class SDoorItem extends SGraphItem {
 export class SDoorItem extends SGraphItem {
     /** 门数据 */
     /** 门数据 */
     data: Door;
     data: Door;
-    /** 门轮廓线坐标list  */
+    /** 门轮廓线坐标list */
     private readonly pointArr: SPoint[] = [];
     private readonly pointArr: SPoint[] = [];
     /** 门长度 */
     /** 门长度 */
     private readonly r: number = 0;
     private readonly r: number = 0;
-    /** 角度  */
+    /** 角度 */
     private readonly ang: number = 0;
     private readonly ang: number = 0;
     /** 旋转点 */
     /** 旋转点 */
     private readonly p: SPoint = new SPoint(0, 0);
     private readonly p: SPoint = new SPoint(0, 0);
     /** 旋转起始角度,结束角度+Math.PI/2 */
     /** 旋转起始角度,结束角度+Math.PI/2 */
     private readonly startAng: number = -Math.PI / 2;
     private readonly startAng: number = -Math.PI / 2;
-    /** X坐标最小值  */
+    /** X坐标最小值 */
     private minX = Number.MAX_SAFE_INTEGER;
     private minX = Number.MAX_SAFE_INTEGER;
-    /** X坐标最大值  */
+    /** X坐标最大值 */
     private maxX = Number.MIN_SAFE_INTEGER;
     private maxX = Number.MIN_SAFE_INTEGER;
-    /** Y坐标最小值  */
+    /** Y坐标最小值 */
     private minY = Number.MAX_SAFE_INTEGER;
     private minY = Number.MAX_SAFE_INTEGER;
-    /** Y坐标最大值  */
+    /** Y坐标最大值 */
     private maxY = Number.MIN_SAFE_INTEGER;
     private maxY = Number.MIN_SAFE_INTEGER;
 
 
     /**
     /**

+ 0 - 34
persagy-web-big/src/items/floor/SFloorItem.ts

@@ -1,34 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { SGraphItem } from "@persagy-web/graph/lib";
-
-/**
- * 一个场景中显示多个楼层
- *
- * * @author  郝建龙(1061851420@qq.com)
- */
-export class SFloorItem extends SGraphItem {} // Class SFloorItem

+ 7 - 8
persagy-web-big/src/items/floor/SHighlightItem.ts

@@ -25,10 +25,9 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SColor, SLine, SPainter, SPoint, SRect } from "@persagy-web/draw/lib";
-import { ItemOrder } from "../..";
-import { ItemColor } from "../..";
-import { SGraphItem } from "@persagy-web/graph/lib";
+import { SColor, SLine, SPainter, SPoint, SRect } from "@persagy-web/draw";
+import { ItemOrder, ItemColor } from "../..";
+import { SGraphItem } from "@persagy-web/graph";
 
 
 /**
 /**
  * 吸附时高亮对象
  * 吸附时高亮对象
@@ -36,12 +35,12 @@ import { SGraphItem } from "@persagy-web/graph/lib";
  * @author  郝建龙
  * @author  郝建龙
  */
  */
 export class SHighlightItem extends SGraphItem {
 export class SHighlightItem extends SGraphItem {
-    /** 对象与鼠标位置距离   */
+    /** 对象与鼠标位置距离 */
     distance: number = 0;
     distance: number = 0;
-    /** 对象类型   */
+    /** 对象类型 */
     private type: number = 1;
     private type: number = 1;
 
 
-    /** 点对象数据-当吸附的为线时,此点为垂线与线段的交点   */
+    /** 点对象数据-当吸附的为线时,此点为垂线与线段的交点 */
     _point: SPoint = new SPoint();
     _point: SPoint = new SPoint();
     get point(): SPoint {
     get point(): SPoint {
         return this._point;
         return this._point;
@@ -52,7 +51,7 @@ export class SHighlightItem extends SGraphItem {
         this.update();
         this.update();
     } // Set point
     } // Set point
 
 
-    /** 点对象数据   */
+    /** 点对象数据 */
     _line: SLine = new SLine();
     _line: SLine = new SLine();
     get line(): SLine {
     get line(): SLine {
         return this._line;
         return this._line;

+ 2 - 2
persagy-web-big/src/items/floor/SSpaceItem.ts

@@ -31,11 +31,11 @@ import {
     SPolygonUtil,
     SPolygonUtil,
     SRect,
     SRect,
     STextAlign
     STextAlign
-} from "@persagy-web/draw/lib";
+} from "@persagy-web/draw";
 import { Space } from "../../types/floor/Space";
 import { Space } from "../../types/floor/Space";
 import { ItemOrder } from "../..";
 import { ItemOrder } from "../..";
 import { ItemColor } from "../..";
 import { ItemColor } from "../..";
-import { SGraphItem } from "@persagy-web/graph/lib";
+import { SGraphItem } from "@persagy-web/graph";
 
 
 /**
 /**
  * 模型空间item
  * 模型空间item

+ 14 - 47
persagy-web-big/src/items/floor/SSpaceItemSS.ts

@@ -32,12 +32,11 @@ import {
     SPolygonUtil,
     SPolygonUtil,
     SRect,
     SRect,
     STextAlign
     STextAlign
-} from "@persagy-web/draw/lib";
+} from "@persagy-web/draw";
 import { Space } from "../../types/floor/Space";
 import { Space } from "../../types/floor/Space";
-import { SMouseEvent } from "@persagy-web/base/lib";
 import { ItemOrder } from "../..";
 import { ItemOrder } from "../..";
 import { ItemColor } from "../..";
 import { ItemColor } from "../..";
-import { SGraphItem } from "@persagy-web/graph/lib";
+import { SGraphItem } from "@persagy-web/graph";
 
 
 /**
 /**
  * 模型空间item
  * 模型空间item
@@ -45,21 +44,21 @@ import { SGraphItem } from "@persagy-web/graph/lib";
  * @author  郝建龙
  * @author  郝建龙
  */
  */
 export class SSpaceItem extends SGraphItem {
 export class SSpaceItem extends SGraphItem {
-    /** 空间所有数据  */
+    /** 空间所有数据 */
     data: Space;
     data: Space;
-    /** 空间轮廓线坐标list  */
+    /** 空间轮廓线坐标list */
     readonly pointArr: SPoint[][] = [];
     readonly pointArr: SPoint[][] = [];
-    /** X坐标最小值  */
+    /** X坐标最小值 */
     minX = Number.MAX_SAFE_INTEGER;
     minX = Number.MAX_SAFE_INTEGER;
-    /** X坐标最大值  */
+    /** X坐标最大值 */
     maxX = Number.MIN_SAFE_INTEGER;
     maxX = Number.MIN_SAFE_INTEGER;
-    /** Y坐标最小值  */
+    /** Y坐标最小值 */
     minY = Number.MAX_SAFE_INTEGER;
     minY = Number.MAX_SAFE_INTEGER;
-    /** Y坐标最大值  */
+    /** Y坐标最大值 */
     maxY = Number.MIN_SAFE_INTEGER;
     maxY = Number.MIN_SAFE_INTEGER;
-    /** path对象      */
+    /** path对象 */
     private path = new SPath2D();
     private path = new SPath2D();
-    /** 高亮状态    */
+    /** 高亮状态 */
     private _highLightFlag: boolean = false;
     private _highLightFlag: boolean = false;
     get highLightFlag(): boolean {
     get highLightFlag(): boolean {
         return this._highLightFlag;
         return this._highLightFlag;
@@ -68,7 +67,7 @@ export class SSpaceItem extends SGraphItem {
         this._highLightFlag = value;
         this._highLightFlag = value;
         this.update();
         this.update();
     } // Set highLightFlag
     } // Set highLightFlag
-    /** 是否显示名字  */
+    /** 是否显示名字 */
     private _showBaseName: boolean = false;
     private _showBaseName: boolean = false;
     get showBaseName(): boolean {
     get showBaseName(): boolean {
         return this._showBaseName;
         return this._showBaseName;
@@ -77,7 +76,7 @@ export class SSpaceItem extends SGraphItem {
         this._showBaseName = value;
         this._showBaseName = value;
         this.update();
         this.update();
     } // Set showBaseName
     } // Set showBaseName
-    /** 是否名字大小  */
+    /** 是否名字大小 */
     private _nameSize: number = 10;
     private _nameSize: number = 10;
     get nameSize(): number {
     get nameSize(): number {
         return this._nameSize;
         return this._nameSize;
@@ -86,7 +85,7 @@ export class SSpaceItem extends SGraphItem {
         this._nameSize = value;
         this._nameSize = value;
         this.update();
         this.update();
     } // Set nameSize
     } // Set nameSize
-    /** 名字是否缩放  */
+    /** 名字是否缩放 */
     private _nameTransform: boolean = false;
     private _nameTransform: boolean = false;
     get nameTransform(): boolean {
     get nameTransform(): boolean {
         return this._nameTransform;
         return this._nameTransform;
@@ -95,7 +94,7 @@ export class SSpaceItem extends SGraphItem {
         this._nameTransform = value;
         this._nameTransform = value;
         this.update();
         this.update();
     } // Set nameTransform
     } // Set nameTransform
-    /** 名字颜色    */
+    /** 名字颜色 */
     private _nameColor: string = "#000000";
     private _nameColor: string = "#000000";
     get nameColor(): string {
     get nameColor(): string {
         return this._nameColor;
         return this._nameColor;
@@ -162,38 +161,6 @@ export class SSpaceItem extends SGraphItem {
         );
         );
     } // Function boundingRect()
     } // Function boundingRect()
 
 
-    // /**
-    //  * 鼠标单击事件
-    //  *
-    //  * @param	event         事件参数
-    //  * @return	boolean
-    //  */
-    // onMouseDown(event: SMouseEvent): boolean {
-    //     console.log("spaceDown");
-    //     this.$emit("click", event);
-    //     return true;
-    // } // Function onMouseDown()
-
-    // /**
-    //  * 鼠标移动事件
-    //  *
-    //  * @param event 事件参数
-    //  */
-    // onMouseMove(event: SMouseEvent): boolean {
-    //     return false;
-    // } // Function onMouseMove()
-
-    // /**
-    //  * 鼠标抬起事件
-    //  *
-    //  * @param	event         事件参数
-    //  * @return	boolean
-    //  */
-    // onMouseUp(event: SMouseEvent): boolean {
-    //     console.log("spaceUp");
-    //     return false;
-    // } // Function onClick()
-
     /**
     /**
      * 判断点是否在区域内
      * 判断点是否在区域内
      *
      *

+ 9 - 10
persagy-web-big/src/items/floor/SVirtualWallItem.ts

@@ -24,11 +24,10 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SPainter, SPoint, SRect } from "@persagy-web/draw/lib";
+import { SPainter, SPoint, SRect } from "@persagy-web/draw";
 import { VirtualWall } from "../../types/floor/VirtualWall";
 import { VirtualWall } from "../../types/floor/VirtualWall";
-import { ItemOrder } from "../..";
-import { ItemColor } from "../..";
-import { SGraphItem } from "@persagy-web/graph/lib";
+import { ItemOrder, ItemColor } from "../..";
+import { SGraphItem } from "@persagy-web/graph";
 
 
 /**
 /**
  * 墙item
  * 墙item
@@ -36,17 +35,17 @@ import { SGraphItem } from "@persagy-web/graph/lib";
  * @author  郝建龙
  * @author  郝建龙
  */
  */
 export class SVirtualWallItem extends SGraphItem {
 export class SVirtualWallItem extends SGraphItem {
-    /** 虚拟墙数据   */
+    /** 虚拟墙数据 */
     data: VirtualWall;
     data: VirtualWall;
-    /** X坐标最小值  */
+    /** X坐标最小值 */
     private minX = Number.MAX_SAFE_INTEGER;
     private minX = Number.MAX_SAFE_INTEGER;
-    /** X坐标最大值  */
+    /** X坐标最大值 */
     private maxX = Number.MIN_SAFE_INTEGER;
     private maxX = Number.MIN_SAFE_INTEGER;
-    /** Y坐标最小值  */
+    /** Y坐标最小值 */
     private minY = Number.MAX_SAFE_INTEGER;
     private minY = Number.MAX_SAFE_INTEGER;
-    /** Y坐标最大值  */
+    /** Y坐标最大值 */
     private maxY = Number.MIN_SAFE_INTEGER;
     private maxY = Number.MIN_SAFE_INTEGER;
-    /** 虚拟墙轮廓线坐标list  */
+    /** 虚拟墙轮廓线坐标list */
     private readonly pointArr: SPoint[][] = [];
     private readonly pointArr: SPoint[][] = [];
 
 
     /**
     /**

+ 10 - 11
persagy-web-big/src/items/floor/SWallItem.ts

@@ -24,11 +24,10 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SPainter, SPath2D, SPoint, SRect } from "@persagy-web/draw/lib";
+import { SPainter, SPath2D, SPoint, SRect } from "@persagy-web/draw";
 import { Wall } from "../../types/floor/Wall";
 import { Wall } from "../../types/floor/Wall";
-import { ItemOrder } from "../..";
-import { ItemColor } from "../..";
-import { SGraphItem } from "@persagy-web/graph/lib";
+import { ItemOrder, ItemColor } from "../..";
+import { SGraphItem } from "@persagy-web/graph";
 
 
 /**
 /**
  * 墙item
  * 墙item
@@ -38,19 +37,19 @@ import { SGraphItem } from "@persagy-web/graph/lib";
 export class SWallItem extends SGraphItem {
 export class SWallItem extends SGraphItem {
     /** 墙数据 */
     /** 墙数据 */
     data: Wall;
     data: Wall;
-    /** X坐标最小值  */
+    /** X坐标最小值 */
     private minX = Number.MAX_SAFE_INTEGER;
     private minX = Number.MAX_SAFE_INTEGER;
-    /** X坐标最大值  */
+    /** X坐标最大值 */
     private maxX = Number.MIN_SAFE_INTEGER;
     private maxX = Number.MIN_SAFE_INTEGER;
-    /** Y坐标最小值  */
+    /** Y坐标最小值 */
     private minY = Number.MAX_SAFE_INTEGER;
     private minY = Number.MAX_SAFE_INTEGER;
-    /** Y坐标最大值  */
+    /** Y坐标最大值 */
     private maxY = Number.MIN_SAFE_INTEGER;
     private maxY = Number.MIN_SAFE_INTEGER;
-    /** 墙轮廓线坐标list  */
+    /** 墙轮廓线坐标list */
     private readonly pointArr: SPoint[][] = [];
     private readonly pointArr: SPoint[][] = [];
-    /** 墙内轮廓线坐标list  */
+    /** 墙内轮廓线坐标list */
     private readonly holesArr: SPoint[][] = [];
     private readonly holesArr: SPoint[][] = [];
-    /** path对象      */
+    /** path对象 */
     private path = new SPath2D();
     private path = new SPath2D();
 
 
     /**
     /**

+ 9 - 10
persagy-web-big/src/items/floor/SWallItemSS.ts

@@ -24,11 +24,10 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SPainter, SPoint, SRect, SPath2D } from "@persagy-web/draw/lib";
+import { SPainter, SPoint, SRect, SPath2D } from "@persagy-web/draw";
 import { Wall } from "../../types/floor/Wall";
 import { Wall } from "../../types/floor/Wall";
-import { ItemOrder } from "../..";
-import { ItemColor } from "../..";
-import { SGraphItem } from "@persagy-web/graph/lib";
+import { ItemOrder, ItemColor } from "../..";
+import { SGraphItem } from "@persagy-web/graph";
 
 
 /**
 /**
  * 墙item
  * 墙item
@@ -38,17 +37,17 @@ import { SGraphItem } from "@persagy-web/graph/lib";
 export class SWallItem extends SGraphItem {
 export class SWallItem extends SGraphItem {
     /** 墙数据 */
     /** 墙数据 */
     data: Wall;
     data: Wall;
-    /** X坐标最小值  */
+    /** X坐标最小值 */
     private minX = Number.MAX_SAFE_INTEGER;
     private minX = Number.MAX_SAFE_INTEGER;
-    /** X坐标最大值  */
+    /** X坐标最大值 */
     private maxX = Number.MIN_SAFE_INTEGER;
     private maxX = Number.MIN_SAFE_INTEGER;
-    /** Y坐标最小值  */
+    /** Y坐标最小值 */
     private minY = Number.MAX_SAFE_INTEGER;
     private minY = Number.MAX_SAFE_INTEGER;
-    /** Y坐标最大值  */
+    /** Y坐标最大值 */
     private maxY = Number.MIN_SAFE_INTEGER;
     private maxY = Number.MIN_SAFE_INTEGER;
-    /** 墙轮廓线坐标list  */
+    /** 墙轮廓线坐标list */
     private readonly pointArr: SPoint[][] = [];
     private readonly pointArr: SPoint[][] = [];
-    /** path对象      */
+    /** path对象 */
     private path = new SPath2D();
     private path = new SPath2D();
 
 
     /**
     /**

+ 9 - 10
persagy-web-big/src/items/floor/SWindowItem.ts

@@ -25,11 +25,10 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SPainter, SPoint, SRect } from "@persagy-web/draw/lib";
+import { SPainter, SPoint, SRect } from "@persagy-web/draw";
 import { Casement } from "../../types/floor/Casement";
 import { Casement } from "../../types/floor/Casement";
-import { ItemOrder } from "../..";
-import { ItemColor } from "../..";
-import { SGraphItem } from "@persagy-web/graph/lib";
+import { ItemOrder, ItemColor } from "../..";
+import { SGraphItem } from "@persagy-web/graph";
 
 
 /**
 /**
  * 窗户item
  * 窗户item
@@ -37,17 +36,17 @@ import { SGraphItem } from "@persagy-web/graph/lib";
  * @author  郝建龙
  * @author  郝建龙
  */
  */
 export class SWindowItem extends SGraphItem {
 export class SWindowItem extends SGraphItem {
-    /** 窗户数据    */
+    /** 窗户数据 */
     data: Casement;
     data: Casement;
-    /** 窗户轮廓线坐标list  */
+    /** 窗户轮廓线坐标list */
     private readonly pointArr: SPoint[] = [];
     private readonly pointArr: SPoint[] = [];
-    /** X坐标最小值  */
+    /** X坐标最小值 */
     private minX = Number.MAX_SAFE_INTEGER;
     private minX = Number.MAX_SAFE_INTEGER;
-    /** X坐标最大值  */
+    /** X坐标最大值 */
     private maxX = Number.MIN_SAFE_INTEGER;
     private maxX = Number.MIN_SAFE_INTEGER;
-    /** Y坐标最小值  */
+    /** Y坐标最小值 */
     private minY = Number.MAX_SAFE_INTEGER;
     private minY = Number.MAX_SAFE_INTEGER;
-    /** Y坐标最大值  */
+    /** Y坐标最大值 */
     private maxY = Number.MIN_SAFE_INTEGER;
     private maxY = Number.MIN_SAFE_INTEGER;
 
 
     /**
     /**

+ 17 - 17
persagy-web-big/src/items/floor/ZoneItem.ts

@@ -31,11 +31,11 @@ import {
     SPoint,
     SPoint,
     SPolygonUtil,
     SPolygonUtil,
     SRect
     SRect
-} from "@persagy-web/draw/lib";
-import { SMouseEvent } from "@persagy-web/base/lib";
+} from "@persagy-web/draw";
+import { SMouseEvent } from "@persagy-web/base";
 import { Zone } from "../../types/floor/Zone";
 import { Zone } from "../../types/floor/Zone";
 import { ItemColor, ItemOrder, Transparency } from "../..";
 import { ItemColor, ItemOrder, Transparency } from "../..";
-import { SGraphItem } from "@persagy-web/graph/lib";
+import { SGraphItem } from "@persagy-web/graph";
 
 
 /**
 /**
  * 业务空间item
  * 业务空间item
@@ -43,27 +43,27 @@ import { SGraphItem } from "@persagy-web/graph/lib";
  * @author  郝建龙
  * @author  郝建龙
  */
  */
 export class SZoneItem extends SGraphItem {
 export class SZoneItem extends SGraphItem {
-    /** 空间所有数据  */
+    /** 空间所有数据 */
     data: Zone;
     data: Zone;
-    /** 空间轮廓线坐标list  */
+    /** 空间轮廓线坐标list */
     readonly pointArr: SPoint[][][] = [];
     readonly pointArr: SPoint[][][] = [];
-    /** X坐标最小值  */
+    /** X坐标最小值 */
     private minX = Number.MAX_SAFE_INTEGER;
     private minX = Number.MAX_SAFE_INTEGER;
-    /** X坐标最大值  */
+    /** X坐标最大值 */
     private maxX = Number.MIN_SAFE_INTEGER;
     private maxX = Number.MIN_SAFE_INTEGER;
-    /** Y坐标最小值  */
+    /** Y坐标最小值 */
     private minY = Number.MAX_SAFE_INTEGER;
     private minY = Number.MAX_SAFE_INTEGER;
-    /** Y坐标最大值  */
+    /** Y坐标最大值 */
     private maxY = Number.MIN_SAFE_INTEGER;
     private maxY = Number.MIN_SAFE_INTEGER;
-    /** path    */
+    /** path */
     private pathList: SPath2D[] = [];
     private pathList: SPath2D[] = [];
-    /** 点击位置坐标  */
+    /** 点击位置坐标 */
     private clickPoint: SPoint | undefined;
     private clickPoint: SPoint | undefined;
-    /** 选中时的颜色  */
+    /** 选中时的颜色 */
     private selectColor: SColor = ItemColor.selectColor;
     private selectColor: SColor = ItemColor.selectColor;
-    /** 不可选时的颜色  */
+    /** 不可选时的颜色 */
     private unselectColor: SColor = ItemColor.zoneUnselectColor;
     private unselectColor: SColor = ItemColor.zoneUnselectColor;
-    /** 高亮状态    */
+    /** 高亮状态 */
     private _highLightFlag: boolean = false;
     private _highLightFlag: boolean = false;
     get highLightFlag(): boolean {
     get highLightFlag(): boolean {
         return this._highLightFlag;
         return this._highLightFlag;
@@ -81,7 +81,7 @@ export class SZoneItem extends SGraphItem {
         this._transparency = value;
         this._transparency = value;
         this.update();
         this.update();
     } // Set transparency
     } // Set transparency
-    /** 受影响状态   */
+    /** 受影响状态 */
     _isInfected: boolean = false;
     _isInfected: boolean = false;
     get isInfected(): boolean {
     get isInfected(): boolean {
         return this._isInfected;
         return this._isInfected;
@@ -90,9 +90,9 @@ export class SZoneItem extends SGraphItem {
         this._isInfected = value;
         this._isInfected = value;
         this.update();
         this.update();
     } // Set isInfected
     } // Set isInfected
-    /** 受影响的业务空间填充颜色    */
+    /** 受影响的业务空间填充颜色 */
     private infectedColor: SColor = ItemColor.zoneInfectedColor;
     private infectedColor: SColor = ItemColor.zoneInfectedColor;
-    /** 受影响的业务空间边框颜色    */
+    /** 受影响的业务空间边框颜色 */
     private infectedBorder: SColor = ItemColor.zoneInfectedBorder;
     private infectedBorder: SColor = ItemColor.zoneInfectedBorder;
 
 
     /**
     /**

+ 0 - 52
persagy-web-big/src/items/topology/SCurveRelation.ts

@@ -1,52 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { SRelation } from "./SRelation";
-
-/**
- * 曲线关系item
- *
- * * @author  郝建龙(1061851420@qq.com)
- */
-export class SCurveRelation extends SRelation {
-    /**
-     * 曲线转直线
-     *
-     * */
-    curve2Line(): void {} // Function curve2Line()
-
-    /**
-     * 曲线转折线
-     *
-     * */
-    curve2Polyline(): void {} // Function curve2Polyline()
-
-    /**
-     * 曲线转垂直线
-     *
-     * */
-    curve2Vertical(): void {} // Function curve2Vertical()
-} // Class SCurveRelation

+ 0 - 50
persagy-web-big/src/items/topology/SImageLegendItem.ts

@@ -1,50 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Legend } from "../../types/topology/Legend";
-import { SGraphItem } from "@persagy-web/graph/lib";
-import { SIconTextItem } from "../SIconTextItem"; // 图标item
-
-/**
- * 图例节点Item(图标类型)
- *
- * * @author  张宇(taohuzy@163.com)
- */
-export class SImageLegendItem extends SIconTextItem {
-    /** 图例节点对象数据 */
-    data: Legend;
-
-    /**
-     * 构造函数
-     *
-     * @param parent    指向父对象
-     * @param data      图例节点对象数据
-     */
-    constructor(parent: SGraphItem | null, data: Legend) {
-        super(parent);
-        this.data = data;
-    }
-} // Class SImageLegendItem

+ 0 - 181
persagy-web-big/src/items/topology/SImageMarkerItem.ts

@@ -1,181 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Marker } from "../../types/topology/Marker";
-import { SGraphItem, SImageItem, SImageShowType } from "@persagy-web/graph/lib";
-import { SPainter } from "@persagy-web/draw";
-
-/**
- * 标识对象Item(图标类型)
- *
- * * @author  张宇(taohuzy@163.com)
- */
-export class SImageMarkerItem extends SImageItem {
-    /** 标识对象数据 */
-    data: Marker;
-
-    /** x轴缩放属性 */
-    _scaleX: number = 1;
-    get scaleX(): number {
-        return this._scaleX;
-    }
-    set scaleX(v: number) {
-        this._scaleX = v;
-        if (this.data.Scale) {
-            this.data.Scale.X = v;
-        }
-        this.update();
-    }
-
-    /** y轴缩放属性 */
-    _scaleY: number = 1;
-    get scaleY(): number {
-        return this._scaleY;
-    }
-    set scaleY(v: number) {
-        this._scaleY = v;
-        if (this.data.Scale) {
-            this.data.Scale.Y = v;
-        }
-        this.update();
-    }
-
-    /** y轴旋转属性 */
-    _rolate: number = 0;
-    get rolate(): number {
-        return this._rolate;
-    }
-    set rolate(v: number) {
-        this._rolate = v;
-        if (this.data.Rolate) {
-            this.data.Rolate.Z = v;
-        }
-        this.update();
-    }
-
-    set name(v: string) {
-        this.data.Name = v;
-    }
-
-    set url(v: string) {
-        if (this.data.Properties) {
-            this.data.Properties.Url = v;
-        }
-    }
-
-    set x(v: number) {
-        this.data.Pos.X = v;
-    }
-
-    set y(v: number) {
-        this.data.Pos.Y = v;
-    }
-
-    set width(v: number) {
-        if (this.data.Size) {
-            this.data.Size.Width = v;
-        }
-    }
-
-    set height(v: number) {
-        if (this.data.Size) {
-            this.data.Size.Height = v;
-        }
-    }
-
-    /**
-     * 构造函数
-     *
-     * @param parent    指向父对象
-     * @param data      标识对象数据
-     */
-    constructor(parent: SGraphItem | null, data: Marker) {
-        super(parent);
-        this.data = data;
-        this.moveTo(data.Pos.X, data.Pos.Y);
-        if (this.data.Scale) {
-            this.scaleX = this.data.Scale.X;
-            this.scaleY = this.data.Scale.Y;
-        }
-        if (this.data.Rolate && this.data.Rolate.Z) {
-            this.rolate = this.data.Rolate.Z;
-        }
-        if (this.data.Size) {
-            this.width = this.data.Size.Width;
-            this.height = this.data.Size.Height;
-        }
-        if (this.data.Properties && this.data.Properties.Url) {
-            if (this.data.Properties.Url instanceof String) {
-                this.url = this.data.Properties.Url;
-            }
-        }
-    } // Constructor
-
-    /**
-     * Item绘制操作
-     *
-     * @param   painter      绘画类
-     */
-    onDraw(painter: SPainter): void {
-        if (this.img) {
-            // 要绘制图片的宽度
-            let width = 0;
-            // 要绘制图片的宽度
-            let height = 0;
-            // 图片item的宽高比
-            let itemAspectRatio: number = this.width / this.height;
-            // 原始图片的宽高比
-            let imgAspectRatio: number =
-                (this.img.width as number) / (this.img.height as number);
-            // 原始图片的高宽比
-            let imgHwRatio: number =
-                (this.img.height as number) / (this.img.width as number);
-            if (this.showType == SImageShowType.Full) {
-                width = this.width;
-                height = this.height;
-            } else if (this.showType == SImageShowType.Equivalency) {
-                if (itemAspectRatio > imgAspectRatio) {
-                    height = this.height;
-                    width = imgAspectRatio * height;
-                } else if (itemAspectRatio < imgAspectRatio) {
-                    width = this.width;
-                    height = width * imgHwRatio;
-                } else {
-                    width = this.width;
-                    height = this.height;
-                }
-            } else if (this.showType == SImageShowType.AutoFit) {
-                this.width = this.img.width as number;
-                this.height = this.img.height as number;
-                width = this.width;
-                height = this.height;
-            }
-            painter.scale(this.scaleX, this.scaleY);
-            painter.rotate(this.rolate);
-            painter.drawImage(this.img, -width / 2, -height / 2, width, height);
-        }
-    } // Function onDraw()
-} // Class SImageMarkerItem

+ 0 - 135
persagy-web-big/src/items/topology/SLineLegendItem.ts

@@ -1,135 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Legend } from "../../types/topology/Legend";
-import { SGraphItem } from "@persagy-web/graph/lib";
-import { SLineItem } from "../SLineItem";
-import { SPoint } from "@persagy-web/draw/lib";
-
-/**
- * 图例节点Item(线类型)
- *
- * * @author  张宇(taohuzy@163.com)
- */
-export class SLineLegendItem extends SLineItem {
-    /** 图例节点对象数据 */
-    data: Legend;
-
-    /** x轴缩放属性 */
-    _scaleX: number = 1;
-    get scaleX(): number {
-        return this._scaleX;
-    }
-    set scaleX(v: number) {
-        this._scaleX = v;
-        if (this.data.Scale) {
-            this.data.Scale.X = v;
-        }
-        this.update();
-    }
-
-    /** y轴缩放属性 */
-    _scaleY: number = 1;
-    get scaleY(): number {
-        return this._scaleY;
-    }
-    set scaleY(v: number) {
-        this._scaleY = v;
-        if (this.data.Scale) {
-            this.data.Scale.Y = v;
-        }
-        this.update();
-    }
-
-    /** y轴旋转属性 */
-    _rolate: number = 0;
-    get rolate(): number {
-        return this._rolate;
-    }
-    set rolate(v: number) {
-        this._rolate = v;
-        if (this.data.Rolate) {
-            this.data.Rolate.Z = v;
-        }
-        this.update();
-    }
-
-    set name(v: string) {
-        this.data.Name = v;
-    }
-
-    set line(arr: SPoint[]) {
-        if (this.data.Properties) {
-            this.data.Properties.Line = arr;
-        }
-    }
-
-    set x(v: number) {
-        this.data.Pos.X = v;
-    }
-
-    set y(v: number) {
-        this.data.Pos.Y = v;
-    }
-
-    set width(v: number) {
-        if (this.data.Size) {
-            this.data.Size.Width = v;
-        }
-    }
-
-    set height(v: number) {
-        if (this.data.Size) {
-            this.data.Size.Height = v;
-        }
-    }
-
-    /**
-     * 构造函数
-     *
-     * @param parent    指向父对象
-     * @param data      图例节点对象数据
-     */
-    constructor(parent: SGraphItem | null, data: Legend) {
-        super(parent);
-        this.data = data;
-        this.moveTo(data.Pos.X, data.Pos.Y);
-        if (this.data.Scale) {
-            this.scaleX = this.data.Scale.X;
-            this.scaleY = this.data.Scale.Y;
-        }
-        if (this.data.Rolate && this.data.Rolate.Z) {
-            this.rolate = this.data.Rolate.Z;
-        }
-        if (this.data.Size) {
-            this.width = this.data.Size.Width;
-            this.height = this.data.Size.Height;
-        }
-        if (this.data.Properties && this.data.Properties.Line) {
-            this.line = this.data.Properties.Line;
-        }
-    }
-} // Class SLineLegendItem

+ 0 - 135
persagy-web-big/src/items/topology/SLineMarkerItem.ts

@@ -1,135 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Marker } from "../../types/topology/Marker";
-import { SGraphItem } from "@persagy-web/graph/lib";
-import { SPoint } from "@persagy-web/draw/lib";
-import { SPolylineItem } from "../SPolylineItem";
-
-/**
- * 标识对象Item(线类型)
- *
- * * @author  张宇(taohuzy@163.com)
- */
-export class SLineMarkerItem extends SPolylineItem {
-    /** 标识对象数据 */
-    data: Marker;
-
-    /** x轴缩放属性 */
-    _scaleX: number = 1;
-    get scaleX(): number {
-        return this._scaleX;
-    }
-    set scaleX(v: number) {
-        this._scaleX = v;
-        if (this.data.Scale) {
-            this.data.Scale.X = v;
-        }
-        this.update();
-    }
-
-    /** y轴缩放属性 */
-    _scaleY: number = 1;
-    get scaleY(): number {
-        return this._scaleY;
-    }
-    set scaleY(v: number) {
-        this._scaleY = v;
-        if (this.data.Scale) {
-            this.data.Scale.Y = v;
-        }
-        this.update();
-    }
-
-    /** y轴旋转属性 */
-    _rolate: number = 0;
-    get rolate(): number {
-        return this._rolate;
-    }
-    set rolate(v: number) {
-        this._rolate = v;
-        if (this.data.Rolate) {
-            this.data.Rolate.Z = v;
-        }
-        this.update();
-    }
-
-    set name(v: string) {
-        this.data.Name = v;
-    }
-
-    set line(arr: SPoint[]) {
-        if (this.data.Properties) {
-            this.data.Properties.Line = arr;
-        }
-    }
-
-    set x(v: number) {
-        this.data.Pos.X = v;
-    }
-
-    set y(v: number) {
-        this.data.Pos.Y = v;
-    }
-
-    set width(v: number) {
-        if (this.data.Size) {
-            this.data.Size.Width = v;
-        }
-    }
-
-    set height(v: number) {
-        if (this.data.Size) {
-            this.data.Size.Height = v;
-        }
-    }
-
-    /**
-     * 构造函数
-     *
-     * @param parent    指向父对象
-     * @param data      标识对象数据
-     */
-    constructor(parent: SGraphItem | null, data: Marker) {
-        super(parent, []);
-        this.data = data;
-        this.moveTo(data.Pos.X, data.Pos.Y);
-        if (this.data.Scale) {
-            this.scaleX = this.data.Scale.X;
-            this.scaleY = this.data.Scale.Y;
-        }
-        if (this.data.Rolate && this.data.Rolate.Z) {
-            this.rolate = this.data.Rolate.Z;
-        }
-        if (this.data.Size) {
-            this.width = this.data.Size.Width;
-            this.height = this.data.Size.Height;
-        }
-        if (this.data.Properties && this.data.Properties.Line) {
-            this.line = this.data.Properties.Line;
-        }
-    } // Constructor
-} // Class SLineMarkerItem

+ 0 - 55
persagy-web-big/src/items/topology/SLineRelation.ts

@@ -1,55 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { SRelation } from "./SRelation";
-
-/**
- * 直连关系线item
- *
- * * @author  郝建龙(1061851420@qq.com)
- */
-export class SLineRelation extends SRelation {
-    /** 是否可以添加点 */
-    canAddPoint: boolean = true;
-
-    /**
-     * 折线转曲线
-     *
-     * */
-    polyline2Curve(): void {} // Function polyline2Curve()
-
-    /**
-     * 折线转直线
-     *
-     * */
-    polyline2Line(): void {} // Function polyline2Line()
-
-    /**
-     * 折线转垂直线
-     *
-     * */
-    polyline2Vertical(): void {} // Function polyline2Vertical()
-} // Class SLineRelation

+ 0 - 49
persagy-web-big/src/items/topology/SNoneLegendItem.ts

@@ -1,49 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Legend } from "../../types/topology/Legend";
-import { SGraphItem } from "@persagy-web/graph/lib";
-
-/**
- * 图例节点Item(非图例类型)
- *
- * * @author  张宇(taohuzy@163.com)
- */
-export class SNoneLegendItem extends SGraphItem {
-    /** 图例节点对象数据 */
-    data: Legend;
-
-    /**
-     * 构造函数
-     *
-     * @param parent    指向父对象
-     * @param data      图例节点对象数据
-     */
-    constructor(parent: SGraphItem | null, data: Legend) {
-        super(parent);
-        this.data = data;
-    }
-} // Class SNoneLegendItem

+ 0 - 65
persagy-web-big/src/items/topology/SRelation.ts

@@ -1,65 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { SGraphItem } from "@persagy-web/graph/lib";
-import { SColor, SPoint, SArrowStyleType } from "@persagy-web/draw/lib";
-import { SRelationState } from "../../enums/SRelationState";
-
-/**
- * 关系item
- *
- * * @author  郝建龙(1061851420@qq.com)
- */
-export abstract class SRelation extends SGraphItem {
-    // /** 起始端点线帽样式(枚举)    */
-    // beginCap: SRelationState = SArrowStyleType.None;
-    // /** 终止端点线帽样式(枚举)    */
-    // endCap: SRelationState = SArrowStyleType.None;
-    // /** 线帽填充色   */
-    // capColor: SColor;
-    // /** 外线颜色    */
-    // color: SColor;
-    // /** 起始锚点对象  */
-    // startAnchor: SAnchorItem | null = null;
-    // /** 终止锚点对象  */
-    // endAnchor: SAnchorItem | null = null;
-    // /** 内线颜色    */
-    // innerLineColor: SColor;
-    // /** 内线宽度    */
-    // innerLineWidth: number = -1;
-    // /** 虚线样式    */
-    // lineDash: number[] = [];
-    // /** 虚线偏移量   */
-    // lineDashOffset: number = 0;
-    // /** 动画速度    */
-    // speed: number = 0;
-    // /** 线宽  */
-    // lineWidth: number;
-    // /** 线状态 */
-    // state: SRelationState = SRelationState.Normal;
-    // /** 折点list  */
-    // pointList: SPoint[] = [];
-} // Class SRelation

+ 0 - 150
persagy-web-big/src/items/topology/STextMarkerItem.ts

@@ -1,150 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Marker } from "../../types/topology/Marker";
-import { SGraphItem, STextItem } from "@persagy-web/graph/lib";
-import { SPainter, SColor } from "@persagy-web/draw";
-
-/**
- * 标识对象Item(文本类型)
- *
- * * @author  张宇(taohuzy@163.com)
- */
-export class STextMarkerItem extends STextItem {
-    /** 标识对象数据 */
-    data: Marker;
-
-    /** x轴缩放属性 */
-    _scaleX: number = 1;
-    get scaleX(): number {
-        return this._scaleX;
-    }
-    set scaleX(v: number) {
-        this._scaleX = v;
-        if (this.data.Scale) {
-            this.data.Scale.X = v;
-        }
-        this.update();
-    }
-
-    /** y轴缩放属性 */
-    _scaleY: number = 1;
-    get scaleY(): number {
-        return this._scaleY;
-    }
-    set scaleY(v: number) {
-        this._scaleY = v;
-        if (this.data.Scale) {
-            this.data.Scale.Y = v;
-        }
-        this.update();
-    }
-
-    /** y轴旋转属性 */
-    _rolate: number = 0;
-    get rolate(): number {
-        return this._rolate;
-    }
-    set rolate(v: number) {
-        this._rolate = v;
-        if (this.data.Rolate) {
-            this.data.Rolate.Z = v;
-        }
-        this.update();
-    }
-
-    set name(v: string) {
-        this.data.Name = v;
-    }
-
-    set text(v: string) {
-        if (this.data.Properties) {
-            this.data.Properties.Text = v;
-        }
-    }
-
-    set x(v: number) {
-        this.data.Pos.X = v;
-    }
-
-    set y(v: number) {
-        this.data.Pos.Y = v;
-    }
-
-    set width(v: number) {
-        if (this.data.Size) {
-            this.data.Size.Width = v;
-        }
-    }
-
-    set height(v: number) {
-        if (this.data.Size) {
-            this.data.Size.Height = v;
-        }
-    }
-
-    /**
-     * 构造函数
-     *
-     * @param parent    指向父对象
-     * @param data      标识对象数据
-     */
-    constructor(parent: SGraphItem | null, data: Marker) {
-        super(parent);
-        this.data = data;
-        this.moveTo(data.Pos.X, data.Pos.Y);
-        if (this.data.Scale) {
-            this.scaleX = this.data.Scale.X;
-            this.scaleY = this.data.Scale.Y;
-        }
-        if (this.data.Rolate && this.data.Rolate.Z) {
-            this.rolate = this.data.Rolate.Z;
-        }
-        if (this.data.Size) {
-            this.width = this.data.Size.Width;
-            this.height = this.data.Size.Height;
-        }
-        if (this.data.Properties && this.data.Properties.Text) {
-            if (this.data.Properties.Text instanceof String) {
-                this.text = this.data.Properties.Text;
-            }
-        }
-    } // Constructor
-
-    /**
-     * Item绘制操作
-     *
-     * @param   painter      绘画类
-     */
-    onDraw(painter: SPainter): void {
-        // 绘制文本
-        painter.brush.color = new SColor(this.color);
-        painter.font = this.font;
-        painter.scale(this.scaleX, this.scaleY);
-        painter.rotate(this.rolate);
-        this.drawFormatText();
-    } // Function onDraw()
-} // Class STextMarkerItem

+ 0 - 68
persagy-web-big/src/items/topology/SVerticalRelation.ts

@@ -1,68 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { SRelation } from "./SRelation";
-import { SGraphItem } from "@persagy-web/graph/lib";
-import { Relation } from "../../types/topology/Relation";
-
-/**
- * 垂直线关系线item
- *
- * * @author  郝建龙(1061851420@qq.com)
- */
-export class SVerticalRelation extends SRelation {
-    /** 对象关系数据 */
-    data: Relation;
-
-    /**
-     * 构造函数
-     *
-     * @param parent    指向父对象
-     * @param data      对象关系数据
-     */
-    constructor(parent: SGraphItem | null, data: Relation) {
-        super(parent);
-        this.data = data;
-    }
-
-    /**
-     * 垂直线转曲线
-     *
-     * */
-    vertical2Curve(): void {} // Function vertical2Curve()
-
-    /**
-     * 垂直线转直线
-     *
-     * */
-    vertical2Line(): void {} // Function vertical2Line()
-
-    /**
-     * 垂直线转折线
-     *
-     * */
-    vertical2Polyline(): void {} // Function vertical2Polyline()
-} // Class SVerticalRelation

+ 0 - 50
persagy-web-big/src/items/topology/SZoneLegendItem.ts

@@ -1,50 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Legend } from "../../types/topology/Legend";
-import { SGraphItem } from "@persagy-web/graph/lib";
-import { SPolygonItem } from "../SPolygonItem"; // 多边形item
-
-/**
- * 图例节点Item(区域类型)
- *
- * * @author  张宇(taohuzy@163.com)
- */
-export class SZoneLegendItem extends SPolygonItem {
-    /** 图例节点对象数据 */
-    data: Legend;
-
-    /**
-     * 构造函数
-     *
-     * @param parent    指向父对象
-     * @param data      图例节点对象数据
-     */
-    constructor(parent: SGraphItem | null, data: Legend) {
-        super(parent);
-        this.data = data;
-    }
-} // Class SZoneLegendItem

+ 0 - 33
persagy-web-big/src/parser/SBigParser.ts

@@ -1,33 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { SParser } from "./SParser";
-
-/**
- *  混合解析器
- *
- */
-export class SBigParser extends SParser {} // class SBigParser

+ 0 - 33
persagy-web-big/src/parser/SEquipParser.ts

@@ -1,33 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { SParser } from "./SParser";
-
-/**
- * 设备信息解析器
- *
- */
-export class SEquipParser extends SParser {} // class SEquipParser

+ 0 - 44
persagy-web-big/src/parser/SGeoParser.ts

@@ -1,44 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { SParser } from "./SParser";
-import { GeoJson } from "../types/geo/GeoJson";
-
-export class SGeoParser extends SParser {
-
-    /**
-     * 解析数据
-     */
-    parseData(data: GeoJson, _fn: Function): void {
-        try {
-            const parsedata = data.features.forEach(t => {
-
-            });
-        } catch (e) {
-            console.log(e);
-        }
-    } // Function parseData()
-} // class SGeoParser

+ 0 - 33
persagy-web-big/src/parser/STopologyParser.ts

@@ -1,33 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-/**
- * 拓扑图信息解析器
- *
- */
-import { SParser } from "./SParser";
-
-export class STopologyParser extends SParser {} // class STopologyParser

+ 0 - 40
persagy-web-big/src/types/ElementData.ts

@@ -1,40 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Legend } from "./topology/Legend";
-import { Marker } from "./topology/Marker";
-import { Relation } from "./topology/Relation";
-
-/**
- * 系统图数据接口
- *
- * @author  张宇
- */
-export interface ElementData {
-    Nodes: Legend[];
-    Markers: Marker[];
-    Relations: Relation[];
-} // Interface ElementData

+ 1 - 1
persagy-web-big/src/types/Outline.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SPoint } from "@persagy-web/draw/lib";
+import { SPoint } from "@persagy-web/draw";
 
 
 /**
 /**
  * 轮廓线接口
  * 轮廓线接口

+ 1 - 1
persagy-web-big/src/types/PointToLine.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SLine, SPoint } from "@persagy-web/draw/lib";
+import { SLine, SPoint } from "@persagy-web/draw";
 
 
 /**
 /**
  * 距离最短线接口
  * 距离最短线接口

+ 1 - 1
persagy-web-big/src/types/TextData.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { STextAlign, STextBaseLine, STextDirection } from "@persagy-web/draw/lib";
+import { STextAlign, STextBaseLine, STextDirection } from "@persagy-web/draw";
 
 
 /**
 /**
  * 文本item数据接口
  * 文本item数据接口

+ 0 - 42
persagy-web-big/src/types/geo/Features.ts

@@ -1,42 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Properties } from "./Properties";
-import { Geometry } from "./Geometry";
-/**
- * Features数据接口
- *
- * @author  郝建龙
- */
-
-export interface Features {
-    /** */
-    type: string;
-    /** */
-    properties: Properties;
-    //
-    geometry: Geometry;
-} // Interface Features

+ 0 - 39
persagy-web-big/src/types/geo/GeoJson.ts

@@ -1,39 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-/**
- * GeoJson数据接口
- *
- * @author  郝建龙
- */
-import { Features } from "./Features";
-
-export interface GeoJson {
-    /** */
-    type: string;
-    /** */
-    features: Features[];
-} // Interface GeoJson

+ 0 - 38
persagy-web-big/src/types/geo/Geometry.ts

@@ -1,38 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-/**
- * Geometry数据接口
- *
- * @author  郝建龙
- */
-
-export interface Geometry {
-    /** */
-    type: string;
-    /** */
-    coordinates: number[][][][];
-} // Interface Geometry

+ 0 - 55
persagy-web-big/src/types/geo/Properties.ts

@@ -1,55 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { PropertyParent } from "./PropertyParent";
-/**
- * Properties数据接口
- *
- * @author  郝建龙
- */
-
-export interface Properties {
-    /** */
-    adcode: string;
-    /** */
-    name: string;
-    /** */
-    center: number[];
-    /** */
-    centroid: number[];
-    /** */
-    childrenNum: number;
-    //
-    level: string;
-    //
-    parent: PropertyParent;
-    //
-    subFeatureIndex: number;
-    //
-    acroutes: number[];
-    //
-    adchar: string | null;
-} // Interface Properties

+ 0 - 35
persagy-web-big/src/types/geo/PropertyParent.ts

@@ -1,35 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-/**
- * PropertyParent数据接口
- *
- * @author  郝建龙
- */
-export interface PropertyParent {
-    //
-    adcode: number | string;
-} // Interface PropertyParent

+ 0 - 39
persagy-web-big/src/types/topology/Anchor.ts

@@ -1,39 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Point } from "../Point";
-
-/**
- * 锚点item接口
- *
- * @author  张宇
- */
-export interface Anchor {
-    /** 锚点ID */
-    ID: string;
-    /** 锚点的坐标  */
-    Pos: Point;
-} // Interface Anchor

+ 0 - 62
persagy-web-big/src/types/topology/Legend.ts

@@ -1,62 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Point } from "../Point";
-import { Size } from "../Size";
-import { Anchor } from "./Anchor";
-import { SGraphElementType } from "../../enums/SGraphElementType";
-
-/**
- * 图例节点接口
- *
- * @author  张宇
- */
-export interface Legend {
-    /** ID */
-    ID: string;
-    /** 名称  */
-    Name: string;
-    /** 返回工程信息化对象 ID 列表 */
-    AttachObjectIds?: string[];
-    /** 图标,区域类型  */
-    GraphElementType: SGraphElementType;
-    /** 对应的图例ID  */
-    GraphElementId: string;
-    /** 位置  */
-    Pos: Point;
-    /** 缩放  */
-    Scale?: Point;
-    /** 旋转  */
-    Rolate?: Point;
-    /** 大小  */
-    Size?: Size;
-    /** 锚点List  */
-    AnchorList?: Anchor[];
-    /** 轮廓线  */
-    OutLine?: Point[][];
-    /** 由应用自己定义  */
-    Properties?: any;
-} // Interface Legend

+ 0 - 53
persagy-web-big/src/types/topology/Marker.ts

@@ -1,53 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Point } from "../Point";
-import { Size } from "../Size";
-import { SMarkerType } from "../../enums/SMarkerType";
-
-/**
- * 标识对象接口
- *
- * @author  张宇
- */
-export interface Marker {
-    /** ID */
-    ID: string;
-    /** 名称  */
-    Name: string;
-    /** 图标(Image),线类型(Line) */
-    Type: SMarkerType;
-    /** 位置  */
-    Pos: Point;
-    /** 缩放  */
-    Scale?: Point;
-    /** 旋转  */
-    Rolate?: Point;
-    /** 大小  */
-    Size?: Size;
-    /** 由应用自己定义  */
-    Properties?: any;
-} // Interface Marker

+ 0 - 59
persagy-web-big/src/types/topology/Relation.ts

@@ -1,59 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .F88X
- *        X8888Y
- *      .}888888N;
- *        i888888N;        .:!              .I$WI:
- *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
- *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
- *            +888888N;  .8888888Y                                  "&&8Y.}8,
- *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
- *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
- *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
- *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
- *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
- *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
- *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
- *      .:R888888I
- *      .&888888I                                          Copyright (c) 2016-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { Point } from "../Point";
-import { SRelationDir } from "../../enums/SRelationDir";
-import { SLineType } from "../../enums/SLineType";
-
-/**
- * 管线对象关系接口
- *
- * @author  张宇
- */
-export interface Relation {
-    /** ID */
-    ID: string;
-    /** 名称 */
-    Name: string;
-    /** 对应的图例ID */
-    GraphElementId: string;
-    /** 关联节点1_id */
-    Node1ID?: string;
-    /** 关联节点2_id */
-    Node2ID?: string;
-    /** 关联锚点1_id  */
-    Anchor1ID?: string;
-    /** 关联锚点2_id */
-    Anchor2ID?: string;
-    /** 方向(0:无向,1:节点1到节点2,2:节点2到节点1) */
-    Dir?: SRelationDir;
-    /** 线类型(0:直线,1:水平/垂直线,2:曲线) */
-    LineType: SLineType;
-    /** 线的顶点坐标 */
-    PointList: Point[];
-    /** 线的绘图样式 */
-    Style?: string;
-} // Interface Relation

+ 1 - 1
persagy-web-big/src/utils/SMathUtil.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SLine, SPoint, SRect } from "@persagy-web/draw/lib";
+import { SLine, SPoint, SRect } from "@persagy-web/draw";
 import { MinDis } from "../types/MinDis";
 import { MinDis } from "../types/MinDis";
 import { Point } from "../types/Point";
 import { Point } from "../types/Point";
 import { PointToLine } from "../types/PointToLine";
 import { PointToLine } from "../types/PointToLine";

+ 1 - 1
persagy-web-draw/src/SColor.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SStringUtil } from "@persagy-web/base/lib";
+import { SStringUtil } from "@persagy-web/base";
 
 
 /**
 /**
  * 颜色类
  * 颜色类

+ 1 - 1
persagy-web-draw/src/SPainter.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SMatrix, SObject } from "@persagy-web/base/lib";
+import { SMatrix, SObject } from "@persagy-web/base";
 import { SPaintEngine } from "./engines/SPaintEngine";
 import { SPaintEngine } from "./engines/SPaintEngine";
 import {
 import {
     SBrush,
     SBrush,

+ 1 - 1
persagy-web-draw/src/SPath2D.ts

@@ -25,7 +25,7 @@
  */
  */
 
 
 import { SPoint } from "./index";
 import { SPoint } from "./index";
-import {SStringBuilder} from "@persagy-web/base/lib";
+import {SStringBuilder} from "@persagy-web/base";
 
 
 /**
 /**
  * Path对象
  * Path对象

+ 1 - 1
persagy-web-draw/src/engines/SPaintEngine.ts

@@ -26,7 +26,7 @@
 
 
 import { SFont, SLine, SPaintEngineType, SPath2D, SPoint, SRect } from "..";
 import { SFont, SLine, SPaintEngineType, SPath2D, SPoint, SRect } from "..";
 import { SPaintState } from "./SPaintState";
 import { SPaintState } from "./SPaintState";
-import { SMatrix } from "@persagy-web/base/lib";
+import { SMatrix } from "@persagy-web/base";
 
 
 /**
 /**
  * 绘制引擎基类
  * 绘制引擎基类

+ 1 - 1
persagy-web-draw/src/engines/SSvgPaintEngine.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SStringBuilder } from "@persagy-web/base/lib";
+import { SStringBuilder } from "@persagy-web/base";
 import { SPath2D } from "../SPath2D";
 import { SPath2D } from "../SPath2D";
 import {
 import {
     SFont,
     SFont,

+ 1 - 1
persagy-web-draw/src/types/SPoint.ts

@@ -29,7 +29,7 @@
  *
  *
  * @author 庞利祥(sybotan@126.com)
  * @author 庞利祥(sybotan@126.com)
  */
  */
-import { SMatrix } from "@persagy-web/base/lib";
+import { SMatrix } from "@persagy-web/base";
 
 
 export class SPoint {
 export class SPoint {
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

+ 2 - 2
persagy-web-graph/src/SGraphItem.ts

@@ -29,8 +29,8 @@ import {
     SMouseEvent,
     SMouseEvent,
     SObject,
     SObject,
     SMatrix
     SMatrix
-} from "@persagy-web/base/lib";
-import { SPainter, SPoint, SRect } from "@persagy-web/draw/lib";
+} from "@persagy-web/base";
+import { SPainter, SPoint, SRect } from "@persagy-web/draw";
 import { SGraphScene } from "./SGraphScene";
 import { SGraphScene } from "./SGraphScene";
 
 
 /**
 /**

+ 2 - 2
persagy-web-graph/src/SGraphScene.ts

@@ -24,8 +24,8 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SMouseEvent, SMatrix } from "@persagy-web/base/lib";
-import { SPainter, SPoint, SRect } from "@persagy-web/draw/lib";
+import { SMouseEvent, SMatrix } from "@persagy-web/base";
+import { SPainter, SPoint, SRect } from "@persagy-web/draw";
 import { SGraphItem } from "./SGraphItem";
 import { SGraphItem } from "./SGraphItem";
 import { SGraphView } from "./SGraphView";
 import { SGraphView } from "./SGraphView";
 import { SGraphSelectContainer } from "./SGraphSelectContainer";
 import { SGraphSelectContainer } from "./SGraphSelectContainer";

+ 1 - 1
persagy-web-graph/src/SGraphSelectContainer.ts

@@ -25,7 +25,7 @@
  */
  */
 
 
 import { SGraphItem } from "./SGraphItem";
 import { SGraphItem } from "./SGraphItem";
-import { SObject } from "@persagy-web/base/lib";
+import { SObject } from "@persagy-web/base";
 import { SGraphLayoutType } from "./enums/SGraphLayoutType";
 import { SGraphLayoutType } from "./enums/SGraphLayoutType";
 import { SOrderSetType } from "./enums/SOrderSetType";
 import { SOrderSetType } from "./enums/SOrderSetType";
 
 

+ 2 - 2
persagy-web-graph/src/SGraphView.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SMouseEvent, SNetUtil } from "@persagy-web/base/lib";
+import { SMouseEvent, SNetUtil } from "@persagy-web/base";
 import {
 import {
     SCanvasPaintEngine,
     SCanvasPaintEngine,
     SCanvasView,
     SCanvasView,
@@ -32,7 +32,7 @@ import {
     SPoint,
     SPoint,
     SRect,
     SRect,
     SSvgPaintEngine
     SSvgPaintEngine
-} from "@persagy-web/draw/lib";
+} from "@persagy-web/draw";
 import { SGraphScene } from "./SGraphScene";
 import { SGraphScene } from "./SGraphScene";
 import { SGraphItem } from "./SGraphItem";
 import { SGraphItem } from "./SGraphItem";
 import { v1 as uuidv1 } from "uuid";
 import { v1 as uuidv1 } from "uuid";

+ 1 - 1
persagy-web-graph/src/commands/SGraphAddCommand.ts

@@ -26,7 +26,7 @@
 
 
 import { SGraphCommand } from "./SGraphCommand";
 import { SGraphCommand } from "./SGraphCommand";
 import { SGraphItem } from "../SGraphItem";
 import { SGraphItem } from "../SGraphItem";
-import { SUndoCommand } from "@persagy-web/base/lib";
+import { SUndoCommand } from "@persagy-web/base";
 import { SGraphScene } from "../SGraphScene";
 import { SGraphScene } from "../SGraphScene";
 
 
 /**
 /**

+ 1 - 1
persagy-web-graph/src/commands/SGraphCommand.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SUndoCommand } from "@persagy-web/base/lib";
+import { SUndoCommand } from "@persagy-web/base";
 import { SGraphScene } from "../SGraphScene";
 import { SGraphScene } from "../SGraphScene";
 
 
 /**
 /**

+ 2 - 2
persagy-web-graph/src/commands/SGraphMoveCommand.ts

@@ -26,8 +26,8 @@
 
 
 import { SGraphCommand } from "./SGraphCommand";
 import { SGraphCommand } from "./SGraphCommand";
 import { SGraphItem } from "../SGraphItem";
 import { SGraphItem } from "../SGraphItem";
-import { SPoint } from "@persagy-web/draw/lib";
-import { SUndoCommand } from "@persagy-web/base/lib";
+import { SPoint } from "@persagy-web/draw";
+import { SUndoCommand } from "@persagy-web/base";
 import { SGraphScene } from "../SGraphScene";
 import { SGraphScene } from "../SGraphScene";
 
 
 /**
 /**

+ 1 - 1
persagy-web-graph/src/commands/SGraphPointListDelete.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SPoint } from "@persagy-web/draw/lib";
+import { SPoint } from "@persagy-web/draw";
 import { SGraphCommand, SGraphItem, SGraphScene } from "../index";
 import { SGraphCommand, SGraphItem, SGraphScene } from "../index";
 
 
 /**
 /**

+ 1 - 1
persagy-web-graph/src/commands/SGraphPointListInsert.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SPoint } from "@persagy-web/draw/lib";
+import { SPoint } from "@persagy-web/draw";
 import { SGraphCommand, SGraphItem, SGraphScene } from "../index";
 import { SGraphCommand, SGraphItem, SGraphScene } from "../index";
 
 
 /**
 /**

+ 1 - 1
persagy-web-graph/src/commands/SGraphPointListUpdate.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SPoint } from "@persagy-web/draw/lib";
+import { SPoint } from "@persagy-web/draw";
 import { SGraphCommand, SGraphItem, SGraphScene } from "../index";
 import { SGraphCommand, SGraphItem, SGraphScene } from "../index";
 
 
 /**
 /**

+ 1 - 1
persagy-web-graph/src/items/SAnchorItem.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SPainter, SColor } from "@persagy-web/draw/lib";
+import { SPainter, SColor } from "@persagy-web/draw";
 import { SGraphItem } from "../SGraphItem";
 import { SGraphItem } from "../SGraphItem";
 import { v1 as uuidv1 } from "uuid";
 import { v1 as uuidv1 } from "uuid";
 
 

+ 1 - 1
persagy-web-graph/src/items/SGraphLineItem.ts

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  * *********************************************************************************************************************
  */
  */
 
 
-import { SColor, SPainter, SPen, SRect } from "@persagy-web/draw/lib";
+import { SColor, SPainter, SPen, SRect } from "@persagy-web/draw";
 import { SGraphItem } from "../SGraphItem";
 import { SGraphItem } from "../SGraphItem";
 
 
 /**
 /**

+ 1 - 1
persagy-web-graph/src/items/SImageItem.ts

@@ -25,7 +25,7 @@
  */
  */
 
 
 import { SObjectItem } from "./SObjectItem";
 import { SObjectItem } from "./SObjectItem";
-import { SPainter, SRect, SSize, SColor, SPoint } from "@persagy-web/draw/lib";
+import { SPainter, SRect, SSize, SColor, SPoint } from "@persagy-web/draw";
 import { SImageShowType, STextOrigin } from "..";
 import { SImageShowType, STextOrigin } from "..";
 import { SGraphItem } from "../SGraphItem";
 import { SGraphItem } from "../SGraphItem";
 
 

+ 1 - 1
persagy-web-graph/src/items/SObjectItem.ts

@@ -25,7 +25,7 @@
  */
  */
 
 
 import { SAnchorItem } from "./SAnchorItem";
 import { SAnchorItem } from "./SAnchorItem";
-import { SPoint, SSize } from "@persagy-web/draw/lib";
+import { SPoint, SSize } from "@persagy-web/draw";
 import { SGraphItem } from "..";
 import { SGraphItem } from "..";
 
 
 /**
 /**

+ 1 - 1
persagy-web-graph/src/items/STextItem.ts

@@ -25,7 +25,7 @@
  */
  */
 
 
 import { SObjectItem } from "./SObjectItem";
 import { SObjectItem } from "./SObjectItem";
-import { SPainter, SRect, SColor, SFont, SPoint } from "@persagy-web/draw/lib";
+import { SPainter, SRect, SColor, SFont, SPoint } from "@persagy-web/draw";
 import { SGraphItem } from "../SGraphItem";
 import { SGraphItem } from "../SGraphItem";
 import { SLineStyle } from "..";
 import { SLineStyle } from "..";
 import { STextOrigin } from "..";
 import { STextOrigin } from "..";