diff --git a/core/core-frontend/src/views/chart/components/js/extremumUitl.ts b/core/core-frontend/src/views/chart/components/js/extremumUitl.ts index 6117111a2a..a9d4ab59b1 100644 --- a/core/core-frontend/src/views/chart/components/js/extremumUitl.ts +++ b/core/core-frontend/src/views/chart/components/js/extremumUitl.ts @@ -139,8 +139,8 @@ function removeDivsWithPrefix(parentDivId, prefix) { export const extremumEvt = (newChart, chart, _options, container) => { chart.container = container + clearExtremum(chart) if (!supportExtremumChartType(chart)) { - clearExtremum(chart) return } const { label: labelAttr } = parseJson(chart.customAttr) @@ -151,7 +151,9 @@ export const extremumEvt = (newChart, chart, _options, container) => { i.forEach(item => { delete item._origin.EXTREME }) - const { minItem, maxItem } = findMinMax(i.filter(item => item._origin.value)) + const { minItem, maxItem } = findMinMax( + i.filter(item => item?._origin?.value !== null && item?._origin?.value !== undefined) + ) if (!minItem || !maxItem) { return } diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts index d9d091f4d2..b4050c177a 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts @@ -227,7 +227,10 @@ export class Bar extends G2PlotChartView { tickCount: axisValue.splitCount } } - return { ...tmpOptions, ...axis } + // 根据axis的最小值,过滤options中的data数据,过滤掉小于最小值的数据 + const { data } = options + const newData = data.filter(item => item.value > axisValue.min) + return { ...tmpOptions, data: newData, ...axis } } return tmpOptions } diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts index 841729cb17..87ec4f0a06 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts @@ -135,7 +135,10 @@ export class HorizontalBar extends G2PlotChartView { tickCount: axisValue.splitCount } } - return { ...tmpOptions, ...axis } + // 根据axis的最小值,过滤options中的data数据,过滤掉小于最小值的数据 + const { data } = options + const newData = data.filter(item => item.value > axisValue.min) + return { ...tmpOptions, data: newData, ...axis } } return tmpOptions }