dcim-topology2d 2.2.0 → 2.2.3

package/chart-diagram/src/utils/drawGraphic.d.ts

@@ -1,3 +1,3 @@
-export declare function drawGraphicShape(appearance: any): any;
-export declare function graphicLinearGradient(nr: number, nb: number, nl: number, nt: number, colors: []): any;
-export declare function setSeriesRenderGroup(appearance: any, api: any): [];
+export declare function drawGraphicShape(appearance: any): any;
+export declare function graphicLinearGradient(nr: number, nb: number, nl: number, nt: number, colors: []): any;
+export declare function setSeriesRenderGroup(appearance: any, api: any): [];

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

@@ -1,97 +1,97 @@
-// 绘制柱子切面
-export function drawGraphicShape(appearance) {
-  const offsetX = appearance.offsetX;
-  const offsetY = appearance.offsetY;
-  // 绘制左侧面
-  const CubeLeft = echarts.graphic.extendShape({
-    shape: {
-      x: 0,
-      y: 0,
-    },
-    buildPath: function (ctx, shape) {
-      // 会canvas的应该都能看得懂，shape是从custom传入的
-      const xAxisPoint = shape.xAxisPoint;
-      // console.log(shape);
-      const c0 = [shape.x, shape.y];
-      const c1 = [shape.x - offsetX, shape.y - offsetY];
-      const c2 = [xAxisPoint[0] - offsetX, xAxisPoint[1] - offsetY];
-      const c3 = [xAxisPoint[0], xAxisPoint[1]];
-      ctx.moveTo(c0[0], c0[1]).lineTo(c1[0], c1[1]).lineTo(c2[0], c2[1]).lineTo(c3[0], c3[1]).closePath();
-    },
-  });
-  // 绘制右侧面
-  const CubeRight = echarts.graphic.extendShape({
-    shape: {
-      x: 0,
-      y: 0,
-    },
-    buildPath: function (ctx, shape) {
-      const xAxisPoint = shape.xAxisPoint;
-      const c1 = [shape.x, shape.y];
-      const c2 = [xAxisPoint[0], xAxisPoint[1]];
-      const c3 = [xAxisPoint[0] + offsetX, xAxisPoint[1] - offsetY];
-      const c4 = [shape.x + offsetX, shape.y - offsetY];
-      ctx.moveTo(c1[0], c1[1]).lineTo(c2[0], c2[1]).lineTo(c3[0], c3[1]).lineTo(c4[0], c4[1]).closePath();
-    },
-  });
-  // 绘制顶面
-  const CubeTop = echarts.graphic.extendShape({
-    shape: {
-      x: 0,
-      y: 0,
-    },
-    buildPath: function (ctx, shape) {
-      const c1 = [shape.x, shape.y];
-      const c2 = [shape.x + offsetX, shape.y - offsetY]; //右点
-      const c3 = [shape.x, shape.y - offsetX];
-      const c4 = [shape.x - offsetX, shape.y - offsetY];
-      ctx.moveTo(c1[0], c1[1]).lineTo(c2[0], c2[1]).lineTo(c3[0], c3[1]).lineTo(c4[0], c4[1]).closePath();
-    },
-  });
-  return {
-    CubeLeft,
-    CubeRight,
-    CubeTop
-  }
-}
-// 线性渐变
-export function graphicLinearGradient(nr, nb, nl, nt, colors) {
-  return new echarts.graphic.LinearGradient(nr, nb, nl, nt, colors);
-}
-export function setSeriesRenderGroup(appearance, api) {
-  const seriesRenderData = [];
-  const groupTypeData = ['CubeLeft', 'CubeRight', 'CubeTop'];
-  const location = api.coord([api.value(0), api.value(1)]);
-  for (let i = 0; i < groupTypeData.length; i++) {
-    const groupItem = groupTypeData[i];
-    const groupNode = {
-      type: groupItem,
-      shape: {
-        api,
-        xValue: api.value(0),
-        yValue: api.value(1),
-        x: location[0],
-        y: location[1],
-        xAxisPoint: api.coord([api.value(0), 0]),
-      }
-    };
-    if(i === groupTypeData.length - 1){
-      // 顶部切面颜色填充
-      groupNode.style = {
-        fill: appearance.seriesCubeTopColor
-      }
-    }else {
-      // 左右切面颜色填充
-      let fillColor = graphicLinearGradient(0, 0, 0, 1, appearance[`series${groupItem}Gradient`]);
-      const cubeColorLinear = appearance[`series${groupItem}Linear`];
-      if(!cubeColorLinear) {
-        fillColor = appearance[`series${groupItem}Color`];
-      }
-      groupNode.style = {
-        fill: fillColor
-      }
-    }
-    seriesRenderData.push(groupNode);
-  }
-  return seriesRenderData;
-}
+// 绘制柱子切面
+export function drawGraphicShape(appearance) {
+  const offsetX = appearance.offsetX;
+  const offsetY = appearance.offsetY;
+  // 绘制左侧面
+  const CubeLeft = echarts.graphic.extendShape({
+    shape: {
+      x: 0,
+      y: 0,
+    },
+    buildPath: function (ctx, shape) {
+      // 会canvas的应该都能看得懂，shape是从custom传入的
+      const xAxisPoint = shape.xAxisPoint;
+      // console.log(shape);
+      const c0 = [shape.x, shape.y];
+      const c1 = [shape.x - offsetX, shape.y - offsetY];
+      const c2 = [xAxisPoint[0] - offsetX, xAxisPoint[1] - offsetY];
+      const c3 = [xAxisPoint[0], xAxisPoint[1]];
+      ctx.moveTo(c0[0], c0[1]).lineTo(c1[0], c1[1]).lineTo(c2[0], c2[1]).lineTo(c3[0], c3[1]).closePath();
+    },
+  });
+  // 绘制右侧面
+  const CubeRight = echarts.graphic.extendShape({
+    shape: {
+      x: 0,
+      y: 0,
+    },
+    buildPath: function (ctx, shape) {
+      const xAxisPoint = shape.xAxisPoint;
+      const c1 = [shape.x, shape.y];
+      const c2 = [xAxisPoint[0], xAxisPoint[1]];
+      const c3 = [xAxisPoint[0] + offsetX, xAxisPoint[1] - offsetY];
+      const c4 = [shape.x + offsetX, shape.y - offsetY];
+      ctx.moveTo(c1[0], c1[1]).lineTo(c2[0], c2[1]).lineTo(c3[0], c3[1]).lineTo(c4[0], c4[1]).closePath();
+    },
+  });
+  // 绘制顶面
+  const CubeTop = echarts.graphic.extendShape({
+    shape: {
+      x: 0,
+      y: 0,
+    },
+    buildPath: function (ctx, shape) {
+      const c1 = [shape.x, shape.y];
+      const c2 = [shape.x + offsetX, shape.y - offsetY]; //右点
+      const c3 = [shape.x, shape.y - offsetX];
+      const c4 = [shape.x - offsetX, shape.y - offsetY];
+      ctx.moveTo(c1[0], c1[1]).lineTo(c2[0], c2[1]).lineTo(c3[0], c3[1]).lineTo(c4[0], c4[1]).closePath();
+    },
+  });
+  return {
+    CubeLeft,
+    CubeRight,
+    CubeTop
+  }
+}
+// 线性渐变
+export function graphicLinearGradient(nr, nb, nl, nt, colors) {
+  return new echarts.graphic.LinearGradient(nr, nb, nl, nt, colors);
+}
+export function setSeriesRenderGroup(appearance, api) {
+  const seriesRenderData = [];
+  const groupTypeData = ['CubeLeft', 'CubeRight', 'CubeTop'];
+  const location = api.coord([api.value(0), api.value(1)]);
+  for (let i = 0; i < groupTypeData.length; i++) {
+    const groupItem = groupTypeData[i];
+    const groupNode = {
+      type: groupItem,
+      shape: {
+        api,
+        xValue: api.value(0),
+        yValue: api.value(1),
+        x: location[0],
+        y: location[1],
+        xAxisPoint: api.coord([api.value(0), 0]),
+      }
+    };
+    if(i === groupTypeData.length - 1){
+      // 顶部切面颜色填充
+      groupNode.style = {
+        fill: appearance.seriesCubeTopColor
+      }
+    }else {
+      // 左右切面颜色填充
+      let fillColor = graphicLinearGradient(0, 0, 0, 1, appearance[`series${groupItem}Gradient`]);
+      const cubeColorLinear = appearance[`series${groupItem}Linear`];
+      if(!cubeColorLinear) {
+        fillColor = appearance[`series${groupItem}Color`];
+      }
+      groupNode.style = {
+        fill: fillColor
+      }
+    }
+    seriesRenderData.push(groupNode);
+  }
+  return seriesRenderData;
+}

