dcim-topology2d 2.1.0 → 2.2.0

package/core/src/models/pen.js

@@ -131,7 +131,7 @@ var Pen = /** @class */ (function () {
         }
     }
     Pen.prototype.render = function (ctx) {
-        if (!this.visible && !this.visibleSwitch){
+        if (!this.visible && !this.visibleSwitch) {
             return;
         }
         if (this.from && !this.to) {
@@ -150,9 +150,9 @@ var Pen = /** @class */ (function () {
         if (this.lineWidth > 1) {
             ctx.lineWidth = this.lineWidth;
         }
-        if(this.dash === 4) {
+        if (this.dash === 4) {
             ctx.strokeStyle = 'transparent';
-        }else {
+        } else {
             const staticStrokeStyle = this.strokeStyle || '#222';
             ctx.strokeStyle = !this.activeImgeIndex ? this.visitStrokeStyle || staticStrokeStyle : this.defaultStrokeStyle || staticStrokeStyle;
         }
@@ -219,19 +219,19 @@ var Pen = /** @class */ (function () {
         }
         for (var _i = 0, _a = this.events; _i < _a.length; _i++) {
             var item = _a[_i];
-            if (item.type !== EventType.Click ) {
+            if (item.type !== EventType.Click) {
                 continue;
             }
             // 画布页面，单击跳转链接事件屏蔽
-            if(item.action === EventAction.Link && window.location.pathname.includes('workspace')){
+            if (item.action === EventAction.Link && window.location.pathname.includes('workspace')) {
                 continue
             }
-            if(item.action === EventAction.Link){
+            if (item.action === EventAction.Link) {
                 this[this.eventFns[item.action]](item.value, item.dcimMenuForType);
-            }else{
+            } else {
                 this[this.eventFns[item.action]] && this[this.eventFns[item.action]](item.value, item.params);
             }
-            if(item.action === 7){
+            if (item.action === 7) {
                 Store.set(this.generateStoreKey('LT:hidePen'), item.value);
             }
         }
@@ -270,10 +270,10 @@ var Pen = /** @class */ (function () {
         // window.open(url, params === undefined ? '_blank' : params);
         var port = window.location.port;
         var href = window.location.href;
-        if(!url.includes("http") && port.includes("3000") && url.includes("id")){
-            url= '/workspace?id=' + url.split('id=')[1]
+        if (!url.includes("http") && port.includes("3000") && url.includes("id")) {
+            url = '/workspace?id=' + url.split('id=')[1]
             // console.log('url:3000===',url)
-        }else if(!url.includes("http://") && href.includes("topologyDetail")){
+        } else if (!url.includes("http://") && href.includes("topologyDetail")) {
             switch (params) {
                 case '1': // 返回上一页
                     let str = href.replace(/\/topologyDetail/g, "")

package/core/src/offscreen.js

@@ -1,8 +1,8 @@
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
-                ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-                function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 import { Store } from 'le5le-store';
 import { Canvas } from './canvas';
-import { Node } from './models'
+import { Node, Line } from './models'
 import { commonStore } from './store'
 var Offscreen = /** @class */ (function (_super) {
     __extends(Offscreen, _super);
@@ -25,38 +25,38 @@ var Offscreen = /** @class */ (function (_super) {
         Store.set(_this.generateStoreKey('LT:offscreen'), _this.canvas);
         return _this;
     }
-    Offscreen.prototype.getRoutineLayer = function(auto) {
-      if(!auto || auto.includes('ActiveLayer')) {
-        this.activeLayer = Store.get(this.generateStoreKey('LT:ActiveLayer'));
-      }
-      if(!auto || auto.includes('HoverLayer')) {
-        this.hoverLayer = Store.get(this.generateStoreKey('LT:HoverLayer'));
-      }
-      if(!auto || auto.includes('AnimateLayer')) {
-        this.animateLayer = Store.get(this.generateStoreKey('LT:AnimateLayer'));
-      }
+    Offscreen.prototype.getRoutineLayer = function (auto) {
+        if (!auto || auto.includes('ActiveLayer')) {
+            this.activeLayer = Store.get(this.generateStoreKey('LT:ActiveLayer'));
+        }
+        if (!auto || auto.includes('HoverLayer')) {
+            this.hoverLayer = Store.get(this.generateStoreKey('LT:HoverLayer'));
+        }
+        if (!auto || auto.includes('AnimateLayer')) {
+            this.animateLayer = Store.get(this.generateStoreKey('LT:AnimateLayer'));
+        }
     };
     Offscreen.prototype.render = function () {
         _super.prototype.render.call(this);
         var ctx = this.canvas.getContext('2d');
-        if(!commonStore || !commonStore[this.TID]) return;
+        if (!commonStore || !commonStore[this.TID]) return;
         let store = commonStore[this.TID];
         ctx.strokeStyle = store.options.color;
         for (var _i = 0, _a = store.data.pens; _i < _a.length; _i++) {
             var item = _a[_i];
-            if(!(item instanceof Node)) item = new Node(item);
+            if (!(item instanceof Node) && !(item instanceof Line)) item = new Node(item);
             if (!item.getTID()) {
                 item.setTID(this.TID);
             }
             item.render(ctx);
         }
-        if(this.activeLayer) {
+        if (this.activeLayer) {
             this.activeLayer.render(ctx);
         }
-        if(this.hoverLayer) {
-          this.hoverLayer.render(ctx);
+        if (this.hoverLayer) {
+            this.hoverLayer.render(ctx);
         }
-        if(this.animateLayer) {
+        if (this.animateLayer) {
             this.animateLayer.render(ctx);
         }
         store = null;

package/core/src/preview.js

@@ -1,5 +1,4 @@
 import {Store} from "le5le-store";
-
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -22,7 +21,8 @@ import {
     formatPadding,
     mousMoveFun,
     mousDownFun,
-    omouseEventPrototDoWindowFn
+    omouseEventPrototDoWindowFn,
+    pageZoom
 } from './utils';
 import {
     resetSelectInteractiveState,
@@ -41,7 +41,17 @@ var Preview = (function (_super) {
         // 选中值发生变化时触发，目前用于日期切换
         _this.eventChangeSubcribe = Store.subscribe(this.generateStoreKey('EVENT:change'), function (data) {
             const {node, date} = data;
-            _this.dispatch('change', node, date); // eventOut外部事件
+            const pickerBindData = _this.store.pickerDataPool.bindData;
+            if(pickerBindData) {
+                // 切换显示日期文字的元件值
+                for (let value of Object.values(pickerBindData)){
+                    if(value.dateId === node.id) {
+                        const pen = _this.store.data.pens[value.order];
+                        pen.text = date.valueStr;
+                    }
+                }
+            }
+            node.formData.realIds ? _this.dispatch('change', node, date) : _this.render(); // eventOut外部事件
         });
         _this.onMouseMove = function (e) {
             _this.store.data.dataResize = 0;
@@ -96,7 +106,7 @@ var Preview = (function (_super) {
                 _this.setNodeText();
             }
             resetSelectInteractiveState(_this.moveIn.hoverNode);
-            const {eventType, value, staticType} = mousDownFun(_this.store.options.type, _this.moveIn.eventNode);
+            const {eventType, value} = mousDownFun(_this.store.options.type, _this.moveIn.eventNode);
             if (_this.moveIn.type == _this.moveInType.Nodes) {
                 _this.setAttributeForCanvasPoint('pointer');
                 switch (eventType) {
@@ -119,7 +129,7 @@ var Preview = (function (_super) {
                         _this.switchStaticsCheckType(_this.moveIn.hoverNode, _this.moveIn.eventNode);
                         break;
                     case downDataType.Formselect:
-                        setSelectDropdownInteractiveState(_this.moveIn.hoverNode, staticType, previewType.Dcim);
+                        setSelectDropdownInteractiveState(_this.moveIn.hoverNode, previewType.Dcim);
                         break;
                 }
             }
@@ -212,8 +222,7 @@ var Preview = (function (_super) {
                 }
                 // topology编辑器或全屏下跳出程序
                 if(_this.store.options.type === 'topology' || window.keyControlFullScreen) return;
-                const screenWidth = window.screen.width < 1920 ? 1920 : window.screen.width;
-                const zoom = window.innerWidth < screenWidth ? document.documentElement.clientWidth / screenWidth : 1;
+                const zoom = pageZoom();
                 _this.isResize = true;
                 clearTimeout(_this.pageResizeTim);
                 _this.pageResizeTim = setTimeout(() => {

package/core/src/store/data.d.ts

@@ -40,6 +40,7 @@ export interface paramsData {
     varVaule?: [],
     branchValue?: [],
     echartData?: [],
+    dataConfig?: {},
     echartAssemblyData?: [],
     routingkey?: string,
     pathRewrite?: string
@@ -106,6 +107,7 @@ export const createStore = () => {
             varVaule: [],
             branchValue: [],
             echartData: [],
+            dataConfig: {},
             echartAssemblyData: [],
             routingkey: '',
             pathRewrite: ''

package/core/src/store/data.js

@@ -46,6 +46,7 @@ export var createStore = function () {
             varVaule: [],
             branchValue: [],
             echartData: [],
+            dataConfig: {},
             echartAssemblyData: [],
             routingkey: '',
             pathRewrite: ''
@@ -155,6 +156,10 @@ export var clearStore = function (store, del) {
         varVaule: [],
         branchValue: [],
         echartData: [],
+        dataConfig: store.mqttParams.dataConfig.data ? {
+            data: {},
+            picker: store.mqttParams.dataConfig.picker
+        } : {},
         echartAssemblyData: [],
         routingkey: '',
         pathRewrite: ''
@@ -181,6 +186,7 @@ export var clearStore = function (store, del) {
         timeDataPool: store.timeDataPool
     });
     if(del) {
+        store.mqttParams.dataConfig = {};
         delete commonStore[store.id];
         removeAllElement();
     }

package/core/src/utils/assignment.js

@@ -2,7 +2,7 @@
 import {commonStore} from '../store';
 import { setConfItemNode } from '../healps';
 import { EventAction } from '../models';
-
+import {confAssociateDateValueShowType, datePickerValueFormatting} from '../utils';
 /**
  * 在节点注册前初始化node数据
  * @param node 节点数据
@@ -47,7 +47,38 @@ export function initDefaultValidat(node, retData) {
     if (node.name === 'line') {
         node.defaultStrokeStyle = node.strokeStyle;
     }
-    const dataDictionary = retData && {...retData.varData, ...retData.branchNameData} || {};
+    setPickerDateConnectData(node);
+    setVarBranchData(node, retData);
+}
+// 初始化配置日期元件关联的数据
+function setPickerDateConnectData(node) {
+    if(node.formData && node.formData.bindDateShowType === confAssociateDateValueShowType.date) {
+        const pickerData = commonStore[node.TID].pickerDataPool;
+        if(!pickerData.bindData) pickerData.bindData = {};
+        pickerData.bindData[node.id] = {
+            order: node.order,
+            dateId: node.formData.dateId
+        };
+        node.text = datePickerValueFormatting({
+            formatType: node.formData.dateFormat,
+            valueType: node.formData.valueType
+        }).dateStr;
+    }
+}
+// 设置变量类型和支路地址的异步数据
+function setVarBranchData(node, retData) {
+    if(!retData) return;
+    const componentData = retData.componentData;
+    let varData = null;
+    let branchNameData = null;
+    if(componentData) {
+        varData = componentData[node.id] || {};
+        branchNameData = componentData[node.id] || {};
+    }else {
+        varData = retData.varData;
+        branchNameData = retData.branchNameData;
+    }
+    const dataDictionary = {...varData, ...branchNameData};
     // 变量类型数据展示，不需要实时更新
     if(Array.isArray(node.data) && Object.keys(dataDictionary).length) {
         let typeName = '';

package/core/src/utils/construction.d.ts

@@ -43,8 +43,32 @@ export interface SelectStaticType {
     dataShow?:number;
     visible?:number;
 }
+export interface DatePickerBindType {
+    echarts?:number;
+    tag?:number;
+    kpi?:number;
+    asset?:number;
+    area?:number;
+    varType?:number;
+    branch?:number;
+    word?:number;
+}
+export interface ConfBindValueType {
+    increment?:number; // 增量值
+    current?:number; // 当前值
+    max?:number; // 最大值
+    min?:number; // 最小值
+    average?:number; // 平均值
+}
+export interface ConfAssociateDateValueShowType {
+    real?:number; // 实时值
+    date?:number; // 日期值
+}
 export const moveDataType: MoveDataType;
 export const downDataType: DownDataType;
 export const previewType: PreviewType;
 export const animateType: AnimateType;
 export const selectStaticType: SelectStaticType;
+export const datePickerBindType: DatePickerBindType;
+export const confBindValueType: ConfBindValueType;
+export const confAssociateDateValueShowType: ConfAssociateDateValueShowType;

package/core/src/utils/construction.js

@@ -1,4 +1,4 @@
-export const echartsStaticType = ['DAY', 'WEEK', 'MONTH', 'YEAR', 'REALTIME'];
+export const echartsStaticType = ['DAY', 'WEEK', 'MONTH', 'YEAR', 'REALTIME', 'CUSTOMIZE'];
 export const winEventActionFns = ['Link', 'DoAnimate', 'DoFn', 'DoWindowFn', 'openImg'];
 export const moveDataType = {
     None: 0,
@@ -40,4 +40,25 @@ export const selectStaticType = {
     static: 1,
     dataShow: 2,
     visible: 3
+};
+export const datePickerBindType = {
+    echarts: 1, // echart
+    tag: 3, // 测点
+    kpi: 6, // 指标
+    asset: 9, // 资产
+    area: 21, // 区域
+    varType: 12, // 变量类型
+    branch: 15, // 支路地址
+    word: -1 // 文字
+};
+export const confBindValueType = {
+    increment: 1, // 增量值
+    current: 2, // 当前值
+    max: 3, // 最大值
+    min: 4, // 最小值
+    average: 5 // 平均值
+};
+export const confAssociateDateValueShowType = {
+    real: 1, // 实时值
+    date: 2 // 日期值
 };

package/core/src/utils/conversion.d.ts

@@ -1,4 +1,6 @@
 import {Node} from "../models";
+export declare function pageZoom(): number;
+export declare function datePickerValueFormatting(data: {}): {};
 export declare function getTabConnectSHConf(node: Node): Node;
 export declare function tabStaticOperation(type: string, node: Node, areaData: any, params: object): void;
 export declare function tabHideShowOperation(node: any, areaData: any, visible: boolean): void;

package/core/src/utils/conversion.js

@@ -1,6 +1,114 @@
 import {commonStore} from '../store';
 import {setElementSwitchTabState} from '../element';
 import {echartsStaticType} from '../utils';
+import {datePickerType, datePickerTypeList} from "../../../store";
+
+/**
+ * yyyy-MM-dd 格式转换
+ * @param valueType 默认值类型：1-默认当天
+ * @returns {string}
+ */
+// function yyyMMddFormatting(valueType) {
+//     if(valueType === 1){
+//         // 默认当天
+//         return new Date().toISOString().split('T')[0];
+//     }
+// }
+
+/**
+ * yyyy-MM-dd HH:mm:ss 格式转换
+ * @param valueType 默认值类型：1-默认当天
+ * @returns {string}
+ */
+// function yyyMMddHHmmssFormatting(valueType) {
+//     if(valueType === 1){
+//         // 默认当天
+//         return new Date().toISOString().replace('T', ' ').substring(0, 19);
+//     }
+// }
+
+/**
+ * yyyy 格式转换
+ * @param valueType 默认值类型：1-默认当天
+ * @returns {number}
+ */
+// function yyyFormatting(valueType) {
+//     if(valueType === 1){
+//         // 默认当天
+//         return new new Date().getFullYear();
+//     }
+// }
+
+/**
+ * yyyy-MM 格式转换
+ * @param valueType 默认值类型：1-默认当天
+ * @returns {string}
+ */
+// function yyyMMFormatting(valueType) {
+//     if(valueType === 1){
+//         // 默认当天
+//         return new Date().toISOString().slice(0, 7);
+//     }
+// }
+
+/**
+ * HH:mm:ss 格式转换
+ * @param valueType 默认值类型：1-默认当天
+ * @returns {string}
+ */
+// function hhmmssddFormatting(valueType) {
+//     if(valueType === 1){
+//         // 默认当天
+//         Date.prototype.formatTime = function() {
+//             return [this.getHours(), this.getMinutes(), this.getSeconds()]
+//                 .map(v => v.toString().padStart(2, '0')).join(':');
+//         };
+//         return new Date().formatTime();
+//     }
+// }
+export function pageZoom() {
+    let screenWidth = 0;
+    if(window.screen.width < 1920) {
+        // 1920 * 1080分辨率以下的适配
+        const zoom = window.screen.width / 1920;
+        screenWidth = Math.round(window.screen.width / zoom);
+    }else {
+        screenWidth = window.screen.width;
+    }
+    const order = window.screen.width > 1280 ? 12 : 8; // 差值计算
+    return window.innerWidth < screenWidth ? (window.innerWidth - order) / screenWidth : 1;
+}
+
+/**
+ * 日期转换
+ * @param data: {formatType: '日期格式', valueType: '默认值类型'}
+ * @returns {string}
+ */
+export function datePickerValueFormatting(data) {
+    if(!Object.keys(datePickerType).length) {
+        // 获取日期类型map数据
+        const params = datePickerTypeList.reduce((obj, item) => {
+            obj[item['id']] = item.format;
+            return obj;
+        }, {});
+        Object.assign(datePickerType, params);
+    }
+    let now = new Date(); // data.valueType === 1 默认
+    const map = {
+        yyyy: now.getFullYear(),
+        MM: String(now.getMonth() + 1).padStart(2, '0'),
+        dd: String(now.getDate()).padStart(2, '0'),
+        HH: String(now.getHours()).padStart(2, '0'),
+        mm: String(now.getMinutes()).padStart(2, '0'),
+        ss: String(now.getSeconds()).padStart(2, '0')
+    };
+    const date = data.dateType ? datePickerType[data.dateType].replace(/yyyy|MM|dd|HH|mm|ss/g, match => map[match]) : '';
+    const dateStr = data.formatType.replace(/yyyy|MM|dd|HH|mm|ss/g, match => map[match]);
+    return {
+        date,
+        dateStr
+    };
+}
 // tab切换页签删除数据处理
 export function getTabConnectSHConf(node) {
     const switchTabType = node.tags.find((t) => {
@@ -82,6 +190,7 @@ export function tabHideShowOperation(node, areaData, isActive) {
         if(!(areaNode && pens[areaNode.order])) return;
         const tagNode = pens[areaNode.order];
         tagNode.visible = !isActive;
+        tagNode.visibleSwitch = tagNode.visible;
         setElementSwitchTabState(tagNode);
     }
 }

package/core/src/utils/math.d.ts

@@ -1,4 +1,3 @@
 export declare function pSBC(p: any, c0: any, c1?: any, l?: any): string;
 export declare function abs(num: number, percent: number | string): number;
 export declare function ptInPolyXY(pt: any, poly: []): boolean;
-export declare function jsonLength(obj: {}): number;

package/core/src/utils/math.js

@@ -115,7 +115,4 @@ export function ptInPolyXY(pt, poly) {
     }
     return c;
 }
-export function jsonLength(obj) {
-    return Object.keys(obj).length;
-}
 //# sourceMappingURL=math.js.map

package/core/src/utils/onmousevent.js

@@ -77,7 +77,7 @@ export function mousDownFun(type, eventNode) {
         params.eventType = downDataType.Tabswitch; // Tab切换
     }else if(action === 11) {
         params.eventType = downDataType.Formselect; // select下拉切换
-        params.staticType = eventNode.dcimStaticForType; // 1: 数据统计；2：数据展示；3：显示隐藏
+        // params.staticType = eventNode.dcimStaticForType; // 1: 数据统计；2：数据展示；3：显示隐藏；4：日期类型
     }else {
         // action === 5 远程控制比较特殊，无论是否绑定远程控制事件，只要数据中有远程控制属性且值为0都会认定为远程控制
         params.eventType = downDataType.Target; // 链接跳转

package/core/src/utils/params.d.ts

@@ -1,2 +1,3 @@
+// @ts-ignore
 export declare function getParams(id: string, data: []): void;
 export declare function filterParams(node: any): void;

package/core/src/utils/params.js

@@ -1,7 +1,11 @@
 import {commonStore} from '../store';
+import {datePickerValueFormatting} from "./conversion";
+import {datePickerBindType, confBindValueType} from "./construction";
+const confConfigMap = new Map();
 // 获取绑定数据的参数
 export function getParams(id, data) {
-    data.map((item) => {
+    for (let i = 0, length = data.length; i < length; i++) {
+        const item = data[i];
         filterParams(id, item);
         if (item.children && item.children.length) {
             getParams(id, item.children);
@@ -9,7 +13,8 @@ export function getParams(id, data) {
         if (item.formData && item.formData.detailPageData && item.formData.detailPageData.pens && item.formData.detailPageData.pens.length) {
             getParams(id, item.formData.detailPageData.pens);
         }
-    });
+    }
+    confConfigMap.clear();
 }
 // 过滤出参数
 export function filterParams(id, node) {
@@ -23,36 +28,48 @@ export function filterParams(id, node) {
     let branchValue = [];
     let doorIds = [];
     let isMqttEventType = false;
+    let dcimStaticForType = '';
     node.events.map((ev) => {
         if(ev.value && ev.value === 'entranceGuard') doorIds.push(ev.params); // 门禁参数
         if(ev.type === 3) isMqttEventType = true;
+        if(ev.type === 4) dcimStaticForType = ev.dcimStaticForType;
     });
     if(doorIds.length) commonStore[id].mqttParams.doorIds = [...commonStore[id].mqttParams.doorIds, ...doorIds];
     if(!isMqttEventType) return;
     if (node.data && Array.isArray(node.data) && node.data.length) {
-        node.data.map((item) => {
+        for (let i = 0, length = node.data.length; i < length; i ++) {
+            const item = node.data[i];
+            let type = 0;
             if (item.key === 'tagId') {
                 tagIds.push(item.value);
+                type = datePickerBindType.tag;
             }
             if (item.key === 'kpiAddr') {
                 kpiAddrs.push(item.value);
+                type = datePickerBindType.kpi;
             }
             if (item.key === 'assetId') {
                 assetIds.push(item.value);
+                type = datePickerBindType.asset;
             }
             if (item.key === 'areaId') {
                 areaIds.push(item.value);
+                type = datePickerBindType.area;
             }
             if (item.key.includes('varValue')) {
                 varVaule.push(item.value);
+                type = datePickerBindType.varType;
             }
             if (item.key === 'branchVal') {
                 branchValue.push(item.value);
+                type = datePickerBindType.branch;
             }
-        })
+            if(dcimStaticForType && node.formData && type) setConfConfigMap(node.id, id, node.formData, item.value, type);
+        }
     }
     if (node.data && Object.prototype.toString.call(node.data) === '[object Object]' && node.data.params && node.data.params.id) {
         echartData.push(node.data.params.id);
+        if(dcimStaticForType && node.formData) setConfConfigMap(node.id, id, node.formData, node.data.params.id, 1);
     }
     commonStore[id].mqttParams.tagIds = [...commonStore[id].mqttParams.tagIds, ...tagIds];
     commonStore[id].mqttParams.kpiAddrs = [...commonStore[id].mqttParams.kpiAddrs, ...kpiAddrs];
@@ -62,4 +79,58 @@ export function filterParams(id, node) {
     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];
+}
+
+/**
+ * 设置绑定日期的配置数据
+ * @param formData 元件关联的日期数据
+ * @param id 当前元件id
+ * @param tid
+ * @param realData 当前元件绑定的数据
+ * @param type 当前元件绑定的数据类型 1：echart   3：测点     6：指标   9：资产  12：变量类型   15：支路地址  21：区域
+ */
+function setConfConfigMap(id, tid, formData, realData, type) {
+    if(!formData.dateId) return;
+    const dateId = formData.dateId;
+    let value = null;
+    let valueStr = '';
+    if(confConfigMap.has(dateId)) {
+
+         const {date, dateStr} = confConfigMap.get(dateId);
+
+        value = date;
+
+        valueStr = dateStr;
+
+    }else {
+
+        const {date, dateStr} = datePickerValueFormatting({
+            formatType: formData.dateFormat,
+            valueType: formData.valueType,
+            dateType: formData.dateType
+        });
+
+        value = date;
+
+        valueStr = dateStr;
+
+        confConfigMap.set(dateId, {date, dateStr});
+
+    }
+    const dataConfig = commonStore[tid].mqttParams.dataConfig;
+    if(!dataConfig.data){
+        dataConfig.data = {};
+        dataConfig.picker = new Map();
+    }
+    dataConfig.data[id] = {
+        id: realData,
+        date: value,
+        dataType: type,
+        valueType: confBindValueType.increment
+    };
+    dataConfig.picker.set(id, {
+        dateId,
+        date: value,
+        dateStr: valueStr
+    });
 }

package/package.json

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