dcim-topology2d 2.1.0 → 2.2.2

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,10 +1,9 @@
-import {Store} from "le5le-store";
-
+import { Store } from "le5le-store";
 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,8 +12,8 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import {KeyType} from './options';
-import {Point} from './models';
+import { KeyType } from './options';
+import { Point } from './models';
 import { Common } from './common'
 import {
     downDataType,
@@ -22,7 +21,8 @@ import {
     formatPadding,
     mousMoveFun,
     mousDownFun,
-    omouseEventPrototDoWindowFn
+    omouseEventPrototDoWindowFn,
+    pageZoom
 } from './utils';
 import {
     resetSelectInteractiveState,
@@ -40,8 +40,18 @@ var Preview = (function (_super) {
         _this.devicePixelRatio = window.devicePixelRatio; // 初始化窗口分辨率
         // 选中值发生变化时触发，目前用于日期切换
         _this.eventChangeSubcribe = Store.subscribe(this.generateStoreKey('EVENT:change'), function (data) {
-            const {node, date} = data;
-            _this.dispatch('change', node, date); // eventOut外部事件
+            const { node, date } = data;
+            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;
@@ -73,8 +83,8 @@ var Preview = (function (_super) {
                     _this.hideTip();
                     _this.setAttributeForCanvasPoint('default');
                     if (hoverNode) {
-                        if(eventNode) _this.setAttributeForCanvasPoint('pointer');
-                        if(hoverNode.visible) _this.showTip(hoverNode, pos);
+                        if (eventNode) _this.setAttributeForCanvasPoint('pointer');
+                        if (hoverNode.visible) _this.showTip(hoverNode, pos);
                         _this.moveIn.type = moveType;
                     }
                     _this.moveIn.eventNode = eventNode;
@@ -88,15 +98,16 @@ var Preview = (function (_super) {
             if (e.button !== 0)
                 return;
             var canvasPos = _this.divLayer.canvas.getBoundingClientRect();
-            _this.mouseDown = {x: e.x - canvasPos.x, y: e.y - canvasPos.y};
+            _this.mouseDown = { x: e.x - canvasPos.x, y: e.y - canvasPos.y };
             if (e.altKey) {
                 _this.setAttributeForCanvasPoint('pointer');
             }
             if (_this.inputObj) {
                 _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 +130,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;
                 }
             }
@@ -130,9 +141,9 @@ var Preview = (function (_super) {
             _this.mouseDown = null;
             _this.lastTranlated.x = 0;
             _this.lastTranlated.y = 0;
-            if(_this.moveIn.eventNode) {
+            if (_this.moveIn.eventNode) {
                 _this.setAttributeForCanvasPoint('pointer');
-            }else {
+            } else {
                 _this.setAttributeForCanvasPoint('default');
             }
         };
@@ -169,16 +180,16 @@ var Preview = (function (_super) {
             event.preventDefault();
             if (event.deltaY < 0) {
                 if (event.layerX && event.layerY) {
-                    _this.scale(1.1, {x: event.layerX, y: event.layerY});
-                    _this.canvas.scale(1.1, {x: event.layerX, y: event.layerY});
+                    _this.scale(1.1, { x: event.layerX, y: event.layerY });
+                    _this.canvas.scale(1.1, { x: event.layerX, y: event.layerY });
                 } else {
                     _this.scale(1.1);
                     _this.canvas.scale(1.1);
                 }
             } else {
                 if (event.layerX && event.layerY) {
-                    _this.scale(0.9, {x: event.layerX, y: event.layerY});
-                    _this.canvas.scale(0.9, {x: event.layerX, y: event.layerY});
+                    _this.scale(0.9, { x: event.layerX, y: event.layerY });
+                    _this.canvas.scale(0.9, { x: event.layerX, y: event.layerY });
                 } else {
                     _this.scale(0.9);
                     _this.canvas.scale(0.9);
@@ -190,19 +201,19 @@ var Preview = (function (_super) {
         };
         window.onresize = function () {
             let isFullScreen = document.fullscreenElement || document.webkitFullscreenElement || document.mozFullscreenElement;
-            if((!isFullScreen && _this.isFullScreen) || window.keyControlFullScreen){
+            if ((!isFullScreen && _this.isFullScreen) || window.keyControlFullScreen) {
                 // F11或ESC退出全屏
-                if(!window.keyControlFullScreen) _this.moveIn.hoverNode.text = '全屏';
+                if (!window.keyControlFullScreen) _this.moveIn.hoverNode.text = '全屏';
                 _this.fitViewPreview(_this.isFullScreen);
                 _this.isFullScreen = false;
                 window.keyControlFullScreen = false;
-            }else {
+            } else {
                 const documentElementHeight = window.innerHeight || document.documentElement.clientHeight; // 每次窗口有变化就重新获取一次网页高度
-                if(window.devicePixelRatio !== _this.devicePixelRatio) {
+                if (window.devicePixelRatio !== _this.devicePixelRatio) {
                     _this.devicePixelInnerHeight = documentElementHeight;
                     _this.devicePixelRatio = window.devicePixelRatio;
                 }
-                if(_this.devicePixelInnerHeight < documentElementHeight && !isFullScreen) {
+                if (_this.devicePixelInnerHeight < documentElementHeight && !isFullScreen) {
                     // 按F11 全屏
                     setTimeout(() => {
                         _this.fitViewPreview(false);
@@ -211,14 +222,13 @@ var Preview = (function (_super) {
                     window.keyControlFullScreen = true;
                 }
                 // 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;
+                if (_this.store.options.type === 'topology' || window.keyControlFullScreen) return;
+                const zoom = pageZoom();
                 _this.isResize = true;
                 clearTimeout(_this.pageResizeTim);
                 _this.pageResizeTim = setTimeout(() => {
-                    if(_this.isResize){
-                        const pageZoom = 1/zoom;
+                    if (_this.isResize) {
+                        const pageZoom = 1 / zoom;
                         _this.store.data.pageZoom = zoom;
                         _this.store.parentElem.style.transform = `scale(${pageZoom})`;
                         _this.store.parentElem.style.transformOrigin = '0 0';
@@ -232,14 +242,20 @@ var Preview = (function (_super) {
                 }, 1000);
             }
         };
+        _this.subcribecreateOverflow = Store.subscribe(this.generateStoreKey('LT:createOverflow'), function (node) {
+            _this.dispatch('createOverflow', node);
+        });
+        _this.subcribeconversionDataOverflow = Store.subscribe(this.generateStoreKey('LT:conversionDataOverflow'), function (data) {
+            _this.dispatch('conversionDataOverflow', data);
+        });
         return _this;
     }
-    Preview.prototype.setAttributeForCanvasPoint = function (type){
+    Preview.prototype.setAttributeForCanvasPoint = function (type) {
 
         this.divLayer.canvas.setAttribute('class', `canvas-point ${type}`);
 
     };
-    Preview.prototype.fitViewPreview = function (restore){
+    Preview.prototype.fitViewPreview = function (restore) {
         this.fitView(null, restore);
         this.render();
     };
@@ -265,7 +281,7 @@ var Preview = (function (_super) {
     };
     Preview.prototype.scale = function (scale, center, w, h) {
         if (this.store.data.scale * scale < this.store.options.minScale ||
-                this.store.data.scale * scale > this.store.options.maxScale) {
+            this.store.data.scale * scale > this.store.options.maxScale) {
             return;
         }
         this.store.data.scale *= scale;
@@ -274,7 +290,7 @@ var Preview = (function (_super) {
             var item = _a[_i];
             item.scale(scale, center, w, h);
             // 驾驶舱底部区域元件，用于控制底部区域Dom宽高等元素自由变换，后期会删除
-            if(item.tags && item.tags[0] && item.tags[0].includes('contromRoomBottom')) this.store.pens['contromRoomBottom'] = item;
+            if (item.tags && item.tags[0] && item.tags[0].includes('contromRoomBottom')) this.store.pens['contromRoomBottom'] = item;
         }
     };
     Preview.prototype.scaleTo = function (scale) {
@@ -289,7 +305,7 @@ var Preview = (function (_super) {
         var parentElem = this.store.parentElem;
         var width = parentElem.offsetWidth,
             height = parentElem.offsetHeight;
-        if(this.store.options.storeSubscribe) {
+        if (this.store.options.storeSubscribe) {
             width = this.store.options.width;
             height = this.store.options.height;
         }
@@ -305,28 +321,47 @@ var Preview = (function (_super) {
         var padding = formatPadding(viewPadding || this.store.options.viewPadding);
         // 4. 获取图形尺寸
         var rect = this.getRect();
-        if(!rect.width) {
+        if (!rect.width) {
             const bkImageRect = this.store.data.bkImageRect;
             rect.width = bkImageRect && bkImageRect.width ? bkImageRect.width : width;
             rect.height = bkImageRect && bkImageRect.height ? bkImageRect.height : height;
         }
         // 6. 计算缩放比
-        var w = (width - padding[1] - padding[3]) / rect.width ;
+        var w = (width - padding[1] - padding[3]) / rect.width;
         var h = (height - padding[0] - padding[2]) / rect.height;
         var ratio = w;
         if (w > h) {
             ratio = h;
         }
         // 保持缩放后的还原度
-        if(typeof restore === 'boolean' && restore)  ratio = w;
+        if (typeof restore === 'boolean' && restore) ratio = w;
         this.scale(ratio, undefined, w, h);
         this.canvas.scale(ratio, undefined, w, h);
         // 7. X抽滚动条隐藏
         this.store.parentElem.style.overflow = 'hidden auto';
     };
+    Preview.prototype.formOverflowOpen = function (data) {
+        this.formOverflowConversionData(data);
+        this.overflowView();
+        this.render(true);
+    }
+    Preview.prototype.overflowView = function () {
+        if (!this.hasView())
+            return;
+        var rect = this.getRect();
+        var width = rect.ex,
+            height = rect.ey
+        width *= this.store.data.pageZoom;
+        height *= this.store.data.pageZoom;
+        this.canvasResize({
+            width: width,
+            height: height,
+        });
+        this.store.parentElem.style.overflow = 'auto';
+    }
     Preview.prototype.destroy = function () {
         this.destroyStatic();
-        if(this.eventChangeSubcribe) this.eventChangeSubcribe.unsubscribe();
+        if (this.eventChangeSubcribe) this.eventChangeSubcribe.unsubscribe();
         this.onMouseMove = null;
         this.onmousedown = null;
         this.onmouseup = null;
@@ -335,5 +370,5 @@ var Preview = (function (_super) {
     return Preview;
 }(Common));
 
-export {Preview};
+export { Preview };
 //# sourceMappingURL=core.js.map

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

@@ -12,12 +12,14 @@ export interface visualization2DData {
     toArrowType: string;
     scale: number;
     pageZoom: number,
+    pageType: number,
     locked: Lock;
     bkImage: string;
     bkColor: string;
     grid?: boolean;
     websocket?: string;
     mqttUrl?: string;
+    tabsContentOptions?: {},
     mqttOptions?: {
         clientId?: string;
         username?: string;
@@ -40,6 +42,7 @@ export interface paramsData {
     varVaule?: [],
     branchValue?: [],
     echartData?: [],
+    dataConfig?: {},
     echartAssemblyData?: [],
     routingkey?: string,
     pathRewrite?: string
@@ -56,6 +59,8 @@ export interface visualization2DStore {
     cacheDatas?: {
         data: visualization2DData;
     }[];
+    // @ts-ignore
+    tabsPageMasterData: Map<string, any>;
     elementInteractivePoor: {}; // element 交互过渡数据
     pickerDataPool: {}; // datePicker 交互数据池
     echartsDataPool: {}; // echarts Dom节点数据
@@ -77,6 +82,8 @@ export interface visualization2DStore {
 }
 // @ts-ignore
 export const createStore = () => {
+    // @ts-ignore
+    // @ts-ignore
     return {
         id: '',
         data: {
@@ -86,6 +93,8 @@ export const createStore = () => {
             toArrowType: 'triangleSolid',
             scale: 1,
             pageZoom: 1,
+            pageType: 0,
+            tabsContentOptions: {},
             locked: Lock.None,
             bkImageRect: null,
             mqttOptions: {
@@ -106,6 +115,7 @@ export const createStore = () => {
             varVaule: [],
             branchValue: [],
             echartData: [],
+            dataConfig: {},
             echartAssemblyData: [],
             routingkey: '',
             pathRewrite: ''
@@ -160,6 +170,7 @@ export const clearStore = (store: visualization2DStore, del: string) => {
         toArrowType: 'triangleSolid',
         scale: 1,
         pageZoom: 1,
+        pageType: 0,
         locked: Lock.None,
         bkImageRect: null,
         mqttOptions: {

package/core/src/store/data.js

@@ -28,6 +28,8 @@ export var createStore = function () {
             dataResize: 1, // 数据是否加载，1是，0否
             bkImageRect: null,
             pageZoom: 1,
+            pageType: 0, // 0-默认：1-tabs切换
+            tabsContentOptions: {}, // tabs内容区域配置属性
             mqttOptions: {
                 clientId: s8()
             },
@@ -46,12 +48,14 @@ export var createStore = function () {
             varVaule: [],
             branchValue: [],
             echartData: [],
+            dataConfig: {},
             echartAssemblyData: [],
             routingkey: '',
             pathRewrite: ''
         },
         pens: {},
         options: { ...DefalutOptions },
+        tabsPageMasterData: new Map(),
         elementInteractivePoor: {}, // element 交互过渡数据
         pickerDataPool: {}, // datePicker 交互数据池
         echartsDataPool: {}, // echarts Dom节点数据
@@ -135,6 +139,8 @@ export var clearStore = function (store, del) {
         toArrowType: 'triangleSolid',
         scale: 1,
         pageZoom: 1,
+        pageType: 0, // 0-默认：1-tabs切换
+        tabsContentOptions: {},
         locked: Lock.None,
         dataResize: 1, // 数据是否加载，1是，0否
         bkImageRect: null,
@@ -155,6 +161,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 +191,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.d.ts

@@ -1,6 +1,6 @@
 import {Node} from '../models';
 
-export declare function setInitNodeDataValidat(node: any, TID: string, type: string, order: number): void;
+export declare function setInitNodeDataValidat(node: any, TID: string, type: string, order: number, options: any): void;
 export declare function initDefaultValidat(node: any, retData: any): void;
 export declare function setDefaultNodeValidat(node: any, retData: any): any;
 export declare function setConnectionTagForConf(node: Node): void;

package/core/src/utils/assignment.js

@@ -2,20 +2,27 @@
 import {commonStore} from '../store';
 import { setConfItemNode } from '../healps';
 import { EventAction } from '../models';
-
+import {confAssociateDateValueShowType, datePickerValueFormatting} from '../utils';
 /**
  * 在节点注册前初始化node数据
  * @param node 节点数据
  * @param TID 数据键
  * @param type topology类型
  * @param order 节点序列
+ * @param options 配置数据
  */
-export function setInitNodeDataValidat(node, TID, type, order) {
+export function setInitNodeDataValidat(node, TID, type, order, options) {
 
-    const syncData = commonStore[TID].mqttData;
+    const syncData = node.PTID? commonStore[node.PTID].mqttData: commonStore[TID].mqttData;
 
     node.TID = TID;
 
+    if(options.pageId){
+        // tabs页面元件偏移量计算
+        node.rect.x += options.x;
+        node.rect.y += options.y;
+    }
+
     if(typeof node.visibleSwitch !== 'boolean') {
         // 兼容旧版显示隐藏属性值设置
         node.visibleSwitch = type === 'topology';
@@ -33,12 +40,18 @@ export function setInitNodeDataValidat(node, TID, type, order) {
     if (node.children && node.children.length) {
 
         node.children.map((_item) => {
-
-            setInitNodeDataValidat(_item, TID, type);
+            _item.PTID = node.PTID;
+            setInitNodeDataValidat(_item, TID, type, null, options);
 
         })
 
     }
+
+    if (node.formData && node.formData.detailPageData && node.formData.detailPageData.pens && node.formData.detailPageData.pens.length) {
+        // PTID为滚动组件子页面的父级节点的TID
+        node.formData.detailPageData.pens.forEach(pen => pen.PTID = TID);
+    }
+
 }
 // 初始化默认节点值
 export function initDefaultValidat(node, retData) {
@@ -47,7 +60,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 && Object.keys(componentData).length) {
+        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;