dcim-topology2d 2.2.4 → 2.2.5

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

@@ -55,7 +55,15 @@ export function initBindCorrelationSetting(node) {
 
 // 自动滑动展示数据
 export function setMapAutoMoveOptions(option, chartNode, node, callback) {
-    option.dataZoom = echartsDataRoom;
+    const dataRoom = JSON.parse(JSON.stringify(echartsDataRoom));
+    if(option.yAxis[0].type === 'category'){
+        // 排行榜缩放条件修改
+        dataRoom.forEach((room) => {
+            room.yAxisIndex = [0];
+            delete room['xAxisIndex'];
+        });
+    }
+    option.dataZoom = dataRoom;
     const dataZoomNode = option.dataZoom[0];
     const {start, end, time} = node.appearance.zoomParams;
     const zoomStart = Number(start);

package/core/src/activeLayer.d.ts

@@ -7,7 +7,6 @@ export declare class ActiveLayer extends Layer {
     rect: Rect;
     pens: Pen[];
     // @ts-ignore
-    penIds: Set<string>;
     rotate: number;
     initialSizeCPs: Point[];
     nodeRects: Rect[];
@@ -23,6 +22,7 @@ export declare class ActiveLayer extends Layer {
     constructor(TID: String);
     calcControlPoints(): void;
     locked(): boolean;
+    getCenterPoints(): object;
     getPoints(): Point[];
     clear(): void;
     saveNodeRects(): void;

package/core/src/activeLayer.js

@@ -25,7 +25,6 @@ var ActiveLayer = /** @class */ (function (_super) {
         _this.rotateCPs = [];
         _this.sizeCPs = [];
         _this.pens = [];
-        _this.penIds = new Set();
         // nodes: Node[] = [];
         // lines: Line[] = [];
         _this.rotate = 0;
@@ -111,6 +110,19 @@ var ActiveLayer = /** @class */ (function (_super) {
         }
         return true;
     };
+    ActiveLayer.prototype.getCenterPoints = function (points) {
+        if(!points) points = this.initialSizeCPs;
+        const xs = points.map(p => p.x);
+        const ys = points.map(p => p.y);
+        const minX = Math.min(...xs);
+        const maxX = Math.max(...xs);
+        const minY = Math.min(...ys);
+        const maxY = Math.max(...ys);
+        return {
+            x: (minX + maxX) / 2,
+            y: (minY + maxY) / 2
+        };
+    };
     ActiveLayer.prototype.getPoints = function () {
         var points = [];
         for (var _i = 0, _a = this.pens; _i < _a.length; _i++) {
@@ -139,7 +151,6 @@ var ActiveLayer = /** @class */ (function (_super) {
     };
     ActiveLayer.prototype.clear = function () {
         this.pens = [];
-        this.penIds.clear();
         this.sizeCPs = [];
         this.rotateCPs = [];
         Store.set(this.generateStoreKey('LT:activeNode'), null);
@@ -449,16 +460,13 @@ var ActiveLayer = /** @class */ (function (_super) {
             return;
         }
         this.pens.push(pen);
-        this.penIds.add(pen.id);
         if (pen instanceof Node) {
             Store.set(this.generateStoreKey('LT:activeNode'), pen);
         }
     };
     ActiveLayer.prototype.setPens = function (pens) {
         this.pens = pens;
-        this.penIds.clear();
         if (this.pens.length === 1 && this.pens[0] instanceof Node) {
-            this.penIds.add(this.pens[0].id);
             Store.set(this.generateStoreKey('LT:activeNode'), this.pens[0]);
         }
     };

package/core/src/common.d.ts

@@ -71,11 +71,12 @@ export declare class Common {
     hoverLine: Line;
     activeNode: Node;
     lineControlPoint: Point;
+    sizeCPs: boolean;
   };
   isFullScreen: Boolean;
   ratioCord: Object;
   _emitter: Emitter;
-  conversionData(data?: any, type?: any): void;
+  conversionData(data?: any): void;
   switchStaticsCheckType(node: Node | any, staticTypeNode: any): any;
   canvasResize(size?: {
     width: number;
@@ -89,7 +90,6 @@ export declare class Common {
   showInput(item: Pen): void;
   getRect(pens?: Pen[]): Rect;
   animate(autoplay?: boolean): void;
-  updateProps(cache?: boolean, pens?: Pen[]): void;
   translate(x: number, y: number, process?: boolean): void;
   centerView(padding?: Padding): boolean;
   hasView(): boolean;

package/core/src/common.js

@@ -15,9 +15,7 @@ import {
     getParams,
     tabHideShowOperation,
     tabStaticOperation,
-    pageZoom,
-    calculateTempRect,
-    confDataOpenType
+    pageZoom
 } from './utils';
 import { useStore, clearStore, commonStore } from './store'
 import * as mqtt from './mqtt.min';
@@ -45,6 +43,7 @@ var Common = /** @class */ (function () {
         this.lastRender = 0;
         this.pageResizeTim = null;
         this.isResize = false;
+        this.isMonitorRealData = false; // 是否监听实时数据，用于是否返回mqtt输出的实时数据
         this.id = s8();
         this.openCount = 0;
         this.lastTranlated = { x: 0, y: 0 };
@@ -59,7 +58,8 @@ var Common = /** @class */ (function () {
             activeNode: null,
             lineControlPoint: null,
             eventNode: null,
-            leaveFile: false
+            leaveFile: false,
+            sizeCPs: false, // 多选的情况，是否在选中区域内
         };
         this.tip = '';
         this.rendering = false;
@@ -233,7 +233,7 @@ var Common = /** @class */ (function () {
         }
     };
     Common.prototype.hoverChangeDeacidizing = function () {
-        if(this.moveIn.transit !== -1){
+        if(this.moveIn && this.moveIn.transit !== -1){
             // 鼠标hover到空白区域，还原背景色
             const currentNode = this.store.data.pens[this.moveIn.transit];
             this.leaveResetBgColor(currentNode);
@@ -307,7 +307,7 @@ var Common = /** @class */ (function () {
         });
     };
 
-    Common.prototype.conversionData = function (obj, type) {
+    Common.prototype.conversionData = function (obj) {
         this.clear();
         if (!obj) {
             obj = { pens: [] };
@@ -355,14 +355,6 @@ var Common = /** @class */ (function () {
                 //this.store.pens[item.id] = linNode;
                 return;
             }
-            if(type === confDataOpenType.importExcel) {
-                // Excel 导入
-                item.id = s8();
-                // 温湿度
-                if(item.subName === 'temp') item.children.forEach((childNode, i) => {
-                    calculateTempRect(item.rect.x, item.rect.y, i, childNode);
-                });
-            }
             setInitNodeDataValidat(item, this.id, setType, _d, this.tabsContentOptions);
             const node = new Node(item);
             this.store.data.pens.push(node);
@@ -883,6 +875,7 @@ var Common = /** @class */ (function () {
         this.animate(true);
         // 九所的 服务器状态监测功能中用到
         if (this.store.options.storeSubscribe) Store.set(this.generateStoreKey('M:monitor'), this.store.monitorAlarm);
+        if(this.isMonitorRealData && retData) Store.set(this.generateStoreKey('D:monitor'), JSON.stringify(retData));
         return data
     };
     Common.prototype.hidePenByTag = function (pens, val) {
@@ -954,7 +947,7 @@ var Common = /** @class */ (function () {
                 const item = _e[_d];
                 if (!item.from) {
                     // 初次绘制画布时this.id替换item.TID
-                    setInitNodeDataValidat(item, this.id, type, _d, item.PTID);
+                    setInitNodeDataValidat(item, this.id, type, _d);
                     const node = new Node(item);
                     this.store.data.pens.push(node);
                 } else {

package/core/src/core.d.ts

@@ -34,8 +34,8 @@ export declare class Topology extends Common{
     dropNodes(jsonList: any[], offsetX: number, offsetY: number): void;
     addNode(node: Node | any, focus?: boolean): any;
     addLine(line: any, focus?: boolean): any;
-    open(data?: any, type?: any): void;
-    updateProps(cache?: boolean, pens?: Pen[]): void;
+    open(data?: any): void;
+    updateProps(isTrans?: [boolean,string], cache?: boolean, pens?: Pen[]): void;
     overflow(): Rect;
     private onMouseMove;
     private onmousedown;