dcim-topology2d 2.2.3 → 2.2.5

package/core/src/middles/nodes/index.js

@@ -1,54 +1,55 @@
-export * from './arbitrarygraph';
-export * from './arbitrarygraph.anchor';
-export * from './arrow';
-export * from './arrow.rect';
-export * from './arrow.anchor';
-export * from './circle';
-export * from './circle.rect';
-export * from './circle.anchor';
-export * from './cloud';
-export * from './cloud.rect';
-export * from './cloud.anchor';
-export * from './cube';
-export * from './cube.rect';
-export * from './cube.anchor';
-export * from './cube.model';
-export * from './diamond';
-export * from './diamond.rect';
-export * from './file';
-export * from './formtable';
-export * from './formselect';
-export * from './hexagon';
-export * from './hexagon.anchor';
-export * from './hexagon.rect';
-export * from './image.rect';
-export * from './image.anchor';
-export * from './iframe';
-export * from './line';
-export * from './line.anchor';
-export * from './line.rect';
-export * from './message';
-export * from './message.anchor';
-export * from './message.rect';
-export * from './pentagon';
-export * from './pentagon.anchor';
-export * from './pentagon.rect';
-export * from './pentagram';
-export * from './pentagram.anchor';
-export * from './pentagram.rect';
-export * from './people';
-export * from './people.rect';
-export * from './rectangle';
-export * from './rectangle.rect';
-export * from './tablePagination';
-export * from './text';
-export * from './triangle';
-export * from './triangle.anchor';
-export * from './triangle.rect';
-export * from './formoverflow';
-export * from './time';
-export * from './formDatePicker';
-export * from './switchs';
-export * from './progress';
-
+export * from './basic/arbitrarygraph';
+export * from './basic/arbitrarygraph.anchor';
+export * from './basic/arrow';
+export * from './basic/arrow.rect';
+export * from './basic/arrow.anchor';
+export * from './basic/circle';
+export * from './basic/circle.rect';
+export * from './basic/circle.anchor';
+export * from './basic/cloud';
+export * from './basic/cloud.rect';
+export * from './basic/cloud.anchor';
+export * from './basic/cube';
+export * from './basic/cube.rect';
+export * from './basic/cube.anchor';
+export * from './basic/cube.model';
+export * from './basic/diamond';
+export * from './basic/diamond.rect';
+export * from './basic/file';
+export * from './basic/image.rect';
+export * from './basic/image.anchor';
+export * from './basic/iframe';
+export * from './basic/line';
+export * from './basic/line.anchor';
+export * from './basic/line.rect';
+export * from './basic/message';
+export * from './basic/message.anchor';
+export * from './basic/message.rect';
+export * from './basic/pentagon';
+export * from './basic/pentagon.anchor';
+export * from './basic/pentagon.rect';
+export * from './basic/pentagram';
+export * from './basic/pentagram.anchor';
+export * from './basic/pentagram.rect';
+export * from './basic/people';
+export * from './basic/people.rect';
+export * from './basic/rectangle';
+export * from './basic/rectangle.rect';
+export * from './basic/text';
+export * from './basic/triangle';
+export * from './basic/triangle.anchor';
+export * from './basic/triangle.rect';
+export * from './icon/echartLine';
+export * from './flow/hexagon';
+export * from './flow/hexagon.anchor';
+export * from './flow/hexagon.rect';
+export * from './form/formtable';
+export * from './form/formselect';
+export * from './form/tablePagination';
+export * from './form/formoverflow';
+export * from './form/time';
+export * from './form/formDatePicker';
+export * from './form/switchs';
+export * from './form/progress';
+export * from './custom/humiture';
 //# sourceMappingURL=index.js.map

package/core/src/models/line.js

@@ -17,7 +17,7 @@ import { drawLineFns, drawArrowFns } from '../middles';
 import { getBezierPoint } from '../middles/lines/curve';
 import { Store } from 'le5le-store';
 import { lineLen, curveLen } from '../utils/canvas';
