dcim-topology2d 2.0.7 → 3.0.2

package/flow-diagram/src/register.js

@@ -1,4 +1,4 @@
-import { registerNode } from '../../core';
+import { registerNode } from 'dcim-topology/core';
 import { flowData, flowDataAnchors, flowDataIconRect, flowDataTextRect } from './data';
 import { flowSubprocess, flowSubprocessIconRect, flowSubprocessTextRect } from './subprocess';
 import { flowDb, flowDbIconRect, flowDbTextRect } from './db';

package/flow-diagram/src/subprocess/subprocess.d.ts

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

package/flow-diagram/src/subprocess/subprocess.rect.d.ts

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

package/flow-diagram/src/subprocess/subprocess.rect.js

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

package/layout/src/align.d.ts

@@ -1,3 +1,3 @@
-import { Pen, Rect } from '../../core';
+import { Pen, Rect } from 'dcim-topology/core';
 export declare function alignNodes(pens: Pen[], rect: Rect, align: string): void;
 export declare function spaceBetween(pens: Pen[], width: number): void;

package/layout/src/align.js

@@ -1,4 +1,4 @@
-import { Node } from '../../core';
+import { Node } from 'dcim-topology/core';
 export function alignNodes(pens, rect, align) {
     for (var _i = 0, pens_1 = pens; _i < pens_1.length; _i++) {
         var item = pens_1[_i];

package/layout/src/layout.d.ts

@@ -1,4 +1,4 @@
-import { Pen } from '../../core';
+import { Pen } from 'dcim-topology/core';
 export declare function layout(pens: Pen[], params: {
     maxWidth: number;
     nodeWidth?: number;

package/layout/src/layout.js

@@ -1,4 +1,4 @@
-import { PenType, getRect } from '../../core';
+import { PenType, getRect } from 'dcim-topology/core';
 import { alignNodes, spaceBetween } from './align';
 export function layout(pens, params) {
     var spaceWidth = params.spaceWidth || 30;

package/myShape-diagram/{index.js → myShape.js}

@@ -1,7 +1,5 @@
 // 源码版写法
-import { registerNode } from '../core'
-import { formOverflow } from '../core/src/middles/nodes/formoverflow'
-
+import { registerNode } from 'dcim-topology/core'
 
 // 组件版写法和bundle一致
 // window.Le5leTopology.registerNode
@@ -193,7 +191,6 @@ export function registerMyShape() {
   registerNode('electricFan', electricFan);
   registerNode('pool', pool);
   registerNode('thermometer', thermometer);
-  registerNode('formOverflow', formOverflow);
 }
 
 // src\views\data.ts 里面加载到工具栏，第一个就是此自定义图形库

package/package.json

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

package/sequence-diagram/src/focus/focus.anchor.d.ts

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

package/sequence-diagram/src/focus/focus.anchor.js

@@ -1,4 +1,4 @@
-import { Point, Direction } from '../../../core';
+import { Point, Direction } from 'dcim-topology/core';
 export function sequenceFocusAnchors(node) {
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.y, Direction.Up));
     node.anchors.push(new Point(node.rect.x + node.rect.width / 2, node.rect.ey, Direction.Bottom));

package/sequence-diagram/src/focus/focus.d.ts

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

package/sequence-diagram/src/focus/focus.rect.d.ts

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

package/sequence-diagram/src/focus/focus.rect.js

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

package/sequence-diagram/src/lifeline/lifeline.anchor.d.ts

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

package/sequence-diagram/src/lifeline/lifeline.anchor.js

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

package/sequence-diagram/src/lifeline/lifeline.d.ts

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

package/sequence-diagram/src/lifeline/lifeline.rect.d.ts

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

package/sequence-diagram/src/lifeline/lifeline.rect.js

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

package/sequence-diagram/src/register.js

@@ -1,4 +1,4 @@
-import { registerNode } from '../../core';
+import { registerNode } from 'dcim-topology/core';
 import { lifeline, lifelineAnchors, lifelineIconRect, lifelineTextRect } from './lifeline';
 import { sequenceFocus, sequenceFocusAnchors, sequenceFocusIconRect, sequenceFocusTextRect } from './focus';
 export function register() {

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

@@ -1,7 +0,0 @@
-export declare function setRingChartText<T>(textData: T): void;
-export declare function setRingPreSeriesOptions<T>(option: T, appearance: T): void;
-export declare function setRingProSeriesOptions<T>(option: T, appearance: T): void;
-export declare function setChartLegendData<T>(legend: T, appearance: T): void;
-export declare function setChartXAxisData<T>(xAxis: [], appearance: T): void;
-export declare function setChartYAxisData<T>(yAxis: [], appearance: T): void;
-export declare function setLineSeriesStyleData<T>(series: [], appearance: T): void;

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

@@ -1,253 +0,0 @@
-// 初始化图例数据和图例配置数据
-import {
-    echartsLegendDefaultData,
-    echartsXAxisDefaultStyleData,
-    echartsYAxisDefaultStyleData,
-    echartsLineSeriesStyleData,
-    echartsColorData
-} from '../../../static';
-
-// 配置环形图中间区域文字样式
-export function setRingChartText(textData) {
-    const {
-        vFontSize, vFontWeight, vColor,
-        vTop, unitTop, unitFontSize, unitFontWeight,
-        unitColor} = textData;
-    if(!unitTop) textData.unitTop = 0;  
-    return {
-        v: {
-            fontSize: vFontSize,
-            fontWeight: vFontWeight,
-            color: vColor,
-            padding: [vTop, 0, 0, 0]
-        },
-        unit: {
-            fontSize: unitFontSize,
-            fontWeight: unitFontWeight,
-            color: unitColor,
-            padding: [unitTop, 0, 0, 0]
-        }
-    };
-}
-// 配置环形‘设备告警统计图’节点展示
-export function setRingPreSeriesOptions(option, appearance) {
-    const rich = setRingChartText(appearance.text);
-    Object.assign(option.title.textStyle.rich, rich);
-    option.title.y = `${appearance.text.y}%`;
-    option.series[0].radius[1] = `${appearance.inner.borderWidth}%`;
-    option.series[0].data[0].itemStyle.color = appearance.inner.borderColor;
-    option.series[0].data[1].itemStyle.color = appearance.inner.borderBgColor;
-    option.series[1].radius[1] = `${appearance.outer.borderWidth}%`;
-    option.series[1].data[0].itemStyle.color = appearance.outer.borderColor;
-}
-// 配置环形‘内存、硬盘、CPU指标占比统计’节点展示
-export function setRingProSeriesOptions(option, appearance) {
-    const seriesFirstChildNode = option.series[0];
-    const rich = setRingChartText(appearance.text);
-    Object.assign(seriesFirstChildNode.data[0].label.normal.rich, rich);
-    seriesFirstChildNode.data[0].label.normal.formatter = function(params){
-        return `{v|${params.value}}{unit|%}`;
-    }
-    seriesFirstChildNode.data[0].value = appearance.proportion;
-    seriesFirstChildNode.radius = appearance.outer.radius;
-    seriesFirstChildNode.data[0].itemStyle = {
-        normal: {
-            color: appearance.outer.borderColor,
-            shadowColor: appearance.outer.borderColor,
-            shadowBlur: 0
-        }
-    };
-    seriesFirstChildNode.data[1].value = 100 - appearance.proportion;
-    seriesFirstChildNode.data[1].itemStyle.normal.color = appearance.outer.borderBgColor;
-    const seriesLastChildNode = option.series[1];
-    seriesLastChildNode.radius = appearance.inner.radius;
-    seriesLastChildNode.itemStyle.normal.color.colorStops[0].color = appearance.inner.borderColor;
-}
-// 图表X轴数据
-export function setChartXAxisData(xAxis, appearance) {
-    for (let i = 0; i < xAxis.length; i++) {
-        const item = xAxis[i];
-        if (!item.axisLabel) {
-            item.axisLabel = JSON.parse(JSON.stringify(echartsXAxisDefaultStyleData['x1AxisLabel']));
-        }
-        const axisLabelStr = `x${i + 1}AxisLabel`;
-        if (!appearance[axisLabelStr]) {
-            appearance[axisLabelStr] = JSON.parse(JSON.stringify(echartsXAxisDefaultStyleData[axisLabelStr]));
-            Object.assign(appearance[axisLabelStr], item.axisLabel);
-        } else {
-            item.axisLabel.color = appearance[axisLabelStr].color || '';
-            item.axisLabel.fontSize = appearance[axisLabelStr].fontSize || 12;
-        }
-    }
-    //return xAxis;
-}
-
-/**
- * 图表Y轴数据
- * @param yAxis Y轴配置数据
- * @param appearance 图表自定义配置
- */
-export function setChartYAxisData(yAxis, appearance) {
-    if (typeof appearance.ySplitLineShow !== 'boolean') {
-        appearance.ySplitLineShow = yAxis[0].splitLine.show;
-    }
-    if (!appearance.ysplitLineLineStyle && yAxis[0].splitLine.show) {
-        appearance.ysplitLineLineStyle = JSON.parse(JSON.stringify(echartsYAxisDefaultStyleData['ysplitLineLineStyle']));
-    }
-    for (let i = 0; i < yAxis.length; i++) {
-        const item = yAxis[i];
-        if(!item.axisLabel) item.axisLabel = {};
-        if (!item.axisLabel.textStyle) {
-            item.axisLabel.textStyle = JSON.parse(JSON.stringify(echartsYAxisDefaultStyleData['y1axisLabelTextStyle']));
-        }
-        if(!item.splitLine) item.splitLine = {};
-        if (!item.splitLine.lineStyle) {
-            item.splitLine.lineStyle = JSON.parse(JSON.stringify(echartsYAxisDefaultStyleData['ysplitLineLineStyle']));
-        }
-        const axisLabelTextStyleStr = `y${i + 1}axisLabelTextStyle`;
-        if (!appearance[axisLabelTextStyleStr]) {
-            appearance[axisLabelTextStyleStr] = JSON.parse(JSON.stringify(echartsYAxisDefaultStyleData[axisLabelTextStyleStr]));
-            Object.assign(appearance[axisLabelTextStyleStr], item.axisLabel.textStyle);
-        } else {
-            const axisLabelTextStyNode = appearance[axisLabelTextStyleStr];
-            item.axisLabel.textStyle.color = axisLabelTextStyNode.color || '';
-            item.axisLabel.textStyle.fontSize = axisLabelTextStyNode.fontSize || '12';
-            item.axisLabel.textStyle.padding = axisLabelTextStyNode.padding || [20, 20, 20, 20];
-        }
-        if (appearance.ysplitLineLineStyle) {
-            item.splitLine.show = appearance.ySplitLineShow;
-            const axisLabelTextStyNode = appearance.ysplitLineLineStyle;
-            item.splitLine.lineStyle.type = axisLabelTextStyNode.type || 'solid';
-            item.splitLine.lineStyle.color = axisLabelTextStyNode.color || '';
-        }
-        const minMaxStr = `y${i + 1}MinMaxData`;
-        if (!appearance[minMaxStr] && item.max) {
-            appearance[minMaxStr] = JSON.parse(JSON.stringify(echartsYAxisDefaultStyleData[minMaxStr]));
-            const minMaxParams = {
-                max: item.max,
-                min: item.min,
-                interval: item.interval
-            };
-            Object.assign(appearance[minMaxStr], minMaxParams);
-        } else {
-            const minMaxNode = appearance[minMaxStr];
-            if (minMaxNode) {
-                item.max = minMaxNode.max;
-                item.min = minMaxNode.min;
-                item.interval = minMaxNode.interval;
-            }
-        }
-        const nameStr = `y${i + 1}NameData`;
-        if (!appearance[nameStr] && item.name) {
-            appearance[nameStr] = JSON.parse(JSON.stringify(echartsYAxisDefaultStyleData[nameStr]));
-            const nameParams = {
-                name: item.name,
-                nameTextStyle: {
-                    color: item.nameTextStyle.color,
-                    padding: item.nameTextStyle.padding,
-                },
-                nameGap: item.nameGap
-            };
-            Object.assign(appearance[nameStr], nameParams);
-        } else {
-            const nameNode = appearance[nameStr];
-            if (nameNode) {
-                item.name = nameNode.name;
-                item.nameTextStyle.color = nameNode.nameTextStyle.color;
-                item.nameTextStyle.padding = nameNode.nameTextStyle.padding;
-                item.nameGap = nameNode.nameGap;
-            }
-        }
-    }
-    //return yAxis;
-}
-
-// 图表图例数据
-export function setChartLegendData(legend, appearance) {
-    if (!legend.formatter) legend.formatter = ['{a|{name}}'].join('\n');
-    // 设置默认图例文字配置，如果想改变初始化文字属性，在 appearance中配置即可
-    if (!legend.textStyle) legend.textStyle = {
-        color: '#fff',
-        height: 8
-    };
-    legend.textStyle.rich = {
-        a: {
-            fontSize: 12,
-            verticalAlign: 'bottom',
-        }
-    };
-    if (!appearance.legend) {
-        appearance.legend = JSON.parse(JSON.stringify(echartsLegendDefaultData));
-        Object.assign(appearance.legend, legend);
-        delete appearance.legend['data'];
-        delete appearance.legend['textStyle'];
-    } else {
-        const {
-            icon,
-            itemWidth,
-            itemHeight,
-            itemGap,
-            top,
-            right,
-            bottom,
-            left,
-            padding,
-            color,
-            height,
-            fontSize
-        } = appearance.legend;
-        legend.icon = icon || '';
-        legend.itemWidth = itemWidth || 12;
-        legend.itemHeight = itemHeight || 12;
-        legend.itemGap = itemGap || 8;
-        legend.top = top || 'auto';
-        legend.right = right || 'auto';
-        legend.bottom = bottom || 'auto';
-        legend.left = left || 'auto';
-        legend.padding = padding || [5, 5, 5, 5];
-        legend.textStyle.color = color || '';
-        legend.textStyle.height = height || 8;
-        legend.textStyle.rich.a = fontSize || 12;
-    }
-    //return legend;
-}
-
-// 图表曲线数据配置
-export function setLineSeriesStyleData(series, appearance) {
-    let seriesOptions = [];
-    for (let i = 0; i < series.length; i++) {
-        const defaultSeriesStyle = JSON.parse(JSON.stringify(echartsLineSeriesStyleData));
-        const item = series[i];
-        let appearanceSeries = appearance.seriesOptions && appearance.seriesOptions[i];
-        if(!appearanceSeries) {
-            appearanceSeries = defaultSeriesStyle;
-            appearanceSeries.name = item.name;
-            appearanceSeries.itemLineStyle.color = i === 0 ? defaultSeriesStyle.itemLineStyle.color : echartsColorData[i];
-            seriesOptions.push(defaultSeriesStyle);
-        }else {
-            seriesOptions.push(appearanceSeries);
-        }
-        item.symbol = appearanceSeries.symbol;
-        item.smooth = appearanceSeries.smooth;
-        item.symbolSize = appearanceSeries.symbolSize || 18;
-        item.itemStyle = {
-            normal: {
-                color: appearanceSeries.itemLineStyle.color,
-                lineStyle: appearanceSeries.itemLineStyle
-            }
-        };
-        if (appearanceSeries.area) {
-            item.areaStyle = {
-                color: appearanceSeries.areaColor && {...appearanceSeries.areaColor} || {...defaultSeriesStyle.areaColor}
-            };
-            appearanceSeries.linear ?
-                    item.areaStyle.color.colorStops = [...appearanceSeries.areaColorStops] :
-                    item.areaStyle = Object.assign({}, item.areaStyle, {color: appearanceSeries.areaBgColor || 'rgba(49, 144, 255, 0.21)'});
-        } else {
-            if (item.areaStyle) delete item['areaStyle'];
-        }
-    }
-
-    appearance.seriesOptions = seriesOptions;
-    //return series;
-}

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

@@ -1,18 +0,0 @@
-interface echartsOptions {
-    color: '',
-    xAxis: [],
-    yAxis: [],
-    series: [],
-    tooltip: null
-}
-export declare function getXYAxisLabelVal(index: number, intervalNum: number, value: any): string;
-export declare function initBindTabSetting(node: any): string;
-export declare function setMapLineBarOptions(option: echartsOptions, node: any): void;
-export declare function setMapGaugeOptions(option: echartsOptions, node: any): void;
-export declare function setMapRingOptions(option: echartsOptions, node: any): void;
-export declare function setMap3dBarOptions(option: echartsOptions, node: any): void;
-export declare function setMapTopOptions(option: echartsOptions, node: any): void;
-export declare function setMapGlobalOptions(option: echartsOptions, node: any): void;
-export declare function setMapDataOptions(option: echartsOptions, node: any): void;
-export declare function setMapAutoMoveOptions(option: echartsOptions, chartNode: string,node: any, callback: any): void;
-export declare function setMapStopAutoMoveOptions(chartNode: string): void;