|
@@ -67,23 +67,21 @@ export interface ColumnResult {
|
|
|
eachSpacing: number;
|
|
eachSpacing: number;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-// 声明全局变量
|
|
|
|
|
-declare const process: number;
|
|
|
|
|
-declare const chartProcess: any;
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 绘制柱状图数据点
|
|
* 绘制柱状图数据点
|
|
|
* @param series 系列数据
|
|
* @param series 系列数据
|
|
|
* @param opts 图表配置
|
|
* @param opts 图表配置
|
|
|
* @param config UCharts配置
|
|
* @param config UCharts配置
|
|
|
* @param context Canvas上下文
|
|
* @param context Canvas上下文
|
|
|
|
|
+ * @param process 动画进度(默认为1)
|
|
|
* @returns 计算结果
|
|
* @returns 计算结果
|
|
|
*/
|
|
*/
|
|
|
export function drawColumnDataPoints(
|
|
export function drawColumnDataPoints(
|
|
|
series: SeriesItem[],
|
|
series: SeriesItem[],
|
|
|
opts: ChartOptions,
|
|
opts: ChartOptions,
|
|
|
config: UChartsConfig,
|
|
config: UChartsConfig,
|
|
|
- context: CanvasContext
|
|
|
|
|
|
|
+ context: CanvasContext,
|
|
|
|
|
+ process = 1
|
|
|
): ColumnResult {
|
|
): ColumnResult {
|
|
|
const xAxisData = opts.chartData?.xAxisData;
|
|
const xAxisData = opts.chartData?.xAxisData;
|
|
|
if (!xAxisData) {
|
|
if (!xAxisData) {
|
|
@@ -161,7 +159,7 @@ export function drawColumnDataPoints(
|
|
|
opts,
|
|
opts,
|
|
|
config,
|
|
config,
|
|
|
zeroPoints,
|
|
zeroPoints,
|
|
|
- chartProcess
|
|
|
|
|
|
|
+ process
|
|
|
);
|
|
);
|
|
|
const tooltipPoints = getStackDataPoints(
|
|
const tooltipPoints = getStackDataPoints(
|
|
|
data as number[],
|
|
data as number[],
|
|
@@ -173,7 +171,7 @@ export function drawColumnDataPoints(
|
|
|
config,
|
|
config,
|
|
|
seriesIndex,
|
|
seriesIndex,
|
|
|
series,
|
|
series,
|
|
|
- chartProcess
|
|
|
|
|
|
|
+ process
|
|
|
);
|
|
);
|
|
|
calPoints.push(tooltipPoints);
|
|
calPoints.push(tooltipPoints);
|
|
|
points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
|
|
points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
|
|
@@ -274,7 +272,7 @@ export function drawColumnDataPoints(
|
|
|
config,
|
|
config,
|
|
|
seriesIndex,
|
|
seriesIndex,
|
|
|
series,
|
|
series,
|
|
|
- chartProcess
|
|
|
|
|
|
|
+ process
|
|
|
);
|
|
);
|
|
|
calPoints.push(points);
|
|
calPoints.push(points);
|
|
|
points = fixColumeStackData(points, eachSpacing, series.length, seriesIndex, config, opts, series);
|
|
points = fixColumeStackData(points, eachSpacing, series.length, seriesIndex, config, opts, series);
|
|
@@ -403,7 +401,7 @@ export function drawColumnDataPoints(
|
|
|
opts,
|
|
opts,
|
|
|
config,
|
|
config,
|
|
|
zeroPoints,
|
|
zeroPoints,
|
|
|
- chartProcess
|
|
|
|
|
|
|
+ process
|
|
|
);
|
|
);
|
|
|
const fixedPoints = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
|
|
const fixedPoints = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
|
|
|
drawColumePointText(fixedPoints, eachSeries, config, context, opts);
|
|
drawColumePointText(fixedPoints, eachSeries, config, context, opts);
|
|
@@ -421,7 +419,7 @@ export function drawColumnDataPoints(
|
|
|
config,
|
|
config,
|
|
|
seriesIndex,
|
|
seriesIndex,
|
|
|
series,
|
|
series,
|
|
|
- chartProcess
|
|
|
|
|
|
|
+ process
|
|
|
);
|
|
);
|
|
|
drawColumePointText(points, eachSeries, config, context, opts);
|
|
drawColumePointText(points, eachSeries, config, context, opts);
|
|
|
break;
|
|
break;
|