dcim-topology2d 2.1.0 → 2.2.0

package/chart-diagram/src/echarts/index.js

@@ -9,7 +9,7 @@ import {
     setMapTopOptions,
     setMapGlobalOptions,
     setMapDataOptions,
-    initBindTabSetting
+    initBindCorrelationSetting
 } from '../utils';
 import {echartsTypeMap} from '../../../static';
 
@@ -67,8 +67,9 @@ export function echarts(ctx, node) {
             echartsData.div.style.transformOrigin = '0 0';
             if(node.data.params) node.data.params.tabCorrelationType = echartsData.tabCorrelationType || ''; // 统计图与Tab关联
             const isLocked = currentStore.data.locked;
-            if (!isLocked || !currentStore.echartsOptionsPool[node.id]) {
-                const tabData = initBindTabSetting(node); // 初始化Tabs数据配置
+            const echartsOptionsData = currentStore.echartsOptionsPool[node.id];
+            if (!isLocked || !echartsOptionsData) {
+                const tabData = initBindCorrelationSetting(node); // 初始化图表与其他组件关联的配置数据
                 // 【未锁定（编辑）状态, options未初始化的状态】
                 if (!appearance.type) appearance.type = echartsTypeMap[`type_${option.displayMode}`]; // 兼容旧数据配置
                 // 公共配置 Top排行榜散点图跳过公共属性配置
@@ -87,8 +88,10 @@ export function echarts(ctx, node) {
                 if (appearance.type.includes('TOP')) setMapTopOptions(option, node);
                 //option.title = appearance.title;
                 option.backgroundColor = appearance.backgroundColor;
+                const correlationData = echartsOptionsData && echartsOptionsData.correlationData || null;
                 currentStore.echartsOptionsPool[node.id] = {
                     option: JSON.parse(JSON.stringify(option)),
+                    correlationData,
                     data: {
                         TID: node.TID,
                         appearance,

package/chart-diagram/src/utils/conversion.d.ts

@@ -6,7 +6,7 @@ interface echartsOptions {
     tooltip: null
 }
 export declare function getXYAxisLabelVal(index: number, intervalNum: number, value: any): string;
-export declare function initBindTabSetting(node: any): string;
+export declare function initBindCorrelationSetting(node: any): string;
 export declare function setMapScatterOptions(option: echartsOptions, node: any): void;
 export declare function setMapLineBarOptions(option: echartsOptions, node: any): void;
 export declare function setMapGaugeOptions(option: echartsOptions, node: any): void;

package/chart-diagram/src/utils/conversion.js

@@ -33,23 +33,24 @@ export function getXYAxisLabelVal(index, intervalNum, value) {
 }
 
 /**
- * 初始化图表与tabs关联的配置数据
+ * 初始化图表与其他组件关联的配置数据
  * @param node 元件节点
  */
-export function initBindTabSetting(node) {
+export function initBindCorrelationSetting(node) {
+    if(!node.data.params || node.data.params.staticForType !== 'OTHER') return null;
     const tabStaticKey = node.tags && node.tags.find((tag) => {return tag.includes('switchTabType')});
+    if(!tabStaticKey) return null; // 与tabs关联？
     const switchTabData = tabStaticKey && commonStore[node.TID].switchTabDataPool[`${tabStaticKey}Data`];
     if(switchTabData) {
         const tabNode = Object.values(switchTabData)[0];
         const tabEventNode = tabNode.events.find((ev) => {return ev.action === 8});
         const tabStaticType = tabEventNode && tabEventNode.dcimStaticForType || '';
-        if(node.data.params) node.data.params.staticForType = tabStaticType;
+        node.data.params.staticForType = tabStaticType;
         return {
             type: tabStaticType,
             data: tabNode.tabData
         };
     }
-    return null;
 }
 
 // 自动滑动展示数据
@@ -509,7 +510,7 @@ export function setMapDataOptions(option, node) {
                 }
             }
         }
-        if(option.series[0].pieData) {
+        if(option.series[0] && option.series[0].pieData) {
             // 3D饼图图例初始化
             const labelLineData = currentStore.echartsDataPool[node.id].labelLineData;
             dataDictionary = set3DPieOptions(option, appearance, labelLineData);

package/core/src/common.js

@@ -14,7 +14,7 @@ import {
     setInitConfData,
     getParams,
     tabHideShowOperation,
-    tabStaticOperation
+    tabStaticOperation, pageZoom
 } from './utils';
 import {useStore, clearStore, commonStore} from './store'
 import * as mqtt from './mqtt.min';
@@ -181,7 +181,8 @@ 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) {
@@ -258,8 +259,7 @@ var Common = /** @class */ (function () {
         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;
+            const zoom = pageZoom();
             this.store.data.pageZoom = zoom;
             this.store.parentElem.style.transform = `scale(${1/zoom})`;
             this.store.parentElem.style.transformOrigin = '0 0';
@@ -739,9 +739,9 @@ 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;
@@ -749,9 +749,9 @@ var Common = /** @class */ (function () {
         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.log('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,9 +764,10 @@ 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.log('mqttClientMessage>>>', ret)
         //console.log('处理消息', ret)
         this.mqttDataDrawing(canvasData.pens, ret)
     };
@@ -912,7 +913,7 @@ var Common = /** @class */ (function () {
             this[item] = null;
 
         })
-        //end
+        //end dcimStaticForType
         window.topology = null;
     };
     // Render or redraw

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)";
     }

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 {

package/core/src/healps/changeData.js

@@ -1,11 +1,11 @@
 //let DETAILDATA = null;
-import {commonStore} from '../store';
+import { commonStore } from '../store';
 import { getEchartsRealData } from '../utils/conversion';
 export function setConfItemNode(pen, syn_synata) {
     const entranceGuard = pen.events.find((ev) => {
         return ev.value === 'entranceGuard';
     });
-    if(entranceGuard) {
+    if (entranceGuard) {
         // 绑定门禁的元件实时数据
         const nullUndefinedRegex = /^(?:null|undefined|\s*)$/;
         const doorData = syn_synata.doorData && syn_synata.doorData[entranceGuard.params];
@@ -13,59 +13,64 @@ export function setConfItemNode(pen, syn_synata) {
         pen.text = doorState === 1 ? '开门' : '关门'; // 1-开门，其他值为关门
     }
     if (!pen.data) return;
-    if(commonStore[pen.TID]) commonStore[pen.TID].data.dataResize = 1;
+    if (commonStore[pen.TID]) commonStore[pen.TID].data.dataResize = 1;
     let isAlarm = false; // 判断元件绑定的数据中是否有告警发生，用于九所项目服务器自身监控功能
-    if(pen.data instanceof Array) {
+    if (pen.data instanceof Array) {
         let _syn = null;
         let isResetVal = false;
-        const {areaData, assetData, kpiData, tagData, asset} = syn_synata
+        const { areaData, assetData, componentData, kpiData, tagData, asset } = syn_synata;
+        const comData = componentData && componentData[pen.id];
         pen.data.map((d) => {
             const key = d.key;
             let value = d.value;
-            const assetItem = assetData[value];
-            const areaItem = areaData[value];
-            const kpiItem = kpiData[value];
-            if(key === 'tagId') value = d.tagId ? d.tagId : d.value;
-            const tagItem = tagData[value];
+            if (key === 'tagId') value = d.tagId ? d.tagId : d.value;
             //console.log('key===========', d)
             if (key === 'assetKey' && d.value === 'assetName' && asset) {
+
                 pen.text = asset.assetName;
-            }else if (key === 'assetId' && assetItem) {
-                _syn = assetItem;
+
+            } else if (key === 'assetId') {
+
+                _syn = comData || assetData[value];
+
                 // if(value === '264'){console.log('_syn',_syn,pen.name,parseInt(_syn.state))}
-            }else if (key === 'areaId' && areaItem) {
-                _syn = areaItem;
-            }else if (key === 'tagId' && tagItem) {
-                _syn = tagItem;
-                if(_syn.kpiName !== '通讯状态' || pen.name !== 'circle'){
+            } else if (key === 'areaId') {
+
+                _syn = comData || areaData[value];
+
+            } else if (key === 'tagId' && (comData || tagData[value])) {
+
+                _syn = comData || tagData[value];
+
+                if (_syn.kpiName !== '通讯状态' || pen.name !== 'circle') {
                     isResetVal = true;
                 }
-                const isControl = parseInt(tagItem.isControlDis); // 是否可控，0可控，1不可控
+                const isControl = parseInt(_syn.isControlDis); // 是否可控，0可控，1不可控
                 //d.isControlDis = isControlDis
-                if(!isControl) {
+                if (!isControl) {
                     d.tagVal = value
-                    d.controlParams = tagItem
+                    d.controlParams = _syn
                     //Object.assign(d, tagItem)
                 }
-            }else if (key === 'kpiAddr' && kpiItem) {
-                _syn = kpiItem;
+            } else if (key === 'kpiAddr' && (comData || kpiData[value])) {
+                _syn = comData || kpiData[value];
                 isResetVal = true
-                const isControl = parseInt(kpiItem.isControlDis); // 是否可控，0可控，1不可控
+                const isControl = parseInt(_syn.isControlDis); // 是否可控，0可控，1不可控
                 //d.isControlDis = isControlDis
-                if(!isControl) {
+                if (!isControl) {
                     d.tagVal = value
-                    d.controlParams = kpiItem
+                    d.controlParams = _syn
                     // delete kpiItem[value]
                     // Object.assign(d, kpiItem)
                 }
             }
         })
-        if(!_syn) return;
+        if (!_syn) return;
         // const type = parseInt(_syn.type) // 是否是开关量
         // 显示的值
         if (isResetVal) pen.text = `${_syn.value}${_syn.unit}`;
         const state = parseInt(_syn.state)
-        if(!state && state !== 0) return
+        if (!state && state !== 0) return
         const name = pen.name
         // 显示的颜色
         let color = ''
@@ -83,9 +88,9 @@ export function setConfItemNode(pen, syn_synata) {
                 let defaulColor = ''
                 if (name === 'text') {
                     defaulColor = 'defaultFontColor'
-                }else if(name === 'line') {
+                } else if (name === 'line') {
                     defaulColor = 'defaultStrokeStyle'
-                }else {
+                } else {
                     defaulColor = 'defaultFillStyle'
                 }
                 color = pen[defaulColor]
@@ -97,17 +102,24 @@ export function setConfItemNode(pen, syn_synata) {
         // 显示的属性
         if (name === 'text') {
             pen.font.color = color
-        }else if(name === 'line') {
+        } else if (name === 'line') {
             pen.strokeStyle = color
             pen.text = ''
-        }else {
+        } else if (name === 'switchs') {
+            //获取值说明中的开值 默认为第一个值为开
+            let openValue = getOpenValue(_syn.valExplain)
+            pen.isOpen = _syn.v == openValue;
+            pen.fillStyle = pen.isOpen ? pen.visitStrokeStyle : pen.strokeStyle;
+            pen.text = '';
+        }
+        else {
             pen.fillStyle = color
         }
         if (name === 'electricFan') setFanData(pen, _syn)
-    }else {
+    } else {
         if (pen.elementRendered) pen.elementRendered = false;
         if (pen.data.echarts) {
-            const {echartDataValue} = syn_synata;
+            const { echartDataValue } = syn_synata;
             const seriesData = echartDataValue;
             const realData = pen.data.params && seriesData && Object.keys(seriesData).length && seriesData[pen.data.params.id];
             if (Array.isArray(realData) && pen.data.params && pen.data.params.displayMode !== 7) {
@@ -137,24 +149,24 @@ export function setFanData(pen, syncData) {
     let runState = false
     let percentage = 1
     const value = parseInt(syncData.v)
-    if(pen.fanValType == '1'){
-        if(value > pen.fanMinVal  && value <= pen.fanMaxVal) {
+    if (pen.fanValType == '1') {
+        if (value > pen.fanMinVal && value <= pen.fanMaxVal) {
             runState = true
-            percentage = value/(pen.fanMaxVal-pen.fanMinVal)
+            percentage = value / (pen.fanMaxVal - pen.fanMinVal)
         }
-    }else if(pen.fanValType == '2'){
-        if(pen.fanNorVal === value) runState = true
+    } else if (pen.fanValType == '2') {
+        if (pen.fanNorVal === value) runState = true
     }
-    if(runState){
+    if (runState) {
         addAnimateByRevolve(pen, percentage)
         pen.animatePlay = true
-    }else{
+    } else {
         pen.animatePlay = false
     }
 }
 
 export function addAnimateByRevolve(pen, percentage) {
-    let time = 200/pen.fanSpeed/percentage
+    let time = 200 / pen.fanSpeed / percentage
     const state = JSON.parse(JSON.stringify(pen))
     delete state.TID
     delete state.animateFrames
@@ -169,3 +181,11 @@ export function addAnimateByRevolve(pen, percentage) {
     pen.animateDuration = time;
 
 }
+
+export function getOpenValue(explain) {
+    let value = 1
+    if (!explain) return value
+    value = explain.split(',')[0].split('=')[0];
+    return value
+
+}

package/core/src/middles/default.js

@@ -1,51 +1,51 @@
 import {
-  arrowAnchors,
-  leftArrow, leftArrowIconRect, leftArrowTextRect,
-  rightArrow, rightArrowIconRect, rightArrowTextRect,
-  twowayArrow, twowayArrowIconRect, twowayArrowTextRect,
-  rectangle, rectangleIconRect, rectangleTextRect,
-  diamond, diamondIconRect, diamondTextRect,
-  text, file, formtable, tablePagination, iframePrimeval,formSelect, fromDatePicker,
-  line as nodeLine, lineAnchors, lineIconRect, lineTextRect,
-  circle, circleIconRect, circleTextRect, circleAnchors,
-  triangle, triangleIconRect, triangleTextRect, triangleAnchors,
-  pentagon, pentagonIconRect, pentagonTextRect, pentagonAnchors,
-  hexagon, hexagonAnchors, hexagonIconRect, hexagonTextRect,
-  pentagram, pentagramAnchors, pentagramIconRect, pentagramTextRect,
-  cloud, cloudAnchors, cloudIconRect, cloudTextRect,
-  message, messageIconRect, messageTextRect, messageAnchors,
-  imageIconRect, imageTextRect,
-  cube, cubeAnchors, cubeIconRect, cubeTextRect,
-  people, peopleIconRect, peopleTextRect,
-  arbitraryGraph, arbitraryGraphAnchors,time
+    arrowAnchors,
+    leftArrow, leftArrowIconRect, leftArrowTextRect,
+    rightArrow, rightArrowIconRect, rightArrowTextRect,
+    twowayArrow, twowayArrowIconRect, twowayArrowTextRect,
+    rectangle, rectangleIconRect, rectangleTextRect,
+    diamond, diamondIconRect, diamondTextRect,
+    text, file, formtable, tablePagination, iframePrimeval, formSelect, fromDatePicker,
+    line as nodeLine, lineAnchors, lineIconRect, lineTextRect,
+    circle, circleIconRect, circleTextRect, circleAnchors,
+    triangle, triangleIconRect, triangleTextRect, triangleAnchors,
+    pentagon, pentagonIconRect, pentagonTextRect, pentagonAnchors,
+    hexagon, hexagonAnchors, hexagonIconRect, hexagonTextRect,
+    pentagram, pentagramAnchors, pentagramIconRect, pentagramTextRect,
+    cloud, cloudAnchors, cloudIconRect, cloudTextRect,
+    message, messageIconRect, messageTextRect, messageAnchors,
+    imageIconRect, imageTextRect,
+    cube, cubeAnchors, cubeIconRect, cubeTextRect,
+    people, peopleIconRect, peopleTextRect,
+    arbitraryGraph, arbitraryGraphAnchors, time, switchs
 } from './nodes';
 import {
-  line,
-  lineControlPoints,
-  calcLineControlPoints,
-  polyline,
-  polylineControlPoints,
-  pointInPolyline,
-  calcPolylineControlPoints,
-  dockPolylineControlPoint,
-  curve,
-  curveControlPoints,
-  pointInCurve,
-  calcCurveControlPoints,
-  mind,
-  calcMindControlPoints,
-  mindControlPoints,
-  pointInMind
+    line,
+    lineControlPoints,
+    calcLineControlPoints,
+    polyline,
+    polylineControlPoints,
+    pointInPolyline,
+    calcPolylineControlPoints,
+    dockPolylineControlPoint,
+    curve,
+    curveControlPoints,
+    pointInCurve,
+    calcCurveControlPoints,
+    mind,
+    calcMindControlPoints,
+    mindControlPoints,
+    pointInMind
 } from './lines';
 import {
-  triangleSolid,
-  triangle as arrowTriangle,
-  diamondSolid,
-  diamond as arrowDiamond,
-  circleSolid, circle as arrowCircle,
-  lineUp,
-  lineDown,
-  line as arrowLine
+    triangleSolid,
+    triangle as arrowTriangle,
+    diamondSolid,
+    diamond as arrowDiamond,
+    circleSolid, circle as arrowCircle,
+    lineUp,
+    lineDown,
+    line as arrowLine
 } from './arrows';
 // Functions of drawing a node.
 export var drawNodeFns = {};
@@ -205,6 +205,10 @@ function init() {
     drawNodeFns.time = time;
     iconRectFns.time = rectangleIconRect;
     textRectFns.time = rectangleTextRect;
+    // 开关
+    drawNodeFns.switchs = switchs;
+    iconRectFns.switchs = rectangleIconRect;
+    textRectFns.switchs = rectangleTextRect;
 }
 init();
 // registerNode: Register a custom node.