dcim-topology2d 2.1.0 → 2.2.2

package/core/src/common.js

@@ -1,9 +1,9 @@
-import {Store} from 'le5le-store';
-import {DivLayer} from './divLayer';
-import {AnimateLayer} from './animateLayer';
-import {RenderLayer} from './renderLayer';
-import {Offscreen} from './offscreen';
-import {Line, Node, Point} from './models';
+import { Store } from 'le5le-store';
+import { DivLayer } from './divLayer';
+import { AnimateLayer } from './animateLayer';
+import { RenderLayer } from './renderLayer';
+import { Offscreen } from './offscreen';
+import { Line, Node, Point } from './models';
 import {
     s8,
     formatPadding,
@@ -14,10 +14,11 @@ import {
     setInitConfData,
     getParams,
     tabHideShowOperation,
-    tabStaticOperation
+    tabStaticOperation, pageZoom
 } from './utils';
-import {useStore, clearStore, commonStore} from './store'
+import { useStore, clearStore, commonStore } from './store'
 import * as mqtt from './mqtt.min';
+import { tabsPageContentData } from "../../store";
 var MoveInType;
 (function (MoveInType) {
     MoveInType[MoveInType["None"] = 0] = "None";
@@ -35,6 +36,7 @@ var Common = /** @class */ (function () {
     function Common(parent, options) {
         var _this = this;
         _this.moveInType = MoveInType;
+        this.tabsContentOptions = {};
         this.mouseDown = null;
         this.renderTimer = 0;
         this.lastRender = 0;
@@ -102,24 +104,24 @@ var Common = /** @class */ (function () {
             if (_this.moveIn.hoverNode) {
                 _this.dispatch('dblclick', _this.moveIn.hoverNode);
                 if (_this.moveIn.hoverNode
-                        .getTextRect()
-                        .hit(new Point(e.x - canvasPos.x, e.y - canvasPos.y))) {
+                    .getTextRect()
+                    .hit(new Point(e.x - canvasPos.x, e.y - canvasPos.y))) {
                     _this.showInput(_this.moveIn.hoverNode);
                 }
                 _this.moveIn.hoverNode.dblclick();
             } else if (_this.moveIn.hoverLine) {
                 _this.dispatch('dblclick', _this.moveIn.hoverLine);
                 if (!_this.moveIn.hoverLine.text ||
-                        _this.moveIn.hoverLine
-                                .getTextRect()
-                                .hit(new Point(e.x - canvasPos.x, e.y - canvasPos.y))) {
+                    _this.moveIn.hoverLine
+                        .getTextRect()
+                        .hit(new Point(e.x - canvasPos.x, e.y - canvasPos.y))) {
                     _this.showInput(_this.moveIn.hoverLine);
                 }
                 _this.moveIn.hoverLine.dblclick();
             }
         };
         this.openCount = 0;
-        this.lastTranlated = {x: 0, y: 0};
+        this.lastTranlated = { x: 0, y: 0 };
         this.moveIn = {
             type: 'None',
             order: 0,
@@ -170,10 +172,10 @@ var Common = /** @class */ (function () {
         this.createMarkdownTip();
         window.topology = this;
     }
-    Common.prototype.categoryDataParams = function (data){
+    Common.prototype.categoryDataParams = function (data) {
         getParams(this.id, data);
     };
-    Common.prototype.getParams = function (assetId){
+    Common.prototype.getParams = function (assetId) {
         const params = {
             doorIds: this.store.mqttParams.doorIds,
             tagIds: this.store.mqttParams.tagIds.join(","),
@@ -181,31 +183,32 @@ var Common = /** @class */ (function () {
             areaIds: this.store.mqttParams.areaIds.join(","),
             routingkey: this.store.mqttParams.routingkey,
             echart: this.store.mqttParams.tagEcharts.join(","),
-            echartData: this.store.mqttParams.echartData
+            echartData: this.store.mqttParams.echartData,
+            dataConfig: this.store.mqttParams.dataConfig.data
         }
         if (this.store.mqttParams.echartAssemblyData.length) params.echartAssemblyData = [...this.store.mqttParams.echartAssemblyData];
-        if(assetId) {
+        if (assetId) {
             params.varValueIds = this.store.mqttParams.varVaule.join(",");
             params.branchAddrs = this.store.mqttParams.branchValue.join(",");
-        }else {
-            if(this.store.mqttParams.assetIds.length && this.store.mqttParams.varVaule.length) {
-                const assetId = this.store.mqttParams.assetIds[this.store.mqttParams.assetIds.length -1];
-                for(let va = 0; va < this.store.mqttParams.varVaule.length; va++) {
+        } else {
+            if (this.store.mqttParams.assetIds.length && this.store.mqttParams.varVaule.length) {
+                const assetId = this.store.mqttParams.assetIds[this.store.mqttParams.assetIds.length - 1];
+                for (let va = 0; va < this.store.mqttParams.varVaule.length; va++) {
                     this.store.mqttParams.varVaule[va] = `${assetId}_${this.store.mqttParams.varVaule[va]}`;
                 }
                 params.varValueIds = this.store.mqttParams.varVaule.join(",");
-            }else {
+            } else {
                 params.varVaule = this.store.mqttParams.varVaule.join(",");
             }
         }
         return params;
     };
     // 根据图表id数据获取测点数据
-    Common.prototype.getTagIdsForEchartsIds = function (data){
+    Common.prototype.getTagIdsForEchartsIds = function (data) {
         this.store.mqttParams.echartAssemblyData = data;
     };
     // 根据指标地址数据获取测点数据
-    Common.prototype.getTagIdsForKpiAddrs = function (data){
+    Common.prototype.getTagIdsForKpiAddrs = function (data) {
         let tagIds = [];
         data.map((item) => {
             tagIds.push(item.tagId);
@@ -213,23 +216,23 @@ var Common = /** @class */ (function () {
         this.store.mqttParams.tagIds = tagIds;
     };
     // 获取绑定值类型参数
-    Common.prototype.getVarValueIdsForVarData = function (data){
+    Common.prototype.getVarValueIdsForVarData = function (data) {
         const ids = [];
         data.map((item) => {
-            if(item.varVal) ids.push(item.assetVarIds);
+            if (item.varVal) ids.push(item.assetVarIds);
         })
         this.store.mqttParams.varVaule = ids;
     };
-    Common.prototype.getBranchValueIdsForBranchsData = function (data){
+    Common.prototype.getBranchValueIdsForBranchsData = function (data) {
         const ids = [];
         data.map((item) => {
-            if(item.branchAddr) ids.push(`${item.assetId}_${item.branchAddr}`);
+            if (item.branchAddr) ids.push(`${item.assetId}_${item.branchAddr}`);
         })
         this.store.mqttParams.branchValue = ids;
     };
     // 固定资产详情数据赋值
-    Common.prototype.renderForAssetPoperties = function (asset, data){
-        if(!Object.keys(asset).length) return;
+    Common.prototype.renderForAssetPoperties = function (asset, data) {
+        if (!Object.keys(asset).length) return;
         data.map((node) => {
             if (node.data && Array.isArray(node.data) && node.data.length) {
                 node.data.map((item) => {
@@ -252,16 +255,15 @@ var Common = /** @class */ (function () {
     Common.prototype.conversionData = function (obj) {
         this.clear();
         if (!obj) {
-            obj = {pens: []};
+            obj = { pens: [] };
         }
         let data = JSON.parse(JSON.stringify(obj));
         Object.assign(this.store.data, data);
         // topology编辑器下跳出程序
-        if(this.store.options.type !== 'topology') {
-            const screenWidth = window.screen.width < 1920 ? 1920 : window.screen.width;
-            const zoom = window.innerWidth < screenWidth ? document.documentElement.clientWidth / screenWidth : 1;
+        if (this.store.options.type !== 'topology') {
+            const zoom = pageZoom();
             this.store.data.pageZoom = zoom;
-            this.store.parentElem.style.transform = `scale(${1/zoom})`;
+            this.store.parentElem.style.transform = `scale(${1 / zoom})`;
             this.store.parentElem.style.transformOrigin = '0 0';
             this.store.parentElem.parentElement.style.overflow = 'hidden';
             Store.set('PAGE:zoom', zoom);
@@ -270,27 +272,28 @@ var Common = /** @class */ (function () {
         this.openCount = 0
         const type = this.store.options.type;
         // for old data.
-        if (data.nodes) {
-            for (var _i = 0, _a = data.nodes; _i < _a.length; _i++) {
-                setInitNodeDataValidat(_a[_i], this.id, type, _i);
-                const item = new Node(_a[_i]);
-                this.store.data.pens.push(item);
-                ///this.store.pens[item.id] = item;
-                setConnectionTagForConf(item);
-            }
-            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;
-            }
-        }
+        // if (data.nodes) {
+        //     for (var _i = 0, _a = data.nodes; _i < _a.length; _i++) {
+        //         setInitNodeDataValidat(_a[_i], this.id, type, _i);
+        //         const item = new Node(_a[_i]);
+        //         this.store.data.pens.push(item);
+        //         ///this.store.pens[item.id] = item;
+        //         setConnectionTagForConf(item);
+        //     }
+        //     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;
+        //     }
+        // }
+        this.conversionTabsPageData();
         // end.
         if (data.pens) {
             for (var _d = 0, _e = data.pens; _d < _e.length; _d++) {
                 const item = _e[_d];
                 if (!item.from) {
-                    setInitNodeDataValidat(item, this.id, type, _d);
+                    setInitNodeDataValidat(item, this.id, type, _d, this.tabsContentOptions);
                     const node = new Node(item);
                     this.store.data.pens.push(node);
                     //this.store.pens[item.id] = node;
@@ -303,7 +306,28 @@ var Common = /** @class */ (function () {
             }
         }
     };
-    Common.prototype.clear = function (del){
+    //
+    Common.prototype.conversionTabsPageData = function () {
+        // tabs页面切换，页面数据更新
+        const pageId = this.tabsContentOptions.pageId;
+        if (!pageId) return;
+        const tabsPageMasterData = this.store.tabsPageMasterData.get('main');
+        for (let i = 0; i < tabsPageMasterData.length; i++) {
+            const node = tabsPageMasterData[i];
+            const eventNode = node.events[0];
+            if (eventNode && eventNode.dcimDetailPage) node.activeImgeIndex = eventNode.dcimDetailPage !== pageId;
+            this.store.data.pens.push(new Node(node));
+        }
+    };
+    Common.prototype.clearTabsPageData = function () {
+        if (!this.store.tabsPageMasterData.size) return;
+        this.store.tabsPageMasterData.clear();
+        this.tabsContentOptions = {};
+        for (let key of Object.keys(tabsPageContentData)) {
+            delete tabsPageContentData[key];
+        }
+    };
+    Common.prototype.clear = function (del) {
         clearStore(this.store, del);
         this.canvas.clearBkImg();
         this.divLayer.clear();
@@ -316,7 +340,7 @@ var Common = /** @class */ (function () {
             //this.canvas.bkImgRectResize(size);
             this.offscreen.resize(size);
             this.divLayer.resize(size);
-        }catch (err) {
+        } catch (err) {
             //console.log('resize-----', err)
         }
     };
@@ -342,7 +366,7 @@ var Common = /** @class */ (function () {
             this.offscreen.render();
             this.canvas.render();
             this.rendering = false;
-        }catch (e) {
+        } catch (e) {
             //console.log(e)
         }
     };
@@ -370,7 +394,7 @@ var Common = /** @class */ (function () {
     };
     // 监听表格数据变化
     Common.prototype.subcribeSyncTableData = function (data) {
-        const {tableNodes, paginationNodes} = Store.get('FORM:tableData').data;
+        const { tableNodes, paginationNodes } = Store.get('FORM:tableData').data;
         if (data && Object.keys(tableNodes).length > 0) {
             const updateNodes = [];
             for (let key of Object.keys(data)) {
@@ -485,15 +509,16 @@ var Common = /** @class */ (function () {
     };
     Common.prototype.switchStaticsCheckType = function (node, staticTypeNode) {
         const staticType = staticTypeNode.dcimStaticForType;
-        if(!staticType || staticType === 'NONE') return;
+        if (staticType === 'PAGE') return this.dispatch('change', node, { id: staticTypeNode.dcimDetailPage, type: 'tabs:page' });
+        if (!staticType || staticType === 'NONE') return;
         // 点击切换统计图统计类别
         const switchTabData = node.tags.find((t) => {
             return t.includes('switchTabType');
         }); // 获取按钮组类型
-        if(!switchTabData) return;
+        if (!switchTabData) return;
         const topologyChangeData = commonStore[node.TID].switchTabDataPool; // 获取所有按钮组和按类型统计图组数据
         const changeNode = topologyChangeData[`${switchTabData}Data`]; // 分别获取按钮组数据
-        if(!changeNode || !changeNode[node.id]) return;
+        if (!changeNode || !changeNode[node.id]) return;
         // 如果存在按钮组节点数据
         const tabAreaData = topologyChangeData[`${switchTabData}AreaData`];
         let tabIndex = 0;
@@ -502,15 +527,15 @@ var Common = /** @class */ (function () {
         };
         for (let switchNode of Object.values(changeNode)) {
             const penNode = this.store.data.pens[switchNode.order];
-            if(!penNode) return;
+            if (!penNode) return;
             const isActive = switchNode.id !== node.id;
-            if(!isActive) {
+            if (!isActive) {
                 visitParams.order = tabIndex;
                 visitParams.data = switchNode.tabData;
             }
             penNode.activeImgeIndex = isActive;
             tabIndex++;
-            if(staticType === 'SH') tabHideShowOperation(switchNode, tabAreaData, isActive); // 对显示隐藏的功能进行交互处理
+            if (staticType === 'SH') tabHideShowOperation(switchNode, tabAreaData, isActive); // 对显示隐藏的功能进行交互处理
         }
         // 对绑定的图表进行数据处理
         tabStaticOperation(staticType, node, tabAreaData, visitParams);
@@ -531,9 +556,9 @@ var Common = /** @class */ (function () {
     };
     Common.prototype.showInput = function (item) {
         if (this.store.data.locked ||
-                item.locked ||
-                item.hideInput ||
-                this.store.options.hideInput) {
+            item.locked ||
+            item.hideInput ||
+            this.store.options.hideInput) {
             return;
         }
         this.inputObj = item;
@@ -626,12 +651,13 @@ var Common = /** @class */ (function () {
         this.tipMarkdown.style.borderRadius = '6px';
         this.tipMarkdown.style.whiteSpace = 'nowrap';
         this.tipMarkdown.id = 'tipMarkdownBytopo'
+        this.tipMarkdown.className = 'tipMarkdownBytopo'
         document.body.appendChild(this.tipMarkdown);
     };
     Common.prototype.showTip = function (data, pos) {
         if (!data ||
-                (!data.markdown && !data.tipId && !data.title) || !data.title ||
-                data.id === this.tip) {
+            (!data.markdown && !data.tipId && !data.title) || !data.title ||
+            data.id === this.tip) {
             return;
         }
         data.markdown = data.title
@@ -707,7 +733,7 @@ var Common = /** @class */ (function () {
         this.tip = '';
     };
     Common.prototype.dispatch = function (event, node, data) {
-        if(!this.store || !this.store.options) return;
+        if (!this.store || !this.store.options) return;
         if (this.store.options.on) {
             this.store.options.on(event, node, data);
         }
@@ -725,8 +751,8 @@ var Common = /** @class */ (function () {
         // }
     };
     Common.prototype.onContent = function (resetDCIM, data) {
-        if(!data) data = this.store.data;
-        let connectParams =  {
+        if (!data) data = this.store.data;
+        let connectParams = {
             mqttUrl: data.mqttUrl,
             username: data.mqttOptions.username,
             password: data.mqttOptions.password,
@@ -739,19 +765,19 @@ var Common = /** @class */ (function () {
             connectParams.password = resetDCIM.mqttPassword;
         }
         // 连接测试，MQTT
-        this.openMqtt(connectParams);
+        this.openMqtt(connectParams, resetDCIM.mqttDebug);
     };
-    Common.prototype.openMqtt = function (connectParams) {
+    Common.prototype.openMqtt = function (connectParams, debug) {
         const _this = this;
         _this.closeMqtt();
-        if(!connectParams.mqttUrl) return;
+        if (!connectParams.mqttUrl) return;
         _this.isEnd = false;
         const url = connectParams.mqttUrl.replace('ip', location.hostname);
         _this.mqttClient = mqtt.connect(url, connectParams);
         _this.mqttClient.on('message', function (topic, message) {
-            //console.log('openMqtt11===================', topic, message)
+            if (debug) console.info('mqttClientTopic>>>', topic, connectParams.mqttTopics)
             if (!topic || topic != connectParams.mqttTopics) return;
-            if (!this.isEnd) _this.doMqttDrow(message.toString());
+            if (!this.isEnd) _this.doMqttDrow(message.toString(), debug);
         });
         const topics = connectParams.mqttTopics;
         if (topics) {
@@ -764,17 +790,17 @@ var Common = /** @class */ (function () {
             this.mqttClient.end();
         }
     };
-    Common.prototype.doMqttDrow = function (ret) {
+    Common.prototype.doMqttDrow = function (ret, debug) {
         let canvasData = this.store.data;
         ret = JSON.parse(ret);
+        if (debug) console.info('mqttClientMessage>>>', ret)
         //console.log('处理消息', ret)
         this.mqttDataDrawing(canvasData.pens, ret)
     };
     Common.prototype.mqttDataDrawing = function (data, retData) {
-        // console.log('收到消息', syncData)
         this.store.monitorAlarm = false;
         data.map((item) => {
-            if(this.store.options.type === 'topology') setInitConfData(this.id, item);
+            if (this.store.options.type === 'topology') setInitConfData(this.id, item);
             setDefaultNodeValidat(item, retData);
             if (item.children && item.children.length) {
                 this.mqttDataDrawing(item.children, retData);
@@ -787,7 +813,7 @@ var Common = /** @class */ (function () {
         this.render();
         this.animate(true);
         // 九所的 服务器状态监测功能中用到
-        if(this.store.options.storeSubscribe) Store.set(this.generateStoreKey('M:monitor'), this.store.monitorAlarm);
+        if (this.store.options.storeSubscribe) Store.set(this.generateStoreKey('M:monitor'), this.store.monitorAlarm);
         return data
     };
     Common.prototype.hidePenByTag = function (pens, val) {
@@ -847,7 +873,7 @@ var Common = /** @class */ (function () {
     };
     Common.prototype.formOverflowConversionData = function (obj) {
         if (!obj) {
-            obj = {pens: []};
+            obj = { pens: [] };
         }
         let data = JSON.parse(JSON.stringify(obj));
         Object.assign(this.store.data, data);
@@ -858,6 +884,8 @@ var Common = /** @class */ (function () {
             for (var _d = 0, _e = data.pens; _d < _e.length; _d++) {
                 const item = _e[_d];
                 if (!item.from) {
+                    // 初次绘制画布时this.id替换item.TID
+                    setInitNodeDataValidat(item, this.id, type, _d, item.PTID);
                     const node = new Node(item);
                     this.store.data.pens.push(node);
                 } else {
@@ -866,6 +894,7 @@ var Common = /** @class */ (function () {
                 }
             }
         }
+        Store.set(this.generateStoreKey('LT:conversionDataOverflow'), data);
     };
     Common.prototype.destroyStatic = function () {
         this.clear('destroy');
@@ -894,7 +923,10 @@ var Common = /** @class */ (function () {
                 pageRelevTableNodes: {}
             }
         });
-        document.body.removeChild(this.tipMarkdown);
+        let tipMarkdown = document.querySelectorAll(".tipMarkdownBytopo");
+        tipMarkdown.forEach(item => {
+            document.body.removeChild(item);
+        })
         if (this.paginationPageListBox) this.paginationPageListBox.removeEventListener('click', this.paginationPageListNode);
         if (this.pagenationPageInput) this.pagenationPageInput.removeEventListener('click', this.pagenationPageInputNode);
         //优化
@@ -912,10 +944,10 @@ var Common = /** @class */ (function () {
             this[item] = null;
 
         })
-        //end
+        //end dcimStaticForType
         window.topology = null;
     };
     // Render or redraw
     return Common;
 }());
-export {Common};
+export { Common };

package/core/src/core.js

@@ -1591,8 +1591,9 @@ var Topology = (function (_super) {
             deleteNodes = getTabConnectSHConf(this.activeLayer.pens[0]);
             this.activeLayer.pens = [];
         }else {
-            deleteNodes = nodes ? nodes : this.activeLayer.pens;
+            deleteNodes = nodes || this.activeLayer.pens;
         }
+        let dateIds = '';
         for (var i = 0; i < deleteNodes.length; i++) {
             var pen = deleteNodes[i];
             if (!force && pen.locked) {
@@ -1600,6 +1601,7 @@ var Topology = (function (_super) {
             }
             var found = this.findIndex(pen);
             if (found > -1) {
+                if(pen.pickerOptions) dateIds += `${pen.id},`;
                 if (this.store.data.pens[found].type === PenType.Node) {
                     this.divLayer.removeDiv(this.store.data.pens[found]);
                 }
@@ -1612,6 +1614,7 @@ var Topology = (function (_super) {
             }
             this.animateLayer.pens.delete(pen.id);
         }
+        if(dateIds) this.resetAssociateDateData(dateIds);
         if (!pens.length) {
             return;
         }
@@ -1619,6 +1622,17 @@ var Topology = (function (_super) {
         this.cache();
         this.dispatch('delete', pens);
     };
+    Topology.prototype.resetAssociateDateData = function (dateIds) {
+        // 重置关联日期数据的元件属性值
+        const pens = this.store.data.pens;
+        for (var i = 0, length = pens.length; i < length; ++i) {
+            const pen = pens[i];
+            if(pen.formData && dateIds.includes(pen.formData.dateId)){
+                pen.events = pen.events.filter((ev) => { return ev.type !== 4 });
+                pen.formData = null;
+            }
+        }
+    };
     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) {

package/core/src/element/common.js

@@ -2,13 +2,22 @@ import {Lock} from '../models';
 import {commonStore} from '../store';
 export function setStyleForElementIdDiv(node, elem, data) {
     if (!elem) return;
-    const store = commonStore[node.TID].data;
+    node.attribute = 'dom';
+    const currentStore = commonStore[node.TID];
+    if(!currentStore.elementInteractivePoor.dom) currentStore.elementInteractivePoor.dom = {};
+    currentStore.elementInteractivePoor.dom[node.id] = elem;
+    let width = node.rect.width;
+    let height = node.rect.height;
+    if(node.name === 'echarts') {
+        width /= currentStore.data.pageZoom;
+        height /= currentStore.data.pageZoom;
+    }
     elem.style.position = 'absolute';
     elem.style.outline = 'none';
     elem.style.left = node.rect.x + 'px';
     elem.style.top = node.rect.y + 'px';
-    elem.style.width = node.rect.width / store.pageZoom + 'px';
-    elem.style.height = node.rect.height / store.pageZoom + 'px';
+    elem.style.width = width + 'px';
+    elem.style.height = height + 'px';
     if (node.rotate || node.offsetRotate) {
         elem.style.transform = "rotate(" + (node.rotate + node.offsetRotate) + "deg)";
     }
@@ -40,7 +49,6 @@ export function loadJS(url) {
     loaderScript.type = 'text/javascript';
     loaderScript.src = url;
     document.body.appendChild(loaderScript);
-    window.datePickerRegister = true;
     return new Promise((resolve, reject) => {
         loaderScript.onload = function () {
             resolve(true);

package/core/src/element/datePicker.js

@@ -10,7 +10,7 @@ export function createDatePickerElement(node) {
                               <svg class="icon-arrow" viewBox="0 0 10 6" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10.000000" height="6.000000" fill="none" customFrame="#000000">
 	<path id="箭头" d="M5 0C5.14734 0 5.28865 0.0632141 5.39284 0.175736L9.83728 4.97574C10.0542 5.21005 10.0542 5.58995 9.83728 5.82426C9.62032 6.05858 9.26857 6.05858 9.05161 5.82426L5 1.44853L0.948393 5.82426C0.731435 6.05858 0.379676 6.05858 0.162718 5.82426C-0.0542395 5.58995 -0.0542395 5.21005 0.162718 4.97574L4.60716 0.175736C4.71135 0.0632141 4.85266 0 5 0Z" fill="rgb(23,206,230)" fill-rule="evenodd" transform="matrix(1,0,0,-1,0,6)" />
 </svg>
-                              <input id='picker${node.id}' class="dataPickerInput" type="text" name='dataPicker${node.id}' placeholder="请选择" readonly />`;
+                              <input id='picker${node.id}' class="dataPickerInput" type="text" name='dataPicker${node.id}' value='${node.pickerOptions.value}' placeholder="请选择" readonly />`;
 
     return pickerBarEle;
 }
@@ -19,10 +19,9 @@ export function createDatePickerElement(node) {
 export function setDataPickerElementStyle(node) {
     const {pickerDataPool, data} = commonStore[node.TID];
     const pickerDom = pickerDataPool[node.id].dom;
-    
-    pickerDom.container.style.border = `${node.lineWidth}px solid ${node.strokeStyle}`;
-    pickerDom.container.style.borderRadius = `${node.borderRadius * 100}px`;
-    pickerDom.container.style.padding = `${node.paddingTop}px ${node.paddingRight}px ${node.paddingBottom}px ${node.paddingLeft}px`;
+    const padding = `${node.paddingTop}px ${node.paddingRight}px ${node.paddingBottom}px ${node.paddingLeft}px`;
+    const containerStyle = pickerDom.container.getAttribute('style');
+    pickerDom.container.style.cssText =`${containerStyle}padding: ${padding}`;
     
     if (!pickerDom.iconDate) pickerDom.iconDate = pickerDom.container.querySelector('.icon-date');
     if (!pickerDom.iconArrow) pickerDom.iconArrow = pickerDom.container.querySelector('.icon-arrow');
@@ -31,17 +30,15 @@ export function setDataPickerElementStyle(node) {
     const round = `${node.font.fontSize + data.scale * 2}px`;
     const parts = node.strokeStyle.match(/([\d.]+)/g);
     const fillColor = parts ? `rgba(${parts[0]},${parts[1]},${parts[2]},1)` : node.strokeStyle;
-    
-    pickerDom.iconDate.style.width = round;
-    pickerDom.iconDate.style.height = round;
-    pickerDom.iconDate.style.left = `${node.font.fontSize}px`;
+
+    pickerDom.iconDate.style.cssText = `width: ${round};height: ${round};left: ${node.font.fontSize}px`;
     pickerDom.iconDate.querySelector('path').style.fill = fillColor;
     
-    pickerDom.iconArrow.style.width = `${node.font.fontSize - data.scale * 2}px`;
-    pickerDom.iconArrow.style.height = `${node.font.fontSize - data.scale * 6}px`;
-    pickerDom.iconArrow.style.right = `${node.font.fontSize - data.scale * 2}px`;
+    const width = node.font.fontSize - data.scale * 2;
+    const height = node.font.fontSize - data.scale * 6;
+
+    pickerDom.iconArrow.style.cssText = `width: ${width}px;height: ${height}px;right: ${width}px`;
     pickerDom.iconArrow.querySelector('path').style.fill = fillColor;
-    
-    pickerDom.input.style.fontSize = `${node.font.fontSize}px`;
-    pickerDom.input.style.color = node.font.color;
-};
+
+    pickerDom.input.style.cssText = `font-size: ${node.font.fontSize}px;color: ${node.font.color}`;
+}

package/core/src/element/select.d.ts

@@ -6,6 +6,6 @@ export declare function createSelectOptions(data: [], node: Node): string;
 export declare function getSelectedData(e: Event, data: any, editData: any): void;
 export declare function setSelectInteractiveState(selected: any, node: Node): void;
 export declare function resetSelectInteractiveState(node: Node): void;
-export declare function setSelectDropdownInteractiveState(node: any, staticType: any, type: any): void;
+export declare function setSelectDropdownInteractiveState(node: any, type: any): void;
 export declare function setSelectElementPosition(node: Node, type: string): void;
 export declare function setSelectElementTheme(node: Node): void;

package/core/src/element/select.js

@@ -86,13 +86,11 @@ export function resetSelectInteractiveState(node) {
 /**
  * 配置下拉options容器的交互状态，展开和收起
  * @param node 下拉元件节点数据
- * @param staticType 下拉功能类型：1: 数据统计；2：数据展示；3：显示隐藏
  * @param type 功能作用区域类型：Dcim，Topology，Logo
  */
-export function setSelectDropdownInteractiveState(node, staticType, type) {
+export function setSelectDropdownInteractiveState(node, type) {
     const currentStore = commonStore[node.TID];
     const selectNode = currentStore.selectDataPool[node.id];
-    if(!selectNode.staticType) selectNode.staticType = staticType;
     if(!selectNode) return;
     if(downId !== node.id && type === previewType.Dcim) {
         // 点击的不是同一个下拉则重置交互样式，清空数据

package/core/src/element/tab.js

@@ -1,4 +1,3 @@
-import {jsonLength} from '../utils';
 import {commonStore} from "../store";
 // 设置tab切换显示隐藏时的 Dom元件状态
 export function setElementSwitchTabState(node) {
@@ -9,14 +8,10 @@ export function setElementSwitchTabState(node) {
             setElementSwitchTabState(ch);
         })
     }
-    if(!(node.name === 'echarts' || node.name === 'select')) return;
+    if(node.attribute !== 'dom') return;
     const currentStore = commonStore[node.TID];
-    if(typeof currentStore.elementInteractivePoor.elementDataLength !== 'number') {
-        currentStore.elementInteractivePoor.elementDataLength = jsonLength(currentStore.echartsDataPool) || jsonLength(currentStore.selectDataPool);
-    }
-    if(!currentStore.elementInteractivePoor.elementDataLength) return;
-    const ele = currentStore.echartsDataPool[node.id] && currentStore.echartsDataPool[node.id].div ||
-            currentStore.selectDataPool[node.id] && currentStore.selectDataPool[node.id].dom.selectEle;
+    if(!currentStore.elementInteractivePoor.dom) return;
+    const ele = currentStore.elementInteractivePoor.dom[node.id];
     if(ele) {
         ele.style.display = !node.visible ? 'none': 'block';
     }else {