dcim-topology2d 1.1.3 → 3.0.2

package/core/src/socket.js

@@ -0,0 +1,51 @@
+import { EventType } from './models';
+var Socket = /** @class */ (function () {
+    function Socket(url, data) {
+        var _this = this;
+        this.url = url;
+        this.data = data;
+        this.onmessage = function (e) {
+            if (!_this.data.pens.length || !e || !e.data) {
+                return;
+            }
+            var msg;
+            try {
+                msg = JSON.parse(e.data);
+            }
+            catch (error) {
+                msg = e.data;
+            }
+            for (var _i = 0, _a = _this.data.pens; _i < _a.length; _i++) {
+                var item = _a[_i];
+                for (var _b = 0, _c = item.events; _b < _c.length; _b++) {
+                    var event_1 = _c[_b];
+                    if (event_1.type === EventType.WebSocket) {
+                        if (event_1.name && event_1.name === msg.event) {
+                            item.doSocketMqtt(event_1, msg.data, _this.socket);
+                        }
+                        else if (!event_1.name && msg) {
+                            item.doSocketMqtt(event_1, msg, _this.socket);
+                        }
+                    }
+                }
+            }
+        };
+        this.init();
+    }
+    Socket.prototype.init = function () {
+        var _this = this;
+        this.socket = new WebSocket(this.url);
+        this.socket.onmessage = this.onmessage;
+        this.socket.onclose = function () {
+            console.log('Canvas websocket closed and reconneting...');
+            _this.init();
+        };
+    };
+    Socket.prototype.close = function () {
+        this.socket.onclose = null;
+        this.socket.close();
+    };
+    return Socket;
+}());
+export { Socket };
+//# sourceMappingURL=socket.js.map

package/core/src/socket.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../packages/core/src/socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAgB,MAAM,UAAU,CAAC;AAEnD;IAEE,gBAAmB,GAAW,EAAS,IAAkB;QAAzD,iBAEC;QAFkB,QAAG,GAAH,GAAG,CAAQ;QAAS,SAAI,GAAJ,IAAI,CAAc;QAczD,cAAS,GAAG,UAAC,CAAe;YAC1B,IAAI,CAAC,KAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;gBAC3C,OAAO;aACR;YAED,IAAI,GAAkC,CAAC;YACvC,IAAI;gBACF,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAC1B;YAAC,OAAO,KAAK,EAAE;gBACd,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC;aACd;YAED,KAAmB,UAAc,EAAd,KAAA,KAAI,CAAC,IAAI,CAAC,IAAI,EAAd,cAAc,EAAd,IAAc,EAAE;gBAA9B,IAAM,IAAI,SAAA;gBACb,KAAoB,UAAW,EAAX,KAAA,IAAI,CAAC,MAAM,EAAX,cAAW,EAAX,IAAW,EAAE;oBAA5B,IAAM,OAAK,SAAA;oBACd,IAAI,OAAK,CAAC,IAAI,KAAK,SAAS,CAAC,SAAS,EAAE;wBACtC,IAAI,OAAK,CAAC,IAAI,IAAI,OAAK,CAAC,IAAI,KAAK,GAAG,CAAC,KAAK,EAAE;4BAC1C,IAAI,CAAC,YAAY,CAAC,OAAK,EAAE,GAAG,CAAC,IAAI,EAAE,KAAI,CAAC,MAAM,CAAC,CAAC;yBACjD;6BAAM,IAAI,CAAC,OAAK,CAAC,IAAI,IAAI,GAAG,EAAE;4BAC7B,IAAI,CAAC,YAAY,CAAC,OAAK,EAAE,GAAG,EAAE,KAAI,CAAC,MAAM,CAAC,CAAC;yBAC5C;qBACF;iBACF;aACF;QACH,CAAC,CAAC;QApCA,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED,qBAAI,GAAJ;QAAA,iBAQC;QAPC,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAEvC,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG;YACpB,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC;YAC1D,KAAI,CAAC,IAAI,EAAE,CAAC;QACd,CAAC,CAAC;IACJ,CAAC;IA2BD,sBAAK,GAAL;QACE,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IACH,aAAC;AAAD,CAAC,AA7CD,IA6CC"}

package/core/src/utils/canvas.js

