dcim-topology2d 1.1.6 → 3.0.2

package/core/src/common.js

@@ -3,14 +3,14 @@ import {DivLayer} from './divLayer';
 import {AnimateLayer} from './animateLayer';
 import {RenderLayer} from './renderLayer';
 import {Offscreen} from './offscreen';
-import {Line, Node, Point} from './models';
-import {setConfItemNode, setStatisticalData} from './healps';
-import {s8, formatPadding, getRect, setInitNodeDataValidat, setDefaultNodeValidat} from './utils';
-import { useStore, clearStore, syncMqttData } from './store'
+import {Socket} from './socket';
+import {Line, Node, Pen, Point, TopologyData, EventAction} from './models';
+import {setConfItemNode} from './healps';
+import {s8, formatPadding, getRect, previewType} from './utils';
+import {DefalutOptions} from './options';
 import {POLL} from './poll';
 import axios from 'axios';
 import * as mqtt from './mqtt.min';
-import { destroyEcharts } from "../../static";
 
 var MoveInType;
 (function (MoveInType) {
@@ -29,33 +29,28 @@ var Common = /** @class */ (function () {
     function Common(parent, options) {
         var _this = this;
         _this.moveInType = MoveInType;
-        this.mqttDataSouse = axios.CancelToken.source();
         this.mouseDown = null;
-        this.renderTimer = 0;
-        this.lastRender = 0;
-        this.id = s8();
-        this.store = useStore(this.id);
         if (typeof parent === 'string') {
-            this.store.parentElem = document.getElementById(parent);
+            this.parentElem = document.getElementById(parent);
         } else {
-            this.store.parentElem = parent;
+            this.parentElem = parent;
         }
         if (!options) {
             options = {};
         }
-        this.store.parentElem.style.position = 'relative';
-        this.store.parentElem.style.overflow = 'auto';
-        //var font = Object.assign({}, DefalutOptions.font, options.font);
-        //options.font = font;
-        // this.options = Object.assign({}, DefalutOptions, options);
-        Object.assign(this.store.options, options);
-        this.store.options.interval = 50;
-        //Store.set(this.generateStoreKey('topology-data'), this.data);
+        this.parentElem.style.position = 'relative';
+        this.parentElem.style.overflow = 'auto';
+        var font = Object.assign({}, DefalutOptions.font, options.font);
+        options.font = font;
+        this.options = Object.assign({}, DefalutOptions, options);
+        this.data = new TopologyData();
+        this.id = s8();
+        Store.set(this.generateStoreKey('topology-data'), this.data);
         var id = this.id;
-        this.animateLayer = new AnimateLayer(id);
-        this.offscreen = new Offscreen(id);
-        this.canvas = new RenderLayer(id);
-        this.divLayer = new DivLayer(id);
+        this.animateLayer = new AnimateLayer(this.options, id);
+        this.offscreen = new Offscreen(this.parentElem, this.options, id);
+        this.canvas = new RenderLayer(this.parentElem, this.options, id);
+        this.divLayer = new DivLayer(this.parentElem, this.options, id);
         this.divLayer.canvas.tabIndex = 0;
         this.divLayer.canvas.ondblclick = this.ondblclick;
         this.divLayer.canvas.onblur = function () {
@@ -114,6 +109,7 @@ var Common = /** @class */ (function () {
         };
         this.openCount = 0;
         this.timmerByTopology = null;
+        this.ratioCord = null;
         this.lastTranlated = {x: 0, y: 0};
         this.moveIn = {
             type: 'None',
@@ -140,6 +136,7 @@ var Common = /** @class */ (function () {
         this.tip = '';
         this.rendering = false;
         this.isFullScreen = false;
+        this.socket = null;
         this.inputObj = null;
         this.input = document.createElement('textarea');
         this.input.style.position = 'absolute';
@@ -150,11 +147,11 @@ var Common = /** @class */ (function () {
         this.input.style.outline = 'none';
         this.input.style.border = '1px solid #cdcdcd';
         this.input.style.resize = 'none';
-        this.store.parentElem.appendChild(this.input);
+        this.parentElem.appendChild(this.input);
         this.paginationPageListBox = document.createElement('ul');
         this.pagenationPageInput = document.createElement('input');
         this.tablePaginationPageStyle();
-        this.store.parentElem.appendChild(this.paginationPageListBox);
+        this.parentElem.appendChild(this.paginationPageListBox);
         // 列表数据选取
         this.paginationPageListNode = function (ev) {
             const node = _this.moveIn.activeNode;
@@ -177,63 +174,61 @@ var Common = /** @class */ (function () {
         window.topology = this;
     }
 
-    Common.prototype.conversionData = function (obj, type) {
-        this.clear();
+    Common.prototype.conversionData = function (obj) {
+        this.parentElem.scrollLeft = 0;
+        this.parentElem.scrollTop = 0;
+        this.canvas.clearBkImg();
+        this.divLayer.clear();
         let data = JSON.parse(JSON.stringify(obj));
         if (!data) {
             data = {pens: []};
         }
-        Object.assign(this.store.data, data);
-        this.store.data.pens = [];
+        Object.assign(this.data, data);
+        this.setBKImageRect();
+        this.ratioCord = {
+            ratio: 1,
+            scaleX: 1,
+            scaleY: 1
+        };
         this.openCount = 0
+        this.data.pens = [];
         // for old data.
         if (data.nodes) {
             for (var _i = 0, _a = data.nodes; _i < _a.length; _i++) {
-                setInitNodeDataValidat(_a[_i], this.id);
-                const item = new Node(_a[_i]);
-                this.store.data.pens.push(item);
-                this.store.pens[item.id] = item;
+                var item = new Node(_a[_i]);
+                this.data.pens.push(item);
                 this.setSwitchTabData(item, _i);
-                // 初始化图表数据
-                if (item.name === 'echarts' && item.data && type !== 'mqtt') {
-                    item.data.echarts.option = setStatisticalData(item, 'def');
-                }
             }
             for (var _b = 0, _c = data.lines; _b < _c.length; _b++) {
-                _c[_b].TID = this.id;
-                const item = new Line(_c[_b]);
-                this.store.data.pens.push(item);
-                this.store.pens[item.id] = item;
+                var item = _c[_b];
+                this.data.pens.push(new Line(item));
             }
         }
         // end.
         if (data.pens) {
             for (var _d = 0, _e = data.pens; _d < _e.length; _d++) {
-                const item = _e[_d];
+                var item = _e[_d];
                 if (!item.from) {
-                    setInitNodeDataValidat(item, this.id);
-                    const node = new Node(item);
-                    this.store.data.pens.push(node);
-                    this.store.pens[item.id] = node;
+                    var node = new Node(item);
+                    this.data.pens.push(node);
                     this.setSwitchTabData(node, _d);
-                    // 初始化图表数据
-                    if (node.name === 'echarts' && node.data && type !== 'mqtt') {
-                        node.data.echarts.option = setStatisticalData(node, 'def');
-                    }
                 } else {
-                    const linNode = new Line(item);
-                    this.store.data.pens.push(linNode);
-                    this.store.pens[item.id] = linNode;
+                    this.data.pens.push(new Line(item));
                 }
             }
         }
     };
-    Common.prototype.clear = function (del){
-        clearStore(this.store, del);
-        this.canvas.clearBkImg();
-        this.divLayer.clear();
-        this.store.parentElem.scrollLeft = 0;
-        this.store.parentElem.scrollTop = 0;
+    Common.prototype.setBKImageRect = function () {
+        if (this.data.bkImageRect) {
+            this.data.bkImageRect.x = this.data.bkImageRect.x ? Number(this.data.bkImageRect.x) : 0;
+            this.data.bkImageRect.y = this.data.bkImageRect.y ? Number(this.data.bkImageRect.y) : 0;
+            this.data.bkImageRect.width = this.data.bkImageRect.width ? Number(this.data.bkImageRect.width) : this.canvas.width;
+            this.data.bkImageRect.height = this.data.bkImageRect.height ? Number(this.data.bkImageRect.height) : this.canvas.height;
+            this.data.bkImageRect.center = {
+                x: this.data.bkImageRect.x + this.data.bkImageRect.width / 2,
+                y: this.data.bkImageRect.y + this.data.bkImageRect.height / 2
+            }
+        }
     };
     Common.prototype.setSwitchTabData = function (node, index, type) {
         if (type) {
@@ -267,40 +262,20 @@ var Common = /** @class */ (function () {
         }
     };
     Common.prototype.canvasResize = function (size) {
-        try {
-            this.canvas.resize(size);
-            //this.canvas.bkImgRectResize(size);
-            this.offscreen.resize(size);
-            this.divLayer.resize(size);
-        }catch (err) {
-            //console.log('resize-----', err)
-        }
+        this.canvas.resize(size);
+        //this.canvas.bkImgRectResize(size);
+        this.offscreen.resize(size);
+        this.divLayer.resize(size);
     };
     // Render or redraw
     Common.prototype.render = function (noFocus) {
-        try {
-            const _this = this;
-            const now = performance.now();
-            if (now - _this.lastRender < _this.store.options.interval && !noFocus) {
-                if (_this.renderTimer) {
-                    cancelAnimationFrame(_this.renderTimer);
-                }
-                _this.renderTimer = requestAnimationFrame(_this.render);
-
-                return;
-            }
-            this.renderTimer = 0;
-            this.lastRender = now;
-            if (this.rendering) {
-                return this;
-            }
-            this.rendering = true;
-            this.offscreen.render();
-            this.canvas.render();
-            this.rendering = false;
-        }catch (e) {
-            //console.log(e)
+        if (this.rendering) {
+            return this;
         }
+        this.rendering = true;
+        this.offscreen.render();
+        this.canvas.render();
+        this.rendering = false;
     };
     Common.prototype.generateStoreKey = function (key) {
         return this.id + "-" + key;
@@ -383,7 +358,7 @@ var Common = /** @class */ (function () {
         this.pagenationPageInput.style.left = node.paginationData.targetPageLocal.x + 'px';
         this.pagenationPageInput.style.top = node.paginationData.targetPageLocal.y + 'px';
         this.pagenationPageInput.style.height = node.rect.height + 'px';
-        this.store.parentElem.appendChild(this.pagenationPageInput);
+        this.parentElem.appendChild(this.pagenationPageInput);
     };
     // 展开分页列表
     Common.prototype.spreadPageListHandle = function (node, e) {
@@ -451,8 +426,8 @@ var Common = /** @class */ (function () {
         // 如果存在按钮组节点数据
         if (changeNode[node.id]) {
             for (let switchNode of Object.values(changeNode)) {
-                if (this.store.data.pens[switchNode.tagOrder]) {
-                    this.store.data.pens[switchNode.tagOrder].activeImgeIndex = switchNode.id !== node.id;
+                if (this.data.pens[switchNode.tagOrder]) {
+                    this.data.pens[switchNode.tagOrder].activeImgeIndex = switchNode.id !== node.id;
                 }
             }
         }
@@ -471,32 +446,31 @@ var Common = /** @class */ (function () {
     Common.prototype.s8 = function () {
         return s8()
     };
-    // Common.prototype.openSocket = function (url) {
-    //     this.closeSocket();
-    //     if (url || this.store.data.websocket) {
-    //         this.socket = new Socket(url || this.store.data.websocket, this.store.data);
-    //     }
-    // };
-    // Common.prototype.closeSocket = function () {
-    //     if (this.socket) {
-    //         this.socket.close();
-    //     }
-    // };
+    Common.prototype.openSocket = function (url) {
+        this.closeSocket();
+        if (url || this.data.websocket) {
+            this.socket = new Socket(url || this.data.websocket, this.data);
+        }
+    };
+    Common.prototype.closeSocket = function () {
+        if (this.socket) {
+            this.socket.close();
+        }
+    };
     Common.prototype.openMqtt = function (url, options) {
         this.closeMqtt();
-        if (url || this.store.data.mqttUrl) {
-            url = url || this.store.data.mqttUrl;
-            const mqttTopics = this.initData && this.initData.mqttTopics ? this.initData.mqttTopics : this.store.data.mqttTopics;
-            options = options || this.store.data.mqttOptions
+        if (url || this.data.mqttUrl) {
+            url = url || this.data.mqttUrl;
+            const mqttTopics = this.initData && this.initData.mqttTopics ? this.initData.mqttTopics : this.data.mqttTopics;
+            options = options || this.data.mqttOptions
             let topics = mqttTopics
             this.isEnd = false;
             // let num = 0; // 记录推送的次数，用于判单丢失情况
-            //console.log('mqtt.connect======', url)
             this.mqttClient = mqtt.connect(url, options);
             var _this = this;
             this.mqttClient.on('message', function (topic, message) {
                 //console.log('openMqtt11===================', topic, message)
-                if (!_this.store.data.pens.length || !topic || topic != _this.store.data.mqttTopics) {
+                if (!_this.data.pens.length || !topic || topic != _this.data.mqttTopics) {
                     return;
                 }
                 if (!this.isEnd) {
@@ -510,7 +484,7 @@ var Common = /** @class */ (function () {
     };
     Common.prototype.openPoll = function (message, val) {
         if (message) {
-            this.poll = new POLL(this.store.data, message, val);
+            this.poll = new POLL(this.data, message, val);
         }
     };
     Common.prototype.clearInterValAll = function () {
@@ -538,10 +512,10 @@ var Common = /** @class */ (function () {
         this.inputObj = null;
     };
     Common.prototype.showInput = function (item) {
-        if (this.store.data.locked ||
+        if (this.data.locked ||
                 item.locked ||
                 item.hideInput ||
-                this.store.options.hideInput) {
+                this.options.hideInput) {
             return;
         }
         this.inputObj = item;
@@ -560,9 +534,9 @@ var Common = /** @class */ (function () {
         this.input.focus();
     };
     Common.prototype.getRect = function (pens) {
-        if (!this.store || !this.store.data) return;
+        if (!this.data) return;
         if (!pens) {
-            pens = this.store.data.pens;
+            pens = this.data.pens;
         }
         return getRect(pens);
     };
@@ -580,7 +554,7 @@ var Common = /** @class */ (function () {
         }
         var offsetX = x - this.lastTranlated.x;
         var offsetY = y - this.lastTranlated.y;
-        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.translate(offsetX, offsetY);
         }
@@ -599,7 +573,7 @@ var Common = /** @class */ (function () {
         var viewCenter = this.getViewCenter(padding);
         var center = rect.center;
         this.translate(viewCenter.x - center.x, viewCenter.y - center.y);
-        var parentElem = this.store.parentElem;
+        var parentElem = this.canvas.parentElem;
         var x = (parentElem.scrollWidth - parentElem.offsetWidth) / 2;
         var y = (parentElem.scrollHeight - parentElem.offsetHeight) / 2;
         parentElem.scrollTo(x, y);
@@ -610,7 +584,7 @@ var Common = /** @class */ (function () {
         return !(rect.width === 99999 || rect.height === 99999);
     };
     Common.prototype.getViewCenter = function (viewPadding) {
-        var padding = formatPadding(viewPadding || this.store.options.viewPadding);
+        var padding = formatPadding(viewPadding || this.options.viewPadding);
         var _a = this.canvas, width = _a.width, height = _a.height;
         return {
             x: (width - padding[1] - padding[3]) / 2 + padding[3],
@@ -674,7 +648,7 @@ var Common = /** @class */ (function () {
         }
         var tipMarkdownMarginLeft = count * 3 + 11
 
-        var parentRect = this.store.parentElem.getBoundingClientRect();
+        var parentRect = this.parentElem.getBoundingClientRect();
         var elemRect = elem.getBoundingClientRect();
         var x = parentRect.left + dataRect.x;
         var y = pos.y + parentRect.top;
@@ -682,8 +656,8 @@ var Common = /** @class */ (function () {
             x = x + dataRect.width / 2 - tipMarkdownMarginLeft
             y = parentRect.top + dataRect.ey - dataRect.height - 46
         }
-        x -= this.store.parentElem.scrollLeft;
-        y -= this.store.parentElem.scrollTop;
+        x -= this.parentElem.scrollLeft;
+        y -= this.parentElem.scrollTop;
         if (x < 0) {
             x = 0;
         }
@@ -715,11 +689,10 @@ var Common = /** @class */ (function () {
         this.tip = '';
     };
     Common.prototype.dispatch = function (event, data) {
-        if(!this.store || !this.store.options) return;
-        if (this.store.options.on) {
-            this.store.options.on(event, data);
+        if (this.options.on) {
+            this.options.on(event, data);
         }
-        if (event === 'node' && data.name == 'tablePagination' && this.store.options.type !== 'topology') {
+        if (event === 'node' && data.name == 'tablePagination' && this.options.type !== 'topology') {
             const tableNodes = Store.get('FORM:tableData').data.tableNodes[data.paginationData.bindFromTableId];
             const pageSize = data.paginationData.pageSize;
             const offset = (parseInt(data.paginationData.pageNumber) - 1) * pageSize;
@@ -745,7 +718,7 @@ var Common = /** @class */ (function () {
         }
         this.initType = type
         this.initData = data
-        const canvasData = data ? data : this.store.data
+        const canvasData = data ? data : this.data
         //this.topologyDetailData = initData
         const url = canvasData.mqttUrl
         // if(url && url.indexOf('://') > -1){
@@ -785,7 +758,7 @@ var Common = /** @class */ (function () {
     };
     Common.prototype.initTagParams = async function (eventType) {
         this.clearTagParams(eventType)
-        const pensData = this.store.data.pens
+        const pensData = this.data.pens
         let tagParams = this.getTagParams(pensData, eventType);
         // 详情页面，即URL配置了资产id的页面
         let assetId = this.getUrlParams('assetId')
@@ -799,7 +772,7 @@ var Common = /** @class */ (function () {
             if (this.assetPoperties) {
                 // 更新画布上固定的资产详情对应的值
                 //const canvasPens = this.pathRewrite ? canvasData.pens : this.canvas.data.pens
-                this.renderForAssetPoperties(pensData);
+                this.renderForAssetPoperties(this.canvas.data.pens);
             }
         }
     };
@@ -873,18 +846,18 @@ var Common = /** @class */ (function () {
         }
     };
     Common.prototype.getMqttData = async function (tagParams, panelData) {
-        let ret = null;
+        let ret = {};
         let data = {};
         let path = '';
         let assetData = null;
         let pathRewrite = this.pathRewrite;
-        let canvasData = this.store.data;
-        let mqttTopics = this.store.data.mqttTopics;
+        let canvasData = JSON.parse(JSON.stringify(this.canvas.data));
+        let mqttTopics = this.data.mqttTopics;
         let tagParamsData = tagParams;
         let detailJson = null;
         Store.set('TIMEOUT:currentPage', `locationPath${this.s8()}`);
         if (panelData) {
-            this.store.data.mqttTopics = mqttTopics
+            this.data.mqttTopics = mqttTopics
             pathRewrite = panelData.pathRewrite;
             canvasData = JSON.parse(JSON.stringify(panelData.data));
             mqttTopics = panelData.mqttTopics;
@@ -920,24 +893,10 @@ var Common = /** @class */ (function () {
             this.theData = data
         }
         let drawedData = null
-        data.cancelToken = this.mqttDataSouse.token;
-        ret = await axios.post(path, data).catch(function(th) {
-            if(axios.isCancel(th)) {
-                console.log('请求取消了----', th.message);
-            } else {
-                console.log('请求失败----')
-            }
-        });
+        ret = await axios.post(path, data);
         if (ret.data && ret.data.data) {
-            if (assetData) ret.data.data.asset = assetData;
-            drawedData = ret.data.data;
-            if(panelData) {
-                syncMqttData.data = drawedData; // 初始化调用
-                Store.set('mqtt:responseData', drawedData);
-            }else {
-                syncMqttData.data = null;
-                this.mqttDataDrawing(canvasData, drawedData);
-            }
+            if (assetData) ret.data.data.asset = assetData
+            drawedData = this.mqttDataDrawing(canvasData, ret.data.data, detailJson)
         }
         this.clearInterValAll();
         this.timmerByTopology = setTimeout(() => {
@@ -951,29 +910,103 @@ var Common = /** @class */ (function () {
         } else {
             return {
                 mqttData: drawedData,
-                // detailData: detailJson
+                detailData: detailJson
             }
         }
     };
     Common.prototype.mqttDataDrawing = function (data, retData, detailJson) {
         const syncData = retData
-        //const detailData = detailJson ? detailJson.data : [];
+        const detailData = detailJson ? detailJson.data : [];
         // console.log('收到消息', syncData)
         Store.set('mqtt:responseData', syncData);
         data.pens.map((item) => {
-            if (item.children && item.children.length) {
+            if (item.children != undefined) {
                 item.children.map((_item) => {
-                    setDefaultNodeValidat(_item, syncData);
+                    item.defaultFillStyle = item.fillStyle;
+                    item.defaultFontColor = item.font.color;
+                    if (item.name === 'line') item.defaultLineColor = item.strokeStyle;
+                    if (!_item.data) return
+                    //const node = detailData.length > 0 ? detailData : syncData
+                    const functionData = _item.events.filter((ev) => {
+                        return ev.action === EventAction.Function
+                    })
+                    const dataValue = functionData[0]
+                    if (functionData.length > 0 && dataValue.value && retData) {
+                        _item.data.map((d) => {
+                            const {kpiData, tagData} = retData;
+                            const key = d.key;
+                            const value = d.value;
+                            const _syncItem = key === 'tagId' ? tagData[value] : kpiData[value];
+                            if ((key === 'tagId' || key === 'kpiAddr') && _syncItem) {
+                                const isControl = parseInt(_syncItem.isControlDis); // 是否可控，0可控，1不可控
+                                if (!isControl) {
+                                    d.tagVal = value
+                                    d.controlParams = _syncItem
+                                    // delete _syncItem[value]
+                                    // Object.assign(d, _syncItem)
+                                }
+                            }
+                        })
+                        //console.log('定制函数=====')
+                        console.log('定制函数------')
+                        const func = new Function('pen', 'params', dataValue.value)
+                        func(_item, JSON.stringify(retData))
+                    } else {
+                        // console.log('默认函数')
+                        setConfItemNode(_item, syncData);
+                    }
+                    this.machAnimateReset(item);
                 })
             } else {
-                setDefaultNodeValidat(item, syncData);
+                item.defaultFillStyle = item.fillStyle;
+                item.defaultFontColor = item.font.color;
+                if (item.name === 'line') item.defaultLineColor = item.strokeStyle;
+                if (!item.data) return
+                //const node = detailData.length > 0 ? detailData : syncData
+                const functionData = item.events.filter((ev) => {
+                    return ev.action === EventAction.Function
+                })
+                const dataValue = functionData[0]
+                if (functionData.length > 0 && dataValue.value && retData) {
+                    item.data.map((d) => {
+                        const {kpiData, tagData} = retData;
+                        const key = d.key;
+                        const value = d.value;
+                        const _syncItem = key === 'tagId' ? tagData[value] : kpiData[value];
+                        if ((key === 'tagId' || key === 'kpiAddr') && _syncItem) {
+                            const isControl = parseInt(_syncItem.isControlDis); // 是否可控，0可控，1不可控
+                            if (!isControl) {
+                                d.tagVal = value;
+                                d.controlParams = _syncItem;
+                                // delete _syncItem[value]
+                                // Object.assign(d, _syncItem)
+                            }
+                        }
+                    });
+                    const func = new Function('pen', 'params', dataValue.value);
+                    func(item, JSON.stringify(retData));
+                    //const machData = func(item, JSON.stringify(retData));
+                    console.log('定制函数------------');
+                } else {
+                    // console.log('默认函数')
+                    setConfItemNode(item, syncData);
+                }
+                this.machAnimateReset(item);
             }
         })
-        //console.log('执行完毕-----', this.store.data.pens)
+        // console.log('执行完毕')
         this.render();
         this.animate(true);
         return data
     };
+    Common.prototype.machAnimateReset = function (pen) {
+        if (!pen.animateFrames || pen.animateFrames.length <= 0) return;
+        for (var _a = 0, _af = pen.animateFrames; _a < _af.length; _a++) {
+            var ani = _af[_a];
+            ani.state.strokeStyle = pen.strokeStyle;
+            ani.state.fillStyle = pen.fillStyle;
+        }
+    };
     Common.prototype.getTagParamsForKpiAddrs = async function (assetId, tagParams, apiStr) {
         let params = {
             assetId: assetId,
@@ -1036,11 +1069,11 @@ var Common = /** @class */ (function () {
         }
     };
     Common.prototype.onMqttContent = async function (tagParams) {
-        if (!this.initType) this.store.data.mqttTopics = 'mqtt-' + s8();
+        if (!this.initType) this.data.mqttTopics = 'mqtt-' + s8();
         // 告知MQTT属性中数据的集合
         const ret = !this.initType ? await this.getMqttData(tagParams) : this.initType;
         if (ret) {
-            let mqttUrlStr = this.store.data.mqttUrl, mqttOption = this.store.data.mqttOptions
+            let mqttUrlStr = this.data.mqttUrl, mqttOption = this.data.mqttOptions
             if (this.initData) {
                 const {mqttUrl, mqttOptions} = this.initData
                 mqttUrlStr = mqttUrl
@@ -1056,8 +1089,8 @@ var Common = /** @class */ (function () {
         const index = eventType[4] ? eventType[4] : ''
         // const url = 'pollUrl'+index;
         // const second = 'pollSecond'+index;
-        const pollUrl = this.store.data['pollUrl' + index]
-        const pollSecond = this.store.data['pollSecond' + index]
+        const pollUrl = this.data['pollUrl' + index]
+        const pollSecond = this.data['pollSecond' + index]
         this.onpollStop(eventType);
         if (pollUrl && pollSecond) {
             this.renderForPoll(tagParams, pollUrl, eventType);
@@ -1104,9 +1137,10 @@ var Common = /** @class */ (function () {
         this.getMqttData(this.tagParams.Mqtt);
     };
     Common.prototype.doMqttDrow = function (ret) {
-        let canvasData = this.store.data;
+        let canvasData = this.canvas.data;
         ret = JSON.parse(ret);
-        //console.log('处理消息', ret)
+        // console.log('处理消息')
+        // console.log('this.canvas.data',this.canvas.data)
         this.mqttDataDrawing(canvasData, ret)
     };
     Common.prototype.hidePenByTag = function (pens, val) {
@@ -1121,11 +1155,11 @@ var Common = /** @class */ (function () {
     Common.prototype.hidePenVal = function (pen, val) {
         const tags = pen.tags
         const obj = val ? JSON.parse(val) : {}
-        const visibleRange = obj.visibleRange ? obj.visibleRange.trim() : ''
-        const visibleFnRange = obj.visibleFnRange ? obj.visibleFnRange.trim() : ''
-        const visibleValue = obj.visibleValue ? obj.visibleValue.trim() : ''
-        const hiddenRange = obj.hiddenRange ? obj.hiddenRange.trim() : ''
-        const tabsValue = obj.tabsValue ? obj.tabsValue.trim() : ''
+        const visibleRange = obj.visibleRange
+        const visibleFnRange = obj.visibleFnRange
+        const visibleValue = obj.visibleValue
+        const hiddenRange = obj.hiddenRange
+        const tabsValue = obj.tabsValue
         if (tags.length > 0) {
             if (visibleRange == '1') {
                 if (this.openCount % 2 == 0) {
@@ -1166,13 +1200,10 @@ var Common = /** @class */ (function () {
         this.render();
     };
     Common.prototype.destroyStatic = function () {
-        this.mqttDataSouse.cancel();
-        this.clear('destroy');
         this.clearInterValAll();
-        //this.closeSocket();
+        this.closeSocket();
         this.closeMqtt();
         this.closePoll();
-        cancelAnimationFrame(this.renderTimer);
         this.subcribe.unsubscribe();
         this.subcribeRender.unsubscribe();
         this.subcribeImage.unsubscribe();
@@ -1186,8 +1217,7 @@ var Common = /** @class */ (function () {
         this.canvas = null;
         this.offscreen.destroy();
         this.offscreen = null;
-        this.store.parentElem = null;
-        destroyEcharts();
+        this.data = null;
         Store.set('form:tableData', null);
         Store.set('TIMEOUT:currentPage', `empty${this.s8()}`);
         Store.set('FORM:tableData', {