整理格式

persagy-web-graph/src/index.ts

@@ -47,12 +47,10 @@ import { SLineStyle } from "./enums/SLineStyle";
 import { SOrderSetType } from "./enums/SOrderSetType";
 import { STextOrigin } from "./enums/STextOrigin";
 import { SGraphStyle } from "./types/SGraphStyle";
-import { Style } from "./types/Style";
-import { SGraphShape } from "./items/SGraphShape";
 import { SGraphAreaGroupItem } from "./items/SGraphAreaGroupItem";
 import { SGraphPolyGroupItem } from "./items/SGraphPolyGroupItem";
-import { AreaGroup } from "./types/AreaGroup";
-import { PolyGroup } from "./types/PolyGroup";
+import { SGraphAreaGroup } from "./types/SGraphAreaGroup";
+import { SGraphPolyGroup } from "./types/SGraphPolyGroup";
 import { Point } from "./types/Point";
 import { SGraphRectItem } from "./items/SGraphRectItem";
 import { SGraphRect } from "./types/SGraphRect";
@@ -84,12 +82,10 @@ export {
     SOrderSetType,
     STextOrigin,
     SGraphStyle,
-    Style,
-    SGraphShape,
     SGraphAreaGroupItem,
     SGraphPolyGroupItem,
-    AreaGroup,
-    PolyGroup,
+    SGraphAreaGroup,
+    SGraphPolyGroup,
     Point,
     SGraphRect,
     SGraphRectItem,

persagy-web-graph/src/items/SGraphAreaGroupItem.ts

@@ -32,7 +32,7 @@ import {
     SPolygonUtil,
     SRect
 } from "@persagy-web/draw/lib";
-import { AreaGroup } from "../types/AreaGroup";
+import { SGraphAreaGroup } from "..";
 import { SGraphStyleItem } from "./SGraphStyleItem";
 
 /**
@@ -60,7 +60,7 @@ export class SGraphAreaGroupItem extends SGraphStyleItem {
      * @param parent  父类
      * @param data    轮廓线及风格数据
      */
-    constructor(parent: SGraphItem | null, data: AreaGroup) {
+    constructor(parent: SGraphItem | null, data: SGraphAreaGroup) {
         super(parent);
         // outline 属性符合条件
         if (data.outline.length && data.outline[0] && data.outline[0].length) {

persagy-web-graph/src/items/SGraphPolyGroupItem.ts

@@ -26,7 +26,7 @@
 
 import { SGraphItem } from "../SGraphItem";
 import { SPainter, SPoint, SPolygonUtil, SRect } from "@persagy-web/draw/lib";
-import { PolyGroup } from "..";
+import { SGraphPolyGroup } from "..";
 import { SGraphStyleItem } from "./SGraphStyleItem";
 
 /**
@@ -52,7 +52,7 @@ export class SGraphPolyGroupItem extends SGraphStyleItem {
      * @param parent  父类
      * @param data    轮廓线及风格数据
      */
-    constructor(parent: SGraphItem | null, data: PolyGroup) {
+    constructor(parent: SGraphItem | null, data: SGraphPolyGroup) {
         super(parent);
         // 轮廓线数据正确
         if (data.outline.length && data.outline[0] && data.outline[0].length) {

persagy-web-graph/src/items/SGraphShape.ts

@@ -1,148 +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) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { SGraphItem } from "../SGraphItem";
-import { SPainter } from "@persagy-web/draw";
-import { Style } from "..";
-import {
-    SColor,
-    SGradient,
-    SLinearGradient,
-    SRadialGradient
-} from "@persagy-web/draw/lib";
-
-/**
- * 图形 item 基类
- *
- * @author 郝建龙 <haojianlong@sagacloud.cn>
- */
-export class SGraphShape extends SGraphItem {
-    /** 当前 item 的风格 */
-    style: Style | undefined;
-
-    /**
-     * 构造函数
-     *
-     * @param parent  父类
-     * @param style   item 各种状态的样式
-     */
-    constructor(parent: SGraphItem | null, style?: Style) {
-        super(parent);
-        this.style = style;
-    }
-
-    /**
-     * 绘制前设置绘制样式
-     *
-     * @return 当前 item 状态值
-     * @deprecated
-     */
-    setStyle(): string {
-        let status = "default";
-        if (this.style) {
-            if (this.enabled) {
-                // 是否选中
-                if (this.selected) {
-                    status = "selected";
-                }
-            } else {
-                status = "disabled";
-            }
-        }
-        return status;
-    }
-
-    /**
-     * 解析渐变样式
-     *
-     * @param str   渐变存储的字符串
-     * @return 渐变颜色转为的字符串
-     */
-    parseFill(str: string): SGradient | undefined {
-        const index1 = str.indexOf("{");
-        const index2 = str.indexOf("}");
-        const temp = str.substring(index1 + 1, index2 - 1);
-        const dataArr = temp.split(";");
-        if (str.indexOf("SLinearGradient") > -1) {
-            try {
-                // @ts-ignore
-                const grad = new SLinearGradient(
-                    ...dataArr[0].split(","),
-                    // @ts-ignore
-                    ...dataArr[1].split(",")
-                );
-                // 处理停点
-                for (let i = 2; i < dataArr.length; i++) {
-                    const cur = dataArr[i].split(",");
-                    grad.addColorStop(Number(cur[0]), new SColor(cur[1]));
-                }
-                return grad;
-            } catch (e) {
-                console.log("渐变颜色格式有误", e, str);
-            }
-        } else if (str.indexOf("SRadialGradient") > -1) {
-            try {
-                // @ts-ignore
-                const grad = new SRadialGradient(
-                    ...dataArr[0].split(","),
-                    // @ts-ignore
-                    ...dataArr[1].split(",")
-                );
-                // 处理停点
-                for (let i = 2; i < dataArr.length; i++) {
-                    const cur = dataArr[i].split(",");
-                    grad.addColorStop(Number(cur[0]), new SColor(cur[1]));
-                }
-                return grad;
-            } catch (e) {
-                console.log("渐变颜色格式有误", e, str);
-            }
-        }
-        return undefined;
-    } // parseFill()
-
-    /**
-     * 绘制
-     *
-     * @param painter   绘制对象
-     * @deprecated
-     */
-    onDraw(painter: SPainter): void {
-        const status = this.setStyle();
-        if (this.style && this.style[status]) {
-            const grad = this.parseFill(this.style[status].fill);
-            if (grad) {
-                painter.brush.gradient = grad;
-            } else {
-                painter.brush.color = new SColor(this.style[status].fill);
-            }
-            painter.pen.color = new SColor(this.style[status].stroke);
-            painter.pen.lineWidth = this.style[status].lineWidth;
-        } else {
-            painter.brush.color = SColor.White;
-        }
-    }
-}

persagy-web-graph/src/items/SGraphSvgItem.ts

@@ -24,17 +24,17 @@
  * *********************************************************************************************************************
  */
 
-import { SGraphShape } from "./SGraphShape";
 import { SPainter, SRect } from "@persagy-web/draw/lib";
 import { SGraphItem } from "../SGraphItem";
-import { SGraphSvg } from "../types/SGraphSvg";
+import { SGraphSvg } from "..";
+import { SGraphStyleItem } from "./SGraphStyleItem";
 
 /**
  * SVG 图片 item
  *
  * @author  郝建龙 <haojianlong@sagacloud.cn>
  */
-export class SGraphSvgItem extends SGraphShape {
+export class SGraphSvgItem extends SGraphStyleItem {
     /** 图片 dom */
     img: CanvasImageSource | undefined;
     /** 图片加载是否完成 */
@@ -96,7 +96,7 @@ export class SGraphSvgItem extends SGraphShape {
      * @param data    传入数据
      */
     constructor(parent: SGraphItem | null, data: SGraphSvg) {
-        super(parent, data.style);
+        super(parent);
         // 传入图片路径
         if (data.url) {
             this.img = new Image();

persagy-web-graph/src/types/AreaGroup.ts

@@ -24,16 +24,13 @@
  * *********************************************************************************************************************
  */
 import { Point } from "./Point";
-import { Style } from "./Style";
 
 /**
  * 多边形组数据类型
  *
  * @author 郝洁 <haojie@persagy.com>
  */
-export interface AreaGroup {
+export interface SGraphAreaGroup {
     /** 轮廓线集合 */
     outline: Point[][][];
-    /** Item 风格 */
-    style?: Style;
 }

persagy-web-graph/src/types/PolyGroup.ts

@@ -24,16 +24,13 @@
  * *********************************************************************************************************************
  */
 import { Point } from "./Point";
-import { Style } from "./Style";
 
 /**
  * 多边形组数据类型
  *
  * @author 郝洁 <haojie@persagy.com>
  */
-export interface PolyGroup {
+export interface SGraphPolyGroup {
     /** 轮廓线集合 */
     outline: Point[][];
-    /** Item 风格 */
-    style?: Style;
 }

persagy-web-graph/src/types/SGraphRect.ts

@@ -23,7 +23,6 @@
  *
  * *********************************************************************************************************************
  */
-import { Style } from "./Style";
 
 /**
  * 矩形(包含圆角矩形)数据类型
@@ -31,9 +30,6 @@ import { Style } from "./Style";
  * @author 郝洁 <haojie@persagy.com>
  */
 export interface SGraphRect {
-    /** item 风格 */
-
-    style?: Style;
     /** 矩形左上角 X 坐标 */
     x: number;
     /** 矩形左上角 Y 坐标 */

persagy-web-graph/src/types/SGraphSvg.ts

@@ -24,16 +24,12 @@
  * *********************************************************************************************************************
  */
 
-import { Style } from "./Style";
-
 /**
  * svg 数据类型
  *
  * @author 郝洁 <haojie@persagy.com>
  */
 export interface SGraphSvg {
-    /** item 风格 */
-    style?: Style;
     /** 矩形左上角 X 坐标 */
     x: number;
     /** 矩形左上角 Y 坐标 */

persagy-web-graph/src/types/Style.ts

@@ -1,37 +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) 2009-2020.  博锐尚格科技股份有限公司
- *        ~8888'
- *        .!88~                                                                     All rights reserved.
- *
- * *********************************************************************************************************************
- */
-
-import { SGraphStyle } from "./SGraphStyle";
-
-/**
- * item 风格接口
- *
- * @author 郝建龙 <haojianlong@sagacloud.cn>
- */
-export interface Style {
-    /** 状态属性 */
-    [propName: string]: SGraphStyle;
-}