dcim-topology2d 2.1.0 → 3.0.2

package/core/src/core.js

@@ -16,25 +16,10 @@ import { Common } from './common'
 import {HoverLayer} from './hoverLayer';
 import {ActiveLayer} from './activeLayer';
 import {KeyType, KeydownType} from './options';
-import {PenType, Node, Point, Line, Lock, AnchorMode, Rect} from './models';
+import {PenType, Node, Point, Line, TopologyData, Lock, AnchorMode, Rect} from './models';
 import {drawNodeFns, drawLineFns} from './middles/index';
-import {
-    s8,
-    pointInRect,
-    formatPadding,
-    setTagIdData,
-    setKpiAddrData,
-    setAssetIdData,
-    setAreaIdData,
-    setVarValueData,
-    setBranchAddressData,
-    setThreeCategoryIdData,
-    setConnectionTagForConf,
-    setConnectionTabsData,
-    getTabConnectSHConf
-} from './utils';
-import {setSelectElementPosition} from './element';
-import {elementType} from '../../static';
+import { s8, pointInRect, formatPadding, previewType} from './utils';
+import axios from 'axios'
 
 var resizeCursors = ['nw-resize', 'ne-resize', 'se-resize', 'sw-resize'];
 var dockOffset = 10;
@@ -42,8 +27,8 @@ var Topology = (function (_super) {
     __extends(Topology, _super);
     function Topology(parent, options) {
         var _this = _super.call(this, parent, options) || this;
-        _this.hoverLayer = new HoverLayer(_this.id);
-        _this.activeLayer = new ActiveLayer(_this.id);
+        _this.hoverLayer = new HoverLayer(this.options, _this.id);
+        _this.activeLayer = new ActiveLayer(this.options, _this.id);
         _this.offscreen.getRoutineLayer();
         _this.activeLayer.topology = this;
         _this.gridElem = document.createElement('div');
@@ -51,10 +36,8 @@ var Topology = (function (_super) {
             index: 0,
             list: [],
         };
-        _this.isTabHideShow = false;
         _this.needCache = false;
         _this.addingArbitraryGraph = false;
-        _this.nodeId = '';
         _this.arbitrarygGraphData = {
             points: [],
             circles: [],
@@ -67,7 +50,7 @@ var Topology = (function (_super) {
             if (Store.get('addingArbitraryGraph')) {
                 return
             }
-            if (_this.scheduledAnimationFrame || _this.store.data.locked === Lock.NoEvent) {
+            if (_this.scheduledAnimationFrame || _this.data.locked === Lock.NoEvent) {
                 return;
             }
             // https://caniuse.com/#feat=mdn-api_mouseevent_buttons
@@ -78,7 +61,7 @@ var Topology = (function (_super) {
             }
             if (_this.mouseDown) {
                 var b = false;
-                switch (_this.store.options.translateKey) {
+                switch (_this.options.translateKey) {
                     case KeyType.None:
                         b = true;
                         break;
@@ -112,9 +95,8 @@ var Topology = (function (_super) {
                     _this.dispatch('translate', {x, y});
                     return false;
                 }
-                
             }
-            if (_this.store.data.locked && _this.mouseDown) {
+            if (_this.data.locked && _this.mouseDown) {
                 return;
             }
             _this.scheduledAnimationFrame = true;
@@ -168,18 +150,18 @@ var Topology = (function (_super) {
                     return;
                 }
                 // Move out parent element.
-                var moveOutX = pos.x + 50 > _this.store.parentElem.clientWidth + _this.store.parentElem.scrollLeft;
-                var moveOutY = pos.y + 50 > _this.store.parentElem.clientHeight + _this.store.parentElem.scrollTop;
-                if (!_this.store.options.disableMoveOutParent && (moveOutX || moveOutY)) {
+                var moveOutX = pos.x + 50 > _this.parentElem.clientWidth + _this.parentElem.scrollLeft;
+                var moveOutY = pos.y + 50 > _this.parentElem.clientHeight + _this.parentElem.scrollTop;
+                if (!_this.options.disableMoveOutParent && (moveOutX || moveOutY)) {
                     _this.dispatch('moveOutParent', pos);
-                    if (_this.store.options.autoExpandDistance > 0) {
+                    if (_this.options.autoExpandDistance > 0) {
                         var resize = false;
                         if (pos.x + 50 > _this.divLayer.canvas.clientWidth) {
-                            _this.canvas.width += _this.store.options.autoExpandDistance;
+                            _this.canvas.width += _this.options.autoExpandDistance;
                             resize = true;
                         }
                         if (pos.y + 50 > _this.divLayer.canvas.clientHeight) {
-                            _this.canvas.height += _this.store.options.autoExpandDistance;
+                            _this.canvas.height += _this.options.autoExpandDistance;
                             resize = true;
                         }
                         if (resize) {
@@ -188,21 +170,20 @@ var Topology = (function (_super) {
                                 height: _this.canvas.height,
                             });
                         }
-                        _this.scroll(moveOutX ? _this.store.options.autoExpandDistance / 2 : 0, moveOutY ? _this.store.options.autoExpandDistance / 2 : 0);
+                        _this.scroll(moveOutX ? _this.options.autoExpandDistance / 2 : 0, moveOutY ? _this.options.autoExpandDistance / 2 : 0);
                     }
                 }
-                var moveLeft = pos.x - 100 < _this.store.parentElem.scrollLeft;
-                var moveTop = pos.y - 100 < _this.store.parentElem.scrollTop;
+                var moveLeft = pos.x - 100 < _this.parentElem.scrollLeft;
+                var moveTop = pos.y - 100 < _this.parentElem.scrollTop;
                 if ((moveLeft || moveTop)) {
                     _this.scroll(moveLeft ? -100 : 0, moveTop ? -100 : 0);
                 }
-                //console.log('_this.moveIn.type----', _this.moveIn.type)
+                // console.log('_this.moveIn.type----', _this.moveIn.type)
                 switch (_this.moveIn.type) {
                     case _this.moveInType.None:
                         _this.hoverLayer.dragRect = new Rect(_this.mouseDown.x, _this.mouseDown.y, pos.x - _this.mouseDown.x, pos.y - _this.mouseDown.y);
                         break;
                     case _this.moveInType.Nodes:
-                        _this.store.data.dataResize = 0;
                         if (_this.activeLayer.locked()) {
                             break;
                         }
@@ -213,15 +194,8 @@ var Topology = (function (_super) {
                             _this.activeLayer.move(offset.x ? offset.x : x, offset.y ? offset.y : y);
                             _this.needCache = true;
                         }
-                        const dropdownSelect = _this.activeLayer.pens.filter((ds) => {return ds.name === elementType.select && ds.selectDropdown});
-                        if(dropdownSelect.length) {
-                            dropdownSelect.map((dropdown) => {
-                                setSelectElementPosition(dropdown);
-                            })
-                        }
                         break;
                     case _this.moveInType.ResizeCP:
-                        _this.store.data.dataResize = 1;
                         var p1 = new Point(_this.mouseDown.x, _this.mouseDown.y);
                         var p2 = new Point(pos.x, pos.y);
                         var offsetX = p2.x - p1.x;
@@ -269,11 +243,8 @@ var Topology = (function (_super) {
                                 }
                             }
                         } else {
-                            const activeLayerPens = _this.activeLayer.pens;
-                            const isOnlySelect = activeLayerPens.length < 2 && activeLayerPens[0].name === elementType.select && activeLayerPens[0].selectDropdown;
-                            if(isOnlySelect) setSelectElementPosition(activeLayerPens[0]);
                             _this.activeLayer.resize(_this.moveIn.activeAnchorIndex, _this.mouseDown, pos);
-                            _this.dispatch('resizePens', activeLayerPens);
+                            _this.dispatch('resizePens', _this.activeLayer.pens);
                             _this.needCache = true;
                         }
                         break;
@@ -314,7 +285,7 @@ var Topology = (function (_super) {
 
                         } else {
 
-                            var arrow = _this.store.data.toArrowType;
+                            var arrow = _this.data.toArrowType;
                             if (_this.moveIn.hoverLine) {
                                 arrow = _this.moveIn.hoverLine.toArrow;
                             }
@@ -368,8 +339,8 @@ var Topology = (function (_super) {
             });
         };
         _this.onmousedown = function (e) {
-            _this.store.data.dataResize = 0;
-            if (e.button !== 0) return;
+            if (e.button !== 0)
+                return;
             var canvasPos = _this.divLayer.canvas.getBoundingClientRect();
             _this.mouseDown = {x: e.x - canvasPos.x, y: e.y - canvasPos.y};
             if (e.altKey) {
@@ -404,7 +375,7 @@ var Topology = (function (_super) {
                         break;
                     case _this.moveInType.LineMove:
                         _this.hoverLayer.initLine = new Line(_this.moveIn.hoverLine);
-                        if (_this.store.data.locked || _this.moveIn.hoverLine.locked) {
+                        if (_this.data.locked || _this.moveIn.hoverLine.locked) {
                             _this.moveIn.hoverLine.click();
                         }
                         // tslint:disable-next-line:no-switch-case-fall-through
@@ -422,12 +393,12 @@ var Topology = (function (_super) {
 
                         } else {
                             _this.hoverLayer.line = _this.addLine({
-                                name: _this.store.data.lineName,
+                                name: _this.data.lineName,
                                 from: new Point(_this.moveIn.hoverNode.rotatedAnchors[_this.moveIn.hoverAnchorIndex].x, _this.moveIn.hoverNode.rotatedAnchors[_this.moveIn.hoverAnchorIndex].y, _this.moveIn.hoverNode.rotatedAnchors[_this.moveIn.hoverAnchorIndex].direction, _this.moveIn.hoverAnchorIndex, _this.moveIn.hoverNode.id),
-                                fromArrow: _this.store.data.fromArrowType,
+                                fromArrow: _this.data.fromArrowType,
                                 to: new Point(_this.moveIn.hoverNode.rotatedAnchors[_this.moveIn.hoverAnchorIndex].x, _this.moveIn.hoverNode.rotatedAnchors[_this.moveIn.hoverAnchorIndex].y),
-                                toArrow: _this.store.data.toArrowType,
-                                strokeStyle: _this.store.options.color,
+                                toArrow: _this.data.toArrowType,
+                                strokeStyle: _this.options.color,
                             });
                             _this.dispatch('anchor', {
                                 anchor: _this.moveIn.hoverNode.rotatedAnchors[_this.moveIn.hoverAnchorIndex],
@@ -470,9 +441,10 @@ var Topology = (function (_super) {
                             const activeNode = _this.moveIn.activeNode;
                             if (!_this.checkNodeOfClickType(activeNode)) {
                                 _this.activeLayer.setPens([activeNode]);
-                                if(activeNode.name === elementType.select && activeNode.selectDropdown) setSelectElementPosition(activeNode, 'down');
-                                if(activeNode.name == 'tablePagination') {
-                                    if (_this.store.options.type === 'topology') return _this.dispatch('node', activeNode);
+                                if (activeNode && activeNode.name == 'arbitraryGraph') {
+                                    _this.dispatch('node', activeNode);
+                                } else if (activeNode && activeNode.name == 'tablePagination') {
+                                    if (_this.options.type === 'topology') return _this.dispatch('node', activeNode);
                                     const pnlKeys = Object.keys(activeNode.paginationData.pageNumberLocals);
                                     const pageNumArea = pnlKeys.find((pna) => {
                                         return e.offsetX - 32 < pna && e.offsetX - parseInt(pna) > 0
@@ -485,13 +457,20 @@ var Topology = (function (_super) {
                                         if (activeNode.paginationData.pageListState) _this.spreadPageListHandle(activeNode, e);
                                         if (activeNode.paginationData.targetPageLocal.hide) _this.targetPageInputHandle(activeNode, e);
                                     }
-                                }else {
-                                    _this.changeTabsState(activeNode);
+                                } else {
                                     _this.dispatch('node', activeNode);
+                                    if(!window.location.pathname.includes('workspace')) {
+                                        const staticTypeNode = activeNode.events.find((ev) => {
+                                            return parseInt(ev.action) === 8
+                                        }); // 若绑定的是echarts统计图事件
+                                        if (staticTypeNode) {
+                                            _this.switchStaticsCheckType(activeNode, staticTypeNode);
+                                        }
+                                    }
                                 }
                             }
                         }
-                        if (_this.store.data.locked || _this.moveIn.activeNode.locked) {
+                        if (_this.data.locked || _this.moveIn.activeNode.locked) {
                             _this.moveIn.activeNode.click();
                         }
                         break;
@@ -532,10 +511,10 @@ var Topology = (function (_super) {
                         if (_this.hoverLayer.line) {
                             var willAddLine = void 0;
                             if (_this.hoverLayer.line.to.id) {
-                                if (!_this.store.options.disableRepeatLine) {
+                                if (!_this.options.disableRepeatLine) {
                                     willAddLine = true;
                                 } else {
-                                    var lines = _this.store.data.pens.filter(function (pen) {
+                                    var lines = _this.data.pens.filter(function (pen) {
                                         return pen.type === PenType.Line &&
                                                 pen.from.isSameAs(_this.hoverLayer.line.from) &&
                                                 pen.to.isSameAs(_this.hoverLayer.line.to);
@@ -543,13 +522,13 @@ var Topology = (function (_super) {
                                     willAddLine = lines.length <= 1;
                                 }
                             } else {
-                                willAddLine = !_this.store.options.disableEmptyLine;
+                                willAddLine = !_this.options.disableEmptyLine;
                             }
                             if (willAddLine) {
                                 _this.activeLayer.pens = [_this.hoverLayer.line];
                                 _this.dispatch('addLine', _this.hoverLayer.line);
                             } else {
-                                _this.store.data.pens.pop();
+                                _this.data.pens.pop();
                                 _this.activeLayer.clear();
                             }
                         }
@@ -568,7 +547,7 @@ var Topology = (function (_super) {
                                 (!_this.hoverLayer.line.from.id || !_this.hoverLayer.line.to.id)) {
                             _this.needCache = true;
                             _this.activeLayer.clear();
-                            _this.store.data.pens.splice(_this.findIndex(_this.hoverLayer.line), 1);
+                            _this.data.pens.splice(_this.findIndex(_this.hoverLayer.line), 1);
                         }
                         break;
                 }
@@ -581,7 +560,7 @@ var Topology = (function (_super) {
             _this.needCache = false;
         };
         _this.onkeydown = function (key) {
-            if (_this.store && _this.store.data.locked ||
+            if (_this.data.locked ||
                     key.target.tagName === 'INPUT' ||
                     key.target.tagName === 'TEXTAREA') {
                 return;
@@ -592,7 +571,7 @@ var Topology = (function (_super) {
             switch (key.key) {
                 case 'a':
                 case 'A':
-                    _this.activeLayer.setPens(_this.store.data.pens);
+                    _this.activeLayer.setPens(_this.data.pens);
                     _this.dispatch('multi', _this.activeLayer.pens);
                     done = true;
                     break;
@@ -696,45 +675,41 @@ var Topology = (function (_super) {
                     return;
                 var obj = JSON.parse(json);
                 event.preventDefault();
-                if(obj.type && obj.type === 'temp') {
-                    obj.locked = 0;
-                    // 模板
-                    _this.animateLayer.stop();
-                    _this.closeMqtt();
-                    _this.open(obj);
-                    const tempData = {
-                        name: obj.name,
-                        component: obj.component,
-                        image: obj.image,
-                        useType: obj.useType,
-                        data: JSON.parse(json)
-                    };
-                    delete tempData.data['pens'];
-                    _this.dispatch('template', tempData);
-                }else {
-                    if (obj.name && obj.name == 'arbitraryGraph') {
-                        Store.set('addingArbitraryGraph', true);
-                        _this.addingArbitraryGraph = true;
-                        _this.dispatch('addingArbitraryGraph', true);
-                        return
-                    }
-                    _this.addingArbitraryGraph = false;
-                    Store.set('addingArbitraryGraph', false);
-                    _this.arbitrarygGraphData = {
-                        points: [],
-                        circles: [],
-                        indexCircle: 0, //当前点击的圆圈
-                        oZindex: -1, //是否达到起点
-                        isDragging: false, //是否在抓取
-                        close: false, //闭合
-                    };
+                if (obj.name && obj.name == 'arbitraryGraph') {
+                    Store.set('addingArbitraryGraph', true);
+                    _this.addingArbitraryGraph = true;
+                    _this.dispatch('addingArbitraryGraph', true);
+                    return
+                }
+                _this.addingArbitraryGraph = false;
+                Store.set('addingArbitraryGraph', false);
+                _this.arbitrarygGraphData = {
+                    points: [],
+                    circles: [],
+                    indexCircle: 0, //当前点击的圆圈
+                    oZindex: -1, //是否达到起点
+                    isDragging: false, //是否在抓取
+                    close: false, //闭合
+                };
+                if (obj.name == 'temp') {
+                    // 温湿度元件
+                    let activeTempNodes = []
+                    _this.dropNodes([obj.children[0]], event.offsetX - 23.5, event.offsetY)
+                    activeTempNodes.push(_this.activeLayer.pens[0])
+                    _this.dropNodes([obj.children[1]], event.offsetX + 11.5, event.offsetY - 8.5)
+                    activeTempNodes.push(_this.activeLayer.pens[0])
+                    _this.dropNodes([obj.children[2]], event.offsetX + 11.5, event.offsetY + 8.5)
+                    activeTempNodes.push(_this.activeLayer.pens[0])
+                    _this.activeLayer.pens = activeTempNodes
+                    _this.combine(activeTempNodes, null, 'temp');
+                } else {
                     _this.dropNodes(Array.isArray(obj) ? obj : [obj], event.offsetX, event.offsetY);
                 }
             } catch (_a) {
             }
         };
         _this.subcribeAnimateMoved = Store.subscribe(this.generateStoreKey('LT:rectChanged'), function (e) {
-            _this.activeLayer.updateLines(_this.store.data.pens);
+            _this.activeLayer.updateLines(_this.data.pens);
         });
         _this.subcribeMediaEnd = Store.subscribe(this.generateStoreKey('mediaEnd'), function (node) {
             if (node.nextPlay) {
@@ -747,7 +722,7 @@ var Topology = (function (_super) {
             if (window.location.pathname.includes('workspace')) {
                 return
             }
-            _this.hidePenByTag(_this.store.data.pens, e);
+            _this.hidePenByTag(_this.data.pens, e);
             const obj = e ? JSON.parse(e) : {}
             const visibleRange = obj.visibleRange
             if (visibleRange == '1') {
@@ -758,10 +733,10 @@ var Topology = (function (_super) {
         _this.divLayer.canvas.onmousedown = this.onmousedown;
         _this.divLayer.canvas.onmouseup = this.onmouseup;
         _this.divLayer.canvas.onwheel = function (event) {
-            if (_this.store.options.disableScale) {
+            if (_this.options.disableScale) {
                 return;
             }
-            switch (_this.store.options.scaleKey) {
+            switch (_this.options.scaleKey) {
                 case KeyType.None:
                     break;
                 case KeyType.Ctrl:
@@ -785,28 +760,28 @@ var Topology = (function (_super) {
                     }
             }
             event.preventDefault();
-            // if (event.deltaY < 0) {
-            //     if (event.layerX && event.layerY) {
-            //         _this.scale(1.1, {x: event.layerX, y: event.layerY});
-            //         _this.canvas.scale(1.1, {x: event.layerX, y: event.layerY});
-            //     } else {
-            //         _this.scale(1.1);
-            //         _this.canvas.scale(1.1);
-            //     }
-            // } else {
-            //     if (event.layerX && event.layerY) {
-            //         _this.scale(0.9, {x: event.layerX, y: event.layerY});
-            //         _this.canvas.scale(0.9, {x: event.layerX, y: event.layerY});
-            //     } else {
-            //         _this.scale(0.9);
-            //         _this.canvas.scale(0.9);
-            //     }
-            // }
+            if (event.deltaY < 0) {
+                if (event.layerX && event.layerY) {
+                    _this.scale(1.1, {x: event.layerX, y: event.layerY});
+                    _this.canvas.scale(1.1, {x: event.layerX, y: event.layerY});
+                } else {
+                    _this.scale(1.1);
+                    _this.canvas.scale(1.1);
+                }
+            } else {
+                if (event.layerX && event.layerY) {
+                    _this.scale(0.9, {x: event.layerX, y: event.layerY});
+                   _this.canvas.scale(0.9, {x: event.layerX, y: event.layerY});
+                } else {
+                    _this.scale(0.9);
+                  _this.canvas.scale(0.9);
+                }
+            }
             _this.divLayer.canvas.focus();
             return false;
         };
         _this.cache();
-        switch (_this.store.options.keydown) {
+        switch (_this.options.keydown) {
             case KeydownType.Document:
                 document.onkeydown = _this.onkeydown;
                 break;
@@ -820,7 +795,6 @@ var Topology = (function (_super) {
                 clearTimeout(timer);
             }
             timer = setTimeout(function () {
-                _this.resize();
                 _this.overflow();
                 _this.render();
             }, 100);
@@ -829,26 +803,26 @@ var Topology = (function (_super) {
         return _this;
     }
     // Render or redraw
-    Topology.prototype.render = function (noFocus) {
-        try{
-            if (noFocus === void 0) {
-                noFocus = false;
-            }
-            if (noFocus) {
-                this.activeLayer.pens = [];
-                this.hoverLayer.node = null;
-                this.hoverLayer.line = null;
-            }
-            if (this.rendering) {
-                return this;
-            }
-            this.rendering = true;
-            this.offscreen.render();
-            this.canvas.render();
-            this.rendering = false;
-        }catch (e){
-            //console.log('render-error-------------', e)
-        }
+    Topology.prototype.render = function (noFocus, type) {
+      try{
+        if (noFocus === void 0) {
+          noFocus = false;
+        }
+        if (noFocus) {
+          this.activeLayer.pens = [];
+          this.hoverLayer.node = null;
+          this.hoverLayer.line = null;
+        }
+        if (this.rendering) {
+          return this;
+        }
+        this.rendering = true;
+        this.offscreen.render();
+        this.canvas.render();
+        this.rendering = false;
+      }catch (e){
+        console.log('render-error-------------')
+      }
     };
     Topology.prototype.resize = function (size) {
         this.canvasResize(size);
@@ -878,26 +852,58 @@ var Topology = (function (_super) {
             }
             if (json.name === 'lineAlone') {
                 _this.addLine({
-                    name: _this.store.data.lineName,
+                    name: _this.data.lineName,
                     from: new Point(json.rect.x, json.rect.y),
-                    fromArrow: _this.store.data.fromArrowType,
+                    fromArrow: _this.data.fromArrowType,
                     to: new Point(json.rect.x + json.rect.width, json.rect.y + json.rect.height),
-                    toArrow: _this.store.data.toArrowType,
-                    strokeStyle: _this.store.options.color,
+                    toArrow: _this.data.toArrowType,
+                    strokeStyle: _this.options.color,
                 }, true);
             }
 
             if (json.name == 'define') {
+
                 // console.log('创建自定义组件 ', json);
+
                 console.log('store 中的 自定义 ', Store.get('defineNode'));
-                _this.dropDefineNode(json, offsetX, offsetY);
-            } else if(json.name === 'temp') {
-                // 温湿度元件
-                _this.dropTempNode(json);
-            }else {
+                if (_this.data.locked) return
+                // let defineNode = Store.get('defineNode');
+                // let nodesList = Store.get('defineNode').pens;
+                let defineNode = JSON.parse(localStorage.getItem("defineNode_"))
+                let nodesList = defineNode.pens;
+
+                let renderNodesList = [];
+
+                for (let i = 0, len = nodesList.length; i < len; i++) {
+
+                    nodesList[i].rect.x = offsetX - nodesList[i].rect.width / 2;
+
+                    nodesList[i].rect.y = offsetY - nodesList[i].rect.height / 2;
+
+                    let node = new Node(nodesList[i]);
+
+                    node.setTID(s8());
+                    node.id = s8();
+                    node.fileId = defineNode.fileId;
+
+                    // console.log('push之前的node', node);
+
+                    _this.data.pens.push(node);
+
+                    renderNodesList.push(node);
+                }
+                _this.activeLayer.setPens([renderNodesList[0]]);
+
+                _this.render(false);
+
+                _this.animate(true);
+
+                _this.cache();
+
+                _this.dispatch('addNode', renderNodesList[0]);
+
+            } 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);
@@ -905,7 +911,7 @@ var Topology = (function (_super) {
                     _this.dispatch('LT:addDiv', node);
                 }
                 if (node.name === 'formTable') {
-                    _this.store.data.dataConstruct[node.id] = {
+                    _this.data.dataConstruct[node.id] = {
                         id: node.id,
                         name: 'table'
                     }
@@ -914,123 +920,36 @@ var Topology = (function (_super) {
         });
         this.divLayer.canvas.focus();
     };
-    Topology.prototype.setNodeData = function(node) {
-        const item = new Node(node);
-        item.setTID(this.id);
-        item.clearChildrenIds();
-        return item;
-    };
-    Topology.prototype.changeTabsState = function (node) {
-        if(this.nodeId === node.id) return;
-        this.nodeId = node.id;
-        this.isTabHideShow = node.events && node.events.some((ev) => {return ev.action === 8 && ev.dcimStaticForType === 'SH'});
-        if(!this.isTabHideShow) return;
-        // tab显示隐藏
-        const pens = this.store.data.pens;
-        // 重置tabs数据
-        for (let i = 0, pensLength = pens.length; i < pensLength; i++) {
-            pens[i].order = i;
-            setConnectionTabsData(pens[i]);
-        }
-        this.switchStaticsCheckType(node, {dcimStaticForType: 'SH'});
-    };
-    // 添加温湿度元件
-    Topology.prototype.dropTempNode = function(json) {
-        const nodeChildren = json.children;
-        delete json['children'];
-        const node = this.setNodeData(json);
-        const combinTempData = [];
-        let nodeX = node.rect.x;
-        let nodeY = node.rect.y;
-        for (let i = 0; i < nodeChildren.length; i++) {
-            const childNode = this.setNodeData(nodeChildren[i]);
-            childNode.rect.x = i === 0 ? nodeX : nodeX + childNode.rect.width / 2;
-            childNode.rect.y = i === 2 ? nodeY + childNode.rect.height + 1 : nodeY;
-            childNode.rect.center = {
-                x: childNode.rect.x + childNode.rect.width / 2,
-                y: childNode.rect.y + childNode.rect.height / 2
-            }
-            childNode.rect.ex = childNode.rect.x + childNode.rect.width;
-            childNode.rect.ey = childNode.rect.y + childNode.rect.height;
-            combinTempData.push(childNode);
-        }
-        this.combine(combinTempData, null, 'temp');
-        this.render();
-        this.cache();
-    };
-    // 添加自定义元件
-    Topology.prototype.dropDefineNode = function(josn, offsetX, offsetY) {
-        var _this = this;
-        if (_this.store.data.locked) return
-        // let defineNode = Store.get('defineNode');
-        // let nodesList = Store.get('defineNode').pens;
-        let defineNode = JSON.parse(localStorage.getItem("defineNode_"))
-        let nodesList = defineNode.pens;
-
-        let renderNodesList = [];
-
-        for (let i = 0, len = nodesList.length; i < len; i++) {
-
-            nodesList[i].rect.x = offsetX - nodesList[i].rect.width / 2;
-
-            nodesList[i].rect.y = offsetY - nodesList[i].rect.height / 2;
-
-            let node = new Node(nodesList[i]);
-
-            node.setTID(s8());
-            node.id = s8();
-            node.fileId = defineNode.fileId;
-
-            // console.log('push之前的node', node);
-
-            _this.store.data.pens.push(node);
-
-            renderNodesList.push(node);
-        }
-        _this.activeLayer.setPens([renderNodesList[0]]);
-
-        _this.render(false);
-
-        _this.animate(true);
-
-        _this.cache();
-
-        _this.dispatch('addNode', renderNodesList[0]);
-    };
-    Topology.prototype.addNode = function (node, focus, visit) {
+    Topology.prototype.addNode = function (node, focus) {
         if (focus === void 0) {
             focus = false;
         }
-        if (this.store.data.locked || !drawNodeFns[node.name]) {
+        if (this.data.locked || !drawNodeFns[node.name]) {
             return null;
         }
         // if it's not a Node
         if (!node.init) {
             node = new Node(node);
         }
-        if (!node.strokeStyle && this.store.options.color) {
-            node.strokeStyle = this.store.options.color;
+        if (!node.strokeStyle && this.options.color) {
+            node.strokeStyle = this.options.color;
         }
         for (var key in node.font) {
             if (!node.font[key]) {
-                node.font[key] = this.store.options.font[key];
+                node.font[key] = this.options.font[key];
             }
         }
-        if (this.store.data.scale !== 1) {
-            node.scale(this.store.data.scale);
+        if (this.data.scale !== 1) {
+            node.scale(this.data.scale);
         }
-        node.visibleSwitch = true;
-        node.order = this.store.data.pens.length;
-        this.store.data.pens.push(node);
-        setConnectionTagForConf(node);
+        this.data.pens.push(node);
+        this.setSwitchTabData(node, this.data.pens.length-1);
         if (focus) {
+            this.activeLayer.setPens([node]);
             this.render();
             this.animate(true);
             this.cache();
-            if(!visit) {
-                this.activeLayer.setPens([node]);
-                this.dispatch('addNode', node);
-            }
+            this.dispatch('addNode', node);
         }
         return node;
     };
@@ -1038,14 +957,14 @@ var Topology = (function (_super) {
         if (focus === void 0) {
             focus = false;
         }
-        if (this.store.data.locked) {
+        if (this.data.locked) {
             return null;
         }
         if (!line.clone) {
             line = new Line(line);
             line.calcControlPoints(true);
         }
-        this.store.data.pens.push(line);
+        this.data.pens.push(line);
         if (focus) {
             this.activeLayer.setPens([line]);
             this.render();
@@ -1058,10 +977,10 @@ var Topology = (function (_super) {
     // open - redraw by the data
     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;
-        this.store.parentElem.scrollTop = 0;
+        Store.set(this.generateStoreKey('LT:scale'), this.data.scale);
+        this.dispatch('scale', this.data.scale);
+        this.parentElem.scrollLeft = 0;
+        this.parentElem.scrollTop = 0;
         this.caches.list = [];
         this.divLayer.clear();
         this.cache();
@@ -1071,22 +990,22 @@ var Topology = (function (_super) {
         this.showGrid();
     };
     Topology.prototype.overflow = function () {
-        try {
-            var rect = this.getRect();
-            let _a = this.canvas;
-            if(!_a.width) return;
-            let width = _a.width, height = _a.height;
-            if (width < rect.width) {
-                width = rect.width;
-            }
-            if (height < rect.height) {
-                height = rect.height;
-            }
-            this.resize({width: width, height: height});
-            return rect;
-        }catch (e){
-            //console.log('init-error-----------',e)
+      try {
+        var rect = this.getRect();
+        let _a = this.canvas;
+        if(!_a.width) return;
+        let width = _a.width, height = _a.height;
+        if (width < rect.width) {
+          width = rect.width;
+        }
+        if (height < rect.height) {
+          height = rect.height;
         }
+        this.resize({width: width, height: height});
+        return rect;
+      }catch (e){
+        console.log('init-error-----------')
+      }
     };
     Topology.prototype.getMoveIn = function (pt) {
         this.lastHoverNode = this.moveIn.hoverNode;
@@ -1096,13 +1015,13 @@ var Topology = (function (_super) {
         this.moveIn.lineControlPoint = null;
         this.moveIn.hoverLine = null;
         this.hoverLayer.hoverAnchorIndex = -1;
-        if (!this.store.data.locked &&
+        if (!this.data.locked &&
                 !(this.activeLayer.pens.length === 1 && this.activeLayer.pens[0].type) &&
                 !this.activeLayer.locked() &&
                 this.activeLayer.rotateCPs[0] &&
                 this.activeLayer.rotateCPs[0].hit(pt, 15)) {
             this.moveIn.type = this.moveInType.Rotate;
-            var cursor = this.store.options.rotateCursor;
+            var cursor = this.options.rotateCursor;
             this.divLayer.canvas.style.cursor = cursor.includes('/')
                     ? "url(\"" + cursor + "\"), auto"
                     : cursor;
@@ -1112,9 +1031,9 @@ var Topology = (function (_super) {
                 pointInRect(pt, this.activeLayer.sizeCPs)) {
             this.moveIn.type = this.moveInType.Nodes;
         }
-        if (!this.store.data.locked &&
+        if (!this.data.locked &&
                 !this.activeLayer.locked() &&
-                !this.store.options.hideSizeCP) {
+                !this.options.hideSizeCP) {
             if (this.activeLayer.pens.length > 1 ||
                     (!this.activeLayer.pens[0].type && !this.activeLayer.pens[0].hideSizeCP)) {
                 for (var i = 0; i < this.activeLayer.sizeCPs.length; ++i) {
@@ -1127,8 +1046,8 @@ var Topology = (function (_super) {
                 }
             }
         }
-        // In active pen. 
-        if (!this.store.data.locked) {
+        // In active pen.
+        if (!this.data.locked) {
             for (var _i = 0, _a = this.activeLayer.pens; _i < _a.length; _i++) {
                 var item = _a[_i];
                 if (item instanceof Line && !item.locked) {
@@ -1148,19 +1067,16 @@ var Topology = (function (_super) {
                 }
             }
         }
-        this.store.data.dataResize = 1;
         this.divLayer.canvas.style.cursor = 'default';
-        var len = this.store.data.pens.length;
+        var len = this.data.pens.length;
         for (var i = len - 1; i > -1; --i) {
-            if(this.store.data.pens[i].visible || this.store.data.pens[i].visibleSwitch){
-                if (this.store.data.pens[i].type === PenType.Node &&
-                        this.inNode(pt, this.store.data.pens[i])) {
-                    return;
-                } else if (this.store.data.pens[i].type === PenType.Line &&
-                        this.inLine(pt, this.store.data.pens[i])) {
-                    // 需要优先判断十分在节点锚点上
-                    // return;
-                }
+            if (this.data.pens[i].type === PenType.Node &&
+                    this.inNode(pt, this.data.pens[i])) {
+                return;
+            } else if (this.data.pens[i].type === PenType.Line &&
+                    this.inLine(pt, this.data.pens[i])) {
+                // 需要优先判断十分在节点锚点上
+                // return;
             }
         }
     };
@@ -1191,7 +1107,7 @@ var Topology = (function (_super) {
         if (inChild === void 0) {
             inChild = false;
         }
-        if (this.store.data.locked === Lock.NoEvent ||
+        if (this.data.locked === Lock.NoEvent ||
                 (!node.visible && !window.location.pathname.includes('workspace')) ||
                 node.locked === Lock.NoEvent) {
             return null;
@@ -1212,22 +1128,21 @@ var Topology = (function (_super) {
             }
             return child;
         }
-        if(!(node instanceof Node)) node = new Node(node);
         if (node.hit(pt)) {
             this.moveIn.hoverNode = node;
             this.moveIn.type = this.moveInType.Nodes;
             // 非绘画页面下禁止不包含点击、双击事件的节点选中鼠标样式
             if (!this.checkNodeOfClickType(node)) {
-                if (!this.store.data.locked && !node.locked) {
+                if (!this.data.locked && !node.locked) {
                     this.divLayer.canvas.style.cursor = 'move';
                 } else {
-                    this.divLayer.canvas.style.cursor = this.store.options.hoverCursor;
+                    this.divLayer.canvas.style.cursor = this.options.hoverCursor;
                 }
             }
             // Too small
-            if (!this.store.data.locked &&
+            if (!this.data.locked &&
                     !node.locked &&
-                    !(this.store.options.hideAnchor ||
+                    !(this.options.hideAnchor ||
                             node.hideAnchor ||
                             node.rect.width < 20 ||
                             node.rect.height < 20)) {
@@ -1250,9 +1165,9 @@ var Topology = (function (_super) {
             }
             return node;
         }
-        if (this.store.options.hideAnchor ||
+        if (this.options.hideAnchor ||
                 node.hideAnchor ||
-                this.store.data.locked ||
+                this.data.locked ||
                 node.locked) {
             return null;
         }
@@ -1284,8 +1199,8 @@ var Topology = (function (_super) {
         if (line.from.hit(point, 5)) {
             this.moveIn.type = this.moveInType.LineFrom;
             this.moveIn.hoverLine = line;
-            if (this.store.data.locked || line.locked) {
-                this.divLayer.canvas.style.cursor = this.store.options.hoverCursor;
+            if (this.data.locked || line.locked) {
+                this.divLayer.canvas.style.cursor = this.options.hoverCursor;
             } else {
                 this.divLayer.canvas.style.cursor = 'move';
             }
@@ -1294,8 +1209,8 @@ var Topology = (function (_super) {
         if (line.to.hit(point, 5)) {
             this.moveIn.type = this.moveInType.LineTo;
             this.moveIn.hoverLine = line;
-            if (this.store.data.locked || line.locked) {
-                this.divLayer.canvas.style.cursor = this.store.options.hoverCursor;
+            if (this.data.locked || line.locked) {
+                this.divLayer.canvas.style.cursor = this.options.hoverCursor;
             } else {
                 this.divLayer.canvas.style.cursor = 'move';
             }
@@ -1304,7 +1219,7 @@ var Topology = (function (_super) {
         if (line.pointIn(point)) {
             this.moveIn.type = this.moveInType.LineMove;
             this.moveIn.hoverLine = line;
-            this.divLayer.canvas.style.cursor = this.store.options.hoverCursor;
+            this.divLayer.canvas.style.cursor = this.options.hoverCursor;
             if (line.from.id || line.to.id) {
                 this.moveIn.type = this.moveInType.Line;
             }
@@ -1314,7 +1229,7 @@ var Topology = (function (_super) {
     };
     Topology.prototype.getLineDock = function (point) {
         this.hoverLayer.dockAnchor = null;
-        for (var _i = 0, _a = this.store.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) {
                 if (item.rect.hit(point, 10)) {
@@ -1381,7 +1296,7 @@ var Topology = (function (_super) {
             rect.ey = rect.y + rect.height;
         }
         this.activeLayer.pens = [];
-        for (var _i = 0, _a = this.store.data.pens; _i < _a.length; _i++) {
+        for (var _i = 0, _a = this.data.pens; _i < _a.length; _i++) {
             var item = _a[_i];
             if (item.locked === Lock.NoEvent) {
                 continue;
@@ -1428,7 +1343,7 @@ var Topology = (function (_super) {
             x: 0,
             y: 0,
         };
-        if (noDock || this.store.options.disableDockLine) {
+        if (noDock || this.options.disableDockLine) {
             return offset;
         }
         var x = 0;
@@ -1437,7 +1352,7 @@ var Topology = (function (_super) {
         var disY = dockOffset;
         for (var _i = 0, _a = this.activeLayer.dockWatchers; _i < _a.length; _i++) {
             var activePt = _a[_i];
-            for (var _b = 0, _c = this.store.data.pens; _b < _c.length; _b++) {
+            for (var _b = 0, _c = this.data.pens; _b < _c.length; _b++) {
                 var item = _c[_b];
                 if (!(item instanceof Node) ||
                         this.activeLayer.has(item) ||
@@ -1470,9 +1385,9 @@ var Topology = (function (_super) {
         if (this.caches.index < this.caches.list.length - 1) {
             this.caches.list.splice(this.caches.index + 1, this.caches.list.length - this.caches.index - 1);
         }
-        var data = JSON.parse(JSON.stringify(this.store.data));
+        var data = new TopologyData(this.data);
         this.caches.list.push(data);
-        if (this.caches.list.length > this.store.options.cacheLen) {
+        if (this.caches.list.length > this.options.cacheLen) {
             this.caches.list.shift();
         }
         this.caches.index = this.caches.list.length - 1;
@@ -1505,31 +1420,31 @@ var Topology = (function (_super) {
         if (noRedo === void 0) {
             noRedo = false;
         }
-        if (this.store.data.locked || this.caches.index < 1) {
+        if (this.data.locked || this.caches.index < 1) {
             return;
         }
         this.divLayer.clear();
-        var data = JSON.parse(JSON.stringify(this.caches.list[--this.caches.index]));
-        this.store.data.pens.splice(0, this.store.data.pens.length);
-        this.store.data.pens.push.apply(this.store.data.pens, data.pens);
+        var data = new TopologyData(this.caches.list[--this.caches.index]);
+        this.data.pens.splice(0, this.data.pens.length);
+        this.data.pens.push.apply(this.data.pens, data.pens);
         this.render(true);
         this.divLayer.render();
         if (noRedo) {
             this.caches.list.splice(this.caches.index + 1, this.caches.list.length - this.caches.index - 1);
         }
-        this.dispatch('undo', this.store.data);
+        this.dispatch('undo', this.data);
     };
     Topology.prototype.redo = function () {
-        if (this.store.data.locked || this.caches.index > this.caches.list.length - 2) {
+        if (this.data.locked || this.caches.index > this.caches.list.length - 2) {
             return;
         }
         this.divLayer.clear();
-        var data = JSON.parse(JSON.stringify(this.caches.list[++this.caches.index]));
-        this.store.data.pens.splice(0, this.store.data.pens.length);
-        this.store.data.pens.push.apply(this.store.data.pens, data.pens);
+        var data = new TopologyData(this.caches.list[++this.caches.index]);
+        this.data.pens.splice(0, this.data.pens.length);
+        this.data.pens.push.apply(this.data.pens, data.pens);
         this.render(true);
         this.divLayer.render();
-        this.dispatch('redo', this.store.data);
+        this.dispatch('redo', this.data);
     };
     Topology.prototype.toImage = function (type, quality, callback, padding, thumbnail) {
         if (thumbnail === void 0) {
@@ -1585,14 +1500,7 @@ var Topology = (function (_super) {
     };
     Topology.prototype.delete = function (force, nodes) {
         var pens = [];
-        var deleteNodes = [];
-        if(this.isTabHideShow) {
-            // 如果删除的是tab显示隐藏元件
-            deleteNodes = getTabConnectSHConf(this.activeLayer.pens[0]);
-            this.activeLayer.pens = [];
-        }else {
-            deleteNodes = nodes ? nodes : this.activeLayer.pens;
-        }
+        const deleteNodes = nodes ? nodes : this.activeLayer.pens;
         for (var i = 0; i < deleteNodes.length; i++) {
             var pen = deleteNodes[i];
             if (!force && pen.locked) {
@@ -1600,14 +1508,14 @@ var Topology = (function (_super) {
             }
             var found = this.findIndex(pen);
             if (found > -1) {
-                if (this.store.data.pens[found].type === PenType.Node) {
-                    this.divLayer.removeDiv(this.store.data.pens[found]);
+                if (this.data.pens[found].type === PenType.Node) {
+                    this.divLayer.removeDiv(this.data.pens[found]);
                 }
-                if (this.store.options.disableEmptyLine) {
+                if (this.options.disableEmptyLine) {
                     this.delEmptyLines(pen.id);
                 }
-                pens.push.apply(pens, this.store.data.pens.splice(found, 1));
-                // this.setSwitchTabData(pen, found, 'delete');
+                pens.push.apply(pens, this.data.pens.splice(found, 1));
+                this.setSwitchTabData(pen, found, 'delete');
                 --i;
             }
             this.animateLayer.pens.delete(pen.id);
@@ -1620,16 +1528,16 @@ var Topology = (function (_super) {
         this.dispatch('delete', pens);
     };
     Topology.prototype.delEmptyLines = function (deleteedId) {
-        for (var i = 0; i < this.store.data.pens.length; i++) {
-            if (this.store.data.pens[i].type !== PenType.Line) {
+        for (var i = 0; i < this.data.pens.length; i++) {
+            if (this.data.pens[i].type !== PenType.Line) {
                 continue;
             }
-            var line = this.store.data.pens[i];
+            var line = this.data.pens[i];
             if (!line.from.id ||
                     !line.to.id ||
                     line.from.id === deleteedId ||
                     line.to.id === deleteedId) {
-                this.store.data.pens.splice(i, 1);
+                this.data.pens.splice(i, 1);
                 this.animateLayer.pens.delete(line.id);
                 --i;
             }
@@ -1638,8 +1546,8 @@ var Topology = (function (_super) {
     Topology.prototype.removeNode = function (node) {
         var i = this.findIndex(node);
         if (i > -1) {
-            this.divLayer.removeDiv(this.store.data.pens[i]);
-            var nodes = this.store.data.pens.splice(i, 1);
+            this.divLayer.removeDiv(this.data.pens[i]);
+            var nodes = this.data.pens.splice(i, 1);
             this.dispatch('delete', nodes);
         }
         this.render(true);
@@ -1648,28 +1556,28 @@ var Topology = (function (_super) {
     Topology.prototype.removeLine = function (line) {
         var i = this.findIndex(line);
         if (i > -1) {
-            var lines = this.store.data.pens.splice(i, 1);
+            var lines = this.data.pens.splice(i, 1);
             this.dispatch('delete', lines);
         }
         this.render(true);
         this.cache();
     };
     Topology.prototype.cut = function () {
-        if (this.store.data.locked) {
+        if (this.data.locked) {
             return;
         }
-        this.clipboard = {
+        this.clipboard = new TopologyData({
             pens: [],
-        };
+        });
         for (var i = 0; i < this.activeLayer.pens.length; i++) {
             var pen = this.activeLayer.pens[i];
             this.clipboard.pens.push(pen.clone());
             var found = this.findIndex(pen);
             if (found > -1) {
                 if (pen.type === PenType.Node) {
-                    this.divLayer.removeDiv(this.store.data.pens[found]);
+                    this.divLayer.removeDiv(this.data.pens[found]);
                 }
-                this.store.data.pens.splice(found, 1);
+                this.data.pens.splice(found, 1);
                 --i;
             }
         }
@@ -1686,9 +1594,9 @@ var Topology = (function (_super) {
             return item.animatePlay;
         });
         if(isAnimate) return false;
-        this.clipboard = {
+        this.clipboard = new TopologyData({
             pens: [],
-        };
+        });
         for (var _i = 0, _a = this.activeLayer.pens; _i < _a.length; _i++) {
             var pen = _a[_i];
             this.clipboard.pens.push(pen.clone());
@@ -1696,7 +1604,7 @@ var Topology = (function (_super) {
         return true;
     };
     Topology.prototype.paste = function () {
-        if (!this.clipboard || this.store.data.locked) {
+        if (!this.clipboard || this.data.locked) {
             return;
         }
         this.hoverLayer.node = null;
@@ -1737,10 +1645,9 @@ var Topology = (function (_super) {
                 }
                 pen.controlPoints = controlPoints;
             }
-            pen.order = this.store.data.pens.length;
-            this.store.data.pens.push(pen);
+            this.data.pens.push(pen);
             this.activeLayer.add(pen);
-            setConnectionTagForConf(pen);
+            this.setSwitchTabData(pen, this.data.pens.length-1);
         }
         this.render();
         this.animate(true);
@@ -1759,41 +1666,62 @@ var Topology = (function (_super) {
         }
     };
     Topology.prototype.bind = function (item, exite, dataType, index) {
-        this.clipboard = {
+        this.clipboard = new TopologyData({
             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, exite);
+            pen.data = []
+            this.bindInfo(item, pen, dataType, index)
             this.clipboard.pens.push(pen.clone());
         }
         if (exite == true) {
             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);
+    Topology.prototype.bindInfo = async function (item, pen, type, index) {
+        if (type == 0) {
+            pen.data.push({
+                "key": "tagId",
+                "value": item.tagId,
+                "isControlDis": item.isControlDis,
+                "type": item.tagType,
+                "tagVal": item.value,
+                "valExplain": item.valExplain,
+                "tagId": item.tagId
+            }, {
+                "key": "测点名称",
+                "value": item.tagName
+            })
+            let obj = {
+                "key": "threeCategoryId",
+                "value": item.threeCategoryId
+            }
             // 绑定悬浮文字
-            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 = item.touchpname
+            if (!JSON.stringify(pen.data).includes(JSON.stringify(obj))) {
+                pen.data.push(obj)
+            }
+        } else if (type == 1) {
+            pen.data.push({
+                "key": "kpiAddr",
+                "value": item.kpiId + '_' + item.kpiAddr,
+                "isControlDis": item.isControlDis,
+                "type": item.tagType
+            }, {
+                "key": "指标名称",
+                "value": item.kpiName
+            })
+        } else if (type == 2) {
+            pen.data.push({
+                "key": "assetId",
+                "value": item.id
+            }, {
+                "key": "资产名称",
+                "value": item.name
+            })
             // 绑定悬浮文字
-            pen.title = itemNode.bak
+            pen.title = item.bak
             if (pen.subName && pen.subName == 'temp') {
                 // 温湿度元件
                 // 通讯状态
@@ -1801,19 +1729,23 @@ var Topology = (function (_super) {
                 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 = [{
+                this.bindInfo(item, pen.children[0], type);
+                // 温度/湿度
+                const _type = 0
+                const ret = await axios.post('/asset/touch_css3000_api/findlist', {assetIds: item.id})
+                ret.data.data.forEach((elem) => {
+                    // if(elem.kpiName=='通讯状态'){
+                    // }else
+                    if (elem.kpiName == '温度') {
+                        pen.children[1].data = []
+                        this.bindInfo(elem, pen.children[1], _type);
+                    } else if (elem.kpiName == '湿度') {
+                        pen.children[2].data = []
+                        this.bindInfo(elem, pen.children[2], _type);
+                    }
+                })
+                pen.children.forEach((item) => {
+                    item.events = [{
                         "type": 3,
                         "action": 2,
                         "value": "",
@@ -1821,27 +1753,23 @@ var Topology = (function (_super) {
                     }]
                 })
             }
-        } 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);
-        }
-        if(typeof exite === 'boolean') pen.text = bindName;
-        // if([0, 2, '0', '2'].includes(type)) {
-        //     //用于处理场地监控，点击一个资产类别后，隐藏掉这个类别下的所有元件
-        //     const setThreeCategory = setThreeCategoryIdData(pen, itemNode);
-        //
-        //     pen.data.push(...setThreeCategory);
-        // }
-        return pen;
+        } else if (type == 3) {
+            pen.data.push({
+                "key": "areaId",
+                "value": item.id
+            }, {
+                "key": "区域名称",
+                "value": item.name
+            })
+        }
+        // let str = JSON.stringify(pen.events)
+        // pen.events.forEach((_item) => {
+        //     if(_item.action==0 && _item.dcimDetailPage && _item.dcimDetailPage != '' && item.devId){
+        //         str = str.replace(new RegExp(_item.dcimAssetValue,'g'), item.devId)
+        //     }
+        // });
+        // pen.events = JSON.parse(str)
+        return pen
     };
     Topology.prototype.newId = function (node, idMaps) {
         var old = node.id;
@@ -1861,12 +1789,10 @@ var Topology = (function (_super) {
         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];
             if (pen instanceof Node) {
                 let isRotateBug = false
-                isAnimate = pen.animateFrames && pen.animateFrames.length
                 if (pen.rotate === 0) {
                     pen.rotate = 360
                     isRotateBug = true
@@ -1885,20 +1811,19 @@ var Topology = (function (_super) {
         this.activeLayer.calcControlPoints();
         this.activeLayer.saveNodeRects();
         this.render();
-        if(isAnimate) this.animate(true);
         // tslint:disable-next-line: no-unused-expression
         cache && this.cache();
     };
     Topology.prototype.lock = function (lock) {
-        this.store.data.locked = lock;
-        for (var _i = 0, _a = this.store.data.pens; _i < _a.length; _i++) {
+        this.data.locked = lock;
+        for (var _i = 0, _a = this.data.pens; _i < _a.length; _i++) {
             var item = _a[_i];
             item.addToDiv && item.addToDiv();
         }
-        this.dispatch('locked', this.store.data.locked);
+        this.dispatch('locked', this.data.locked);
     };
     Topology.prototype.lockPens = function (pens, lock) {
-        for (var _i = 0, _a = this.store.data.pens; _i < _a.length; _i++) {
+        for (var _i = 0, _a = this.data.pens; _i < _a.length; _i++) {
             var item = _a[_i];
             for (var _b = 0, pens_2 = pens; _b < pens_2.length; _b++) {
                 var pen = pens_2[_b];
@@ -1916,33 +1841,33 @@ var Topology = (function (_super) {
     };
     Topology.prototype.up = function (pen) {
         var i = this.findIndex(pen);
-        if (i > -1 && i !== this.store.data.pens.length - 1) {
-            this.store.data.pens.splice(i + 2, 0, this.store.data.pens[i]);
-            this.store.data.pens.splice(i, 1);
+        if (i > -1 && i !== this.data.pens.length - 1) {
+            this.data.pens.splice(i + 2, 0, this.data.pens[i]);
+            this.data.pens.splice(i, 1);
         }
     };
     Topology.prototype.top = function (pen) {
         var i = this.findIndex(pen);
         if (i > -1) {
-            this.store.data.pens.push(this.store.data.pens[i]);
-            this.store.data.pens.splice(i, 1);
+            this.data.pens.push(this.data.pens[i]);
+            this.data.pens.splice(i, 1);
         }
     };
     Topology.prototype.down = function (pen) {
         var i = this.findIndex(pen);
         if (i > -1 && i !== 0) {
-            this.store.data.pens.splice(i - 1, 0, this.store.data.pens[i]);
-            this.store.data.pens.splice(i + 1, 1);
+            this.data.pens.splice(i - 1, 0, this.data.pens[i]);
+            this.data.pens.splice(i + 1, 1);
         }
     };
     Topology.prototype.bottom = function (pen) {
         var i = this.findIndex(pen);
         if (i > -1) {
-            this.store.data.pens.unshift(this.store.data.pens[i]);
-            this.store.data.pens.splice(i + 1, 1);
+            this.data.pens.unshift(this.data.pens[i]);
+            this.data.pens.splice(i + 1, 1);
         }
     };
-    Topology.prototype.combine = function (pens, stand, temp, rect) {
+    Topology.prototype.combine = function (pens, stand, temp) {
         if (stand === void 0) {
             stand = false;
         }
@@ -1955,7 +1880,7 @@ var Topology = (function (_super) {
             var item = pens_3[_i];
             var i = this.findIndex(item);
             if (i > -1) {
-                this.store.data.pens.splice(i, 1);
+                this.data.pens.splice(i, 1);
             }
         }
         var node = new Node({
@@ -1967,8 +1892,6 @@ var Topology = (function (_super) {
             paddingTop: 0,
             paddingBottom: 0,
             strokeStyle: 'transparent',
-            visible: true,
-            visibleSwitch: true,
             children: [],
         });
         if (temp) {
@@ -1979,14 +1902,10 @@ var Topology = (function (_super) {
             item.stand = stand;
             item.parentId = node.id;
             item.animatePlay = false;
-            item.visible = true;
-            item.visibleSwitch = true;
             item.calcRectInParent(node);
-            this.deleteSelectTabOptionNode(item);
             node.children.push(item);
         }
-        node.order = this.store.data.pens.length;
-        this.store.data.pens.push(node);
+        this.data.pens.push(node);
         this.activeLayer.setPens([node]);
         this.dispatch('node', node);
         this.cache();
@@ -1999,57 +1918,27 @@ var Topology = (function (_super) {
             return;
         }
         const nodeChildren = JSON.parse(JSON.stringify(node));
-        var i = this.findIndex(nodeChildren);
-        if (i > -1 && nodeChildren.name === 'combine') {
-            this.store.data.pens.splice(i, 1);
-        } else {
-            nodeChildren.children = null;
-        }
         for (var _i = 0, _a = nodeChildren.children; _i < _a.length; _i++) {
             var item = new Node(_a[_i]);
             item.parentId = undefined;
             item.rectInParent = undefined;
             item.locked = Lock.None;
-            item.order = this.store.data.pens.length;
-            this.addSelectTabOptionNode(item);
-            this.store.data.pens.push(item);
+            this.data.pens.push(item);
+        }
+        var i = this.findIndex(nodeChildren);
+        if (i > -1 && nodeChildren.name === 'combine') {
+            this.data.pens.splice(i, 1);
+        } else {
+            nodeChildren.children = null;
         }
-        this.deleteSelectTabOptionNode(nodeChildren);
         this.cache();
         this.activeLayer.clear();
         this.hoverLayer.clear();
     };
-    Topology.prototype.deleteSelectTabOptionNode = function (node) {
-        const tagNode = node.tags.find((t) => {return t.includes('selectOption')});
-        if(tagNode){
-            // 删除下拉节点关联的这个元件
-            const tagArr = tagNode.split('-');
-            const parentId = tagArr[1] && tagArr[1].trim();
-            if(parentId && this.store.selectTabDataPool[parentId].has(node.id)) this.store.selectTabDataPool[parentId].delete(node.id);
-        }
-    },
-    Topology.prototype.addSelectTabOptionNode = function (node) {
-        const tagNode = node.tags.find((t) => {return t.includes('selectOption')});
-        if(tagNode){
-            // 添加下拉节点关联的这个元件
-            const tagArr = tagNode.split('-');
-            const parentId = tagArr[1] && tagArr[1].trim();
-            if(!parentId) return;
-            const params = {
-                TID: node.TID,
-                id: node.id,
-                name: node.name,
-                order: node.order,
-                visible: node.visible,
-                tag: tagNode
-            }
-            this.store.selectTabDataPool[parentId].set(node.id, params);
-        }
-    },
     Topology.prototype.find = function (idOrTag, pens) {
         var _this = this;
         if (!pens) {
-            pens = this.store.data.pens;
+            pens = this.data.pens;
         }
         var result = [];
         pens.forEach(function (item) {
@@ -2066,28 +1955,28 @@ var Topology = (function (_super) {
         return result;
     };
     Topology.prototype.findIndex = function (pen) {
-        for (var i = 0; i < this.store.data.pens.length; ++i) {
-            if (pen.id === this.store.data.pens[i].id) {
+        for (var i = 0; i < this.data.pens.length; ++i) {
+            if (pen.id === this.data.pens[i].id) {
                 return i;
             }
         }
         return -1;
     };
     Topology.prototype.anchor = function (anchor) {
-        this.store.options.hideAnchor = anchor
+        this.options.hideAnchor = anchor
         this.dispatch('hideAnchor', anchor);
     };
     // scale for scaled canvas:
     //   > 1, expand
     //   < 1, reduce
     Topology.prototype.scale = function (scale, center, w, h) {
-        if (this.store.data.scale * scale < this.store.options.minScale ||
-                this.store.data.scale * scale > this.store.options.maxScale) {
+        if (this.data.scale * scale < this.options.minScale ||
+                this.data.scale * scale > this.options.maxScale) {
             return;
         }
-        this.store.data.scale *= scale;
+        this.data.scale *= scale;
         !center && (center = this.getRect().center);
-        for (var _i = 0, _a = this.store.data.pens; _i < _a.length; _i++) {
+        for (var _i = 0, _a = this.data.pens; _i < _a.length; _i++) {
             var item = _a[_i];
             item.scale(scale, center, w, h);
         }
@@ -2096,18 +1985,18 @@ var Topology = (function (_super) {
                 pen.scale(scale, center);
             }
         });
-        Store.set(this.generateStoreKey('LT:scale'), this.store.data.scale);
+        Store.set(this.generateStoreKey('LT:scale'), this.data.scale);
         this.render();
         this.cache();
-        this.dispatch('scale', this.store.data.scale);
+        this.dispatch('scale', this.data.scale);
     };
     // scale for origin canvas:
     Topology.prototype.scaleTo = function (scale) {
-        this.scale(scale / this.store.data.scale);
-        this.store.data.scale = scale;
+        this.scale(scale / this.data.scale);
+        this.data.scale = scale;
     };
     Topology.prototype.round = function () {
-        for (var _i = 0, _a = this.store.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.round();
@@ -2118,7 +2007,7 @@ var Topology = (function (_super) {
         if (!this.hasView())
             return;
         // 1. 重置画布尺寸为容器尺寸
-        var parentElem = this.store.parentElem;
+        var parentElem = this.canvas.parentElem;
         var width = parentElem.offsetWidth, height = parentElem.offsetHeight;
         this.resize({
             width: width,
@@ -2127,7 +2016,7 @@ var Topology = (function (_super) {
         // 2. 图形居中
         this.centerView(viewPadding);
         // 3. 获取设置的留白值
-        var padding = formatPadding(viewPadding || this.store.options.viewPadding);
+        var padding = formatPadding(viewPadding || this.options.viewPadding);
         // 4. 获取图形尺寸
         var rect = this.getRect();
         // 6. 计算缩放比
@@ -2140,7 +2029,7 @@ var Topology = (function (_super) {
         this.scale(ratio);
     };
     Topology.prototype.showTipText = function (data, pos) {
-        if (this.store.data.locked && data.title) {
+        if (this.data.locked && data.title) {
             this.divLayer.canvas.title = data.title;
             this.tip = data.id;
         }
@@ -2151,15 +2040,15 @@ var Topology = (function (_super) {
             return;
         }
         this.scrolling = true;
-        this.store.parentElem.scrollLeft += x;
-        this.store.parentElem.scrollTop += y;
+        this.parentElem.scrollLeft += x;
+        this.parentElem.scrollTop += y;
         setTimeout(function () {
             _this.scrolling = false;
         }, 700);
     };
     Topology.prototype.toComponent = function (pens) {
         if (!pens) {
-            pens = this.store.data.pens;
+            pens = this.data.pens;
         }
         var rect = this.getRect(pens);
         var node = new Node({
@@ -2200,7 +2089,7 @@ var Topology = (function (_super) {
             attr = 'text';
         }
         var pen;
-        this.store.data.pens.forEach(function (item) {
+        this.data.pens.forEach(function (item) {
             if (item.id === idOrTag || item.tags.indexOf(idOrTag) > -1) {
                 pen = item;
             }
@@ -2212,7 +2101,7 @@ var Topology = (function (_super) {
             attr = 'text';
         }
         var pen;
-        this.store.data.pens.forEach(function (item) {
+        this.data.pens.forEach(function (item) {
             if (item.id === idOrTag || item.tags.indexOf(idOrTag) > -1) {
                 pen = item;
             }
@@ -2225,12 +2114,11 @@ var Topology = (function (_super) {
         this.gridElem.style.left = '0';
         this.gridElem.style.top = '0';
         this.gridElem.innerHTML = "<svg class=\"svg-grid\" width=\"100%\" height=\"100%\" style=\"position:absolute;left:0;right:0;top:0;bottom:0\"\n      xmlns=\"http://www.w3.org/2000/svg\">\n      <defs>\n        <pattern id=\"grid\" width=\"10\" height=\"10\" patternUnits=\"userSpaceOnUse\">\n          <path d=\"M 10 0 L 0 0 0 10\" fill=\"none\" stroke=\"#f3f3f3\" stroke-width=\"1\" />\n        </pattern>\n      </defs>\n      <rect width=\"100%\" height=\"100%\" fill=\"url(#grid)\" />\n    </svg>";
-        this.store.parentElem.appendChild(this.gridElem);
+        this.parentElem.appendChild(this.gridElem);
     };
     Topology.prototype.showGrid = function (show) {
-        if(!this.store || !this.store.data) return;
         if (show === undefined) {
-            show = this.store.data.grid;
+            show = this.data.grid;
         }
         this.gridElem.style.width = this.canvas.width + 'px';
         this.gridElem.style.height = this.canvas.height + 'px';
@@ -2321,7 +2209,7 @@ var Topology = (function (_super) {
         canvas.style.height = 500 + 'px';
         canvas.style.zIndex = 1;
         canvas.setAttribute('id', 'arbitraryCanvas');
-        this.store.parentElem.appendChild(canvas)
+        this.parentElem.appendChild(canvas)
     };
     Topology.prototype.createArbitraryGraph = function () {
 
@@ -2378,31 +2266,6 @@ var Topology = (function (_super) {
 
         return true
     };
-    Topology.prototype.formOverflowOpen = function (data) {
-        this.formOverflowConversionData(data);
-        this.overflowView();
-        this.render(true);
-    }
-    Topology.prototype.overflowView = function (data) {
-        try {
-            var rect = this.getRect();
-            let _a = this.canvas;
-            if(!_a.width) return;
-            let width = _a.width, height = _a.height;
-            let rectWidth = rect.width? (rect.ex + 4) : rect.width
-            let rectHeight= rect.height? (rect.ey + 4) : rect.height
-            if (width < rectWidth) {
-                width = rectWidth;
-            }
-            if (height < rectHeight) {
-                height = rectHeight;
-            }
-            this.resize({width: width, height: height});
-            return rect;
-        }catch (e){
-            console.log('-error--------overflowView---',e)
-        }
-    }
     return Topology;
 }(Common));