package/chart-diagram/src/utils/index.d.ts

@@ -1,5 +1,5 @@
-export * from './conversion';
-export * from './drawGraphic';
-export * from './changeOptions';
-export * from './formatter';
-export * from './surfaceParametricConversion';
+export * from './conversion';
+export * from './drawGraphic';
+export * from './changeOptions';
+export * from './formatter';
+export * from './surfaceParametricConversion';

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

@@ -1,5 +1,5 @@
-export * from './conversion';
-export * from './drawGraphic';
-export * from './changeOptions';
-export * from './formatter';
-export * from './surfaceParametricConversion';
+export * from './conversion';
+export * from './drawGraphic';
+export * from './changeOptions';
+export * from './formatter';
+export * from './surfaceParametricConversion';

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

@@ -64,6 +64,10 @@ export function lineBarDataAuto(option, params, data, appearance) {
     }
     if(option.legend && legendChange) option.legend.data = legendData; // 为角标数据赋值
     option.series = seriesData;
+    if(appearance.type === '3dBar'){
+        seriesNodes[1].data = [...seriesData[0].data];
+        option.series.push(seriesNodes[1]);
+    }
 }
 
 export function barPileStaticDataAuto(option, data, appearance) {

package/core/index.js

@@ -7,22 +7,4 @@ export * from './src/models';
 export * from './src/middles';
 export * from './src/healps';
 export * from './src/store';
-export * from './src/element';
-//# sourceMappingURL=index.js.map
-import axios from 'axios'
-if(axios.defaults.headers.common) axios.defaults.headers.common['Authorization'] = getToken();
- 
- function getToken(){
-  if(process.browser){
-    var strcookie = document.cookie;//获取cookie字符串
-    var arrcookie = strcookie.split("; ");//分割
-    //遍历匹配
-    for ( var i = 0; i < arrcookie.length; i++) {
-        var arr = arrcookie[i].split("=");
-        if (arr[0] == "token"){
-            return arr[1];
-        }
-    }
-  }
-    return "";
-}
+export * from './src/element';

package/core/src/activeLayer.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) {
@@ -219,16 +219,16 @@ var ActiveLayer = /** @class */ (function (_super) {
                 default:
                     if (!item.onlySizeX) {
 
-                        var sizeX = (this.nodeRects[i].width + offsetX)/item.rect.width;
+                        var sizeX = (this.nodeRects[i].width + offsetX) / item.rect.width;
 
                         var nodeRectsCircles = this.nodeRects[i].circles;
 
-                        item.rect.width =  this.nodeRects[i].width + offsetX;
+                        item.rect.width = this.nodeRects[i].width + offsetX;
 
                     }
                     if (!item.onlySizeY) {
 
-                        var sizeY = (this.nodeRects[i].height + offsetY)/item.rect.height;
+                        var sizeY = (this.nodeRects[i].height + offsetY) / item.rect.height;
 
                         item.rect.height = this.nodeRects[i].height + offsetY;
 
@@ -484,7 +484,7 @@ var ActiveLayer = /** @class */ (function (_super) {
     };
     ActiveLayer.prototype.render = function (ctx) {
         var _this = this;
-        if(!commonStore || !commonStore[_this.TID]) return;
+        if (!commonStore || !commonStore[_this.TID]) return;
         var globalStore = commonStore[_this.TID];
         if (globalStore.data.locked > Lock.Readonly) {
             return;
@@ -512,12 +512,12 @@ var ActiveLayer = /** @class */ (function (_super) {
                 var tmp = new Node(item, true);
                 tmp.setTID(TID);
                 tmp.data = null;
-                tmp.fillStyle = null;
+                tmp.fillStyle = item.focusFillStyle ? item.focusFillStyle : null; //获取聚焦背景色
                 tmp.bkType = 0;
                 tmp.icon = '';
                 tmp.image = '';
-                tmp.text = '';
-                if(window.location.pathname.includes('workspace')){
+                tmp.text = item.text;
+                if (window.location.pathname.includes('workspace')) {
                     if (tmp.strokeStyle !== 'transparent') {
                         tmp.strokeStyle = '#ffffff';
                         tmp.lineWidth += 2;
@@ -614,18 +614,18 @@ var ActiveLayer = /** @class */ (function (_super) {
         this.dockWatchers = this.rect.toPoints();
         this.dockWatchers.unshift(this.rect.center);
     };
-    ActiveLayer.prototype.handleArbitrayGraphSize = function (type,item, offsetX, offsetY, l, sizeX, sizeY, nodeRectsCircles) {
-        if(item.name !== 'arbitraryGraph') return
+    ActiveLayer.prototype.handleArbitrayGraphSize = function (type, item, offsetX, offsetY, l, sizeX, sizeY, nodeRectsCircles) {
+        if (item.name !== 'arbitraryGraph') return
 
         switch (type) {
 
             case 0:
 
-                for(let c=0, length = item.rect.circles.length; c<length; c++ ) {
+                for (let c = 0, length = item.rect.circles.length; c < length; c++) {
 
-                    item.rect.circles[c].x=item.rect.circles[c].x*sizeX+item.rect.ex*(1-sizeX);
+                    item.rect.circles[c].x = item.rect.circles[c].x * sizeX + item.rect.ex * (1 - sizeX);
 
-                    item.rect.circles[c].y=item.rect.circles[c].y*sizeY+item.rect.ey*(1-sizeY);
+                    item.rect.circles[c].y = item.rect.circles[c].y * sizeY + item.rect.ey * (1 - sizeY);
 
                 }
 
@@ -633,11 +633,11 @@ var ActiveLayer = /** @class */ (function (_super) {
 
             case 1:
 
-                for(let c=0, length = item.rect.circles.length; c<length; c++ ) {
+                for (let c = 0, length = item.rect.circles.length; c < length; c++) {
 
-                    item.rect.circles[c].x=item.rect.circles[c].x*sizeX+item.rect.x*(1-sizeX);
+                    item.rect.circles[c].x = item.rect.circles[c].x * sizeX + item.rect.x * (1 - sizeX);
 
-                    item.rect.circles[c].y=item.rect.circles[c].y*sizeY+item.rect.ey*(1-sizeY);
+                    item.rect.circles[c].y = item.rect.circles[c].y * sizeY + item.rect.ey * (1 - sizeY);
 
                 }
 
@@ -645,11 +645,11 @@ var ActiveLayer = /** @class */ (function (_super) {
 
             case 2:
 
-                for(let c=0, length = item.rect.circles.length; c<length; c++ ) {
+                for (let c = 0, length = item.rect.circles.length; c < length; c++) {
 
-                    item.rect.circles[c].x=item.rect.circles[c].x*sizeX+item.rect.x*(1-sizeX);
+                    item.rect.circles[c].x = item.rect.circles[c].x * sizeX + item.rect.x * (1 - sizeX);
 
-                    item.rect.circles[c].y=item.rect.circles[c].y*sizeY+item.rect.y*(1-sizeY);
+                    item.rect.circles[c].y = item.rect.circles[c].y * sizeY + item.rect.y * (1 - sizeY);
 
                 }
 
@@ -657,11 +657,11 @@ var ActiveLayer = /** @class */ (function (_super) {
 
             case 3:
 
-                for(let c=0, length = item.rect.circles.length; c<length; c++ ) {
+                for (let c = 0, length = item.rect.circles.length; c < length; c++) {
 
-                    item.rect.circles[c].x=item.rect.circles[c].x*sizeX+item.rect.ex*(1-sizeX);
+                    item.rect.circles[c].x = item.rect.circles[c].x * sizeX + item.rect.ex * (1 - sizeX);
 
-                    item.rect.circles[c].y=item.rect.circles[c].y*sizeY+item.rect.y*(1-sizeY);
+                    item.rect.circles[c].y = item.rect.circles[c].y * sizeY + item.rect.y * (1 - sizeY);
 
                 }
 

package/core/src/calling.js

@@ -68,25 +68,35 @@ var Calling = (function () {
         this.store.data.scale = data.scale || 1;
         this.store.data.pens = [];
         // for old data.
-        if (data.nodes) {
-            for (var _i = 0, _a = data.nodes; _i < _a.length; _i++) {
-                var item = _a[_i];
-                item.TID = this.id;
-                item.rect.x = 0;
-                item.rect.y = 0;
-                this.store.data.pens.push(new Node(item));
-            }
-            for (var _b = 0, _c = data.lines; _b < _c.length; _b++) {
-                var item = _c[_b];
-                item.TID = this.id;
-                this.store.data.pens.push(new Line(item));
-            }
-        }
+        // if (data.nodes) {
+        //     for (var _i = 0, _a = data.nodes; _i < _a.length; _i++) {
+        //         var item = _a[_i];
+        //         item.TID = this.id;
+        //         item.rect.x = 0;
+        //         item.rect.y = 0;
+        //         this.store.data.pens.push(new Node(item));
+        //     }
+        //     for (var _b = 0, _c = data.lines; _b < _c.length; _b++) {
+        //         var item = _c[_b];
+        //         item.TID = this.id;
+        //         this.store.data.pens.push(new Line(item));
+        //     }
+        // }
         // end.
         if (data.pens) {
             for (var _d = 0, _e = data.pens; _d < _e.length; _d++) {
                 var item = _e[_d];
                 item.TID = this.id;
+                if(!this.store.options.isFitview) {
+                    if(item.rect.x > 0) {
+                        item.rect.ex -= item.rect.x;
+                        item.rect.x = 0;
+                    }
+                    if(item.rect.y > 0) {
+                        item.rect.ey -= item.rect.y;
+                        item.rect.y = 0;
+                    }
+                }
                 if (!item.from) {
                     this.store.data.pens.push(new Node(item));
                 } else {
@@ -136,7 +146,7 @@ var Calling = (function () {
     //   < 1, reduce
     Calling.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;
@@ -154,25 +164,14 @@ var Calling = (function () {
         var parentElem = this.store.parentElem;
         var x = (parentElem.offsetWidth - rect.width) / 2;
         var y = parentElem.scrollHeight - rect.height;
-        var w = parentElem.offsetWidth / rect.width;
-        var h = parentElem.scrollHeight / rect.height;
-        var ratio = w;
-        if (w > h) {
-            ratio = h;
-        }
+        // var w = parentElem.offsetWidth / rect.width;
+        // var h = parentElem.scrollHeight / rect.height;
+        // var ratio = w;
+        // if (w > h) {
+        //     ratio = h;
+        // }
         this.canvas.canvas.style.transform = `translate(${x}px, ${y}px)`;
-        for (var _i = 0, _a = this.store.data.pens; _i < _a.length; _i++) {
-            var item = _a[_i];
-            if(item.rect.x > 0) {
-                item.rect.ex = item.rect.ex - item.rect.x;
-                item.rect.x = 0;
-            }
-            if(item.rect.y > 0) {
-                item.rect.ey = item.rect.ey - item.rect.y;
-                item.rect.y = 0;
-            }
-        }
-        this.scale(ratio);
+        this.scale(1);
         this.resize({width: rect.width, height: rect.height});
     };
     Calling.prototype.centerView = function (padding) {

package/core/src/common.d.ts

@@ -51,6 +51,7 @@ export declare class Common {
   private showTip;
   private hideTip;
   inputObj: Pen;
+  tabsContentOptions: {};
   mouseDown: {
     x: number;
     y: number;