@@ -1,4 +1,4 @@
-import { Point } from '../models';
+import { Point } from '../models/point';
 export function flatNodes(nodes) {
     var result = {
         nodes: [],

package/core/src/utils/conversion.d.ts

@@ -1,7 +0,0 @@
-import {Node} from "../models";
-
-export declare function setTagIdData(data: any): [];
-export declare function setKpiAddrData(data: any): [];
-export declare function setAssetIdData(data: any): [];
-export declare function setAreaIdData(data: any): [];
-export declare function setThreeCategoryIdData(pen: Node, data: any): [];

package/core/src/utils/conversion.js

@@ -1,54 +0,0 @@
-export function setTagIdData(data) {
-    return [{
-        "key": "tagId",
-        "value": data.tagId,
-        "isControlDis": data.isControlDis,
-        "type": data.tagType,
-        "tagVal": data.value,
-        "valExplain": data.valExplain,
-        "tagId": data.tagId
-    }, {
-        "key": "测点名称",
-        "value": data.tagName
-    }];
-}
-export function setKpiAddrData(data) {
-    return [{
-        "key": "kpiAddr",
-        "value": data.kpiId + '_' + data.kpiAddr,
-        "isControlDis": data.isControlDis,
-        "type": data.tagType
-    }, {
-        "key": "指标名称",
-        "value": data.kpiName
-    }];
-}
-export function setAssetIdData(data) {
-    return [{
-        "key": "assetId",
-        "value": data.id
-    }, {
-        "key": "资产名称",
-        "value": data.name
-    }];
-}
-export function setAreaIdData(data) {
-    return [{
-        "key": "areaId",
-        "value": data.id
-    }, {
-        "key": "区域名称",
-        "value": data.name
-    }];
-}
-export function setThreeCategoryIdData(pen, data) {
-    let params = [];
-    const hasThreeCategoryId = pen.data.find((tc) => {
-        return tc.key === 'threeCategoryId' && tc.value.includes(data.threeCategoryId);
-    });
-    if(!hasThreeCategoryId) params = [{
-        "key": "threeCategoryId",
-        "value": data.threeCategoryId
-    }];
-    return params;
-}

package/core/src/utils/dom.d.ts

@@ -1,7 +1,8 @@
-import { Node } from '../models';
-import { visualization2DStore } from '../store';
+import { Node } from '../models/node';
+// @ts-ignore
+import { TopologyData } from 'dcim-topology/core'
 export declare let DomElements: {};
-export declare function createChildrenDivByElementId(node: Node, data?: visualization2DStore): HTMLDivElement;
-export declare function setStyleForElementIdDiv(node: Node, elem: HTMLElement, data: visualization2DStore): void;
+export declare function createChildrenDivByElementId(node: Node, data?: TopologyData): HTMLDivElement;
+export declare function setStyleForElementIdDiv(node: Node, elem: HTMLElement, data: TopologyData): void;
 export declare function createDiv(node: Node): HTMLDivElement;
 export declare function loadJS(url: string, callback?: () => void, render?: boolean): void;

package/core/src/utils/dom.js

@@ -1,9 +1,7 @@
 import { Store } from 'le5le-store';
-import { Lock } from '../models'
-import {commonStore} from '../store';
+import { Lock } from 'dcim-topology/core/src/models/status'
 export let DomElements = {};
 export function createChildrenDivByElementId(node, data) {
-  if(!data) data = commonStore[node.TID].data;
   if (!DomElements[node.id]) {
     DomElements[node.id] = document.getElementById(node.id);
     if (DomElements[node.id]) {

package/core/src/utils/onmousevent.js

@@ -1,6 +1,5 @@
 import { ptInPolyXY } from './math';
 import { moveDataType, downDataType } from './construction'
-import { Node } from '../models'
 // 执行window函数
 export function omouseEventPrototDoWindowFn (eventNode, node) {
 
@@ -19,16 +18,8 @@ export function mousMoveFun(type, pos, data) {
 
     for (var _i = 0, _a = data; _i < _a.length; _i++) {
         var item = _a[_i];
-        //const isPoint = ptInPolyXY(pos, item.rotatedAnchors);
-        let isInPointNode = null;
-        if(item.name === 'arbitraryGraph') {
-            // 任意多边形通过点获取区域
-            isInPointNode = ptInPolyXY(pos, item.rotatedAnchors);
-        }else {
-            if(!(item instanceof Node)) item = new Node(item);
-            isInPointNode = item.hit(pos);
-        }
-        if(isInPointNode) {
+        const isPoint = ptInPolyXY(pos, item.rotatedAnchors);
+        if(isPoint) {
             params.hoverNode = item;
             params.order = _i;
         }
@@ -52,7 +43,7 @@ export function mousDownFun(type, eventNode) {
     if(action === 3) {
         params.eventType = downDataType.Window; // 打开会话窗口
     }else if(action === 7){
-        params.eventType = downDataType.Showhide; // 显示/隐藏
+        params.eventType = downDataType.Showhide; // 链接跳转
         params.value = eventNode.value;
     }else if(action === 8){
         params.eventType = downDataType.Tabswitch; // Tab切换

package/flow-diagram/src/comment/comment.anchor.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowCommentAnchors(node: Node): void;

package/flow-diagram/src/comment/comment.anchor.js

@@ -1,4 +1,4 @@
-import { Point, Direction } from '../../../core';
+import { Point, Direction } from 'dcim-topology/core';
 export function flowCommentAnchors(node) {
     node.anchors.push(new Point(node.rect.x, node.rect.y + node.rect.height / 2, Direction.Left));
 }

package/flow-diagram/src/comment/comment.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowComment(ctx: CanvasRenderingContext2D, node: Node): void;

package/flow-diagram/src/data/data.anchor.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowDataAnchors(node: Node): void;

package/flow-diagram/src/data/data.anchor.js

@@ -1,4 +1,4 @@
-import { Point, Direction } from '../../../core';
+import { Point, Direction } from 'dcim-topology/core';
 export function flowDataAnchors(node) {
     node.anchors.push(new Point(node.rect.x + node.rect.width / 14, node.rect.y + node.rect.height / 2, Direction.Left));
     node.anchors.push(new Point(node.rect.x + (node.rect.width * 4) / 7, node.rect.y, Direction.Up));

package/flow-diagram/src/data/data.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowData(ctx: CanvasRenderingContext2D, node: Node): void;

package/flow-diagram/src/data/data.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowDataIconRect(node: Node): void;
 export declare function flowDataTextRect(node: Node): void;

package/flow-diagram/src/data/data.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function flowDataIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/flow-diagram/src/db/db.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowDb(ctx: CanvasRenderingContext2D, node: Node): void;

package/flow-diagram/src/db/db.rect.d.ts

@@ -1,4 +1,4 @@
 // @ts-ignore
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowDbIconRect(node: Node): void;
 export declare function flowDbTextRect(node: Node): void;

package/flow-diagram/src/db/db.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function flowDbIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/flow-diagram/src/display/display.anchor.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowDisplayAnchors(node: Node): void;

package/flow-diagram/src/display/display.anchor.js

@@ -1,4 +1,4 @@
-import { Point, Direction } from '../../../core';
+import { Point, Direction } from 'dcim-topology/core';
 export function flowDisplayAnchors(node) {
     node.anchors.push(new Point(node.rect.x, node.rect.y + node.rect.height / 2, Direction.Left));
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));

package/flow-diagram/src/display/display.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowDisplay(ctx: CanvasRenderingContext2D, node: Node): void;

package/flow-diagram/src/display/display.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowDisplayIconRect(node: Node): void;
 export declare function flowDisplayTextRect(node: Node): void;

package/flow-diagram/src/display/display.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function flowDisplayIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/flow-diagram/src/document/document.anchor.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowDocumentAnchors(node: Node): void;

package/flow-diagram/src/document/document.anchor.js

@@ -1,4 +1,4 @@
-import { Point, Direction } from '../../../core';
+import { Point, Direction } from 'dcim-topology/core';
 export function flowDocumentAnchors(node) {
     node.anchors.push(new Point(node.rect.x, node.rect.y + node.rect.height / 2, Direction.Left));
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));

package/flow-diagram/src/document/document.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowDocument(ctx: CanvasRenderingContext2D, node: Node): void;

package/flow-diagram/src/document/document.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowDocumentIconRect(node: Node): void;
 export declare function flowDocumentTextRect(node: Node): void;

package/flow-diagram/src/document/document.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function flowDocumentIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/flow-diagram/src/externStorage/externStorage.anchor.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowExternStorageAnchors(node: Node): void;

package/flow-diagram/src/externStorage/externStorage.anchor.js

@@ -1,4 +1,4 @@
-import { Point, Direction } from '../../../core';
+import { Point, Direction } from 'dcim-topology/core';
 export function flowExternStorageAnchors(node) {
     node.anchors.push(new Point(node.rect.x, node.rect.y + node.rect.height / 2, Direction.Left));
     node.anchors.push(new Point(node.rect.x + (node.rect.width * 8) / 15, node.rect.y, Direction.Up));

package/flow-diagram/src/externStorage/externStorage.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowExternStorage(ctx: CanvasRenderingContext2D, node: Node): void;

package/flow-diagram/src/externStorage/externStorage.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowExternStorageIconRect(node: Node): void;
 export declare function flowExternStorageTextRect(node: Node): void;

package/flow-diagram/src/externStorage/externStorage.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function flowExternStorageIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/flow-diagram/src/internalStorage/internalStorage.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowInternalStorage(ctx: CanvasRenderingContext2D, node: Node): void;

package/flow-diagram/src/internalStorage/internalStorage.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowInternalStorageIconRect(node: Node): void;
 export declare function flowInternalStorageTextRect(node: Node): void;

package/flow-diagram/src/internalStorage/internalStorage.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function flowInternalStorageIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/flow-diagram/src/manually/manually.anchor.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowManuallyAnchors(node: Node): void;

package/flow-diagram/src/manually/manually.anchor.js

@@ -1,4 +1,4 @@
-import { Point, Direction } from '../../../core';
+import { Point, Direction } from 'dcim-topology/core';
 export function flowManuallyAnchors(node) {
     node.anchors.push(new Point(node.rect.x, node.rect.y + (node.rect.height * 5) / 8, Direction.Left));
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y + node.rect.height / 8, Direction.Up));

package/flow-diagram/src/manually/manually.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowManually(ctx: CanvasRenderingContext2D, node: Node): void;

package/flow-diagram/src/manually/manually.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowManuallyIconRect(node: Node): void;
 export declare function flowManuallyTextRect(node: Node): void;

package/flow-diagram/src/manually/manually.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function flowManuallyIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/flow-diagram/src/parallel/parallel.anchor.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowParallelAnchors(node: Node): void;

package/flow-diagram/src/parallel/parallel.anchor.js

@@ -1,4 +1,4 @@
-import { Point, Direction } from '../../../core';
+import { Point, Direction } from 'dcim-topology/core';
 export function flowParallelAnchors(node) {
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y + node.rect.height, Direction.Bottom));

package/flow-diagram/src/parallel/parallel.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowParallel(ctx: CanvasRenderingContext2D, node: Node): void;

package/flow-diagram/src/queue/queue.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowQueue(ctx: CanvasRenderingContext2D, node: Node): void;

package/flow-diagram/src/queue/queue.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowQueueIconRect(node: Node): void;
 export declare function flowQueueTextRect(node: Node): void;

package/flow-diagram/src/queue/queue.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function flowQueueIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/flow-diagram/src/register.js

@@ -1,4 +1,4 @@
-import { registerNode } from '../../core';
+import { registerNode } from 'dcim-topology/core';
 import { flowData, flowDataAnchors, flowDataIconRect, flowDataTextRect } from './data';
 import { flowSubprocess, flowSubprocessIconRect, flowSubprocessTextRect } from './subprocess';
 import { flowDb, flowDbIconRect, flowDbTextRect } from './db';

package/flow-diagram/src/subprocess/subprocess.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowSubprocess(ctx: CanvasRenderingContext2D, node: Node): void;

package/flow-diagram/src/subprocess/subprocess.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function flowSubprocessIconRect(node: Node): void;
 export declare function flowSubprocessTextRect(node: Node): void;

package/flow-diagram/src/subprocess/subprocess.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function flowSubprocessIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/layout/src/align.d.ts

@@ -1,3 +1,3 @@
-import { Pen, Rect } from '../../core';
+import { Pen, Rect } from 'dcim-topology/core';
 export declare function alignNodes(pens: Pen[], rect: Rect, align: string): void;
 export declare function spaceBetween(pens: Pen[], width: number): void;

package/layout/src/align.js

@@ -1,4 +1,4 @@
-import { Node } from '../../core';
+import { Node } from 'dcim-topology/core';
 export function alignNodes(pens, rect, align) {
     for (var _i = 0, pens_1 = pens; _i < pens_1.length; _i++) {
         var item = pens_1[_i];

package/layout/src/layout.d.ts

@@ -1,4 +1,4 @@
-import { Pen } from '../../core';
+import { Pen } from 'dcim-topology/core';
 export declare function layout(pens: Pen[], params: {
     maxWidth: number;
     nodeWidth?: number;

package/layout/src/layout.js

@@ -1,4 +1,4 @@
-import { PenType, getRect } from '../../core';
+import { PenType, getRect } from 'dcim-topology/core';
 import { alignNodes, spaceBetween } from './align';
 export function layout(pens, params) {
     var spaceWidth = params.spaceWidth || 30;

package/myShape-diagram/myShape.js

@@ -1,5 +1,5 @@
 // 源码版写法
-import { registerNode } from '../core'
+import { registerNode } from 'dcim-topology/core'
 
 // 组件版写法和bundle一致
 // window.Le5leTopology.registerNode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcim-topology2d",
-  "version": "1.1.3",
+  "version": "3.0.2",
   "description": "",
   "main": "-",
   "scripts": {

package/sequence-diagram/src/focus/focus.anchor.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function sequenceFocusAnchors(node: Node): void;

package/sequence-diagram/src/focus/focus.anchor.js

@@ -1,4 +1,4 @@
-import { Point, Direction } from '../../../core';
+import { Point, Direction } from 'dcim-topology/core';
 export function sequenceFocusAnchors(node) {
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.ey, Direction.Bottom));

package/sequence-diagram/src/focus/focus.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function sequenceFocus(ctx: CanvasRenderingContext2D, node: Node): void;

package/sequence-diagram/src/focus/focus.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function sequenceFocusIconRect(node: Node): void;
 export declare function sequenceFocusTextRect(node: Node): void;

package/sequence-diagram/src/focus/focus.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function sequenceFocusIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/sequence-diagram/src/lifeline/lifeline.anchor.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function lifelineAnchors(node: Node): void;

package/sequence-diagram/src/lifeline/lifeline.anchor.js

@@ -1,4 +1,4 @@
-import { Point, Direction } from '../../../core';
+import { Point, Direction } from 'dcim-topology/core';
 export function lifelineAnchors(node) {
     node.anchors.push(new Point(node.rect.x, node.rect.y + 25, Direction.Left));
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));

package/sequence-diagram/src/lifeline/lifeline.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function lifeline(ctx: CanvasRenderingContext2D, node: Node): void;

package/sequence-diagram/src/lifeline/lifeline.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function lifelineIconRect(node: Node): void;
 export declare function lifelineTextRect(node: Node): void;

package/sequence-diagram/src/lifeline/lifeline.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function lifelineIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/sequence-diagram/src/register.js

@@ -1,4 +1,4 @@
-import { registerNode } from '../../core';
+import { registerNode } from 'dcim-topology/core';
 import { lifeline, lifelineAnchors, lifelineIconRect, lifelineTextRect } from './lifeline';
 import { sequenceFocus, sequenceFocusAnchors, sequenceFocusIconRect, sequenceFocusTextRect } from './focus';
 export function register() {

package/core/src/store/common.d.ts

@@ -1,9 +0,0 @@
-import { Pen } from '../models';
-// @ts-ignore
-export const commonStore: {
-    canvasDraws: {
-        [key: string]: (ctx: CanvasRenderingContext2D, pen: Pen) => void;
-    };
-    anchors: { [key: string]: (pen: Pen) => void }; 
-    htmlElements: { [key: string]: HTMLDivElement }; // html元素
-};

package/core/src/store/common.js

@@ -1,5 +0,0 @@
-export var commonStore = {
-    canvasDraws: {},
-    anchors: {},
-    htmlElements: {}
-};