dcim-topology2d 1.1.0 → 1.1.2

package/core/src/calling.js

@@ -14,6 +14,7 @@ var Calling = (function () {
         if (!options) {
             options = {};
         }
+        options.type = this.store.options.isFitview ? 'titLogo' : 'bottLogo';
         Object.assign(this.store.options, options);
         if (typeof parent === 'string') {
             this.store.parentElem = document.getElementById(parent);
@@ -137,6 +138,7 @@ var Calling = (function () {
         }
         this.store.data.scale *= scale;
         !center && (center = this.getRect().center);
+        center.type = this.store.options.type;
         for (var _i = 0, _a = this.store.data.pens; _i < _a.length; _i++) {
             var item = _a[_i];
             item.scale(scale, center, w, h);

package/core/src/common.js

@@ -282,7 +282,7 @@ var Common = /** @class */ (function () {
         try {
             const _this = this;
             const now = performance.now();
-            if (now - _this.lastRender < _this.store.options.interval) {
+            if (now - _this.lastRender < _this.store.options.interval && !noFocus) {
                 if (_this.renderTimer) {
                     cancelAnimationFrame(_this.renderTimer);
                 }
@@ -954,7 +954,7 @@ var Common = /** @class */ (function () {
         // console.log('收到消息', syncData)
         Store.set('mqtt:responseData', syncData);
         data.pens.map((item) => {
-            if (item.children != undefined) {
+            if (item.children && item.children.length) {
                 item.children.map((_item) => {
                     item.defaultFillStyle = item.fillStyle;
                     item.defaultFontColor = item.font.color;

package/core/src/healps/changeData.d.ts

@@ -5,4 +5,4 @@ export declare function setNodeEvents(item: any[], pen: Pen): void;
 export declare function setControlData(pen: Pen, syncData: Node): void;
 export declare function getControlNode(item: any, data: any): Node;
 export declare function getDetailData(data: Node): void;
-export declare function setStatisticalData(pen: Pen, data: any): Node;
+export declare function setStatisticalData(pen: Pen, staticForType: string, chartData: any): Node;

package/core/src/healps/changeData.js

@@ -96,22 +96,26 @@ export function setConfItemNode(pen, syn_synata) {
             const { echartDataValue } = syn_synata;
             //const seriesData = pen.data.echarts.option.series.length > 1 ? echartDataValue : echartData
             const seriesData = echartDataValue;
-            if(seriesData) pen.data.echarts = setStatisticalData(pen, seriesData)
+            const chartData = seriesData && Object.keys(seriesData).length && seriesData[pen.data.params.id];
+            const staticForType = pen.data.params.staticForType ? pen.data.params.staticForType : '';//统计类型：日，周，月，年
+            if(staticForType && (!chartData || !chartData[`${staticForType}_Data`]) || !chartData) {
+                // 无效配置
+            }else {
+                pen.data.echarts = setStatisticalData(pen, staticForType, chartData);
+            }
         }
     }
     return pen
 }
-export function setStatisticalData(pen, echartData) {
+export function setStatisticalData(pen, staticForType, chartData) {
     const node = Object.assign({}, pen);
     const displayMode = parseInt(node.data.echarts.option.displayMode);
-    const chartData = echartData[node.data.params.id];
-    if ((displayMode === 1 || displayMode === 2) && chartData){ // 折线图，柱状图
+    const chartOptions = staticForType ? chartData[`${staticForType}_Data`] : chartData;
+    if (displayMode === 1 || displayMode === 2){ // 折线图，柱状图
         //const xData = [], seriesData = [];
-        const staticForType = node.data.params.staticForType ? node.data.params.staticForType : '';//统计类型：日，周，月，年
         const seriesNodes = node.data.echarts.option.series;
         // 双轴曲线
         if(seriesNodes.length > 1 || node.data.params.curveNum > 1){
-            const chartOptions = staticForType ? chartData[`${staticForType}_Data`] : chartData;
             const legendData = [];
             if(!chartOptions) return;
             node.data.echarts.option.xAxis[0].data = chartOptions.XData;
@@ -130,16 +134,13 @@ export function setStatisticalData(pen, echartData) {
                 node.data.echarts.option.series = []
             }
         }else {
-            const chartOptions = staticForType ? chartData[`${staticForType}_Data`] : chartData;
             if(chartOptions) {
                 node.data.echarts.option.xAxis[0].data = chartOptions.XData;
                 node.data.echarts.option.series[0].data = chartOptions.seriesData;
             }
         }
     }
-    if(displayMode === 4 && chartData) { // 电量图
-        const staticForType = node.data.params.staticForType ? node.data.params.staticForType : '';//统计类型：日，周，月，年
-        const chartOptions = staticForType ? chartData[`${staticForType}_Data`] : chartData;
+    if(displayMode === 4) { // 电量图
         node.data.echarts.option.yAxis[0].data = chartOptions.XData;
         node.data.echarts.option.yAxis[1].data = chartOptions.seriesData;
         node.data.echarts.option.series[0].data = chartOptions.seriesData;
@@ -153,10 +154,12 @@ export function setStatisticalData(pen, echartData) {
             node.data.echarts.option.series[1].data = barData;
         }
     }
-    if (displayMode === 5 && chartData && Array.isArray(chartData)){ // 饼图
+    if (displayMode === 5){ // 饼图
         const colors = node.data.echarts.option.color;
+        const pieData = staticForType ? chartData : chartData.data;
         const seriesData = [];
-        chartData.map((chd, index) => {
+        if(!pieData) return;
+        pieData.map((chd, index) => {
             seriesData.push({
                 itemStyle: { color: colors[index] },
                 name: chd.name,

package/core/src/models/node.js

@@ -238,12 +238,12 @@ var Node = /** @class */ (function (_super) {
                 this.iframe ||
                 this.elementId ||
                 this.hasGif()) {
-          if(type) {
-            // 复合Echarts初始化
-            createChildrenDivByElementId(this);
-          }else {
-            Store.set(this.generateStoreKey('LT:addDiv'), this);
-          }
+            if(type) {
+                // 复合Echarts初始化
+                createChildrenDivByElementId(this);
+            }else {
+                Store.set(this.generateStoreKey('LT:addDiv'), this);
+            }
         }
     };
     Node.prototype.hasGif = function () {
@@ -749,11 +749,13 @@ var Node = /** @class */ (function (_super) {
         this.rect.height *= h;
         this.rect.ex = this.rect.x + this.rect.width;
         this.rect.ey = this.rect.y + this.rect.height;
-        if (this.imageWidth) {
-            this.imageWidth *= w;
-        }
-        if (this.imageHeight) {
-            this.imageHeight *= h;
+        if(!(center.type && center.type === 'bottLogo')) {
+            if (this.imageWidth) {
+                this.imageWidth *= w;
+            }
+            if (this.imageHeight) {
+                this.imageHeight *= h;
+            }
         }
         this.lastImage = null;
         this.font.fontSize *= scale;

package/core/src/utils/dom.js

@@ -1,7 +1,9 @@
 import { Store } from 'le5le-store';
 import { Lock } from '../models'
+import {commonStore} from '../store';
 export let DomElements = {};
 export function createChildrenDivByElementId(node, data) {
+  if(!data) data = commonStore[node.TID].data;
   if (!DomElements[node.id]) {
     DomElements[node.id] = document.getElementById(node.id);
     if (DomElements[node.id]) {

package/package.json

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