dcim-topology2d 2.0.8 → 2.2.0

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

@@ -9,7 +9,7 @@ import {
     setMapTopOptions,
     setMapGlobalOptions,
     setMapDataOptions,
-    initBindTabSetting
+    initBindCorrelationSetting
 } from '../utils';
 import {echartsTypeMap} from '../../../static';
 
@@ -67,8 +67,9 @@ export function echarts(ctx, node) {
             echartsData.div.style.transformOrigin = '0 0';
             if(node.data.params) node.data.params.tabCorrelationType = echartsData.tabCorrelationType || ''; // 统计图与Tab关联
             const isLocked = currentStore.data.locked;
-            if (!isLocked || !currentStore.echartsOptionsPool[node.id]) {
-                const tabData = initBindTabSetting(node); // 初始化Tabs数据配置
+            const echartsOptionsData = currentStore.echartsOptionsPool[node.id];
+            if (!isLocked || !echartsOptionsData) {
+                const tabData = initBindCorrelationSetting(node); // 初始化图表与其他组件关联的配置数据
                 // 【未锁定（编辑）状态, options未初始化的状态】
                 if (!appearance.type) appearance.type = echartsTypeMap[`type_${option.displayMode}`]; // 兼容旧数据配置
                 // 公共配置 Top排行榜散点图跳过公共属性配置
@@ -87,8 +88,10 @@ export function echarts(ctx, node) {
                 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,

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

@@ -1,6 +1,7 @@
 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 set3DPieOptions<T>(option: T, appearance: T, labelLineData: any, realData: any): {};
 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;

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

@@ -1,11 +1,11 @@
 // 初始化图例数据和图例配置数据
 import {
-    echartsLegendDefaultData,
     echartsXAxisDefaultStyleData,
     echartsYAxisDefaultStyleData,
     echartsLineSeriesStyleData,
     echartsColorData
 } from '../../../static';
+import {getPie3D} from './surfaceParametricConversion';
 
 // 配置环形图中间区域文字样式
 export function setRingChartText(textData) {
@@ -63,6 +63,20 @@ export function setRingProSeriesOptions(option, appearance) {
     seriesLastChildNode.radius = appearance.inner.radius;
     seriesLastChildNode.itemStyle.normal.color.colorStops[0].color = appearance.inner.borderColor;
 }
+
+// 3D饼图 | 环形图 属性配置
+export function set3DPieOptions(option, appearance, labelLineData, realData){
+    let type = appearance.type.includes('pie') ? 'pie' : 'ring';
+    const {legendData, series, node, total, boxHeight} = getPie3D(appearance.grid.internalDiameterRatio, type, appearance, labelLineData, realData);
+    option.grid3D.boxHeight = boxHeight;
+    option.legend.data = legendData;
+    option.series = series;
+    return {
+        node,
+        total
+    };
+}
+
 // 图表X轴数据
 export function setChartXAxisData(xAxis, appearance) {
     for (let i = 0; i < xAxis.length; i++) {
@@ -172,7 +186,6 @@ export function setChartYAxisData(yAxis, appearance) {
 
 // 图表图例数据
 export function setChartLegendData(legend, appearance) {
-    if (!legend.formatter) legend.formatter = ['{a|{name}}'].join('\n');
     // 设置默认图例文字配置，如果想改变初始化文字属性，在 appearance中配置即可
     if (!legend.textStyle) legend.textStyle = {
         color: '#fff',
@@ -184,39 +197,32 @@ export function setChartLegendData(legend, appearance) {
             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;
-    }
+    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;
 }
 

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

@@ -6,7 +6,7 @@ interface echartsOptions {
     tooltip: null
 }
 export declare function getXYAxisLabelVal(index: number, intervalNum: number, value: any): string;
-export declare function initBindTabSetting(node: any): string;
+export declare function initBindCorrelationSetting(node: any): string;
 export declare function setMapScatterOptions(option: echartsOptions, node: any): void;
 export declare function setMapLineBarOptions(option: echartsOptions, node: any): void;
 export declare function setMapGaugeOptions(option: echartsOptions, node: any): void;

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

@@ -8,7 +8,9 @@ import {
     setLineSeriesStyleData,
     setRingPreSeriesOptions,
     setRingProSeriesOptions,
-    mapFormatterSet
+    set3DPieOptions,
+    mapFormatterSet,
+    set3DPieMouseHover
 } from '../utils';
 import {
     gaugeNormalAuto,
@@ -31,11 +33,13 @@ export function getXYAxisLabelVal(index, intervalNum, value) {
 }
 
 /**
- * 初始化图表与tabs关联的配置数据
+ * 初始化图表与其他组件关联的配置数据
  * @param node 元件节点
  */
-export function initBindTabSetting(node) {
+export function initBindCorrelationSetting(node) {
+    if(!node.data.params || node.data.params.staticForType !== 'OTHER') return null;
     const tabStaticKey = node.tags && node.tags.find((tag) => {return tag.includes('switchTabType')});
+    if(!tabStaticKey) return null; // 与tabs关联？
     const switchTabData = tabStaticKey && commonStore[node.TID].switchTabDataPool[`${tabStaticKey}Data`];
     if(switchTabData) {
         const tabNode = Object.values(switchTabData)[0];
@@ -47,7 +51,6 @@ export function initBindTabSetting(node) {
             data: tabNode.tabData
         };
     }
-    return null;
 }
 
 // 自动滑动展示数据
@@ -169,14 +172,53 @@ export function setMapRingOptions(option, node) {
     //const chartOption = JSON.parse(JSON.stringify(option));
     const appearance = node.appearance;
     if(appearance.type === 'ringPre'){
-
+        //环形‘设备告警统计图’节点展示配置
         setRingPreSeriesOptions(option, appearance);
 
     }else if(appearance.type === 'ringPro'){
-
+        //环形‘内存、硬盘、CPU指标占比统计’节点展示配置
         setRingProSeriesOptions(option, appearance);
 
+    }else if(appearance.type === 'ring3d' || appearance.type === 'pie3d'){
+        // 3D饼图配置
+        option.backgroundColor = appearance.backgroundColor;
+        option.grid3D = {
+            show: false,
+            top: appearance.grid.top,
+            left: appearance.grid.left,
+            right: appearance.grid.right,
+            bottom: appearance.grid.bottom,
+            viewControl: {
+                alpha: appearance.grid.alpha, //角度
+                distance: appearance.grid.distance, //调整视角到主体的距离，类似调整zoom
+                rotateSensitivity: 0, //设置为0无法旋转
+                zoomSensitivity: 0, //设置为0无法缩放
+                panSensitivity: 0, //设置为0无法平移
+                autoRotate: false, //自动旋转
+            }
+        };
+        if(appearance.grid.beta) option.grid3D.viewControl.beta = appearance.grid.beta;
+        Object.assign(option.legend, appearance.legend);
+        if(appearance.labelLine && appearance.labelLine.show) set3DPieLabelLine(option, appearance.labelLine, node.TID, node.id);
+        if(appearance.legendTextStyle) {
+            const {fontSize, align, color, width, data} = appearance.legendTextStyle;
+            const rich = {
+                a: {
+                    color,
+                    width
+                }
+            }
+            for (let i = 0; i < data.length; i++) {
+                rich[`b${i}`] = data[i];
+            }
+            option.legend.textStyle = {
+                fontSize,
+                align,
+                rich
+            }
+        }
     }else {
+        // 基础图表的配置
         const seriesNode = option.series[0];
         if ((!appearance.label || typeof appearance.label.showValue !== 'boolean')) {
             appearance.label = {
@@ -225,6 +267,66 @@ export function setMapRingOptions(option, node) {
     }
 }
 
+function getItemNode(color, fontSize, fontWeight, padding) {
+    return {
+        color,
+        fontSize,
+        fontWeight,
+        padding
+    }
+}
+
+// 设置3D饼图引线样式
+function set3DPieLabelLine(option, labelLine, TID, id){
+    const rich = {};
+    const { data, color, lengthWidth, startAngle, clockwise, center, radius } = labelLine;
+    const lineData = [];
+    for (let i = 0; i < data.length; i ++){
+        const {
+            length,
+            length2,
+            nameFontSize,
+            nameFontWeight,
+            nameColor,
+            namePadding,
+            valueFontSize,
+            valueFontWeight,
+            valueColor,
+            valuePadding,
+            unitFontSize,
+            unitFontWeight,
+            unitColor,
+            unitPadding
+        } = data[i];
+        rich[`name${i+1}`] = getItemNode(nameColor, nameFontSize, nameFontWeight, namePadding);
+        rich[`unit${i+1}`] = getItemNode(unitColor, unitFontSize, unitFontWeight, unitPadding);
+        rich[`value${i+1}`] = getItemNode(valueColor, valueFontSize, valueFontWeight, valuePadding);
+        lineData.push({
+            minTurnAngle: 90,
+            length: length,
+            length2: length2,
+            lineStyle: {
+                width: lengthWidth
+            }
+        })
+    }
+    commonStore[TID].echartsDataPool[id].labelLineData = {
+        name: 'pie2d',
+        type: 'pie',
+        hoverAnimation: false,
+        label: {
+            opacity: 1,
+            color,
+            rich
+        },
+        startAngle, //起始角度，支持范围[0, 360]。
+        clockwise, //饼图的扇区是否是顺时针排布。上述这两项配置主要是为了对齐3d的样式
+        radius, // 两个值设置成相同的，环形就隐藏了
+        center, //指示线的位置
+        data: lineData
+    };
+}
+
 // 自动配置3D柱状图的节点数据
 export function setMap3dBarOptions(option, node) {
     // 取消注册自定义形状
@@ -286,7 +388,7 @@ export function setMapGlobalOptions(option, node) {
     // const chartOption = JSON.parse(JSON.stringify(option));
     const appearance = node.appearance;
     // 图表网格数据
-    if (appearance.grid) {
+    if (appearance.grid && !appearance.grid.distance) {
 
         option.grid ? Object.assign(option.grid, appearance.grid) : option.grid = appearance.grid;
 
@@ -296,14 +398,15 @@ export function setMapGlobalOptions(option, node) {
     // 图表Y轴数据
     if (option.yAxis) setChartYAxisData(option.yAxis, appearance);
     // 图表图例数据
-    //if (option.legend) setChartLegendData(option.legend, appearance);
+    if (appearance.legend) setChartLegendData(option.legend, appearance);
     // 曲线样式数据
     if (appearance.type.includes('line')) setLineSeriesStyleData(option.series, appearance);
 }
 
 // 实时改变图表data值
 export function setMapDataOptions(option, node) {
-    const optionNode = commonStore[node.TID].echartsOptionsPool[node.id].option;
+    const currentStore = commonStore[node.TID];
+    let optionNode = currentStore.echartsOptionsPool[node.id].option;
     const appearance = node.appearance;
     const params = node.params;
     // 3d 柱状图
@@ -323,6 +426,7 @@ export function setMapDataOptions(option, node) {
         // 日，周，月，年，实时类型，不与分组统计一起使用
         staticTypeData = staticForType ? syncEchartsData && syncEchartsData[`${staticForType}_Data`] : syncEchartsData;
     }
+    let dataDictionary = {};
     // 实时数据加载
     if(staticTypeData) {
 
@@ -360,6 +464,16 @@ export function setMapDataOptions(option, node) {
             }else if(appearance.type === 'ringPro'){
                 // 按照百分比统计设备配置情况
                 pieRingProportionAuto(optionNode, pieData, appearance.proportion);
+
+            }else if(appearance.type === 'ring3d' || appearance.type === 'pie3d'){
+                for (let i = 0; i < pieData.length; i++){
+                    pieData[i].itemOpacity = 0.9;
+                    pieData[i].itemColor = appearance.chartData[i] && appearance.chartData[i].itemColor || echartsColorData[i];
+                }
+                // 3D饼图图例更新
+                const labelLineData = currentStore.echartsDataPool[node.id].labelLineData;
+                dataDictionary = set3DPieOptions(optionNode, appearance, labelLineData, pieData);
+
             }else {
 
                 pieRingNormalAuto(optionNode, pieData);
@@ -396,16 +510,23 @@ export function setMapDataOptions(option, node) {
                 }
             }
         }
-        if (option.series) {
-            for (let i = 0; i < option.series.length; i++) {
-                const item = option.series[i];
-                if(item.name) optionNode.series[i].name = item.name;
-                optionNode.series[i].data = item.data;
+        if(option.series[0] && option.series[0].pieData) {
+            // 3D饼图图例初始化
+            const labelLineData = currentStore.echartsDataPool[node.id].labelLineData;
+            dataDictionary = set3DPieOptions(option, appearance, labelLineData);
+            optionNode = option;
+        }else {
+            if (option.series) {
+                for (let i = 0; i < option.series.length; i++) {
+                    const item = option.series[i];
+                    if(item.name) optionNode.series[i].name = item.name;
+                    optionNode.series[i].data = item.data;
+                }
             }
         }
     }
 
-    mapFormatterSet(appearance, optionNode, staticTypeData);
+    mapFormatterSet(appearance, optionNode, staticTypeData, dataDictionary);
 
     const currentChartNode = commonStore[node.TID].echartsDataPool[node.id];
     const mapChart = currentChartNode.chart;
@@ -427,6 +548,13 @@ export function setMapDataOptions(option, node) {
             return mapChart.setOption(chartNode);
         })
     }
+    // 鼠标hover状态,用于3D饼图
+    if(appearance.mouseHoverState) {
+        mapChart.off('mouseover');
+        mapChart.off('globalout');
+        let type = appearance.type.includes('pie') ? 'pie' : 'ring';
+        set3DPieMouseHover(mapChart, type, option, appearance.seriesStyleData);
+    }
     mapChart.setOption(optionNode);
     mapChart.resize();
 }

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

@@ -1 +1 @@
-export declare function mapFormatterSet(appearance: object, option: any, data: any): void;
+export declare function mapFormatterSet(appearance: object, option: any, data: any, dataDictionary: any): void;

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

@@ -1,12 +1,14 @@
 import {rankingTopColorList} from '../../../static';
 
-export function mapFormatterSet(appearance, options, data) {
+export function mapFormatterSet(appearance, options, data, dataDictionary) {
     if(appearance.type.includes('ring') || appearance.type.includes('pie')) {
         const seriesNode = options.series[0];
         if(seriesNode.label && seriesNode.label.normal &&!seriesNode.label.normal.formatter) {
             setMapRingOptionsFormatter(appearance, seriesNode);
         }
     }
+    if(appearance.type === 'ring3d') setMapRing3DFormatter(appearance, options, dataDictionary);
+    if(appearance.type === 'pie3d') setMapPie3DFormatter(appearance, options);
     if(appearance.type.includes('line') || appearance.type.includes('bar')) setMapLineBarFormatter(appearance, options);
     if(appearance.type.includes('lineTwins')) setMapLineTwinsFormatter(appearance, options);
     if(appearance.type.includes('scatter')) setMapScatterFormatter(options);
@@ -42,32 +44,20 @@ function setMapLineBarFormatter(appearance, options){
                 const item = param[i];
                 const unit = getTooltipUnit(i, appearance);
                 const dott = getTooltipDott(param[i].color);
-                data += `<br>${dott}${item.seriesName}：${item.value} ${unit}`;
+                data += `<br>${dott}${item.seriesName}：${appearance.total && appearance.total[item.dataIndex].value || item.value} ${unit}`;
             }
             return `<div style="border-bottom: 1px solid rgba(255,255,255,.3); font-size: 12px;margin-bottom: 5px;">${param[0].name}</div>${data}`;
         }
     }
 }
 function getTooltipUnit(index, appearance) {
-    if(!(appearance.tooltipUnit && appearance.tooltipUnit[index])) return '';
-    return appearance.tooltipUnit[index];
+    return appearance.tooltipUnit && appearance.tooltipUnit[index] || appearance.series && appearance.series[index] && appearance.series[index].labelUnit || '';
 }
 function getTooltipDott(color) {
     return `<span style="display: inline-block;margin-right: 8px;border: 5px solid ${color};border-radius: 100%"></span>`;
 }
 // 堆叠统计
 function setMapBarPileStaticFormatter(appearance, options) {
-    if(!options.tooltip.formatter){
-        options.tooltip.formatter = function(param) {
-            let data = `${param[0].seriesName}：${param[0].value} ${appearance.series[0] && appearance.series[0].labelUnit || ''}`;
-            for (let i = 1; i < param.length; i++){
-                const item = param[i];
-                const series = appearance.series[i];
-                data += `<br>${item.seriesName}：${appearance.total && appearance.total[item.dataIndex].value || item.value} ${series && series.labelUnit || ''}`;
-            }
-            return `<div style="border-bottom: 1px solid rgba(255,255,255,.3); font-size: 12px;margin-bottom: 5px;">${param[0].name}</div>${data}`;
-        }
-    }
     for (let i = 0; i < options.series.length; i++) {
         const item = options.series[i];
         const setItem = appearance.series[i];
@@ -167,4 +157,50 @@ function setMapRingOptionsFormatter(appearance, seriesNode) {
             }
         }
     }
+}
+// 环形3D图自定义展示配置
+function setMapRing3DFormatter(appearance, options, data) {
+    if(!options.tooltip.formatter) {
+        options.tooltip.formatter = (params) => {
+            if (params.seriesName !== 'mouseoutSeries' && params.seriesName !== 'pie2d') {
+                const pieData = options.series[params.seriesIndex].pieData;
+                const pv = (pieData.endRatio - pieData.startRatio) *100;
+                let bfb = Math.round(pv);
+                return `${
+                        params.seriesName
+                }<br/><span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${
+                        params.color
+                };"></span>${bfb}${appearance.unit}`;
+            }
+        }
+    }
+    options.legend.formatter = (name) => {
+        const legendItem = data.node[name];
+        const pv = (legendItem.value / data.total) * 100;
+        const p = Math.round(pv)+'%';
+        return `{a|${name}}{b${legendItem.order}|${legendItem.value}}{b${legendItem.order}|${p}}`;
+    }
+}
+// 饼图3D图自定义展示配置
+function setMapPie3DFormatter(appearance, options) {
+    if(!options.tooltip.formatter) {
+        options.tooltip.formatter = (params) => {
+            if (params.seriesName !== 'mouseoutSeries') {
+                const pieData = options.series[params.seriesIndex].pieData;
+                if(!pieData) return; // 先退出，后期若有hover引线时，图形联动的需求时再做逻辑处理
+                return `${
+                        params.seriesName
+                }<br/><span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${
+                        params.color
+                };"></span>${pieData.value}${appearance.unit}`;
+            }
+        }
+    }
+    const lastSeriesNode = options.series[options.series.length - 1];
+    if(appearance.labelLine.show && !lastSeriesNode.label.formatter) {
+        lastSeriesNode.label.formatter = (params) => {
+            const dataIndex = params.dataIndex + 1;
+            return `{name${dataIndex}|${params.name}}{value${dataIndex}|${params.value}}{unit${dataIndex}|${appearance.unit}}`;
+        }
+    }
 }

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

@@ -2,3 +2,4 @@ export * from './conversion';
 export * from './drawGraphic';
 export * from './changeOptions';
 export * from './formatter';
+export * from './surfaceParametricConversion';

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

@@ -2,3 +2,4 @@ export * from './conversion';
 export * from './drawGraphic';
 export * from './changeOptions';
 export * from './formatter';
+export * from './surfaceParametricConversion';

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

@@ -18,61 +18,52 @@ export function lineBarDataAuto(option, params, data, appearance) {
         if(realSeriesNode.name) seriesNodes[0].name = realSeriesNode.name;
         return;
     }
-    if(seriesNodes.length > 1 || params && params.curveNum > 1){
-        // 双曲线|柱状
-        if(option.yAxis.length > 1 && appearance.yAxisValueAuto) {
-            if(!appearance.yAxisMaxIntervalue) appearance.yAxisMaxIntervalue = 1;
-            // 双轴曲线，且曲线值为自适应
-            const dataGroup = {
-                data1: data.seriesData[0] && data.seriesData[0].data || [],
-                data2: data.seriesData[1] && data.seriesData[1].data || []
-            };
-            const newData = [...dataGroup.data1, ...dataGroup.data2];
-            let min = Math.min(...newData);
-            let max = Math.max(...newData);
-            const power = Math.floor(Math.log10(min));
-            for (let i = 0; i < option.yAxis.length; i++) {
-                const currentData = dataGroup[`data${i + 1}`];
-                if(min < 0 && Math.max(...currentData) < max) max *= appearance.yAxisMaxIntervalue;
-                if(min > 0 && Math.max(...currentData) < max) min = Math.pow(10, power);
-                option.yAxis[i].min = Math.ceil(min);
-                option.yAxis[i].max = Math.ceil(max);
-            }
+    const realSeriesData = data.seriesData;
+    // 双轴曲线间距配置
+    if(option.yAxis.length > 1 && appearance.yAxisValueAuto) {
+        if(!appearance.yAxisMaxIntervalue) appearance.yAxisMaxIntervalue = 1;
+        // 双轴曲线，且曲线值为自适应
+        const dataGroup = {
+            data1: realSeriesData[0] && realSeriesData[0].data || [],
+            data2: realSeriesData[1] && realSeriesData[1].data || []
+        };
+        const newData = [...dataGroup.data1, ...dataGroup.data2];
+        let min = Math.min(...newData);
+        let max = Math.max(...newData);
+        const power = Math.floor(Math.log10(min));
+        for (let i = 0; i < option.yAxis.length; i++) {
+            const currentData = dataGroup[`data${i + 1}`];
+            if(min < 0 && Math.max(...currentData) < max) max *= appearance.yAxisMaxIntervalue;
+            if(min > 0 && Math.max(...currentData) < max) min = Math.pow(10, power);
+            option.yAxis[i].min = Math.ceil(min);
+            option.yAxis[i].max = Math.ceil(max);
         }
-        const legendData = [];
-        let legendChange = false;
-        seriesNodes.map((item, index) => {
-            const seriesItem = data.seriesData[index];
-            item.data = seriesItem ? seriesItem.data : [];
-            // 获取角标数据
-            if(seriesItem && seriesItem.name) {
-                item.name = seriesItem.name;
-                legendData.push(seriesItem.name);
-                legendChange = true;
-            }
-        });
-        if(option.legend && legendChange) option.legend.data = legendData; // 为角标数据赋值
-    }else{
-        if(!data.seriesData.length) return;
-        let seriesData = [];
-        for (let i = 0; i < data.seriesData.length; i++){
-            const realSeriesNode = data.seriesData[i];
-            let currSeriesNode = {};
-            const seriesItem = seriesNodes[i];
-            if(seriesItem) {
-                currSeriesNode = seriesItem;
-            }else {
-                const newSeriesItem = JSON.parse(JSON.stringify(seriesNodes[0]));
-                newSeriesItem.itemStyle.normal.lineStyle.color = echartsColorData[i];
-                newSeriesItem.itemStyle.normal.color = echartsColorData[i];
-                currSeriesNode = newSeriesItem;
-            }
-            if(realSeriesNode.name) currSeriesNode.name = realSeriesNode.name;
-            currSeriesNode.data = realSeriesNode.data;
-            seriesData.push(currSeriesNode);
+    }
+    let legendChange = false;
+    let seriesData = [];
+    const legendData = [];
+    for (let i = 0; i < realSeriesData.length; i++){
+        const realSeriesNode = realSeriesData[i];
+        let currSeriesNode = {};
+        const seriesItem = seriesNodes[i];
+        if(seriesItem) {
+            currSeriesNode = seriesItem;
+        }else {
+            const newSeriesItem = JSON.parse(JSON.stringify(seriesNodes[0]));
+            newSeriesItem.itemStyle.normal.lineStyle.color = echartsColorData[i];
+            newSeriesItem.itemStyle.normal.color = echartsColorData[i];
+            currSeriesNode = newSeriesItem;
+        }
+        if(realSeriesNode.name) {
+            currSeriesNode.name = realSeriesNode.name;
+            legendData.push(realSeriesNode.name);
+            legendChange = true;
         }
-        option.series = seriesData;
+        currSeriesNode.data = realSeriesNode.data;
+        seriesData.push(currSeriesNode);
     }
+    if(option.legend && legendChange) option.legend.data = legendData; // 为角标数据赋值
+    option.series = seriesData;
 }
 
 export function barPileStaticDataAuto(option, data, appearance) {

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

@@ -0,0 +1,3 @@
+export declare function getPie3D(internalDiameterRatio: Number, type: String, appearance: {}, labelLineData: any, realData: any): {};
+export declare function getParametricEquation(startRatio: Number, endRatio: Number, isSelected: Boolean, isHovered: Boolean, k: any, h: Number): {};
+export declare function set3DPieMouseHover(myChart: object, type: String, option: {}, valueData: any): void;