dcim-topology2d 2.2.4 → 2.2.5

package/core/src/core.js

@@ -22,19 +22,18 @@ import {
     s8,
     pointInRect,
     formatPadding,
-    setTagIdData,
-    setKpiAddrData,
-    setAssetIdData,
-    setAreaIdData,
-    setVarValueData,
-    setBranchAddressData,
-    setThreeCategoryIdData,
+    setConfBindPointMonitorData,
+    createEchartsLineIcon,
     setConnectionTagForConf,
     setConnectionTabsData,
-    getTabConnectSHConf, calculateTempRect
+    getTabConnectSHConf,
+    bindDataConfig,
+    hasBoundData,
+    dataBindType
 } from './utils';
 import {setSelectElementPosition} from './element';
 import {elementType} from '../../static';
+import {bindDataWithIconAssociationPool, iconMotionData} from "../../store";
 
 var resizeCursors = ['nw-resize', 'ne-resize', 'se-resize', 'sw-resize'];
 var dockOffset = 10;
@@ -129,8 +128,9 @@ var Topology = (function (_super) {
                 _this.raf = null;
                 if (!_this.mouseDown) {
                     _this.getMoveIn(pos);
+                    const hoverNode = _this.moveIn.hoverNode;
                     // Render hover anchors.
-                    if (_this.moveIn.hoverNode !== _this.lastHoverNode) {
+                    if (hoverNode !== _this.lastHoverNode) {
                         if (_this.lastHoverNode) {
                             // Send a move event.
                             _this.dispatch('moveOutNode', _this.lastHoverNode);
@@ -138,11 +138,11 @@ var Topology = (function (_super) {
                             // Clear hover anchors.
                             _this.hoverLayer.node = null;
                         }
-                        if (_this.moveIn.hoverNode) {
-                            _this.hoverLayer.node = _this.moveIn.hoverNode;
+                        if (hoverNode) {
+                            _this.hoverLayer.node = hoverNode;
                             // Send a move event.
-                            _this.dispatch('moveInNode', _this.moveIn.hoverNode);
-                            _this.showTip(_this.moveIn.hoverNode, pos);
+                            _this.dispatch('moveInNode', hoverNode);
+                            _this.showTip(hoverNode, pos);
                             // _this.showTipText(_this.moveIn.hoverNode, pos);
                         }
                     }
@@ -161,14 +161,15 @@ var Topology = (function (_super) {
                     } else if (_this.hoverLayer.hoverLineCP) {
                         _this.hoverLayer.hoverLineCP = null;
                     }
-                    if (_this.moveIn.hoverNode !== _this.lastHoverNode ||
+                    if (hoverNode !== _this.lastHoverNode ||
                         _this.moveIn.type === _this.moveInType.HoverAnchors ||
                         _this.hoverLayer.lasthoverLineCP !== _this.hoverLayer.hoverLineCP) {
                         _this.hoverLayer.lasthoverLineCP = _this.hoverLayer.hoverLineCP;
                         _this.render();
                     }
                     _this.scheduledAnimationFrame = false;
-                    if(_this.moveIn.type === _this.moveInType.Nodes && _this.moveIn.hoverNode.order !== (_this.lastHoverNode && _this.lastHoverNode.order)){
+                    const lastHoverOrder = _this.lastHoverNode && _this.lastHoverNode.order;
+                    if(hoverNode && (_this.moveIn.type === _this.moveInType.Nodes) && hoverNode.order !== lastHoverOrder){
                         // 鼠标hover元件之上，改变背景色
                         _this.hoverChangeFollowOperation(_this.moveIn.hoverNode, _this.lastHoverNode);
                     }
@@ -506,7 +507,7 @@ var Topology = (function (_super) {
                             }
                         }else {
                             // 存在多个选中元件时，如果点击选中区域外则取消多个元件的选中
-                            if(!_this.activeLayer.penIds.has(_this.moveIn.activeNode.id)){
+                            if(!_this.moveIn.sizeCPs){
                                 _this.activeLayer.setPens([_this.moveIn.activeNode]);
                                 _this.dispatch('node', _this.moveIn.activeNode);
                             }
@@ -714,8 +715,7 @@ var Topology = (function (_super) {
             try {
                 var json = event.dataTransfer.getData('Topology') ||
                     event.dataTransfer.getData('Text');
-                if (!json)
-                    return;
+                if (!json) return;
                 var obj = JSON.parse(json);
                 event.preventDefault();
                 if(obj.type && obj.type === 'temp') {
@@ -913,13 +913,8 @@ var Topology = (function (_super) {
                 // console.log('创建自定义组件 ', json);
                 console.log('store 中的 自定义 ');
                 _this.dropDefineNode(json, offsetX, offsetY);
-            } else if(json.name === 'temp') {
-                // 温湿度元件
-                _this.dropTempNode(json);
-            }else {
+            } else {
                 var node = new Node(json);
-                if(node.name === 'echarts') node.dash = 4;
-                if(node.name === 'iframe') node.iframe = 'http://www.yingzeshiji.com.cn/'; // 默认展示盈泽世纪官网
                 node.setTID(_this.id);
                 node.clearChildrenIds();
                 _this.addNode(node, true);
@@ -956,21 +951,6 @@ var Topology = (function (_super) {
         }
         this.switchStaticsCheckType(node, {dcimStaticForType: 'SH'});
     };
-    // 添加温湿度元件
-    Topology.prototype.dropTempNode = function(json) {
-        const nodeChildren = json.children;
-        delete json['children'];
-        const node = this.setNodeData(json);
-        const combinTempData = [];
-        for (let i = 0; i < nodeChildren.length; i++) {
-            const childNode = this.setNodeData(nodeChildren[i]);
-            calculateTempRect(node.rect.x, node.rect.y, i, childNode);
-            combinTempData.push(childNode);
-        }
-        this.combine(combinTempData, null, 'temp');
-        this.render();
-        this.cache();
-    };
     // 添加自定义元件
     Topology.prototype.dropDefineNode = function(josn, offsetX, offsetY) {
         var _this = this;
@@ -1010,7 +990,7 @@ var Topology = (function (_super) {
 
         _this.dispatch('addNode', renderNodesList[0]);
     };
-    Topology.prototype.addNode = function (node, focus, visit) {
+    Topology.prototype.addNode = function (node, focus, visit, cache) {
         if (focus === void 0) {
             focus = false;
         }
@@ -1044,7 +1024,7 @@ var Topology = (function (_super) {
                 this.dispatch('addNode', node);
             }
         }
-        this.cache();
+        !cache && this.cache();
         return node;
     };
     Topology.prototype.addLine = function (line, focus) {
@@ -1069,8 +1049,8 @@ var Topology = (function (_super) {
         return line;
     };
     // open - redraw by the data
-    Topology.prototype.open = function (topoJSon, type) {
-        this.conversionData(topoJSon, type);
+    Topology.prototype.open = function (topoJSon) {
+        this.conversionData(topoJSon);
         Store.set(this.generateStoreKey('LT:scale'), this.store.data.scale);
         this.dispatch('scale', this.store.data.scale);
         this.store.parentElem.scrollLeft = 0;
@@ -1108,6 +1088,7 @@ var Topology = (function (_super) {
         this.moveIn.hoverNode = null;
         this.moveIn.lineControlPoint = null;
         this.moveIn.hoverLine = null;
+        this.moveIn.sizeCPs = false;
         this.hoverLayer.hoverAnchorIndex = -1;
         if (!this.store.data.locked &&
             !(this.activeLayer.pens.length === 1 && this.activeLayer.pens[0].type) &&
@@ -1124,6 +1105,7 @@ var Topology = (function (_super) {
         if (this.activeLayer.pens.length > 1 &&
             pointInRect(pt, this.activeLayer.sizeCPs)) {
             this.moveIn.type = this.moveInType.Nodes;
+            this.moveIn.sizeCPs = true;
         }
         if (!this.store.data.locked &&
             !this.activeLayer.locked() &&
@@ -1624,6 +1606,7 @@ var Topology = (function (_super) {
                 if (this.store.options.disableEmptyLine) {
                     this.delEmptyLines(pen.id);
                 }
+                if(pen.isPointMonitor) this.deletePointAssociationIconData(pen.id);
                 pens.push.apply(pens, this.store.data.pens.splice(found, 1));
                 // this.setSwitchTabData(pen, found, 'delete');
                 --i;
@@ -1638,6 +1621,13 @@ var Topology = (function (_super) {
         this.cache();
         this.dispatch('delete', pens);
     };
+    // 删除点位监控元件关联的小图标
+    Topology.prototype.deletePointAssociationIconData = function (id) {
+        const dataPool = bindDataWithIconAssociationPool;
+        if(!dataPool.size || !dataPool.has(id)) return;
+        const iconOrder = dataPool.get(dataPool.get(id).cid).order;
+        this.store.data.pens.splice(iconOrder, 1);
+    };
     Topology.prototype.resetAssociateDateData = function (dateIds) {
         // 重置关联日期数据的元件属性值
         const pens = this.store.data.pens;
@@ -1711,14 +1701,24 @@ var Topology = (function (_super) {
         this.render();
         this.dispatch('delete', this.clipboard.pens);
     };
-    Topology.prototype.copy = function () {
+    Topology.prototype.copy = function (type) {
         let isAnimate = this.activeLayer.pens.find((item) => {
             return item.animatePlay;
         });
         if(isAnimate) return false;
-        this.clipboard = {
-            pens: [],
-        };
+        if (type === 'paste') {
+            // 粘贴：保留 initPens，为空则取 pens
+            this.clipboard = {
+                initPens: this.clipboard.initPens || this.clipboard.pens,
+                pens: []
+            };
+        } else {
+            // 非粘贴：保存初始区域 + 重置剪贴板
+            if (this.activeLayer.pens.length > 1) this.activeLayer.initialSizeCPs = [...this.activeLayer.sizeCPs];
+            this.clipboard = {
+                pens: []
+            };
+        }
         for (var _i = 0, _a = this.activeLayer.pens; _i < _a.length; _i++) {
             var pen = _a[_i];
             this.clipboard.pens.push(pen.clone());
@@ -1726,31 +1726,38 @@ var Topology = (function (_super) {
         return true;
     };
     Topology.prototype.paste = function (position) {
-        if (!this.clipboard || this.store.data.locked) {
-            return;
-        }
+        if (!this.clipboard || this.store.data.locked) return;
         this.hoverLayer.node = null;
         this.hoverLayer.line = null;
         this.activeLayer.pens = [];
         var idMaps = {};
-        const clipboardPens = JSON.parse(JSON.stringify(this.clipboard.pens));
-        for (var _i = 0, _a = clipboardPens; _i < _a.length; _i++) {
-            const list = _a[_i];
+        const { pens: clipPens, cpx, options } = this.clipboard;
+
+        // 计算中心点
+        if (!cpx && clipPens.length > 1 && position) this.clipboard.cpx = this.activeLayer.getCenterPoints();
+
+        const targetPens = position ? (this.clipboard.initPens || clipPens) : clipPens;
+        const clipboardPens = JSON.parse(JSON.stringify(targetPens));
+
+        for (const [i, list] of clipboardPens.entries()) {
+            list.isBind && this.activeLayer.clear();
             let pen = {};
             if (list.type === PenType.Node) {
                 pen = new Node(list);
                 this.newId(pen, idMaps);
-                const {x, y, width, height} = pen.rect;
-                const rect = this.resetRect(position, x, y, width, height);
-                Object.assign(pen.rect, rect);
-                if (pen.subName && pen.subName == 'temp') {
-                    // 温湿度元件
-                    pen.children.forEach((item, index) => {
-                        calculateTempRect(pen.rect.x, pen.rect.y, index, item);
-                        defaultTextRect(item);
-                    })
-                }
+                this.resetRect(position, this.clipboard.cpx, pen.rect);
+                // 温湿度/温度节点初始化
+                const isSpecialNode = ['temp', 'humiture'].includes(pen.subName);
+                if (isSpecialNode && drawNodeFns[pen.subName]) drawNodeFns[pen.subName](null, pen, true);
+
                 pen.init();
+
+                // 绑定数据：自动生成折线图标
+                if (list.isBind && options[i]) {
+                    const { type, node, bindName, count } = options[i];
+                    if (type !== dataBindType.ASSET) pen.text = pen.isAlias ? bindName : pen.defaultText;
+                    pen.isPointMonitor && this.bindWithIconAssociation(type, pen, node, i + 1, count);
+                }
             }
             if (list.type === PenType.Line) {
                 pen = new Line(list);
@@ -1772,7 +1779,7 @@ var Topology = (function (_super) {
         this.render();
         this.animate(true);
         this.cache();
-        this.copy();
+        !position && this.copy('paste'); // 非鼠标右键的粘贴才执行拷贝
         if (this.clipboard.pens.length > 1) {
             this.dispatch('multi', {
                 pens: this.clipboard.pens,
@@ -1785,113 +1792,162 @@ var Topology = (function (_super) {
             }
         }
     };
-    // 重置元件偏移位置，暂时先添加此处理方法，日后优化因放到rect.js中处理
-    Topology.prototype.resetRect = function (position, x, y, width, height) {
+    // 重置元件偏移位置
+    Topology.prototype.resetRect = function (position, cpx, rect) {
         if(!position) {
-            x+=20;
-            y+=20;
+            rect.x += 20;
+            rect.y += 20;
+        }else if(!cpx && position) {
+            rect.x = position.x;
+            rect.y = position.y;
+        }else if(cpx && position) {
+            rect.x = rect.x + (position.x - cpx.x);
+            rect.y = rect.y + (position.y - cpx.y);
+        }
+        rect.init();
+    };
+    /**
+     * 绑定数据
+     * @param data 绑定的数据 Array
+     * @param type 绑定的数据类型 Number
+     * @param batch 批量绑定 Boolean
+     */
+    Topology.prototype.bind = function (data, type, batch) {
+        const pen = this.activeLayer.pens[0];
+        const boundData = new Set();
+        // 获取已绑定的数据标识
+        const targetKeys = new Set(['tagId', 'kpiAddr', 'assetId', 'areaId', 'varId', 'branchVal']);
+        if(pen.data && pen.data.length) {
+            for (const node of pen.data) {
+                if (targetKeys.has(node.key)) boundData.add(node.value);
+            }
+        }
+        // 非视频：自动添加 MQTT 事件
+        if(type !== dataBindType.VIDEO) {
+            // 除 视频绑定外的其他数据绑定后，自动添加mqtt事件
+            const hasMqtt = pen.events.find((ev) => { return ev.type === 3 });
+            if(!hasMqtt) pen.events.push({ type: 3, action: 2, value: '', show: true });
+        }
+        let result = [];
+        // 剪贴板数据初始化
+        this.clipboard = { pens: [], options: [], cpx: null, initPens: null };
+        for (const [i, item] of data.entries()) {
+
+            if (hasBoundData(boundData, item, type)) continue; // 如果已绑定该数据则跳过
+
+            const options = bindDataConfig(item, type);
+            // 赋值标题、事件
+            if(options.title) pen.title = options.title;
+            if(options.events.length) pen.events = options.events;
+            // 赋值子级
+            if(options.children.length) {
+                pen.children.forEach((sub, c) => {
+                    const subNode = options.children[c];
+                    if(!subNode) return;
+                    sub.data = subNode.data;
+                    sub.events = subNode.events;
+                });
+            }
+
+            if(batch && i !== 0) {
+                // 批量绑定数据
+                const clonePen = pen.clone();
+                clonePen.isBind = true;
+                clonePen.data = [...options.data];
+                clonePen.rect.x += 20 * (i-1);
+                clonePen.rect.y += 20  * (i-1);
+
+                this.clipboard.pens.push(clonePen);
+                this.clipboard.options.push({
+                    node: item.default || item,
+                    count: length - 1,
+                    bindName: options.bindName,
+                    type
+                });
+            }else {
+                // 单个绑定数据
+                result = [...pen.data, ...options.data];
+                if(type !== dataBindType.asset) pen.text = pen.isAlias ? options.bindName : pen.defaultText;
+            }
+        }
+        if(result.length) {
+            pen.data = result;
+            pen.isPointMonitor && this.bindWithIconAssociation(type, pen, data[0].default || data[0], 0, 0); // 点位监控 自动生成折线小图标;
+        }
+        // 批量粘贴
+        this.clipboard.pens.length && this.paste();
+    };
+    /**
+     * 绑定数据关联图标的操作
+     * @param type 绑定的数据类型
+     * @param pen 元件的节点数据
+     * @param data 绑定的节点数据
+     * @param index 批量绑定时的数据索引
+     * @param count 对应索引下标的总数据
+     */
+    Topology.prototype.bindWithIconAssociation = function (type, pen, data, index, count) {
+        const dataPool = bindDataWithIconAssociationPool;
+        if(dataPool.has(pen.id)){
+            // 修改绑定的数据
+            const iconId = dataPool.get(pen.id).cid;
+            const iconEvents = this.store.data.pens[dataPool.get(iconId).order].events;
+            iconEvents.forEach((ev) => {
+                setConfBindPointMonitorData(type, ev, data);
+            })
         }else {
-            x = position.x;
-            y = position.y;
-        }
-        return {
-            x,
-            y,
-            center: {
-                x: x + width / 2,
-                y: y + height / 2
-            },
-            ex: x + width,
-            ey: y + height
-        }
-    };
-    Topology.prototype.bind = function (item, exite, dataType, index) {
-        this.clipboard = {
-            pens: [],
-        };
-        for (var _i = 0, _a = this.activeLayer.pens; _i < _a.length; _i++) {
-            var pen = _a[_i];
-            pen.data = [];
-            this.bindInfo(item, pen, dataType, index, false);
-            this.clipboard.pens.push(pen.clone());
+            // 添加绑定的数据
+            const iconData = createEchartsLineIcon(type, pen, data);
+            const newNode = this.setNodeData(iconData);
+            const pencx = pen.rect.center.x,
+                  pency = pen.rect.center.y,
+                  iconcx = newNode.rect.center.x,
+                  iconcy = newNode.rect.center.y;
+            // 存储矩形偏移及关联信息
+            dataPool.set(pen.id, {
+                cid: newNode.id,
+                order: -1,
+                cx: pencx,
+                cy: pency,
+                dx: iconcx - pencx, // 图标中心点与矩形中心点的距离，固定不变
+                dy: iconcy - pency  // 图标中心点与矩形中心点的距离，固定不变
+            });
+            // 存储图标偏移及关联信息
+            dataPool.set(newNode.id, {
+                cid: pen.id,
+                order: -1,
+                cx: iconcx,
+                cy: iconcy
+            });
+            this.addNode(newNode, index === count, true, true);
+        }
+    };
+    // 设置绑定的点位监控数据与小图标关联
+    Topology.prototype.resetBindWithIconConnectData = function () {
+        const dataPool = bindDataWithIconAssociationPool;
+        if(!dataPool.size) return;
+        for (let i = 0, pen = this.store.data.pens; i < pen.length; i++) {
+            const node = pen[i];
+            if(dataPool.has(node.id)) dataPool.get(node.id).order = i;
+        }
+    };
+    // 元件移动或缩放时，关联的图标也跟随移动改变位置
+    Topology.prototype.resetBindWithIconConnectRect = function (pen) {
+        const dataPool = bindDataWithIconAssociationPool;
+        if(!dataPool.size || !dataPool.has(pen.id)) return;
+        const penData = dataPool.get(pen.id); // 若是图标元件，则penData为icon的预存数据, pen 为icon节点数据
+        if(!pen.isPointMonitor) {
+            // 小图标基本属性变化，重置关联的固定值
+            const node = dataPool.get(penData.cid); // 元件的预存数据。
+            const oldPen = this.store.data.pens[node.order];
+            node.dx = pen.rect.center.x - oldPen.rect.center.x;
+            node.dy = pen.rect.center.y - oldPen.rect.center.y;
+            return;
         }
-        if (exite) this.paste();
-    };
-    Topology.prototype.bindInfo = async function (item, pen, type, index, exite) {
-        const itemNode = item && item.default || item;
-        let bindName = '';
-        if ([0, '0'].includes(type)) {
-            bindName = itemNode.tagName;
-            const setTagId = setTagIdData(itemNode);
-            pen.data.push(...setTagId);
-            // 绑定悬浮文字
-            pen.title = itemNode.touchpname
-            //用于处理场地监控，点击一个资产类别后，隐藏掉这个类别下的所有元件
-            const setThreeCategory = setThreeCategoryIdData(pen, itemNode);
-            pen.data.push(...setThreeCategory);
-        } else if ([1, '1'].includes(type)) {
-            bindName = itemNode.kpiName;
-            const setKpiAddr = setKpiAddrData(itemNode);
-            pen.data.push(...setKpiAddr);
-        } else if ([2, '2'].includes(type)) {
-            bindName = itemNode.name;
-            const setAssetId = setAssetIdData(itemNode);
-            pen.data.push(...setAssetId);
-            // 绑定悬浮文字
-            pen.title = itemNode.bak
-            if (pen.subName && pen.subName == 'temp') {
-                // 温湿度元件
-                // 通讯状态
-                pen.children[0].data = []
-                if (index > 0) {
-                    pen.children[0].text = index + 1 + '#'
-                }
-                this.bindInfo(itemNode, pen.children[0], type);
-                // 温度
-                if(item.temperature) {
-                    pen.children[1].data = [];
-                    this.bindInfo(item.temperature, pen.children[1], 0);
-                }
-                // 湿度
-                if(item.dampness) {
-                    pen.children[2].data = []
-                    this.bindInfo(item.dampness, pen.children[2], 0);
-                }
-                pen.children.forEach((itemNode) => {
-                    itemNode.events = [{
-                        "type": 3,
-                        "action": 2,
-                        "value": "",
-                        "show": true
-                    }]
-                })
-            }
-        } else if ([3, '3'].includes(type)) {
-            bindName = itemNode.name;
-            const setAreaId = setAreaIdData(itemNode);
-            pen.data.push(...setAreaId);
-        }else if ([4, '4'].includes(type)) {
-            bindName = itemNode.name;
-            const setVarId = setVarValueData(itemNode);
-            pen.data.push(...setVarId);
-        }else if ([5, '5'].includes(type)) {
-            bindName = itemNode.value;
-            const setBranch = setBranchAddressData(itemNode);
-            pen.data.push(...setBranch);
-        }else if (['video'].includes(type)) {
-            bindName = '';
-            pen.title = itemNode.params.name
-            pen.events = [itemNode];
-        }
-        pen.text = pen.isAlias ? bindName : pen.defaultText;
-        // if([0, 2, '0', '2'].includes(type)) {
-        //     //用于处理场地监控，点击一个资产类别后，隐藏掉这个类别下的所有元件
-        //     const setThreeCategory = setThreeCategoryIdData(pen, itemNode);
-        //
-        //     pen.data.push(...setThreeCategory);
-        // }
-        if(exite) this.cache();
-        return pen;
+        // 小图标便宜位置更新
+        const iconNode = this.store.data.pens[dataPool.get(penData.cid).order];
+        iconNode.rect.center.x = pen.rect.center.x + penData.dx;
+        iconNode.rect.center.y = pen.rect.center.y + penData.dy;
+        iconNode.rect.calcOffset();
     };
     Topology.prototype.newId = function (node, idMaps) {
         var old = node.id;
@@ -1904,13 +1960,15 @@ var Topology = (function (_super) {
             }
         }
     };
-    Topology.prototype.updateProps = function (cache, pens) {
-        if (cache === void 0) {
-            cache = true;
-        }
-        if (!pens) {
-            pens = this.activeLayer.pens;
-        }
+    /**
+     * 更新节点数据
+     * @param motion 关联节点是否跟随移动
+     * @param cache
+     * @param pens
+     */
+    Topology.prototype.updateProps = function (motion = false, cache, pens) {
+        if (cache === void 0) cache = true;
+        if (!pens) pens = this.activeLayer.pens;
         let isAnimate = false;
         for (var _i = 0, pens_1 = pens; _i < pens_1.length; _i++) {
             var pen = pens_1[_i];
@@ -1929,6 +1987,7 @@ var Topology = (function (_super) {
                 if (!pen.strokeStyle) {
                     pen.strokeStyle = 'transparent'
                 }
+                if(motion === true || iconMotionData[motion]) this.resetBindWithIconConnectRect(pen); // 点位监控关联的小图标跟随移动
             }
         }
         this.activeLayer.updateLines(pens);
@@ -2426,11 +2485,9 @@ var Topology = (function (_super) {
             }
         }
 
-        if (window.location.pathname.includes('workspace') || (isClickTpye === true && !window.location.pathname.includes('workspace'))) {
-            return false
-        }
+        return !(window.location.pathname.includes('workspace') || (isClickTpye === true && !window.location.pathname.includes('workspace')));
+
 
-        return true
     };
     return Topology;
 }(Common));

package/core/src/healps/changeData.d.ts

@@ -1,7 +1,6 @@
 import {Pen} from "../models";
 
 export declare function setConfItemNode(item: any[], syncData: Node): Node;
-export declare function setNodeEvents(item: any[], pen: Pen): void;
 export declare function setControlData(pen: Pen, syncData: Node): void;
 export declare function getControlNode(item: any, data: any): Node;
 export declare function getDetailData(data: Node): void;

package/core/src/healps/changeData.js

@@ -137,10 +137,6 @@ export function setConfItemNode(pen, syn_synata) {
     }
 }
 
-export function setNodeEvents(item, pen) {
-
-}
-
 export function setFanData(pen, syncData) {
     if (!syncData) return
     pen.text = ''

package/core/src/middles/default.js

@@ -10,14 +10,15 @@ import {
     circle, circleIconRect, circleTextRect, circleAnchors,
     triangle, triangleIconRect, triangleTextRect, triangleAnchors,
     pentagon, pentagonIconRect, pentagonTextRect, pentagonAnchors,
-    hexagon, hexagonAnchors, hexagonIconRect, hexagonTextRect,
+    hexagon, hexagonAnchors, hexagonIconRect, hexagonTextRect, humiture,
     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
+    arbitraryGraph, arbitraryGraphAnchors, time, switchs, progress,
+    svgEchartsLine
 } from './nodes';
 import {
     line,
@@ -61,7 +62,9 @@ export var drawLineFns = {};
 export var drawArrowFns = {};
 function init() {
     console.log('Init middles.');
-    // ********Default nodes.*******
+    // ********Default nodes.******* 
+    // svgEchartsLine
+    drawNodeFns.svgEchartsLine = svgEchartsLine;
     // datePicker
     drawNodeFns.datePicker = fromDatePicker;
     // select
@@ -104,6 +107,8 @@ function init() {
     iconRectFns.hexagon = hexagonIconRect;
     textRectFns.hexagon = hexagonTextRect;
     anchorsFns.hexagon = hexagonAnchors;
+    // humiture
+    drawNodeFns.humiture = humiture;
     // Pentagon
     drawNodeFns.pentagon = pentagon;
     iconRectFns.pentagon = pentagonIconRect;

package/core/src/middles/nodes/{arbitrarygraph.anchor.d.ts → basic/arbitrarygraph.anchor.d.ts}

@@ -1,2 +1,2 @@
-import { Node } from '../../models';
+import { Node } from '../../../models';
 export declare function arbitraryGraphAnchors(node: Node): void;

package/core/src/middles/nodes/{arbitrarygraph.anchor.js → basic/arbitrarygraph.anchor.js}

@@ -1,4 +1,4 @@
-import { Point } from '../../models/point';
+import { Point } from '../../../models/point';
 export function arbitraryGraphAnchors(node) {
 
   for(let i=0, circles=node.rect.circles; i<circles.length; i++) {

package/core/src/middles/nodes/{arbitrarygraph.d.ts → basic/arbitrarygraph.d.ts}

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