-import { text } from '../middles/nodes/text';
+import { text } from '../middles/nodes/basic/text';
 import { Rect } from './rect';
 import { abs } from '../utils/math';
 var Line = /** @class */ (function (_super) {

package/core/src/models/node.js

@@ -17,8 +17,7 @@ import { Point } from './point';
 import { Line } from './line';
 import { anchorsFns, iconRectFns, textRectFns, drawNodeFns } from '../middles';
 import { defaultAnchors } from '../middles/default.anchor';
-import { defaultIconRect, defaultTextRect } from '../middles/default.rect';
-import { text, tableText, defaultText, iconfont } from '../middles/nodes/text';
+import { text, tableText, defaultText, iconfont, defaultIconRect, defaultTextRect } from '../middles';
 import { Store } from 'le5le-store';
 import { abs, s8, animateType } from '../utils';
 export const images = {};
@@ -91,12 +90,16 @@ var Node = /** @class */ (function (_super) {
         _this.leakageStart = json.leakageStart || 0;
         _this.leakageEnd = json.leakageEnd || 0;
         _this.leakageFillStyle = json.leakageFillStyle || '#ff0000';
+        _this.lineOffsetSpeed = json.lineOffsetSpeed || 1;
         _this.bindStaticId = json.bindStaticId || '';
         //_this.buttonCheckSlide = json.buttonCheckSlide || '';
         _this.visitStrokeStyle = json.visitStrokeStyle || '';
         _this.thBottomStrokeStyle = json.thBottomStrokeStyle || '#fff';
         _this.thBottomLineWidth = json.thBottomLineWidth || 1;
         _this.focusFillStyle = json.focusFillStyle;
+        _this.hoverFillStyle = json.hoverFillStyle;
+        _this.defaultText = json.defaultText || json.text;
+        if(_this.name.startsWith('svg')) _this.path = json.path || [];
         // 兼容老数据
         if (json.children && json.children[0] && json.children[0].parentRect) {
             _this.paddingLeft = json.children[0].parentRect.offsetX;
@@ -149,6 +152,8 @@ var Node = /** @class */ (function (_super) {
         _this.nextPlay = json.nextPlay;
         _this.time = json.time;
         _this.isOpen = json.isOpen;
+        _this.isAlias = json.isAlias || false;
+        _this.isPointMonitor = json.isPointMonitor || false;
         _this.isShowPercent = json.isShowPercent || false;
         _this.maxValue = json.maxValue || 100;
         _this.retationDecimalPlaces = json.retationDecimalPlaces;
@@ -202,8 +207,7 @@ var Node = /** @class */ (function (_super) {
         // Calc rect of text.
         if (textRectFns[this.name]) {
             textRectFns[this.name](this);
-        }
-        else {
+        } else {
             defaultTextRect(this);
         }
         // Calc rect of icon.
@@ -310,8 +314,9 @@ var Node = /** @class */ (function (_super) {
                     child = new Node(item);
                     child.parentId = this.id;
                     child.calcRectByParent(this);
-                    child.init();
-                    child.setChild(item.children);
+                    if (!child.rectInParent) child.calcRectInParent(this);
+                    // child.init();
+                    // child.setChild(item.children);
                     break;
             }
             this.children.push(child);
@@ -332,9 +337,7 @@ var Node = /** @class */ (function (_super) {
         }
     };
     Node.prototype.draw = function (ctx) {
-        if (!drawNodeFns[this.name]) {
-            return;
-        }
+        if (!drawNodeFns[this.name]) return;
         // DrawBk
         switch (this.bkType) {
             case 1:
@@ -436,6 +439,7 @@ var Node = /** @class */ (function (_super) {
         var img = new Image();
         img.crossOrigin = 'anonymous';
         img.src = defaultImageNode && defaultImageNode.status === 404 ? '' : this.image;
+        img.dataset.floorImageIndex = this.floorImageIndex;
         img.onload = function (e) {
             _this.lastImage = _this.image;
             _this.imgNaturalWidth = img.naturalWidth;
@@ -679,17 +683,17 @@ var Node = /** @class */ (function (_super) {
                     // 线条左右流动动画
                     if ([animateType.LeftFlow, animateType.RightFlow].includes(this.animateType) && item.state.lineDashOffset) {
                         let o = item.state.lineDashOffset;
+                        let s = this.lineOffsetSpeed;
                         switch (this.animateType) {
                             case animateType.LeftFlow:
                                 o = Math.abs(o)
                                 if (o > 100) o = 1;
-                                o++
-
+                                o = o + 1*s
                                 break;
                             case animateType.RightFlow:
                                 o = Math.abs(o) * -1
                                 if (o < -100) o = -1;
-                                o--
+                                o = o - 1*s
                                 break;
                         }
                         item.state.lineDashOffset = o

package/core/src/models/pen.d.ts

@@ -11,6 +11,7 @@ export declare abstract class Pen {
     id: string;
     type: PenType;
     name: string;
+    subName: string;
     tags: string[];
     rect: Rect;
     lineWidth: number;
@@ -67,6 +68,11 @@ export declare abstract class Pen {
         value: string;
         params: string;
         name?: string;
+        data: {
+            name: string,
+            id: string,
+            type: number
+        }
     }[];
     private eventFns;
     parentId: string;

package/core/src/models/rect.d.ts

@@ -9,6 +9,7 @@ export declare class Rect {
     center: Point;
     constructor(x: number, y: number, width: number, height: number);
     init(): void;
+    calcOffset(): void;
     floor(): void;
     round(): void;
     clone(): Rect;

package/core/src/models/rect.js

@@ -1,18 +1,18 @@
 import { Point } from './point';
 import { pointInRect } from '../utils/canvas';
 var Rect = /** @class */ (function () {
-    function Rect(x, y, width, height, offset) {
+    function Rect(x, y, width, height) {
         this.x = x;
         this.y = y;
         this.width = width;
         this.height = height;
         this.center = new Point(0, 0);
-        if (width < 0) {
-            this.width = 0;
-        }
-        if (height < 0) {
-            this.height = 0;
-        }
+        // if (width < 0) {
+        //     this.width = 0;
+        // }
+        // if (height < 0) {
+        //     this.height = 0;
+        // }
         this.init();
     }
     Rect.prototype.init = function () {
@@ -20,6 +20,12 @@ var Rect = /** @class */ (function () {
         this.ey = this.y + this.height;
         this.calcCenter();
     };
+    Rect.prototype.calcOffset = function () {
+        this.x = this.center.x - this.width / 2;
+        this.y = this.center.y - this.height / 2;
+        this.ex = this.x + this.width;
+        this.ey = this.y + this.height;
+    };
     Rect.prototype.floor = function () {
         this.x |= 0;
         this.y |= 0;

package/core/src/options.js

@@ -29,7 +29,9 @@ export var DefalutOptions = {
     dockStrokeStyle: '#fa541c',
     dockFillStyle: '#fa541c',
     dragColor: '#1890ff',
+    defaultText: '', // 默认文字
     activeColor: '#1890ff',
+    hoverFillStyle: '',
     rotateCursor: '/assets/img/rotate.cur',
     hoverCursor: 'pointer',
     minScale: 0.1,
@@ -39,6 +41,8 @@ export var DefalutOptions = {
     keydown: KeydownType.Document,
     viewPadding: 0,
     interval: 50,
-    storeSubscribe: false
+    storeSubscribe: false,
+    isAlias: false, // 元件绑数据是否带上数据名称 type
+    isPointMonitor: false, // 点位监控
 };
 //# sourceMappingURL=options.js.map

package/core/src/preview.js

@@ -35,6 +35,7 @@ var Preview = (function (_super) {
         var _this = _super.call(this, parent, options) || this;
         _this.offscreen.getRoutineLayer(['AnimateLayer']);
         _this.scheduledAnimationFrame = false;
+        _this.shiftFScreenFull = false; // shift+F全屏
         _this.innerHeight = window.innerHeight || document.documentElement.clientHeight; // 初始化网页高度
         _this.devicePixelInnerHeight = _this.innerHeight; // 初始化网页缩放高度
         _this.devicePixelRatio = window.devicePixelRatio; // 初始化窗口分辨率
@@ -86,9 +87,14 @@ var Preview = (function (_super) {
                         if (eventNode) _this.setAttributeForCanvasPoint('pointer');
                         if (hoverNode.visible) _this.showTip(hoverNode, pos);
                         _this.moveIn.type = moveType;
+                        _this.hoverChangeFollowOperation(hoverNode, _this.moveIn.hoverNode);
+                    }else {
+                        const run = _this.hoverChangeDeacidizing();
+                        run && _this.render();
                     }
                     _this.moveIn.eventNode = eventNode;
-                    _this.moveIn.hoverNode = hoverNode;
+                    _this.moveIn.hoverNode = _this.moveIn.leaveFile ? null : hoverNode;
+                    _this.moveIn.leaveFile = false;
                     return;
                 }
                 _this.scheduledAnimationFrame = false;
@@ -180,19 +186,19 @@ 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 });
                 } else {
-                    _this.scale(1.1);
                     _this.canvas.scale(1.1);
+                    _this.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 });
                 } else {
-                    _this.scale(0.9);
                     _this.canvas.scale(0.9);
+                    _this.scale(0.9);
                 }
             }
             _this.render();
@@ -203,9 +209,10 @@ var Preview = (function (_super) {
             let isFullScreen = document.fullscreenElement || document.webkitFullscreenElement || document.mozFullscreenElement;
             if ((!isFullScreen && _this.isFullScreen) || window.keyControlFullScreen) {
                 // F11或ESC退出全屏
-                if (!window.keyControlFullScreen) _this.moveIn.hoverNode.text = '全屏';
+                if (!window.keyControlFullScreen && !_this.shiftFScreenFull) _this.moveIn.hoverNode.text = '全屏';
                 _this.fitViewPreview(_this.isFullScreen);
                 _this.isFullScreen = false;
+                _this.shiftFScreenFull = false;
                 window.keyControlFullScreen = false;
             } else {
                 const documentElementHeight = window.innerHeight || document.documentElement.clientHeight; // 每次窗口有变化就重新获取一次网页高度
@@ -227,21 +234,26 @@ var Preview = (function (_super) {
                 _this.isResize = true;
                 clearTimeout(_this.pageResizeTim);
                 _this.pageResizeTim = setTimeout(() => {
-                    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';
-                        _this.store.parentElem.parentElement.style.overflow = 'hidden';
-                        _this.store.data.dataResize = 1;
-                        _this.isResize = false;
-                        Store.set('PAGE:zoom', zoom);
-                        _this.fitView();
-                        _this.render();
-                    }
+                    if(!_this.isResize) return;
+                    const pageZoom = 1 / zoom;
+                    _this.store.data.pageZoom = zoom;
+                    _this.store.parentElem.style.transform = `scale(${pageZoom})`;
+                    _this.store.parentElem.style.transformOrigin = '0 0';
+                    if(_this.store.parentElem.parentElement) _this.store.parentElem.parentElement.style.overflow = 'hidden';
+                    _this.store.data.dataResize = 1;
+                    _this.isResize = false;
+                    Store.set('PAGE:zoom', zoom);
+                    _this.fitView();
+                    _this.render();
                 }, 1000);
             }
         };
+        window.onkeydown = function (e) {
+            if (e.shiftKey && (e.key === 'f' || e.key === 'F')) {
+                _this.shiftFScreenFull = true;
+                omouseEventPrototDoWindowFn({ value: 'topoFullscreen' }, null);
+            }
+        };
         _this.subcribecreateOverflow = Store.subscribe(this.generateStoreKey('LT:createOverflow'), function (node) {
             _this.dispatch('createOverflow', node);
         });
@@ -260,7 +272,7 @@ var Preview = (function (_super) {
         this.render();
     };
     // open - redraw by the data
-    Preview.prototype.open = function (topoJSon, type) {
+    Preview.prototype.open = function (topoJSon) {
         this.conversionData(topoJSon);
         this.setBKImageRect();
         this.fitView();
@@ -340,12 +352,14 @@ var Preview = (function (_super) {
         // 7. X抽滚动条隐藏
         this.store.parentElem.style.overflow = 'hidden auto';
     };
-    Preview.prototype.formOverflowOpen = function (data) {
+
+    Preview.prototype.formOverflowOpen = function (data, scrollbarShow) {
         this.formOverflowConversionData(data);
-        this.overflowView();
+        this.overflowView(scrollbarShow);
         this.render(true);
+        this.animate(true);
     }
-    Preview.prototype.overflowView = function () {
+    Preview.prototype.overflowView = function (scroll) {
         if (!this.hasView())
             return;
         var rect = this.getRect();
@@ -357,7 +371,24 @@ var Preview = (function (_super) {
             width: width,
             height: height,
         });
-        this.store.parentElem.style.overflow = 'auto';
+        switch(scroll)
+        {
+            case 'hidden':
+                this.store.parentElem.style.overflowX = 'hidden';
+                this.store.parentElem.style.overflowY = 'hidden';
+                break;
+            case 'x':
+                this.store.parentElem.style.overflowX = 'auto';
+                this.store.parentElem.style.overflowY = 'hidden';
+                break;
+            case 'y':
+                this.store.parentElem.style.overflowX = 'hidden';
+                this.store.parentElem.style.overflowY = 'auto';
+                break;
+            default:
+                this.store.parentElem.style.overflowX = 'auto';
+                this.store.parentElem.style.overflowY = 'auto';
+        }
     }
     Preview.prototype.destroy = function () {
         this.destroyStatic();
@@ -366,6 +397,7 @@ var Preview = (function (_super) {
         this.onmousedown = null;
         this.onmouseup = null;
         window.onresize = null;
+        window.onkeydown = null;
     };
     return Preview;
 }(Common));

package/core/src/renderLayer.js

@@ -53,6 +53,11 @@ var RenderLayer = /** @class */ (function (_super) {
         return _this;
     }
     RenderLayer.prototype.scale = function (scale, center, w, h){
+        const currentStore = commonStore[this.TID];
+        if (currentStore.data.scale * scale < currentStore.options.minScale ||
+            currentStore.data.scale * scale > currentStore.options.maxScale) {
+            return;
+        }
         if(!this.bkImgRect) {
             this.scaleX = w ? w : scale;
             this.scaleY = h ? h : scale;

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

@@ -152,7 +152,6 @@ export const useStore = (id = 'default'): visualization2DStore => {
     }
     return commonStore[id];
 };
-export declare function clearElementDataPool(data: {}): void;
 // @ts-ignore
 export const clearStore = (store: visualization2DStore, del: string) => {
     store.data = {

package/core/src/store/data.js

@@ -14,7 +14,7 @@ import { Lock } from '../models';
 import {DefalutOptions} from '../options';
 import {s8} from '../utils';
 import {commonStore} from './common';
-import {removeAllElement} from '../../../store';
+import { removeDefineElement, clearElementDataPool } from '../../../store';
 export var createStore = function () {
     return {
         id: '',
@@ -86,50 +86,6 @@ export var useStore = function (id) {
     }
     return commonStore[id];
 };
-export function clearElementDataPool(data) {
-    const { echartsDataPool, selectDataPool, iframeDataPool, formoverDataPool, formoverCanvasDataPool} = data;
-    for (let [key, node] of Object.entries(echartsDataPool)) {
-        if(node) {
-            clearInterval(node.timeTicket);
-            if(node.chart) {
-                node.chart.off('mouseover');
-                node.chart.off('mouseout');
-                node.chart.off('globalout');
-                node.chart.dispose();
-            }
-            if(node.div && node.div.parentNode) node.div.parentNode.removeChild(node.div);
-        }
-        delete data.echartsDataPool[key];
-    }
-    if(Object.keys(selectDataPool).length) {
-        let dropdownEle = null,
-                dropdownListEle = null;
-        for (let [key, node] of Object.entries(selectDataPool)) {
-            if(!dropdownEle) {
-                dropdownEle = node.dom.selectDropdown;
-                dropdownListEle = node.dom.selectDropdownUl;
-            }
-            if(node.dom.selectEle && node.dom.selectEle.parentNode) node.dom.selectEle.parentNode.removeChild(node.dom.selectEle);
-            delete data.selectDataPool[key];
-        }
-        if(dropdownEle) dropdownEle.style.display = 'none';
-        if(dropdownListEle) dropdownListEle.innerHTML = '';
-    }
-    for (let [key, node] of Object.entries(iframeDataPool)) {
-        node.iframe.parentNode.removeChild(node.iframe);
-        delete data.iframeDataPool[key];
-    }
-    for (let key of Object.keys(formoverDataPool)) {
-        delete formoverDataPool[key];
-    }
-    for (let key of Object.keys(formoverCanvasDataPool)) {
-        const elementNode = document.getElementById(key);
-        if(elementNode) {
-            elementNode.parentNode.removeChild(elementNode);   
-        }
-        delete formoverCanvasDataPool[key];
-    }
-}
 export var clearStore = function (store, del) {
     store.lastScale = store.data.scale;
     store.data = {
@@ -190,9 +146,10 @@ export var clearStore = function (store, del) {
         formoverCanvasDataPool: store.formoverCanvasDataPool,
         timeDataPool: store.timeDataPool
     });
+    window.laydate && window.laydate.destroy();
     if(del) {
         store.mqttParams.dataConfig = {};
         delete commonStore[store.id];
-        removeAllElement();
+        removeDefineElement();
     }
 };