dcim-topology2d 2.2.3 → 3.0.2

package/core/src/healps/changeData.js

@@ -1,96 +1,75 @@
 //let DETAILDATA = null;
-import { commonStore } from '../store';
-import { getEchartsRealData } from '../utils/conversion';
 export function setConfItemNode(pen, syn_synata) {
-    const entranceGuard = pen.events.find((ev) => {
-        return ev.value === 'entranceGuard';
-    });
-    if (entranceGuard) {
-        // 绑定门禁的元件实时数据
-        const nullUndefinedRegex = /^(?:null|undefined|\s*)$/;
-        const doorData = syn_synata.doorData && syn_synata.doorData[entranceGuard.params];
-        const doorState = doorData && !nullUndefinedRegex.test(doorData.state) && parseInt(doorData.state);
-        pen.text = doorState === 1 ? '开门' : '关门'; // 1-开门，其他值为关门
-    }
-    if (!pen.data) return;
-    if (commonStore[pen.TID]) commonStore[pen.TID].data.dataResize = 1;
-    let isAlarm = false; // 判断元件绑定的数据中是否有告警发生，用于九所项目服务器自身监控功能
-    if (pen.data instanceof Array) {
-        let _syn = null;
-        let isResetVal = false;
-        const { areaData, assetData, componentData, kpiData, tagData, asset } = syn_synata;
-        const comData = componentData && componentData[pen.id];
+    if (!pen.data) return
+    if(pen.data instanceof Array) {
+        let _syn = ''
+        let isResetVal = false
+        let isResetFontColor = false
+        const {areaData, assetData, kpiData, tagData, asset} = syn_synata
         pen.data.map((d) => {
             const key = d.key;
             let value = d.value;
-            if (key === 'tagId') value = d.tagId ? d.tagId : d.value;
+            const assetItem = assetData[value];
+            const areaItem = areaData[value];
+            const kpiItem = kpiData[value];
+            if(key === 'tagId') value = d.tagId ? d.tagId : d.value
+            const tagItem = tagData[value];
             //console.log('key===========', d)
             if (key === 'assetKey' && d.value === 'assetName' && asset) {
-
                 pen.text = asset.assetName;
-
-            } else if (key === 'assetId') {
-
-                _syn = comData || assetData[value];
-
+            }else if (key === 'assetId' && assetItem) {
+                _syn = assetItem;
                 // if(value === '264'){console.log('_syn',_syn,pen.name,parseInt(_syn.state))}
-            } else if (key === 'areaId') {
-
-                _syn = comData || areaData[value];
-
-            } else if (key === 'tagId' && (comData || tagData[value])) {
-
-                _syn = comData || tagData[value];
-
-                if (_syn.kpiName !== '通讯状态' || pen.name !== 'circle') {
-                    isResetVal = true;
+            }else if (key === 'areaId' && areaItem) {
+                _syn = areaItem;
+            }else if (key === 'tagId' && tagItem) {
+                _syn = tagItem;
+                if(_syn.kpiName !== '通讯状态' || pen.name !== 'circle'){
+                    isResetVal = true
                 }
-                const isControl = parseInt(_syn.isControlDis); // 是否可控，0可控，1不可控
+                const isControl = parseInt(tagItem.isControlDis); // 是否可控，0可控，1不可控
                 //d.isControlDis = isControlDis
-                if (!isControl) {
+                if(!isControl) {
                     d.tagVal = value
-                    d.controlParams = _syn
+                    d.controlParams = tagItem
                     //Object.assign(d, tagItem)
                 }
-            } else if (key === 'kpiAddr' && (comData || kpiData[value])) {
-                _syn = comData || kpiData[value];
+            }else if (key === 'kpiAddr' && kpiItem) {
+                _syn = kpiItem;
                 isResetVal = true
-                const isControl = parseInt(_syn.isControlDis); // 是否可控，0可控，1不可控
+                const isControl = parseInt(kpiItem.isControlDis); // 是否可控，0可控，1不可控
                 //d.isControlDis = isControlDis
-                if (!isControl) {
+                if(!isControl) {
                     d.tagVal = value
-                    d.controlParams = _syn
+                    d.controlParams = kpiItem
                     // delete kpiItem[value]
                     // Object.assign(d, kpiItem)
                 }
             }
         })
-        if (!_syn) return;
         // const type = parseInt(_syn.type) // 是否是开关量
         // 显示的值
         if (isResetVal) pen.text = `${_syn.value}${_syn.unit}`;
         const state = parseInt(_syn.state)
-        if (!state && state !== 0) return
+        if(!state && state !== 0) return
         const name = pen.name
         // 显示的颜色
         let color = ''
         switch (state) {
             case 0: // 正常告警
                 color = '#FF0000';
-                isAlarm = true;
                 break;
             case 1: // 离线告警, 通讯开关告警
                 color = '#6d6d6d';
-                isAlarm = true;
                 break;
             case 2: // 未告警
             case 3: // 无告警
                 let defaulColor = ''
                 if (name === 'text') {
                     defaulColor = 'defaultFontColor'
-                } else if (name === 'line') {
+                }else if(name === 'line') {
                     defaulColor = 'defaultStrokeStyle'
-                } else {
+                }else {
                     defaulColor = 'defaultFillStyle'
                 }
                 color = pen[defaulColor]
@@ -99,44 +78,84 @@ export function setConfItemNode(pen, syn_synata) {
                 color = '#D38C00';
                 break;
         }
+
         // 显示的属性
         if (name === 'text') {
             pen.font.color = color
-        } else if (name === 'line') {
+        }else if(name === 'line') {
             pen.strokeStyle = color
             pen.text = ''
-        } else if (name === 'switchs') {
-            //获取值说明中的开值 默认为第一个值为开
-            let openValue = getOpenValue(_syn.valExplain)
-            pen.isOpen = _syn.v == openValue;
-            pen.fillStyle = pen.isOpen ? pen.visitStrokeStyle : pen.strokeStyle;
-            pen.text = '';
-        } else if (name === 'progress') {
-            pen.value = _syn.v;
-            pen.text = '';
-        }
-        else {
+        }else {
             pen.fillStyle = color
         }
+
         if (name === 'electricFan') setFanData(pen, _syn)
-    } else {
+    }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 realData = pen.data.params && seriesData && Object.keys(seriesData).length && seriesData[pen.data.params.id];
-            if (Array.isArray(realData) && pen.data.params && pen.data.params.displayMode !== 7) {
-                getEchartsRealData(pen, realData);
-            } else {
-                commonStore[pen.TID].echartsRealDataPool[pen.id] = realData;
+            if(seriesData) pen.data.echarts = setStatisticalData(pen, seriesData)
+        }
+    }
+    return pen
+}
+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 = [];
+        const staticForType = node.data.params.staticForType ? node.data.params.staticForType : '';//统计类型：日，周，月，年
+        const seriesNodes = node.data.echarts.option.series;
+        // 双轴曲线
+        if(seriesNodes.length > 1 || node.data.params.curveNum > 1){
+            const chartOptions = staticForType ? chartData[`${staticForType}_Data`] : chartData;
+            const 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 {
+            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;
             }
         }
     }
-    return {
-        monitorAlarm: isAlarm
+    if (displayMode === 5 && chartData){ // 饼图
+        const colors = node.data.echarts.option.color;
+        const seriesData = [];
+        chartData.map((chd, index) => {
+            seriesData.push({
+                itemStyle: { color: colors[index] },
+                name: chd.name,
+                value: chd.value
+            })
+        })
+        node.data.echarts.option.series[0].data = seriesData;
     }
+    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 node.data.echarts;
 }
-
 export function setNodeEvents(item, pen) {
 
 }
@@ -152,24 +171,24 @@ export function setFanData(pen, syncData) {
     let runState = false
     let percentage = 1
     const value = parseInt(syncData.v)
-    if (pen.fanValType == '1') {
-        if (value > pen.fanMinVal && value <= pen.fanMaxVal) {
+    if(pen.fanValType == '1'){
+        if(value > pen.fanMinVal  && value <= pen.fanMaxVal) {
             runState = true
-            percentage = value / (pen.fanMaxVal - pen.fanMinVal)
+            percentage = value/(pen.fanMaxVal-pen.fanMinVal)
         }
-    } else if (pen.fanValType == '2') {
-        if (pen.fanNorVal === value) runState = true
+    }else if(pen.fanValType == '2'){
+        if(pen.fanNorVal === value) runState = true
     }
-    if (runState) {
+    if(runState){
         addAnimateByRevolve(pen, percentage)
         pen.animatePlay = true
-    } else {
+    }else{
         pen.animatePlay = false
     }
 }
 
 export function addAnimateByRevolve(pen, percentage) {
-    let time = 200 / pen.fanSpeed / percentage
+    let time = 200/pen.fanSpeed/percentage
     const state = JSON.parse(JSON.stringify(pen))
     delete state.TID
     delete state.animateFrames
@@ -184,11 +203,3 @@ export function addAnimateByRevolve(pen, percentage) {
     pen.animateDuration = time;
 
 }
-
-export function getOpenValue(explain) {
-    let value = 1
-    if (!explain) return value
-    value = explain.split(',')[0].split('=')[0];
-    return value
-
-}

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, formSelect, fromDatePicker,
-    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, time, switchs, progress
-} 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,12 +64,6 @@ export var drawArrowFns = {};
 function init() {
     console.log('Init middles.');
     // ********Default nodes.*******
-    // datePicker
-    drawNodeFns.datePicker = fromDatePicker;
-    // select
-    drawNodeFns.select = formSelect;
-    // iframe
-    drawNodeFns.iframe = iframePrimeval;
     // tablePagination
     drawNodeFns.tablePagination = tablePagination;
     // formtable
@@ -201,16 +197,6 @@ function init() {
     drawArrowFns.lineUp = lineUp;
     drawArrowFns.lineDown = lineDown;
     // ********end********
-    // 当前时间
-    drawNodeFns.time = time;
-    iconRectFns.time = rectangleIconRect;
-    textRectFns.time = rectangleTextRect;
-    // 开关
-    drawNodeFns.switchs = switchs;
-    iconRectFns.switchs = rectangleIconRect;
-    textRectFns.switchs = rectangleTextRect;
-    // 进度条
-    drawNodeFns.progress = progress;
 }
 init();
 // registerNode: Register a custom node.

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

@@ -1,2 +1,3 @@
 export * from './default';
-export * from './nodes';
+export * from './nodes/rectangle';
+export * from './nodes/text';

package/core/src/middles/index.js

@@ -1,6 +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/arbitrarygraph.js

@@ -1,19 +1,17 @@
 export function arbitraryGraph(ctx, node) {
 
-    ctx.beginPath();
+  ctx.beginPath();
 
-    ctx.lineWidth = 1;
+  ctx.lineWidth = 1;
 
-    ctx.moveTo(node.rect.circles[0].x, node.rect.circles[0].y);
+  for(let i=0,len=node.rect.circles.length; i<len; i++) {
 
-    for(let i=1,len=node.rect.circles.length; i<len; i++) {
+    ctx.lineTo(node.rect.circles[i].x, node.rect.circles[i].y)
+  }
 
-        ctx.lineTo(node.rect.circles[i].x, node.rect.circles[i].y);
-    }
+  ctx.closePath();
 
-    ctx.closePath();
-
-    (node.fillStyle || node.bkType) && ctx.fill();
-
-    ctx.stroke();
+  (node.fillStyle || node.bkType) && ctx.fill();
+  
+  ctx.stroke();
 }