分层

src/components/editClass/big-edit/SBaseEditScene.ts

@@ -1,9 +1,10 @@
-import { SGraphEditScene } from "../edit"
-import { SMouseEvent, SUndoStack } from "@persagy-web/base/lib";
+import { SGraphEditScene, SGraphAddCommand } from "../edit"
+import { SMouseEvent } from "@persagy-web/base/lib";
 import { SPoint, SFont, SColor, SRect } from '@persagy-web/draw/lib';
-import { SRectSelectItem } from '@persagy-web/big/lib';
+import { SRectSelectItem, SItemStatus } from '@persagy-web/big/lib';
 import { SGraphItem, SGraphSelectContainer } from "@persagy-web/graph/";
 import { uuid } from "./until";
+import { SBaseExpainEdit, SBaseArrow, SBaseEquipment, SBasePipeUninTool,addBasePipe } from "./"
 export class SBaseEditScene extends SGraphEditScene {
 
     /**图例节点 */
@@ -20,6 +21,189 @@ export class SBaseEditScene extends SGraphEditScene {
     }
 
     /**
+     * 新增基础类注释
+     *
+     * @param   event   鼠标事件参数
+     */
+    addExplainItem(event: SMouseEvent): void {
+        const data = {
+            /** 名称  */
+            name: '基础注释文本',
+            /** 图标 */
+            type: "Text",
+            /** 位置  */
+            pos: { x: event.x, y: event.y },
+            /** 由应用自己定义  */
+            properties: {
+                type: "BaseExplain",
+            },
+            style: {
+                default: {
+                    text: '请在右侧属性栏输入文字！',
+                    color: "#646c73",
+                    font: 14,
+                    backgroundcolor: "#f7f9facc",
+                }
+            }
+        }
+        const item = new SBaseExpainEdit(null, data);
+        item.moveTo(event.x, event.y);
+        item.selectable = true;
+        item.moveable = true;
+        this.addItem(item);
+        this.undoStack.push(new SGraphAddCommand(this, item));
+        this.grabItem = null;
+        this.finishCreated(item);
+    }
+
+    /**
+     * 新增基础箭头（折线）
+     *
+     * @param event 鼠标事件
+     */
+    addPolyLineArrow(event: SMouseEvent): void {
+        const data = {
+            name: '基础箭头',
+            type: "Arrow",
+            pos: { x: 0, y: 0 },
+            properties: {
+                type: "BaseArrow",
+            },
+            style: {
+                outLine: [{ x: event.x, y: event.y }],
+                default: {
+                }
+            }
+        }
+        const item = new SBaseArrow(null, data);
+        item.status = SItemStatus.Create;
+        item.selectable = true;
+        this.addItem(item);
+        this.undoStack.push(new SGraphAddCommand(this, item));
+        this.grabItem = item;
+        item.connect("finishCreated", this, this.finishCreated);
+        item.connect("onContextMenu", this, this.getItem);
+        if (this.view) {
+            this.view.update();
+        }
+    }
+
+    /**
+     * 添加基本设备item
+     *
+     * @param event 鼠标事件
+     */
+    addEuqipment(event: SMouseEvent): void {
+        const data = {
+            /** 名称  */
+            name: '基础设备',
+            num: 1,
+            size: { width: 50, height: 50 },
+            /** 图标（Image），线类型(Line) */
+            type: "Image",
+            /** 位置  */
+            pos: { x: event.x, y: event.y },
+            /** 由应用自己定义  */
+            properties: {
+                type: "baseEquipment",
+            },
+            style: {
+                default: {
+                    strokecolor: "#c0ccda",
+                    url: require('./../../../assets/images/svg.svg'),
+                }
+            }
+        }
+        const circleItem = new SBaseEquipment(null, data);
+        circleItem.status = SItemStatus.Create;
+        this.addItem(circleItem);
+        this.undoStack.push(new SGraphAddCommand(this, circleItem));
+        circleItem.selectable = true;
+        this.grabItem = circleItem;
+        circleItem.connect("finishCreated", this, this.finishCreated);
+        circleItem.connect("onContextMenu", this, this.getItem);
+        if (this.view) {
+            this.view.update();
+        }
+    }
+
+    /**
+    * 新增管道
+    *
+    * @param event 鼠标事件
+    */
+    addBasePipe(event: SMouseEvent) {
+        const data = {
+            name: '管道',
+            type: "line",
+            pos: { x: 0, y: 0 },
+            properties: {
+                type: "BasePolyline",
+            },
+            style: {
+                outLine: [{ x: event.x, y: event.y }],
+                default: {
+                }
+            }
+        }
+        const item = new SBasePipe(null, data);
+        item.status = SItemStatus.Create;
+        item.selectable = true;
+        this.addItem(item);
+        this.undoStack.push(new SGraphAddCommand(this, item));
+        this.grabItem = item;
+        item.connect("finishCreated", this, this.finishCreated);
+        item.connect("onContextMenu", this, this.getItem);
+        if (this.view) {
+            this.view.update();
+        }
+    }
+
+    /**
+     * 添加基本管道联通器
+     *
+     * @param event 鼠标事件
+     * @param cmd 命令
+     */
+    addPipeUninTool(event: SMouseEvent, cmd: string): void {
+        const cmdList = {
+            'wantou': 2,
+            'santong': 3,
+            'sitong': 4,
+        }
+        const data = {
+            /** 名称  */
+            name: '基础管道接头',
+            /** 图标（Image），线类型(Line) */
+            type: "Image",
+            /** 位置  */
+            pos: { x: event.x, y: event.y },
+            /** 由应用自己定义  */
+            properties: {
+                type: "BasePipeUninTool",
+            },
+            style: {
+                uninToolType: cmdList[cmd] ? cmdList[cmd] : 2,  //2,3,4 分别分二头连接器、三头连接器、四头连接器
+                default: {
+                    strokecolor: "#c0ccda",
+                }
+            }
+        }
+        const item = new SBasePipeUninTool(null, data);
+        item.status = SItemStatus.Create;
+        item.selectable = true;
+        item.moveable = true;
+        this.addItem(item);
+        this.undoStack.push(new SGraphAddCommand(this, item));
+        this.grabItem = item;
+        item.connect("finishCreated", this, this.finishCreated);
+        item.connect("onContextMenu", this, this.getItem);
+        if (this.view) {
+            this.view.update();
+        }
+    }
+
+    /**
      * 重做
      *
      * @return any
@@ -179,7 +363,7 @@ export class SBaseEditScene extends SGraphEditScene {
      */
     paste() {
         const copyList = JSON.parse(JSON.stringify(this.copyString));
-        copyList.forEach((t:any) => {
+        copyList.forEach((t: any) => {
             if (this.view) {
                 t.Pos.X += 10,
                     t.Pos.Y += 10

src/components/editClass/big-edit/index.ts

@@ -2,6 +2,7 @@ import { SBaseEditScene } from "./SBaseEditScene"
 import { SBaseExpainEdit } from "./items/SBaseExpainEdit"
 import { SBasePipeUninTool } from "./items/SBasePipeUninTool"
 import { SBasePipe } from "./items/SBasePipe"
+import { SBaseArrow } from "./items/SBaseArrow"
 import { Anchor } from "./types/Anchor"
 import { ElementData } from "./types/ElementData"
 import { Legend } from "./types/Legend"
@@ -9,4 +10,4 @@ import { Marker } from "./types/Marker"
 import { Relation } from "./types/Relation"
 import { BigEditFactory } from "./BigEditFactory"
 import { SBaseEquipment } from "./items/SBaseEquipment"
-export { SBasePipe, SBasePipeUninTool, SBaseEquipment, BigEditFactory, Anchor, Legend, Marker, Relation, ElementData, SBaseEditScene, SBaseExpainEdit }
+export { SBaseArrow, SBasePipe, SBasePipeUninTool, SBaseEquipment, BigEditFactory, Anchor, Legend, Marker, Relation, ElementData, SBaseEditScene, SBaseExpainEdit }

src/components/editClass/big-edit/items/SBaseArrow.ts

@@ -0,0 +1,117 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .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 { SColor, SFont, SPainter, SArrowStyleType } from "@persagy-web/draw/";
+import { SBasePolylineEdit } from './../../edit';
+import { SGraphItem,SLineStyle } from "@persagy-web/graph";
+import { Marker } from "./../types/Marker";
+import { SMouseEvent } from "@persagy-web/base/lib";
+import { ItemOrder } from '@persagy-web/big/lib';
+
+/**
+ * 编辑箭头(折线)
+ *
+ * * @author  韩耀龙(han_yao_long#163.com)
+ */
+
+export class SBaseArrow extends SBasePolylineEdit {
+    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //属性
+    /** 起始点样式 */
+    _begin = SArrowStyleType.None;
+    get begin(): SArrowStyleType {
+        return this._begin;
+    }
+    set begin(v: SArrowStyleType) {
+        this._begin = v;
+        this.update();
+    }
+    /** 结束点样式 */
+    _end = SArrowStyleType.None;
+    get end(): SArrowStyleType {
+        return this._end;
+    }
+    set end(v: SArrowStyleType) {
+        this._end = v;
+        this.update();
+    }
+    constructor(parent: SGraphItem | null, data: Marker) {
+        super(parent, data);
+        this.begin = SArrowStyleType.Basic
+    }
+    /**
+     * 鼠标按下事件
+     *
+     * @param   event   保存事件参数
+     * @return  boolean
+     */
+    onMouseDown(event: SMouseEvent): boolean {
+        super.onMouseDown(event)
+        return true;
+    } // Function onMouseDown()
+
+    /**
+     * 绘制基本图形
+     *
+     * @param   painter painter对象
+     * */
+    drawBaseLine(painter: SPainter): void {
+        // 绘制基本图形
+        if (this.lineStyle == SLineStyle.Dashed) {
+            painter.pen.lineDash = [
+                painter.toPx(this.lineWidth * 3),
+                painter.toPx(this.lineWidth * 7)
+            ];
+        } else if (this.lineStyle == SLineStyle.Dotted) {
+            painter.pen.lineDash = [
+                painter.toPx(this.lineWidth),
+                painter.toPx(this.lineWidth)
+            ];
+        }
+        painter.pen.color = this.strokeColor;
+        painter.drawArrowLine(this.pointList[0], this.pointList[1], {
+            begin: this.begin,
+            end: SArrowStyleType.None
+        });
+        painter.drawArrowLine(
+            this.pointList[this.pointList.length - 2],
+            this.pointList[this.pointList.length - 1],
+            {
+                begin: SArrowStyleType.None,
+                end: this.end
+            }
+        );
+        painter.drawPolyline(this.pointList);
+    } // Function drawBaseLine()
+
+    /**
+    * 返回对象储存的相关数据
+    *
+    * @return	formData
+    */
+    toData(): any {
+        return super.toData()
+    }
+}

src/components/editClass/edit/SGraphEditScene.ts

@@ -27,7 +27,8 @@
 import { SGraphScene, SGraphItem } from "@persagy-web/graph";
 import { SPoint } from "@persagy-web/draw";
 import { SMouseEvent, SUndoStack, } from "@persagy-web/base";
-import { SRectSelectItem } from "@persagy-web/big";
+import { SRectSelectItem, SItemStatus } from "@persagy-web/big";
+import { SBaseArrowEdit,SBasePolygonEdit, SBaseCircleEdit, SBaseLineEdit, SGraphAddCommand, SGraphEdit, SBasePolylineEdit, SBaseTextEdit, SBaseImageEdit, SBaseRectEdit, SBaseTriangleEdit } from './'
 
 /**
  * Graphy图形引擎编辑场景类
@@ -77,51 +78,310 @@ export class SGraphEditScene extends SGraphScene {
     selectChange(obj: any) { }
 
     /**
-     * 增加直线线段item
-     * @param SMouseEvent  鼠标事件
-     */
-    addLine(event: SMouseEvent) {
+    * 新增基础类直线
+    *
+    * @param   event   鼠标事件参数
+    */
+    addLine(event: SMouseEvent): void {
+        const data = {
+            /** 名称  */
+            name: '基础直线',
+            /** 图标（Image），线类型(Line) */
+            type: "Line",
+            /** 缩放比例（Image），线类型(Line) */
+            scale: { x: 1, y: 1, z: 1 },
+            /** 缩放比例（Image），线类型(Line) */
+            rolate: { x: 0, y: 0, z: 0 },
+            /** 位置  */
+            pos: { x: 0, y: 0 },
+            /** 由应用自己定义  */
+            properties: {
+                type: "BaseLine"           // 自定义类型用于区分mark与node
+            },
+            style: {
+                default: {
+                    line: [{ x: event.x, y: event.y }],
+                }
+            }
+        }
+        const lineItem = new SBaseLineEdit(null, data);
+        lineItem.status = SItemStatus.Create;
+        this.addItem(lineItem);
+        this.undoStack.push(new SGraphAddCommand(this, lineItem));
+        lineItem.selectable = true;
+        this.grabItem = lineItem;
+        lineItem.connect("finishCreated", this, this.finishCreated);
+        lineItem.connect("onContextMenu", this, this.getItem);
+        if (this.view) {
+            this.view.update();
+        }
     }
 
     /**
-     * 增加折线线段item
-     * @param SMouseEvent  鼠标事件
+     * 新增折线
+     *
+     * @param event 鼠标事件
      */
-    addPolyline(event: SMouseEvent) {
+    addPolyLine(event: SMouseEvent): void {
+        const data = {
+            name: '基础折线',
+            type: "line",
+            pos: { x: 0, y: 0 },
+            properties: {
+                type: "BasePolyline",
+            },
+            style: {
+                outLine: [{ x: event.x, y: event.y }],
+                default: {
+                }
+            }
+        }
+        const item = new SBasePolylineEdit(null, data);
+        item.status = SItemStatus.Create;
+        item.selectable = true;
+        this.addItem(item);
+        this.undoStack.push(new SGraphAddCommand(this, item));
+        this.grabItem = item;
+        item.connect("finishCreated", this, this.finishCreated);
+        item.connect("onContextMenu", this, this.getItem);
+        if (this.view) {
+            this.view.update();
+        }
     }
 
     /**
-     * 增加多边形item
-     * @param SMouseEvent  鼠标事件
-     */
-    addPolygonItem(event: SMouseEvent) {
+   * 新增基础类图片
+   *
+   * @param   event   鼠标事件参数
+   */
+    addImageItem(event: SMouseEvent): void {
+        const data = {
+            /** 名称  */
+            name: '基础图片',
+            num: 1,
+            /** 图标（Image），线类型(Line) */
+            type: "Image",
+            /** 位置  */
+            pos: { x: event.x, y: event.y },
+            /** 由应用自己定义  */
+            properties: {
+                type: "BaseImage",
+            },
+            style: {
+                default: {
+                    strokecolor: "#c0ccda",
+                    url: '',
+                }
+            }
+        }
+        const item = new SBaseImageEdit(null, data);
+        item.selectable = true;
+        item.moveable = true;
+        this.addItem(item);
+        this.undoStack.push(new SGraphAddCommand(this, item));
+        this.finishCreated(item);
     }
 
     /**
-     * 增加图片item
-     * @param SMouseEvent  鼠标事件
+     * 新增基础类文本
+     *
+     * @param   event   鼠标事件参数
+     */
+    addTextItem(event: SMouseEvent): void {
+        const data = {
+            /** 名称  */
+            name: '基础文本',
+            /** 图标 */
+            type: "Text",
+            /** 位置  */
+            pos: { x: event.x, y: event.y },
+            size: { width: 0, height: 0 },
+            /** 由应用自己定义  */
+            properties: {
+                type: "BaseText"           // 自定义类型用于区分mark与node
+            },
+            style: {
+                default: {
+                    text: '请在右侧属性栏输入文字！',
+                    color: "#646c73",
+                    font: 14,
+                    backgroundcolor: "#f7f9facc",
+                }
+            }
+        }
+        const item = new SBaseTextEdit(null, data);
+        item.moveTo(event.x, event.y);
+        item.moveable = true;
+        this.addItem(item);
+        this.undoStack.push(new SGraphAddCommand(this, item));
+        this.grabItem = null;
+        item.connect("onContextMenu", this, this.getItem);
+        this.finishCreated(item);
+    }
+    /**
+     * 添加基本矩形item
+     * @param event 鼠标事件
      */
-    addImgItem(event: SMouseEvent) {
+    addRectItem(event: SMouseEvent): void {
+        const data = {
+            name: '基础矩形',
+            /** 图标（Image），线类型(Line) */
+            type: "Zone",
+            /** 位置  */
+            pos: { x: 0, y: 0 },
+            properties: {
+                type: "BaseRect",
+            },
+            style: {
+                default: {
+                    line: [{ x: event.x, y: event.y }],
+                }
+            }
+        }
+        const rectItem = new SBaseRectEdit(null, data);
+        rectItem.status = SItemStatus.Create;
+        this.addItem(rectItem);
+        this.undoStack.push(new SGraphAddCommand(this, rectItem));
+        rectItem.selectable = true;
+        rectItem.moveable = true;
+        this.grabItem = rectItem;
+        rectItem.isTransform = true
+        rectItem.connect("finishCreated", this, this.finishCreated);
+        rectItem.connect("onContextMenu", this, this.getItem);
+        if (this.view) {
+            this.view.update();
+        }
     }
 
     /**
-     * 增加文本item
-     * @param SMouseEvent  鼠标事件
+     * 添加基本三角形item
+     *
+     * @param event 鼠标事件
      */
-    addTextItem(event: SMouseEvent) {
+    addTriangleItem(event: SMouseEvent): void {
+        const data = {
+            name: '基础三角形',
+            type: "Zone",
+            pos: { x: 0, y: 0 },
+            properties: {
+                type: "BaseTriangle",
+            },
+            style: {
+                default: {
+                    line: [{ x: event.x, y: event.y }],
+                }
+            }
+        }
+        const triangleItem = new SBaseTriangleEdit(null, data);
+        triangleItem.status = SItemStatus.Create;
+        this.addItem(triangleItem);
+        this.undoStack.push(new SGraphAddCommand(this, triangleItem));
+        triangleItem.selectable = true;
+        triangleItem.moveable = true;
+        this.grabItem = triangleItem;
+        triangleItem.connect("finishCreated", this, this.finishCreated);
+        triangleItem.connect("onContextMenu", this, this.getItem);
+        if (this.view) {
+            this.view.update();
+        }
     }
 
     /**
-     * 删除文本item
-     * @param SMouseEvent  鼠标事件
+     * 添加基本圆
+     *
+     * @param event 鼠标事件
      */
-    deleiteItems(): void { }
+    addCircleItem(event: SMouseEvent): void {
+        const data = {
+            name: '基础圆形',
+            type: "Zone",
+            pos: { x: 0, y: 0 },
+            properties: {
+                type: "BaseCircle",
+            },
+            style: {
+                default: {
+                },
+                line: [{ x: event.x, y: event.y }],
+            }
+        }
+        const circleItem = new SBaseCircleEdit(null, data);
+        circleItem.status = SItemStatus.Create;
+        circleItem.selectable = true;
+        this.grabItem = circleItem;
+        this.addItem(circleItem);
+        this.undoStack.push(new SGraphAddCommand(this, circleItem));
+        circleItem.connect("finishCreated", this, this.finishCreated);
+        circleItem.connect("onContextMenu", this, this.getItem);
+        if (this.view) {
+            this.view.update();
+        }
+    }
 
     /**
-     * 修改item样式
-     * @param SMouseEvent  鼠标事件
+    * 添加基本多边形
+    *
+    * @param event 鼠标事件
+    */
+    addPolygonItem(event: SMouseEvent): void {
+        const data = {
+            name: '基础多边形',
+            type: "Zone",
+            pos: { x: 0, y: 0 },
+            properties: {
+                type: "BasePolygon",
+            },
+            style: {
+                outLine: [{ x: event.x, y: event.y }],
+                default: {
+                }
+            }
+        }
+        const polygonItem = new SBasePolygonEdit(null, data);
+        polygonItem.status = SItemStatus.Create;
+        polygonItem.selectable = true;
+        this.addItem(polygonItem);
+        this.undoStack.push(new SGraphAddCommand(this, polygonItem));
+        this.grabItem = polygonItem;
+        polygonItem.connect("finishCreated", this, this.finishCreated);
+        polygonItem.connect("onContextMenu", this, this.getItem);
+        if (this.view) {
+            this.view.update();
+        }
+    }
+
+    /**
+     * 添加基本箭头item(直线类)
+     *
+     * @param event 鼠标事件
      */
-    updatedItems(): void { }
+    addBaseArrowsItem(event: SMouseEvent): void {
+        const data = {
+            name: '基础箭头',
+            type: "Zone",
+            pos: { x: 0, y: 0 },
+            properties: {
+                type: "BaseArrow",
+            },
+            style: {
+                default: {
+                    line: [{ x: event.x, y: event.y }],
+                }
+            }
+        }
+        const arrowItem = new SBaseArrowEdit(null, data);
+        arrowItem.status = SItemStatus.Create;
+        arrowItem.moveable = true;
+        this.addItem(arrowItem);
+        this.undoStack.push(new SGraphAddCommand(this, arrowItem));
+        arrowItem.selectable = true;
+        this.grabItem = arrowItem;
+        arrowItem.connect("finishCreated", this, this.finishCreated);
+        arrowItem.connect("onContextMenu", this, this.getItem);
+        if (this.view) {
+            this.view.update();
+        }
+    }
 
     /**
      * 对齐指定item
@@ -195,4 +455,13 @@ export class SGraphEditScene extends SGraphScene {
         this.grabItem = rect;
     }
 
+    /**
+    * 获取item (常用与场景外的调用F)
+    * @param  event SMouseEvent 鼠标事件
+    * @param  item SGraphEdit|null 返回item
+    *
+    */
+    getItem(item: SGraphEdit | null, event: SMouseEvent[]) {
+    }
+
 }// Class GraphEditScene

src/components/editClass/persagy-edit/PTopoScene.ts

@@ -1,5 +1,5 @@
-import { SBaseEditScene, SBaseExpainEdit, SBaseEquipment, SBasePipeUninTool, SBasePipe } from "./../big-edit";
-import { SBasePolylineEdit, SBaseRectEdit, SBaseLineEdit, SBaseTextEdit, SGraphEdit, SBaseArrowEdit, SBaseCircleEdit, SBaseTriangleEdit, SBasePolygonEdit } from "./../edit";
+import { SBaseEditScene, SBaseExpainEdit, SBaseEquipment, SBasePipeUninTool, SBasePipe, SBaseArrow } from "./../big-edit";
+import { SBaseRectEdit, SGraphEdit, SBaseArrowEdit, SBaseCircleEdit, SBaseTriangleEdit, SBasePolygonEdit } from "./../edit";
 import { SPersagyImageEdit } from "./"
 import { SMouseEvent } from "@persagy-web/base/lib";
 import { SGraphSelectContainer, SLineStyle } from "@persagy-web/graph";
@@ -48,14 +48,12 @@ export class PTopoScene extends SBaseEditScene {
     onMouseDown(event: SMouseEvent): any {
         this.vueOnMouseDown(event) //外部调用
         if (this.editCmd == "EditBaseLine") {
-            // this.addLine(event)
-            this.addPolyLine(event);
+            this.addPolyLineArrow(event);
             this.clearCmdStatus();
         } else if (this.editCmd == "EditBasePolyLine") {
             this.addPolyLine(event);
             this.clearCmdStatus();
-        }
-        else if (this.editCmd == "EditBasetext") {
+        } else if (this.editCmd == "EditBasetext") {
             this.addTextItem(event);
             this.clearCmdStatus();
         }
@@ -110,464 +108,6 @@ export class PTopoScene extends SBaseEditScene {
         }
         return true
     }
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    //新增 item 类方法；
-    /**
-     * 新增基础类直线
-     *
-     * @param   event   鼠标事件参数
-     */
-    addLine(event: SMouseEvent): void {
-        const data = {
-            /** 名称  */
-            name: '基础直线',
-            /** 图标（Image），线类型(Line) */
-            type: "Line",
-            /** 缩放比例（Image），线类型(Line) */
-            scale: { x: 1, y: 1, z: 1 },
-            /** 缩放比例（Image），线类型(Line) */
-            rolate: { x: 0, y: 0, z: 0 },
-            /** 位置  */
-            pos: { x: 0, y: 0 },
-            /** 由应用自己定义  */
-            properties: {
-                type: "BaseLine"           // 自定义类型用于区分mark与node
-            },
-            style: {
-                default: {
-                    line: [{ x: event.x, y: event.y }],
-                }
-            }
-        }
-        const lineItem = new SBaseLineEdit(null, data);
-        lineItem.status = SItemStatus.Create;
-        this.addItem(lineItem);
-        this.undoStack.push(new SGraphAddCommand(this, lineItem));
-        lineItem.selectable = true;
-        this.grabItem = lineItem;
-        lineItem.connect("finishCreated", this, this.finishCreated);
-        lineItem.connect("onContextMenu", this, this.getItem);
-        if (this.view) {
-            this.view.update();
-        }
-    }
-
-    /**
-     * 新增基础类文本
-     *
-     * @param   event   鼠标事件参数
-     */
-    addTextItem(event: SMouseEvent): void {
-        const data = {
-            /** 名称  */
-            name: '基础文本',
-            /** 图标 */
-            type: "Text",
-            /** 位置  */
-            pos: { x: event.x, y: event.y },
-            size: { width: 0, height: 0 },
-            /** 由应用自己定义  */
-            properties: {
-                type: "BaseText"           // 自定义类型用于区分mark与node
-            },
-            style: {
-                default: {
-                    text: '请在右侧属性栏输入文字！',
-                    color: "#646c73",
-                    font: 14,
-                    backgroundcolor: "#f7f9facc",
-                }
-            }
-        }
-        const item = new SBaseTextEdit(null, data);
-        item.moveTo(event.x, event.y);
-        item.moveable = true;
-        this.addItem(item);
-        this.undoStack.push(new SGraphAddCommand(this, item));
-        this.grabItem = null;
-        item.connect("onContextMenu", this, this.getItem);
-        this.finishCreated(item);
-    }
-
-    /**
-     * 新增基础类注释
-     *
-     * @param   event   鼠标事件参数
-     */
-    addExplainItem(event: SMouseEvent): void {
-        const data = {
-            /** 名称  */
-            name: '基础注释文本',
-            /** 图标 */
-            type: "Text",
-            /** 位置  */
-            pos: { x: event.x, y: event.y },
-            /** 由应用自己定义  */
-            properties: {
-                type: "BaseExplain",
-            },
-            style: {
-                default: {
-                    text: '请在右侧属性栏输入文字！',
-                    color: "#646c73",
-                    font: 14,
-                    backgroundcolor: "#f7f9facc",
-                }
-            }
-        }
-        const item = new SBaseExpainEdit(null, data);
-        item.moveTo(event.x, event.y);
-        item.selectable = true;
-        item.moveable = true;
-        this.addItem(item);
-        this.undoStack.push(new SGraphAddCommand(this, item));
-        this.grabItem = null;
-        this.finishCreated(item);
-    }
-
-    /**
-     * 新增基础类图片
-     *
-     * @param   event   鼠标事件参数
-     */
-    addImageItem(event: SMouseEvent): void {
-        const data = {
-            /** 名称  */
-            name: '基础图片',
-            num: 1,
-            /** 图标（Image），线类型(Line) */
-            type: "Image",
-            /** 位置  */
-            pos: { x: event.x, y: event.y },
-            /** 由应用自己定义  */
-            properties: {
-                type: "BaseImage",
-            },
-            style: {
-                default: {
-                    strokecolor: "#c0ccda",
-                    url: '',
-                }
-            }
-        }
-        const item = new SPersagyImageEdit(null, data);
-        item.selectable = true;
-        item.moveable = true;
-        this.addItem(item);
-        this.undoStack.push(new SGraphAddCommand(this, item));
-        this.Markers.push(item);
-        this.finishCreated(item);
-    }
-
-    /**
-     * 添加基本矩形item
-     * @param event 鼠标事件
-     */
-    addRectItem(event: SMouseEvent): void {
-        const data = {
-            name: '基础矩形',
-            /** 图标（Image），线类型(Line) */
-            type: "Zone",
-            /** 位置  */
-            pos: { x: 0, y: 0 },
-            properties: {
-                type: "BaseRect",
-            },
-            style: {
-                default: {
-                    line: [{ x: event.x, y: event.y }],
-                }
-            }
-        }
-        const rectItem = new SBaseRectEdit(null, data);
-        rectItem.status = SItemStatus.Create;
-        this.addItem(rectItem);
-        this.undoStack.push(new SGraphAddCommand(this, rectItem));
-        rectItem.selectable = true;
-        rectItem.moveable = true;
-        this.grabItem = rectItem;
-        rectItem.isTransform = true
-        rectItem.connect("finishCreated", this, this.finishCreated);
-        rectItem.connect("onContextMenu", this, this.getItem);
-        if (this.view) {
-            this.view.update();
-        }
-    }
-
-    /**
-     * 添加基本三角形item
-     *
-     * @param event 鼠标事件
-     */
-    addTriangleItem(event: SMouseEvent): void {
-        const data = {
-            name: '基础三角形',
-            type: "Zone",
-            pos: { x: 0, y: 0 },
-            properties: {
-                type: "BaseTriangle",
-            },
-            style: {
-                default: {
-                    line: [{ x: event.x, y: event.y }],
-                }
-            }
-        }
-        const triangleItem = new SBaseTriangleEdit(null, data);
-        triangleItem.status = SItemStatus.Create;
-        this.addItem(triangleItem);
-        this.undoStack.push(new SGraphAddCommand(this, triangleItem));
-        triangleItem.selectable = true;
-        triangleItem.moveable = true;
-        this.grabItem = triangleItem;
-        triangleItem.connect("finishCreated", this, this.finishCreated);
-        triangleItem.connect("onContextMenu", this, this.getItem);
-        if (this.view) {
-            this.view.update();
-        }
-    }
-
-    /**
-     * 添加基本箭头item
-     *
-     * @param event 鼠标事件
-     */
-    addArrowsItem(event: SMouseEvent): void {
-        const data = {
-            name: '基础箭头',
-            type: "Zone",
-            pos: { x: 0, y: 0 },
-            properties: {
-                type: "BaseArrow",
-            },
-            style: {
-                default: {
-                    line: [{ x: event.x, y: event.y }],
-                }
-            }
-        }
-        const arrowItem = new SBaseArrowEdit(null, data);
-        arrowItem.status = SItemStatus.Create;
-        arrowItem.moveable = true;
-        this.addItem(arrowItem);
-        this.undoStack.push(new SGraphAddCommand(this, arrowItem));
-        arrowItem.selectable = true;
-        this.grabItem = arrowItem;
-        arrowItem.connect("finishCreated", this, this.finishCreated);
-        arrowItem.connect("onContextMenu", this, this.getItem);
-        if (this.view) {
-            this.view.update();
-        }
-    }
-
-    /**
-     * 添加基本圆
-     *
-     * @param event 鼠标事件
-     */
-    addCircleItem(event: SMouseEvent): void {
-        const data = {
-            name: '基础圆形',
-            type: "Zone",
-            pos: { x: 0, y: 0 },
-            properties: {
-                type: "BaseCircle",
-            },
-            style: {
-                default: {
-                },
-                line: [{ x: event.x, y: event.y }],
-            }
-        }
-        const circleItem = new SBaseCircleEdit(null, data);
-        circleItem.status = SItemStatus.Create;
-        circleItem.selectable = true;
-        this.grabItem = circleItem;
-        this.addItem(circleItem);
-        this.undoStack.push(new SGraphAddCommand(this, circleItem));
-        circleItem.connect("finishCreated", this, this.finishCreated);
-        circleItem.connect("onContextMenu", this, this.getItem);
-        if (this.view) {
-            this.view.update();
-        }
-    }
-
-    /**
-     * 添加基本多边形
-     *
-     * @param event 鼠标事件
-     */
-    addPolygonItem(event: SMouseEvent): void {
-        const data = {
-            name: '基础多边形',
-            type: "Zone",
-            pos: { x: 0, y: 0 },
-            properties: {
-                type: "BasePolygon",
-            },
-            style: {
-                outLine: [{ x: event.x, y: event.y }],
-                default: {
-                }
-            }
-        }
-        const polygonItem = new SBasePolygonEdit(null, data);
-        polygonItem.status = SItemStatus.Create;
-        polygonItem.selectable = true;
-        this.addItem(polygonItem);
-        this.undoStack.push(new SGraphAddCommand(this, polygonItem));
-        this.grabItem = polygonItem;
-        polygonItem.connect("finishCreated", this, this.finishCreated);
-        polygonItem.connect("onContextMenu", this, this.getItem);
-        if (this.view) {
-            this.view.update();
-        }
-    }
-
-    /**
-     * 新增折线
-     *
-     * @param event 鼠标事件
-     */
-    addPolyLine(event: SMouseEvent): void {
-        const data = {
-            name: '管道',
-            type: "line",
-            pos: { x: 0, y: 0 },
-            properties: {
-                type: "BasePolyline",
-            },
-            style: {
-                outLine: [{ x: event.x, y: event.y }],
-                default: {
-                }
-            }
-        }
-        const item = new SBasePolylineEdit(null, data);
-        item.status = SItemStatus.Create;
-        item.selectable = true;
-        this.addItem(item);
-        this.undoStack.push(new SGraphAddCommand(this, item));
-        this.grabItem = item;
-        item.connect("finishCreated", this, this.finishCreated);
-        item.connect("onContextMenu", this, this.getItem);
-        if (this.view) {
-            this.view.update();
-        }
-    }
-    /**
-     * 添加基本设备item
-     *
-     * @param event 鼠标事件
-     */
-    addEuqipment(event: SMouseEvent): void {
-        const data = {
-            /** 名称  */
-            name: '基础设备',
-            num: 1,
-            size: { width: 50, height: 50 },
-            /** 图标（Image），线类型(Line) */
-            type: "Image",
-            /** 位置  */
-            pos: { x: event.x, y: event.y },
-            /** 由应用自己定义  */
-            properties: {
-                type: "baseEquipment",
-            },
-            style: {
-                default: {
-                    strokecolor: "#c0ccda",
-                    url: require('./../../../assets/images/svg.svg'),
-                }
-            }
-        }
-        const circleItem = new SBaseEquipment(null, data);
-        circleItem.status = SItemStatus.Create;
-        this.addItem(circleItem);
-        this.undoStack.push(new SGraphAddCommand(this, circleItem));
-        circleItem.selectable = true;
-        this.grabItem = circleItem;
-        circleItem.connect("finishCreated", this, this.finishCreated);
-        circleItem.connect("onContextMenu", this, this.getItem);
-        if (this.view) {
-            this.view.update();
-        }
-    }
-    /**
-     * 添加基本管道联通器
-     *
-     * @param event 鼠标事件
-     * @param cmd 命令
-     */
-    addPipeUninTool(event: SMouseEvent, cmd: string): void {
-        const cmdList = {
-            'wantou': 2,
-            'santong': 3,
-            'sitong': 4,
-        }
-        const data = {
-            /** 名称  */
-            name: '基础管道接头',
-            /** 图标（Image），线类型(Line) */
-            type: "Image",
-            /** 位置  */
-            pos: { x: event.x, y: event.y },
-            /** 由应用自己定义  */
-            properties: {
-                type: "BasePipeUninTool",
-            },
-            style: {
-                uninToolType: cmdList[cmd] ? cmdList[cmd] : 2,  //2,3,4 分别分二头连接器、三头连接器、四头连接器
-                default: {
-                    strokecolor: "#c0ccda",
-                }
-            }
-        }
-        const item = new SBasePipeUninTool(null, data);
-        item.status = SItemStatus.Create;
-        item.selectable = true;
-        item.moveable = true;
-        this.addItem(item);
-        this.undoStack.push(new SGraphAddCommand(this, item));
-        this.grabItem = item;
-        item.connect("finishCreated", this, this.finishCreated);
-        item.connect("onContextMenu", this, this.getItem);
-        if (this.view) {
-            this.view.update();
-        }
-    }
-
-    /**
-     * 新增管道
-     *
-     * @param event 鼠标事件
-     */
-    addBasePipe(event: SMouseEvent) {
-        const data = {
-            name: '管道',
-            type: "line",
-            pos: { x: 0, y: 0 },
-            properties: {
-                type: "BasePolyline",
-            },
-            style: {
-                outLine: [{ x: event.x, y: event.y }],
-                default: {
-                }
-            }
-        }
-        const item = new SBasePipe(null, data);
-        item.status = SItemStatus.Create;
-        item.selectable = true;
-        this.addItem(item);
-        this.undoStack.push(new SGraphAddCommand(this, item));
-        this.grabItem = item;
-        item.connect("finishCreated", this, this.finishCreated);
-        item.connect("onContextMenu", this, this.getItem);
-        if (this.view) {
-            this.view.update();
-        }
-    }
 
     /**
      * 修改 item 样式，数据等方法