dcim-topology2d 1.1.6 → 3.0.2

package/core/src/healps/changeData.js

@@ -1,9 +1,6 @@
 //let DETAILDATA = null;
-import { echartsDefaultDataMap } from '../../../static';
-import { commonStore } from '../store'
 export function setConfItemNode(pen, syn_synata) {
     if (!pen.data) return
-    commonStore[pen.TID].data.dataResize = 1;
     if(pen.data instanceof Array) {
         let _syn = ''
         let isResetVal = false
@@ -81,6 +78,7 @@ export function setConfItemNode(pen, syn_synata) {
                 color = '#D38C00';
                 break;
         }
+
         // 显示的属性
         if (name === 'text') {
             pen.font.color = color
@@ -90,129 +88,73 @@ export function setConfItemNode(pen, syn_synata) {
         }else {
             pen.fillStyle = color
         }
+
         if (name === 'electricFan') setFanData(pen, _syn)
     }else {
         if (pen.elementRendered) pen.elementRendered = false;
-        if(pen.data.echarts) {
+        if(pen.data.params && pen.data.echarts) {
             const { echartDataValue } = syn_synata;
+            //const seriesData = pen.data.echarts.option.series.length > 1 ? echartDataValue : echartData
             const seriesData = echartDataValue;
-            const chartData = pen.data.params && seriesData && Object.keys(seriesData).length && seriesData[pen.data.params.id];
-            const staticForType = pen.data.params && pen.data.params.staticForType || '';//统计类型：日，周，月，年
-            pen.data.echarts.option = setStatisticalData(pen, null, staticForType, chartData);
+            if(seriesData) pen.data.echarts = setStatisticalData(pen, seriesData)
         }
     }
     return pen
 }
-
-/**
- * 设置图表数据
- * @param pen 拓扑节点
- * @param dataType 数据类型：‘def’-默认，不传默认为-实时
- * @param staticForType 统计类型：日，周，月，年
- * @param chartData // 图表实时数据
- * @returns {*}
- */
-export function setStatisticalData(pen, dataType, staticForType, chartData) {
-    const node = JSON.parse(JSON.stringify(pen));
-    const echartsOption = node.data.echarts.option;
-    const optionDisplayMode = echartsOption.displayMode;
-    let displayMode = 0;
-    if(typeof optionDisplayMode === 'string') {
-
-        const displayType = optionDisplayMode.split('_')[0];
-
-        displayMode = parseInt(displayType);
-
-    }else {
-        displayMode = parseInt(optionDisplayMode);
-    }
-    const defaultData = echartsDefaultDataMap[`displayMode_${optionDisplayMode}`];
-    const staticTypeData = chartData && chartData[`${staticForType}_Data`];
-    const chartRealData = staticForType ? staticTypeData || defaultData : chartData || defaultData;
-    if (displayMode === 1 || displayMode === 2){ // 折线图，柱状图
+export function setStatisticalData(pen, echartData) {
+    const node = Object.assign({}, pen);
+    const displayMode = parseInt(node.data.echarts.option.displayMode);
+    const chartData = echartData[node.data.params.id];
+    if ((displayMode === 1 || displayMode === 2) && chartData){ // 折线图，柱状图
         //const xData = [], seriesData = [];
-        dataType = staticForType && staticTypeData || chartData && chartData.seriesData.length ? '' : 'def';
-        const seriesNodes = echartsOption.series;
-        const isBaseLineBar = ['line', 'bar'].includes(node.appearance.type);
+        const staticForType = node.data.params.staticForType ? node.data.params.staticForType : '';//统计类型：日，周，月，年
+        const seriesNodes = node.data.echarts.option.series;
         // 双轴曲线
-        if(seriesNodes.length > 1 || node.data.params && node.data.params.curveNum > 1){
+        if(seriesNodes.length > 1 || node.data.params.curveNum > 1){
+            const chartOptions = staticForType ? chartData[`${staticForType}_Data`] : chartData;
             const legendData = [];
-            let legendChange = false;
-            echartsOption.xAxis[0].data = chartRealData.XData;
-            let order = 0;
-            //循环给每条统计数据赋值
-            seriesNodes.map((item, index) => {
-                let seriesItem = null;
-                // 执行类型为恢复默认
-                if(dataType === 'def') {
-                    let defaultSeriesItem = defaultData.seriesData[order];
-                    if(!defaultSeriesItem) defaultSeriesItem = defaultData.seriesData[0]; // 默认数据只有一个时，只取第一个
-                    seriesItem = JSON.parse(JSON.stringify(defaultSeriesItem));
-                    if(['line', 'bar'].includes(item.type)) order++; // 此判断为过滤series中的图表柱子或折线节点样式
-                    if(!isBaseLineBar) return item.data = seriesItem.data; // 曲线或柱状图模板一般会走这个逻辑
-                    if(!index) {
-                        seriesItem.name = '标注1';
-                        item.data = seriesItem.data;
-                    }else {
-                        // 自动生成series数据计算
-                        for(let i = 0, sdl = seriesItem.data.length; i < sdl; i++){
-                            displayMode === 1 ? seriesItem.data[i] -= 400 : seriesItem.data[i] += 100;
-                        }
-                        seriesItem.name = `标注${index + 1}`;
-                        item.data = seriesItem.data;
-                    }
-                }else {
-                    // 执行类型为实时数据
-                    seriesItem = chartRealData.seriesData[index];
-                    if(!seriesItem) return item.data = [];
-                    item.data = seriesItem.data;
-                }
-                // 获取角标数据
-                if(seriesItem.name) {
-                    item.name = seriesItem.name;
-                    legendData.push(seriesItem.name);
-                    legendChange = true;
-                }
-            });
-            if(echartsOption.legend && legendChange) echartsOption.legend.data = legendData; // 为角标数据赋值
+            if(!chartOptions) return;
+            node.data.echarts.option.xAxis[0].data = chartOptions.XData;
+            let legend = node.data.echarts.option.legend;
+            if(chartOptions.seriesData.length) {
+                //循环给每条统计数据赋值
+                seriesNodes.map((item, index) => {
+                    const { name, data } = chartOptions.seriesData[index];
+                    item.name = name;
+                    item.data = data;
+                    legendData.push(name);
+                });
+                legend.data = legendData;
+            }else {
+                node.data.echarts.option.legend = [];
+                node.data.echarts.option.series = []
+            }
         }else {
-            // 单曲线或柱状的执行逻辑
-            echartsOption.xAxis[0].data = chartRealData.XData;
-            const { name, data } = chartRealData.seriesData[0];
-            if(name) seriesNodes[0].name = name;
-            seriesNodes[0].data = data;
-        }
-    }
-    if(displayMode === 4) { // top排行榜
-        echartsOption.yAxis[0].data = chartRealData.XData;
-        const { data } = chartRealData.seriesData[0];
-        echartsOption.yAxis[1].data = data;
-        for (let i = 0; i < echartsOption.series.length; i++) {
-            const node = echartsOption.series[i];
-            node.symbolBoundingData = chartRealData.total;
-            node.data = data;
+            const chartOptions = staticForType ? chartData[`${staticForType}_Data`] : chartData;
+            if(chartOptions) {
+                node.data.echarts.option.xAxis[0].data = chartOptions.XData;
+                node.data.echarts.option.series[0].data = chartOptions.seriesData;
+            }
         }
     }
-    if (displayMode === 5 || displayMode === 3){ // 饼图/环形图
-        const colors = echartsOption.color;
-        const pieData = staticForType ? chartData || defaultData : chartData && chartData.data || defaultData.seriesData;
+    if (displayMode === 5 && chartData){ // 饼图
+        const colors = node.data.echarts.option.color;
         const seriesData = [];
-        pieData.map((chd, index) => {
+        chartData.map((chd, index) => {
             seriesData.push({
                 itemStyle: { color: colors[index] },
                 name: chd.name,
                 value: chd.value
             })
         })
-        echartsOption.series[0].data = seriesData;
+        node.data.echarts.option.series[0].data = seriesData;
     }
-    if(displayMode === 6){ // 仪表盘
-        // 仪表盘分两种，分别有不同的取值方式，下面两行先注释掉
-        // node.appearance.title.text = chartData.name;
-        // node.data.echarts.option.title.text = chartData.name;
-        echartsOption.series[0].data[0].value = chartData && chartData.value || defaultData.value;
+    if(displayMode === 6 && chartData){ // 仪表盘
+        node.appearance.title.text = chartData.name;
+        node.data.echarts.option.title.text = chartData.name;
+        node.data.echarts.option.series[0].data[0].value = chartData.value;
     }
-    return echartsOption;
+    return node.data.echarts;
 }
 export function setNodeEvents(item, pen) {
 

package/core/src/hoverLayer.d.ts

@@ -1,6 +1,13 @@
-import { Rect, Point, Line, Node } from './models';
+import { TopologyData } from './models/data';
+import { Rect } from './models/rect';
+import { Point } from './models/point';
+import { Line } from './models/line';
+import { Node } from './models/node';
+import { Options } from './options';
 import { Layer } from './layer';
 export declare class HoverLayer extends Layer {
+    options: Options;
+    protected data: TopologyData;
     line: Line;
     initLine: Line;
     node: Node;
@@ -12,7 +19,7 @@ export declare class HoverLayer extends Layer {
     dockLineY: number;
     root: Node;
     dragRect: Rect;
-    constructor(TID: String);
+    constructor(options: Options, TID: String);
     lineTo(to: Point, toArrow?: string): void;
     lineFrom(from: Point): void;
     lineMove(pt: Point, initPos: {

package/core/src/hoverLayer.js

@@ -1,8 +1,8 @@
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
-                ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-                function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
@@ -11,17 +11,22 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { Point, Node, PenType, Lock } from './models';
+import { Point } from './models/point';
+import { Node } from './models/node';
+import { PenType } from './models/pen';
 import { Store } from 'le5le-store';
+import { Lock } from './models/status';
 import { Layer } from './layer';
-import { commonStore } from './store'
 var HoverLayer = /** @class */ (function (_super) {
     __extends(HoverLayer, _super);
-    function HoverLayer(TID) {
+    function HoverLayer(options, TID) {
+        if (options === void 0) { options = {}; }
         var _this = _super.call(this, TID) || this;
+        _this.options = options;
         _this.hoverAnchorIndex = -1;
         _this.dockLineX = 0;
         _this.dockLineY = 0;
+        _this.data = Store.get(_this.generateStoreKey('topology-data'));
         Store.set(_this.generateStoreKey('LT:HoverLayer'), _this);
         return _this;
     }
@@ -65,16 +70,14 @@ var HoverLayer = /** @class */ (function (_super) {
     };
     HoverLayer.prototype.render = function (ctx) {
         var _this = this;
-        if(!commonStore || !commonStore[_this.TID]) return;
-        var globalStore = commonStore[_this.TID];
-        if (globalStore.data.locked === Lock.NoEvent) {
+        if (this.data.locked === Lock.NoEvent) {
             return;
         }
-        ctx.fillStyle = globalStore.options.hoverColor;
+        ctx.fillStyle = this.options.hoverColor;
         ctx.save();
         // anchors
-        if (globalStore.options.alwaysAnchor) {
-            globalStore.data.pens.forEach(function (pen) {
+        if (this.options.alwaysAnchor) {
+            this.data.pens.forEach(function (pen) {
                 if (pen.type === PenType.Line) {
                     return;
                 }
@@ -87,23 +90,23 @@ var HoverLayer = /** @class */ (function (_super) {
                         continue;
                     }
                     ctx.beginPath();
-                    ctx.arc(anchor.x, anchor.y, anchor.radius || globalStore.options.anchorRadius, 0, Math.PI * 2);
-                    ctx.strokeStyle = anchor.strokeStyle || globalStore.options.hoverColor;
-                    ctx.fillStyle = anchor.fillStyle || globalStore.options.anchorFillStyle;
+                    ctx.arc(anchor.x, anchor.y, anchor.radius || _this.options.anchorRadius, 0, Math.PI * 2);
+                    ctx.strokeStyle = anchor.strokeStyle || _this.options.hoverColor;
+                    ctx.fillStyle = anchor.fillStyle || _this.options.anchorFillStyle;
                     ctx.fill();
                     ctx.stroke();
                 }
             });
         }
         ctx.restore();
-        if (this.node && !globalStore.data.locked) {
+        if (this.node && !this.data.locked) {
             if (!this.node.getTID()) {
                 this.node.setTID(this.TID);
             }
             this.root = this.getRoot(this.node) || this.node;
             if (this.root) {
                 ctx.save();
-                ctx.strokeStyle = globalStore.options.dragColor;
+                ctx.strokeStyle = this.options.dragColor;
                 ctx.globalAlpha = 0.2;
                 if (this.root.rotate) {
                     ctx.translate(this.root.rect.center.x, this.root.rect.center.y);
@@ -114,20 +117,20 @@ var HoverLayer = /** @class */ (function (_super) {
                 ctx.strokeRect(this.root.rect.x, this.root.rect.y, this.root.rect.width, this.root.rect.height);
                 ctx.restore();
             }
-            if (!globalStore.options.hideAnchor) {
+            if (!this.options.hideAnchor) {
                 for (var i = 0; i < this.node.rotatedAnchors.length; ++i) {
                     if (this.node.locked ||
-                            this.node.hideAnchor ||
-                            (this.node.rotatedAnchors[i].hidden && this.hoverAnchorIndex !== i)) {
+                        this.node.hideAnchor ||
+                        (this.node.rotatedAnchors[i].hidden && this.hoverAnchorIndex !== i)) {
                         continue;
                     }
                     ctx.beginPath();
-                    ctx.arc(this.node.rotatedAnchors[i].x, this.node.rotatedAnchors[i].y, this.node.rotatedAnchors[i].radius || globalStore.options.anchorRadius, 0, Math.PI * 2);
+                    ctx.arc(this.node.rotatedAnchors[i].x, this.node.rotatedAnchors[i].y, this.node.rotatedAnchors[i].radius || this.options.anchorRadius, 0, Math.PI * 2);
                     ctx.strokeStyle =
-                            this.node.rotatedAnchors[i].strokeStyle || globalStore.options.hoverColor;
+                        this.node.rotatedAnchors[i].strokeStyle || this.options.hoverColor;
                     ctx.fillStyle =
-                            this.node.rotatedAnchors[i].fillStyle ||
-                            globalStore.options.anchorFillStyle;
+                        this.node.rotatedAnchors[i].fillStyle ||
+                            this.options.anchorFillStyle;
                     ctx.fill();
                     ctx.stroke();
                 }
@@ -136,9 +139,9 @@ var HoverLayer = /** @class */ (function (_super) {
         if (this.dockAnchor) {
             ctx.save();
             ctx.beginPath();
-            ctx.arc(this.dockAnchor.x, this.dockAnchor.y, this.dockAnchor.radius || globalStore.options.anchorRadius, 0, Math.PI * 2);
-            ctx.strokeStyle = globalStore.options.dockStrokeStyle;
-            ctx.fillStyle = globalStore.options.dockFillStyle;
+            ctx.arc(this.dockAnchor.x, this.dockAnchor.y, this.dockAnchor.radius || this.options.anchorRadius, 0, Math.PI * 2);
+            ctx.strokeStyle = this.options.dockStrokeStyle;
+            ctx.fillStyle = this.options.dockFillStyle;
             ctx.fill();
             ctx.stroke();
             ctx.restore();
@@ -148,7 +151,7 @@ var HoverLayer = /** @class */ (function (_super) {
             ctx.arc(this.hoverLineCP.x, this.hoverLineCP.y, 5, 0, Math.PI * 2);
             ctx.fill();
         }
-        ctx.strokeStyle = globalStore.options.hoverColor + '80';
+        ctx.strokeStyle = this.options.hoverColor + '80';
         ctx.lineWidth = 1;
         if (this.dockLineX > 0) {
             var size = Store.get(this.generateStoreKey('LT:size'));
@@ -166,8 +169,8 @@ var HoverLayer = /** @class */ (function (_super) {
         }
         // Select nodes by drag.
         if (this.dragRect) {
-            ctx.fillStyle = globalStore.options.dragColor + '30';
-            ctx.strokeStyle = globalStore.options.dragColor;
+            ctx.fillStyle = this.options.dragColor + '30';
+            ctx.strokeStyle = this.options.dragColor;
             ctx.beginPath();
             ctx.strokeRect(this.dragRect.x, this.dragRect.y, this.dragRect.width, this.dragRect.height);
             ctx.fillRect(this.dragRect.x, this.dragRect.y, this.dragRect.width, this.dragRect.height);
@@ -177,7 +180,7 @@ var HoverLayer = /** @class */ (function (_super) {
         if (!node.parentId) {
             return null;
         }
-        for (var _i = 0, _a = commonStore[this.TID].data.pens; _i < _a.length; _i++) {
+        for (var _i = 0, _a = this.data.pens; _i < _a.length; _i++) {
             var item = _a[_i];
             if (item instanceof Node && item.id === node.parentId) {
                 var n = this.getRoot(item);
@@ -193,4 +196,4 @@ var HoverLayer = /** @class */ (function (_super) {
     return HoverLayer;
 }(Layer));
 export { HoverLayer };
-//# sourceMappingURL=hoverLayer.js.map
+//# sourceMappingURL=hoverLayer.js.map

package/core/src/middles/default.d.ts

@@ -1,4 +1,6 @@
-import { Point, Node, Line } from '../models';
+import { Point } from '../models';
+import { Node } from '../models';
+import { Line } from '../models';
 export declare const drawNodeFns: any;
 export declare const iconRectFns: any;
 export declare const textRectFns: any;

package/core/src/middles/default.js

@@ -1,52 +1,54 @@
-import {
-  arrowAnchors,
-  leftArrow, leftArrowIconRect, leftArrowTextRect,
-  rightArrow, rightArrowIconRect, rightArrowTextRect,
-  twowayArrow, twowayArrowIconRect, twowayArrowTextRect,
-  rectangle, rectangleIconRect, rectangleTextRect,
-  diamond, diamondIconRect, diamondTextRect,
-  text, file, formtable, tablePagination, iframePrimeval,
-  line as nodeLine, lineAnchors, lineIconRect, lineTextRect,
-  circle, circleIconRect, circleTextRect, circleAnchors,
-  triangle, triangleIconRect, triangleTextRect, triangleAnchors,
-  pentagon, pentagonIconRect, pentagonTextRect, pentagonAnchors,
-  hexagon, hexagonAnchors, hexagonIconRect, hexagonTextRect,
-  pentagram, pentagramAnchors, pentagramIconRect, pentagramTextRect,
-  cloud, cloudAnchors, cloudIconRect, cloudTextRect,
-  message, messageIconRect, messageTextRect, messageAnchors,
-  imageIconRect, imageTextRect,
-  cube, cubeAnchors, cubeIconRect, cubeTextRect,
-  people, peopleIconRect, peopleTextRect,
-  arbitraryGraph, arbitraryGraphAnchors,
-} from './nodes';
-import {
-  line,
-  lineControlPoints,
-  calcLineControlPoints,
-  polyline,
-  polylineControlPoints,
-  pointInPolyline,
-  calcPolylineControlPoints,
-  dockPolylineControlPoint,
-  curve,
-  curveControlPoints,
-  pointInCurve,
-  calcCurveControlPoints,
-  mind,
-  calcMindControlPoints,
-  mindControlPoints,
-  pointInMind
-} from './lines';
-import {
-  triangleSolid,
-  triangle as arrowTriangle,
-  diamondSolid,
-  diamond as arrowDiamond,
-  circleSolid, circle as arrowCircle,
-  lineUp,
-  lineDown,
-  line as arrowLine
-} from './arrows';
+import { rectangle } from './nodes/rectangle';
+import { circle } from './nodes/circle';
+import { triangle } from './nodes/triangle';
+import { diamond } from './nodes/diamond';
+import { leftArrow, rightArrow, twowayArrow } from './nodes/arrow';
+import { text } from './nodes/text';
+import { line as nodeLine } from './nodes/line';
+import { triangleAnchors } from './nodes/triangle.anchor';
+import { arrowAnchors } from './nodes/arrow.anchor';
+import { lineAnchors } from './nodes/line.anchor';
+import { circleIconRect, circleTextRect } from './nodes/circle.rect';
+import { triangleIconRect, triangleTextRect } from './nodes/triangle.rect';
+import { diamondIconRect, diamondTextRect } from './nodes/diamond.rect';
+import { twowayArrowIconRect, twowayArrowTextRect, leftArrowIconRect, leftArrowTextRect, rightArrowIconRect, rightArrowTextRect } from './nodes/arrow.rect';
+import { lineIconRect, lineTextRect } from './nodes/line.rect';
+import { line, lineControlPoints, calcLineControlPoints } from './lines/line';
+import { polyline, polylineControlPoints, pointInPolyline, calcPolylineControlPoints, dockPolylineControlPoint } from './lines/polyline';
+import { curve, curveControlPoints, pointInCurve, calcCurveControlPoints } from './lines/curve';
+import { mind, calcMindControlPoints, mindControlPoints, pointInMind } from './lines/mind';
+import { triangleSolid, triangle as arrowTriangle } from './arrows/triangle';
+import { diamondSolid, diamond as arrowDiamond } from './arrows/diamond';
+import { circleSolid, circle as arrowCircle } from './arrows/circle';
+import { circleAnchors } from './nodes/circle.anchor';
+import { lineUp, lineDown, line as arrowLine } from './arrows/line';
+import { pentagon } from './nodes/pentagon';
+import { pentagonIconRect, pentagonTextRect } from './nodes/pentagon.rect';
+import { pentagonAnchors } from './nodes/pentagon.anchor';
+import { hexagon } from './nodes/hexagon';
+import { hexagonAnchors } from './nodes/hexagon.anchor';
+import { hexagonIconRect, hexagonTextRect } from './nodes/hexagon.rect';
+import { pentagram } from './nodes/pentagram';
+import { pentagramAnchors } from './nodes/pentagram.anchor';
+import { pentagramIconRect, pentagramTextRect } from './nodes/pentagram.rect';
+import { cloud } from './nodes/cloud';
+import { cloudAnchors } from './nodes/cloud.anchor';
+import { cloudIconRect, cloudTextRect } from './nodes/cloud.rect';
+import { message } from './nodes/message';
+import { messageIconRect, messageTextRect } from './nodes/message.rect';
+import { messageAnchors } from './nodes/message.anchor';
+import { file } from './nodes/file';
+import { imageIconRect, imageTextRect } from './nodes/image.rect';
+import { cube } from './nodes/cube';
+import { cubeAnchors } from './nodes/cube.anchor';
+import { cubeIconRect, cubeTextRect } from './nodes/cube.rect';
+import { people } from './nodes/people';
+import { peopleIconRect, peopleTextRect } from './nodes/people.rect';
+import { rectangleIconRect, rectangleTextRect } from './nodes/rectangle.rect';
+import { arbitraryGraph } from './nodes/arbitrarygraph';
+import { arbitraryGraphAnchors } from './nodes/arbitrarygraph.anchor';
+import { formtable } from './nodes/formtable';
+import { tablePagination } from './nodes/tablePagination';
 // Functions of drawing a node.
 export var drawNodeFns = {};
 // Calc the occupy rect of icon.
@@ -62,8 +64,6 @@ export var drawArrowFns = {};
 function init() {
     console.log('Init middles.');
     // ********Default nodes.*******
-    // iframe
-    drawNodeFns.iframe = iframePrimeval;
     // tablePagination
     drawNodeFns.tablePagination = tablePagination;
     // formtable

package/core/src/middles/index.js

@@ -1,5 +1,4 @@
 export * from './default';
-export * from './nodes';
-export * from './lines';
-export * from './arrows';
+export * from './nodes/rectangle';
+export * from './nodes/text';
 //# sourceMappingURL=index.js.map

package/core/src/middles/nodes/pentagon.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../models';
+import { Rect } from '../../models/rect';
 export function pentagonIconRect(node) {
     var w = node.rect.width / 2;
     var h = node.rect.height / 2;

package/core/src/middles/nodes/rectangle.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../models';
+import { Rect } from '../../models/rect';
 export function rectangleIconRect(node) {
     node.iconRect = new Rect(node.rect.x + node.paddingLeftNum, node.rect.y + node.paddingTopNum, node.rect.height - node.paddingTopNum - node.paddingBottomNum, node.rect.height - node.paddingTopNum - node.paddingBottomNum);
     node.fullIconRect = new Rect(node.rect.x + node.paddingLeftNum, node.rect.y + node.paddingTopNum, node.rect.width - node.paddingLeftNum - node.paddingRightNum, node.rect.height - node.paddingTopNum - node.paddingBottomNum);

package/core/src/models/data.d.ts

@@ -0,0 +1,26 @@
+import { Pen } from './pen';
+import { Lock } from './status';
+export declare class TopologyData {
+    pens: Pen[];
+    lineName: string;
+    fromArrowType: string;
+    toArrowType: string;
+    scale: number;
+    locked: Lock;
+    bkImage: string;
+    bkColor: string;
+    grid?: boolean;
+    websocket?: string;
+    mqttUrl?: string;
+    mqttOptions?: {
+        clientId?: string;
+        username?: string;
+        password?: string;
+    };
+    mqttTopics?: string;
+    manualCps?: boolean;
+    dataConstruct?: any;
+    data?: any;
+    bkImageRect?: any;
+    constructor(json?: any);
+}

package/core/src/models/data.js

@@ -0,0 +1,77 @@
+import { Node } from './node';
+import { Line } from './line';
+import { Lock } from './status';
+import { s8 } from '../utils';
+var TopologyData = /** @class */ (function () {
+    function TopologyData(json) {
+        this.pens = [];
+        this.lineName = 'curve';
+        this.fromArrowType = '';
+        this.toArrowType = 'triangleSolid';
+        this.scale = 1;
+        this.locked = Lock.None;
+        this.bkImageRect = null;
+        this.mqttOptions = {
+            clientId: s8()
+        };
+        this.dataConstruct = {};
+        if (json) {
+            this.pens = [];
+            json.dataConstruct = {};
+            for (var _i = 0, _a = json.pens; _i < _a.length; _i++) {
+                var item = _a[_i];
+                if (item.from) {
+                    this.pens.push(new Line(item));
+                }
+                else {
+                    if(item.name === 'formTable') {
+                        json.dataConstruct[item.id] = {
+                            id: item.id,
+                            name: 'table'
+                        }
+                    }
+                    this.pens.push(new Node(item));
+                }
+            }
+            this.lineName = json.lineName || 'curve';
+            this.fromArrowType = json.fromArrowType || '';
+            this.toArrowType = json.toArrowType || 'triangleSolid';
+            this.scale = json.scale || 1;
+            this.locked = json.locked || Lock.None;
+            this.bkImage = json.bkImage;
+            this.bkColor = json.bkColor;
+            this.grid = json.grid;
+            this.manualCps = json.manualCps;
+            this.websocket = json.websocket;
+            this.mqttUrl = json.mqttUrl;
+            this.bkImageRect = json.bkImageRect;
+            if (json.mqttOptions) {
+                var opts = '';
+                if (typeof json.mqttOptions === 'object') {
+                    opts = JSON.stringify(json.mqttOptions);
+                }
+                else {
+                    opts = json.mqttOptions + '';
+                }
+                this.mqttOptions = JSON.parse(opts);
+            }
+            else {
+                this.mqttOptions = { clientId: s8() };
+            }
+            this.dataConstruct = json.dataConstruct ? json.dataConstruct : {};
+            this.mqttTopics = json.mqttTopics;
+            if (typeof json.data === 'object') {
+                this.data = JSON.parse(JSON.stringify(json.data));
+            }
+            else {
+                this.data = json.data || '';
+            }
+        }
+        if (!this.mqttOptions) {
+            this.mqttOptions = { clientId: s8() };
+        }
+    }
+    return TopologyData;
+}());
+export { TopologyData };
+//# sourceMappingURL=data.js.map

package/core/src/models/data.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data.js","sourceRoot":"","sources":["../../../../packages/core/src/models/data.ts"],"names":[],"mappings":"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"}

package/core/src/models/index.d.ts

@@ -1,3 +1,4 @@
+export * from './data';
 export * from './pen';
 export * from './node';
 export * from './line';

package/core/src/models/index.js

@@ -1,3 +1,4 @@
+export * from './data';
 export * from './pen';
 export * from './node';
 export * from './line';