dcim-topology2d 2.0.8 → 2.1.0

package/core/src/utils/conversion.js

@@ -1,7 +1,40 @@
 import {commonStore} from '../store';
 import {setElementSwitchTabState} from '../element';
 import {echartsStaticType} from '../utils';
-
+// tab切换页签删除数据处理
+export function getTabConnectSHConf(node) {
+    const switchTabType = node.tags.find((t) => {
+        return t.includes('switchTabType');
+    }); // 获取按钮组类型
+    const topologyChangeData = commonStore[node.TID].switchTabDataPool;
+    const tabAreaData = topologyChangeData[`${switchTabType}AreaData`];
+    const bindConfIds = node.bindStaticId.split(','); // tab元件绑定的元件id
+    const currentNode = [{...node}]; // 需要删除的关联元件数据
+    for (let i = 0; i < bindConfIds.length; i++) {
+        const id = bindConfIds[i];
+        if(tabAreaData[id]) {
+            currentNode.push(tabAreaData[id]);
+            delete tabAreaData[id];
+        }
+    }
+    const changeData = topologyChangeData[`${switchTabType}Data`];
+    delete changeData[node.id];
+    if(Object.keys(changeData).length) {
+        // 第一个页签设置选中效果
+        const firstNode = Object.values(changeData)[0];
+        firstNode.activeImgeIndex = false;
+        const firstNodeBindConfIds = firstNode.bindStaticId.split(','); // tab元件绑定的元件id
+        // 为绑定的每个元件设置可见
+        for (let i = 0; i < firstNodeBindConfIds.length; i++) {
+            const tabAreaNode = tabAreaData[firstNodeBindConfIds[i]];
+            if(tabAreaNode) {
+                tabAreaNode.visible = true;
+                tabAreaNode.visibleSwitch = true;
+            }
+        }
+    }
+    return currentNode;
+}
 /**
  * Tab 数据统计
  * @param type 统计类型
@@ -155,6 +188,15 @@ export function setVarValueData(data) {
         "value": data.name
     }];
 }
+export function setBranchAddressData(data) {
+    return [{
+        "key": "branchVal",
+        "value": data.value
+    }, {
+        "key": "支路地址Key",
+        "value": data.key
+    }];
+}
 export function setThreeCategoryIdData(pen, data) {
     let params = [];
     const hasThreeCategoryId = pen.data.find((tc) => {

package/core/src/utils/params.js

@@ -20,6 +20,7 @@ export function filterParams(id, node) {
     let tagEcharts = [];
     let echartData = [];
     let varVaule = [];
+    let branchValue = [];
     let doorIds = [];
     let isMqttEventType = false;
     node.events.map((ev) => {
@@ -45,6 +46,9 @@ export function filterParams(id, node) {
             if (item.key.includes('varValue')) {
                 varVaule.push(item.value);
             }
+            if (item.key === 'branchVal') {
+                branchValue.push(item.value);
+            }
         })
     }
     if (node.data && Object.prototype.toString.call(node.data) === '[object Object]' && node.data.params && node.data.params.id) {
@@ -55,6 +59,7 @@ export function filterParams(id, node) {
     commonStore[id].mqttParams.assetIds = [...commonStore[id].mqttParams.assetIds, ...assetIds];
     commonStore[id].mqttParams.areaIds = [...commonStore[id].mqttParams.areaIds, ...areaIds];
     commonStore[id].mqttParams.varVaule = [...commonStore[id].mqttParams.varVaule, ...varVaule];
+    commonStore[id].mqttParams.branchValue = [...commonStore[id].mqttParams.branchValue, ...branchValue];
     commonStore[id].mqttParams.tagEcharts = [...commonStore[id].mqttParams.tagEcharts, ...tagEcharts];
     commonStore[id].mqttParams.echartData = [...commonStore[id].mqttParams.echartData, ...echartData];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcim-topology2d",
-  "version": "2.0.8",
+  "version": "2.1.0",
   "description": "",
   "main": "-",
   "scripts": {

package/style/common.css

@@ -12,7 +12,4 @@ li {
 .canvas-point,
 .canvas-point.default{
   cursor: default;
-}
-.canvas-point.pointer > div{
-  z-index: -2;
 }

package/style/datePicker.css

@@ -0,0 +1,44 @@
+.topology-datePicker{
+    position: relative;
+    box-sizing: border-box;
+}
+.topology-datePicker i{
+    display: inline-block;
+}
+.topology-datePicker input{
+    width: 100%;
+    height: 100%;
+    line-height: 100%;
+    border: none;
+    background: transparent;
+    vertical-align: top;
+}
+.topology-datePicker input::placeholder{
+    font-weight: normal;
+    color: rgb(220, 223, 230);
+}
+.topology-datePicker input:active,
+.topology-datePicker input:focus{
+    outline: none;
+}
+.topology-datePicker .icon-date,
+.topology-datePicker .icon-arrow{
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+}
+.layui-laydate-main{
+    width: 322px !important;
+}
+.layui-laydate-main table{
+    width: 100%;
+}
+.layui-laydate-header i{
+    font-size: 14px !important;
+}
+.laydate-set-ym {
+    font-size: 16px;
+}
+.layui-laydate-footer span.layui-laydate-preview{
+    font-size: 14px;
+}

package/style/editor.css

@@ -4,6 +4,9 @@
 /*.canvas-point{*/
 /*    z-index: 6;*/
 /*}*/
+.canvas-point.pointer > div{
+    z-index: -2;
+}
 .topoEchart,
 .topology-select{
     z-index: 1;

package/style/index.css

@@ -1,4 +1,5 @@
 @import './common.css';
 @import './select.css';
+@import './datePicker.css';