dcim-topology2d 2.2.0 → 3.0.2

package/activity-diagram/src/final/final.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function activityFinal(ctx: CanvasRenderingContext2D, node: Node): void;

package/activity-diagram/src/final/final.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function activityFinalIconRect(node: Node): void;
 export declare function activityFinalTextRect(node: Node): void;

package/activity-diagram/src/final/final.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function activityFinalIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/activity-diagram/src/fork/fork.anchor.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function forkHAnchors(node: Node): void;
 export declare function forkVAnchors(node: Node): void;

package/activity-diagram/src/fork/fork.anchor.js

@@ -1,4 +1,4 @@
-import { Point, Direction } from '../../../core';
+import { Point, Direction } from 'dcim-topology/core';
 export function forkHAnchors(node) {
     node.anchors.push(new Point(node.rect.x, node.rect.y + node.rect.height / 2, Direction.Left));
     node.anchors.push(new Point(node.rect.ex, node.rect.y + node.rect.height / 2, Direction.Right));

package/activity-diagram/src/fork/fork.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function fork(ctx: CanvasRenderingContext2D, node: Node): void;

package/activity-diagram/src/fork/fork.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function forkIconRect(node: Node): void;
 export declare function forkTextRect(node: Node): void;

package/activity-diagram/src/fork/fork.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function forkIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/activity-diagram/src/register.js

@@ -1,4 +1,4 @@
-import { registerNode } from '../../core';
+import { registerNode } from 'dcim-topology/core';
 import { activityFinal, activityFinalIconRect, activityFinalTextRect } from './final';
 import { fork, forkHAnchors, forkVAnchors, forkIconRect, forkTextRect } from './fork';
 import { swimlaneH, swimlaneHIconRect, swimlaneHTextRect } from './swimlaneH';

package/activity-diagram/src/swimlaneH/swimlaneH.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function swimlaneH(ctx: CanvasRenderingContext2D, node: Node): void;

package/activity-diagram/src/swimlaneH/swimlaneH.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function swimlaneHIconRect(node: Node): void;
 export declare function swimlaneHTextRect(node: Node): void;

package/activity-diagram/src/swimlaneH/swimlaneH.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function swimlaneHIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/activity-diagram/src/swimlaneV/swimlaneV.d.ts

@@ -1,2 +1,2 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function swimlaneV(ctx: CanvasRenderingContext2D, node: Node): void;

package/activity-diagram/src/swimlaneV/swimlaneV.rect.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function swimlaneVIconRect(node: Node): void;
 export declare function swimlaneVTextRect(node: Node): void;

package/activity-diagram/src/swimlaneV/swimlaneV.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function swimlaneVIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/chart-diagram/index.d.ts

@@ -1,5 +1,3 @@
-// @ts-ignore
-export * from './src/utils';
 export * from './src/echarts';
 export * from './src/register';
-export * from '../myShape-diagram/index.js';
+export * from '../myShape-diagram/myShape';

package/chart-diagram/index.js

@@ -1,5 +1,4 @@
-export * from './src/utils';
 export * from './src/echarts';
 export * from './src/register';
-export * from '../myShape-diagram/index.js';
+export * from '../myShape-diagram/myShape.js';
 //# sourceMappingURL=index.js.map

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

@@ -1,3 +1,4 @@
 // @ts-ignore
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
+export declare const echartsData: any;
 export declare function echarts(ctx: CanvasRenderingContext2D, node: Node): void;

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

@@ -1,112 +1,104 @@
-import {s8, createDiv, rectangle, commonStore} from '../../../core';
-import {plugsPool} from '../../../store';
-import {
-    setMapScatterOptions,
-    setMapLineBarOptions,
-    setMapGaugeOptions,
-    setMapRingOptions,
-    setMap3dBarOptions,
-    setMapTopOptions,
-    setMapGlobalOptions,
-    setMapDataOptions,
-    initBindCorrelationSetting
-} from '../utils';
-import {echartsTypeMap} from '../../../static';
-
-export function echarts(ctx, node) {
-    const currentStore = commonStore[node.TID];
-    if (!(currentStore && currentStore.data.dataResize)) return;
-    //console.log('echarts绘制-----node', node);
-    // if(currentElement) currentElement.style.display = !node.visible ? 'none': 'block';
-    // if(!node.visible) return;
-    // 绘制一个底图，类似于占位符。
-    rectangle(ctx, node)
-    // tslint:disable-next-line:no-shadowed-variable
-    var echarts = plugsPool.echarts || window.echarts
-    if (!node.data || !echarts) {
-        return
-    }
-    if (typeof node.data === 'string') {
-        node.data = JSON.parse(node.data)
-    }
-    if (!node.data.echarts) {
-        return
-    }
-    if (!node.elementId) {
-        node.elementId = s8()
-    }
-    let echartsData = currentStore.echartsDataPool[node.id];
-    if (!node.elementLoaded && !(echartsData && echartsData.div)) {
-        if(!echartsData) {
-            echartsData = {
-                div: createDiv(node)
-            };
-        }else {
-            echartsData.div = createDiv(node);
-        }
-        node.elementLoaded = true
-        document.body.appendChild(echartsData.div)
-        // 添加当前节点到div层
-        node.addToDiv()
-        echartsData.chart = echarts.init(echartsData.div, node.data.echarts.theme)
-        node.elementRendered = false
-        // 等待父div先渲染完成，避免初始图表控件太大
-        setTimeout(function () {
-            echartsData.chart.resize()
-        });
-        currentStore.echartsDataPool[node.id] = echartsData;
-    }
-    if (!node.elementRendered) {
-        const appearance = node.appearance;
-        // 初始化时，等待父div先渲染完成，避免初始图表控件太大。
-        setTimeout(function () {
-            let option = node.data.echarts.option;
-            if(!(echartsData && echartsData.chart)) return;
-            const pageZoom = currentStore.data.pageZoom;
-            echartsData.div.style.transform = `scale(${pageZoom})`;
-            echartsData.div.style.transformOrigin = '0 0';
-            if(node.data.params) node.data.params.tabCorrelationType = echartsData.tabCorrelationType || ''; // 统计图与Tab关联
-            const isLocked = currentStore.data.locked;
-            const echartsOptionsData = currentStore.echartsOptionsPool[node.id];
-            if (!isLocked || !echartsOptionsData) {
-                const tabData = initBindCorrelationSetting(node); // 初始化图表与其他组件关联的配置数据
-                // 【未锁定（编辑）状态, options未初始化的状态】
-                if (!appearance.type) appearance.type = echartsTypeMap[`type_${option.displayMode}`]; // 兼容旧数据配置
-                // 公共配置 Top排行榜散点图跳过公共属性配置
-                if (option.displayMode !== 4 && option.displayMode !== 7) setMapGlobalOptions(option, node);
-                // 散点图
-                if (appearance.type.includes('scatter')) setMapScatterOptions(option, node);
-                // 折线图和柱状图
-                if (appearance.type.includes('line') || appearance.type.includes('bar')) setMapLineBarOptions(option, node);
-                // 仪表盘
-                if (appearance.type === 'gauge') setMapGaugeOptions(option, node);
-                // 环形图 || 饼图
-                if (appearance.type.includes('ring') || appearance.type.includes('pie')) setMapRingOptions(option, node);
-                // 3d 柱状图
-                if (appearance.type === '3dBar') setMap3dBarOptions(option, node);
-                // Top排行榜
-                if (appearance.type.includes('TOP')) setMapTopOptions(option, node);
-                //option.title = appearance.title;
-                option.backgroundColor = appearance.backgroundColor;
-                const correlationData = echartsOptionsData && echartsOptionsData.correlationData || null;
-                currentStore.echartsOptionsPool[node.id] = {
-                    option: JSON.parse(JSON.stringify(option)),
-                    correlationData,
-                    data: {
-                        TID: node.TID,
-                        appearance,
-                        id: node.id,
-                        params: node.data.params,
-                        tabData
-                    }
-                };
-                if (!isLocked) echartsData.chart.clear();
-            }
-            // echarts 数据渲染更新
-            setMapDataOptions(option, currentStore.echartsOptionsPool[node.id].data);
-            node.elementRendered = true;
-        })
-    }
-}
-
-//# sourceMappingURL=index.js.map
+import { s8, createDiv, rectangle } from 'dcim-topology/core';
+export let echartsData = {};
+export function echarts(ctx, node) {
+    //console.log('echarts绘制-----node', node);
+    // 绘制一个底图，类似于占位符。
+    rectangle(ctx, node);
+    // tslint:disable-next-line:no-shadowed-variable
+    var echarts = echartsData.echarts || window.echarts;
+    if (!node.data || !echarts) {
+        return;
+    }
+    if (typeof node.data === 'string') {
+        node.data = JSON.parse(node.data);
+    }
+    if (!node.data.echarts) {
+        return;
+    }
+    if (!node.elementId) {
+        node.elementId = s8();
+    }
+    const currentElement = document.getElementById(node.id);
+    if (!node.elementLoaded && !currentElement) {
+        // if(echartsData[node.id]) {
+        //     const appearCharts = echarts.getInstanceByDom(echartsData[node.id].div);
+        //     if (appearCharts) echarts.dispose(appearCharts);
+        //     echartsData[node.id] = null;
+        // }
+        echartsData[node.id] = {
+            div: createDiv(node)
+        };
+        node.elementLoaded = true;
+        document.body.appendChild(echartsData[node.id].div);
+        // 添加当前节点到div层
+        node.addToDiv('init');
+        echartsData[node.id].chart = echarts.init(echartsData[node.id].div, node.data.echarts.theme);
+        node.elementRendered = false;
+        // 等待父div先渲染完成，避免初始图表控件太大
+        setTimeout(function () {
+            echartsData[node.id].chart.resize();
+        });
+    }
+    if (!node.elementRendered) {
+        // 初始化时，等待父div先渲染完成，避免初始图表控件太大。
+        setTimeout(function () {
+            let option = {...node.data.echarts.option};
+            if(node.appearance.type === 'line' || node.appearance.type === 'bar') {
+                option.color = node.appearance.color;
+                option.xAxis[0].axisLabel.formatter = function(value, index){
+                    if (index === 0 || index%(node.appearance.intervalNumX) === 0){
+                        return value;
+                    }
+                    else {
+                        return '';
+                    }
+                }
+
+                option.yAxis[0].axisLabel.formatter = function(value, index){
+                    if (index === 0 || index%(node.appearance.intervalNumY) === 0){
+                        return value;
+                    }
+                    else {
+                        return '';
+                    }
+                }
+                // if(option.series.length >= 2) {
+
+                //     for(let i=0; i<option.series.length-1 ; i++){
+
+                //         option.color.push(node.appearance.color[0])
+                //     }
+                // }
+                option.yAxis[0].splitLine = node.appearance.splitLine;
+
+            }else if(node.appearance.type === 'gauge') {
+                const pointerColor = node.appearance.pointerColor;
+                node.appearance.pointer.length = `${node.appearance.pointer.length}%`;
+                option.series[0].min = node.appearance.min;
+                option.series[0].max = node.appearance.max;
+                option.series[0].itemStyle.color = pointerColor ? pointerColor : node.appearance.axisLabel.color;
+                option.series[0].splitNumber = node.appearance.splitNumber;
+                option.series[0].pointer = node.appearance.pointer;
+                option.series[0].axisLabel = node.appearance.axisLabel;
+                option.series[0].axisLine.lineStyle = node.appearance.axisLine.lineStyle;
+                option.series[0].detail = node.appearance.detail;
+                //option.series[0].data = node.appearance.data;
+                if(option.isGaugeLinear) {
+                    option.series[0].axisLine.lineStyle.color = [
+                        [1, new echarts.graphic.LinearGradient(0, 0, 1, 0, option.linearColors)]
+                    ]
+                }
+            }else if(node.appearance.type === 'ring') {
+                option.series[0].radius = [`${node.appearance.innerRadius}%`, `${node.appearance.outerRadius}%`];
+                option.series[0].label = node.appearance.label;
+            }
+            option.title = node.appearance.title;
+            option.backgroundColor = node.appearance.backgroundColor;
+            echartsData[node.id].chart.clear();
+            echartsData[node.id].chart.setOption(option);
+            echartsData[node.id].chart.resize();
+            node.elementRendered = true;
+        });
+    }
+}
+//# sourceMappingURL=index.js.map

package/chart-diagram/src/register.js

@@ -1,13 +1,12 @@
-import { registerNode } from '../../core';
-import { echarts } from './echarts';
-import { plugsPool } from '../../store';
-// import './echarts/echarts.min.js';
+import { registerNode, loadJS } from 'dcim-topology/core';
+import { echarts, echartsData } from './echarts';
+import './echarts/echarts.min.js';
 export function register(_echarts) {
-    plugsPool.echarts = _echarts;
-    // if (process.browser && !echartsDataPool.echarts && !window.echarts) {
-    //     //loadJS('https://cdn.bootcdn.net/ajax/libs/echarts/4.8.0/echarts.min.js', null, true);
-    //     loadJS(`${location.origin}/libary/echarts.min.js`, null, true);
-    // }
+    echartsData.echarts = _echarts;
+    if (process.browser && !echartsData.echarts && !window.echarts) {
+        //loadJS('https://cdn.bootcdn.net/ajax/libs/echarts/4.8.0/echarts.min.js', null, true);
+        loadJS(`${location.origin}/libary/echarts.min.js`, null, true);
+    }
     registerNode('echarts', echarts, null, null, null);
 }
 //# sourceMappingURL=register.js.map

package/class-diagram/src/class/class.d.ts

@@ -1,3 +1,3 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function simpleClass(ctx: CanvasRenderingContext2D, node: Node): void;
 export declare function interfaceClass(ctx: CanvasRenderingContext2D, node: Node): void;

package/class-diagram/src/class/class.rect.d.ts

@@ -1,4 +1,4 @@
-import { Node } from '../../../core';
+import { Node } from 'dcim-topology/core';
 export declare function simpleClassIconRect(node: Node): void;
 export declare function simpleClassTextRect(node: Node): void;
 export declare function interfaceClassIconRect(node: Node): void;

package/class-diagram/src/class/class.rect.js

@@ -1,4 +1,4 @@
-import { Rect } from '../../../core';
+import { Rect } from 'dcim-topology/core';
 export function simpleClassIconRect(node) {
     node.iconRect = new Rect(0, 0, 0, 0);
 }

package/class-diagram/src/register.js

@@ -1,4 +1,4 @@
-import { registerNode } from '../../core';
+import { registerNode } from 'dcim-topology/core';
 import { simpleClass, simpleClassIconRect, simpleClassTextRect, interfaceClass, interfaceClassIconRect, interfaceClassTextRect } from './class';
 export function register() {
     registerNode('simpleClass', simpleClass, null, simpleClassIconRect, simpleClassTextRect);

package/core/index.d.ts

@@ -6,5 +6,3 @@ export * from './src/utils';
 export * from './src/models';
 export * from './src/middles';
 export * from './src/healps';
-export * from './src/store';
-export * from './src/element';

package/core/index.js

@@ -6,8 +6,6 @@ export * from './src/utils';
 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();

package/core/src/activeLayer.d.ts

@@ -1,7 +1,15 @@
-import { Pen, Node, Line, Rect, Point } from './models';
+import { Options } from './options';
+import { Pen } from './models/pen';
+import { Node } from './models/node';
+import { Line } from './models/line';
+import { Rect } from './models/rect';
+import { Point } from './models/point';
+import { TopologyData } from './models/data';
 import { Layer } from './layer';
 import { Topology } from './core';
 export declare class ActiveLayer extends Layer {
+    options: Options;
+    protected data: TopologyData;
     rotateCPs: Point[];
     sizeCPs: Point[];
     rect: Rect;
@@ -18,7 +26,7 @@ export declare class ActiveLayer extends Layer {
     dockWatchers: Point[];
     topology: Topology;
     rotating: boolean;
-    constructor(TID: String);
+    constructor(options: Options, TID: String);
     calcControlPoints(): void;
     locked(): boolean;
     getPoints(): Point[];