From 4a4b956af73800f217a5411c7c040390a81ebb38 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 15 Aug 2023 12:00:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BD=B4=E5=80=BC=E5=BF=85=E9=A1=BB?= =?UTF-8?q?=E5=A4=A7=E4=BA=8E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/chart/chart/common/common_antv.js | 54 +++++++++++++++++-- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js index 243971e98c..5d4dedb723 100644 --- a/frontend/src/views/chart/chart/common/common_antv.js +++ b/frontend/src/views/chart/chart/common/common_antv.js @@ -623,8 +623,31 @@ export function getXAxis(chart) { const axisValue = a.axisValue if (chart.type.includes('horizontal')) { if (axisValue && !axisValue.auto) { - axisValue.min && (axis.minLimit = parseFloat(axisValue.min)) - axisValue.max && (axis.maxLimit = parseFloat(axisValue.max)) + const yAxisSeriesMaxList = [] + const maxList = [] + chart.data.data.forEach(ele => { + maxList.push(ele.value) + }) + yAxisSeriesMaxList.push(Math.max.apply(null, maxList)) + if (yAxisSeriesMaxList.length > 0 && !isNaN(axisValue.max)) { + const max = Math.max.apply(null, yAxisSeriesMaxList) + if (max <= parseFloat(axisValue.max)) { + axisValue.max && (axis.maxLimit = axis.max = parseFloat(axisValue.max)) + } + } + + const yAxisSeriesMinList = [] + const minList = [] + chart.data.data.forEach(ele => { + minList.push(ele.value) + }) + yAxisSeriesMinList.push(Math.min.apply(null, minList)) + if (yAxisSeriesMinList.length > 0 && !isNaN(axisValue.min)) { + const min = Math.min.apply(null, yAxisSeriesMinList) + if (min >= parseFloat(axisValue.min)) { + axisValue.min && (axis.minLimit = axis.min = parseFloat(axisValue.min)) + } + } axisValue.splitCount && (axis.tickCount = parseFloat(axisValue.splitCount)) } } @@ -712,8 +735,31 @@ export function getYAxis(chart) { const axisValue = a.axisValue if (!chart.type.includes('horizontal')) { if (axisValue && !axisValue.auto) { - axisValue.min && (axis.minLimit = axis.min = parseFloat(axisValue.min)) - axisValue.max && (axis.maxLimit = axis.max = parseFloat(axisValue.max)) + const yAxisSeriesMaxList = [] + const maxList = [] + chart.data.data.forEach(ele => { + maxList.push(ele.value) + }) + yAxisSeriesMaxList.push(Math.max.apply(null, maxList)) + if (yAxisSeriesMaxList.length > 0 && !isNaN(axisValue.max)) { + const max = Math.max.apply(null, yAxisSeriesMaxList) + if (max <= parseFloat(axisValue.max)) { + axisValue.max && (axis.maxLimit = axis.max = parseFloat(axisValue.max)) + } + } + + const yAxisSeriesMinList = [] + const minList = [] + chart.data.data.forEach(ele => { + minList.push(ele.value) + }) + yAxisSeriesMinList.push(Math.min.apply(null, minList)) + if (yAxisSeriesMinList.length > 0 && !isNaN(axisValue.min)) { + const min = Math.min.apply(null, yAxisSeriesMinList) + if (min >= parseFloat(axisValue.min)) { + axisValue.min && (axis.minLimit = axis.min = parseFloat(axisValue.min)) + } + } axisValue.splitCount && (axis.tickCount = parseFloat(axisValue.splitCount)) } }