From 8e4d32b8c98d56887911b94d37918123610ef1f7 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Fri, 24 Nov 2023 16:34:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E9=9B=B7=E8=BE=BE?= =?UTF-8?q?=E5=9B=BE):=20=E9=9B=B7=E8=BE=BE=E5=9B=BE=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E5=80=BC=E5=8F=96=E5=AE=9E=E9=99=85=E6=9C=80=E5=B0=8F=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/lang/en.js | 2 +- core/frontend/src/lang/tw.js | 2 +- core/frontend/src/lang/zh.js | 2 +- core/frontend/src/views/chart/chart/radar/radar.js | 6 ++++-- core/frontend/src/views/chart/chart/radar/radar_antv.js | 6 ++++-- .../views/chart/components/componentStyle/SplitSelector.vue | 2 +- .../chart/components/componentStyle/SplitSelectorAntV.vue | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js index 565d57928e..700a9fb3fe 100644 --- a/core/frontend/src/lang/en.js +++ b/core/frontend/src/lang/en.js @@ -1482,7 +1482,7 @@ export default { dimension_letter_space: 'Name Letter Space', font_family: 'Font Family', font_family_tip: 'The font will only take effect if it is installed on the operating system', - radar_max_tip: 'If the maximum value of the actual data is greater than the custom maximum value, the maximum value of the actual data will prevail.', + radar_min_max_tip: 'If the minimum value of the actual data is less than the custom minimum value, or the maximum value is greater than the custom maximum value, the actual data will prevail.', letter_space: 'Letter Space', font_shadow: 'Font Shadow', chart_area: 'Area', diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js index bcb8ec3da1..fd4ef830f8 100644 --- a/core/frontend/src/lang/tw.js +++ b/core/frontend/src/lang/tw.js @@ -1479,7 +1479,7 @@ export default { dimension_letter_space: '名稱字間距', font_family: '字體', font_family_tip: '只有操作系統上已安裝該字體才能生效', - radar_max_tip: '如果實際數據的最大值大於自定義的最大值，將以實際數據的最大值為準。', + radar_min_max_tip: '如果實際數據的最小值小於自定義的最小值，或者最大值大於自定義的最大值，將以實際數據為準。', letter_space: '字間距', font_shadow: '字體陰影', chart_area: '面積圖', diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js index 418d25b9fa..47e1f17be1 100644 --- a/core/frontend/src/lang/zh.js +++ b/core/frontend/src/lang/zh.js @@ -1479,7 +1479,7 @@ export default { dimension_letter_space: '名称字间距', font_family: '字体', font_family_tip: '只有操作系统上已安装该字体才能生效', - radar_max_tip: '如果实际数据的最大值大于自定义的最大值，将以实际数据的最大值为准。', + radar_min_max_tip: '如果实际数据的最小值小于自定义的最小值，或者最大值大于自定义的最大值，将以实际数据为准。', letter_space: '字间距', font_shadow: '字体阴影', chart_area: '面积图', diff --git a/core/frontend/src/views/chart/chart/radar/radar.js b/core/frontend/src/views/chart/chart/radar/radar.js index 3ea0d245ab..c690e134eb 100644 --- a/core/frontend/src/views/chart/chart/radar/radar.js +++ b/core/frontend/src/views/chart/chart/radar/radar.js @@ -31,6 +31,7 @@ export function baseRadarOption(chart_option, chart) { if (chart.data) { chart_option.title.text = chart.title const maxValues = [] + const minValues = [] for (let i = 0; i < chart.data.series.length; i++) { const y = chart.data.series[i] if (y.data.length === 0) { @@ -63,12 +64,13 @@ export function baseRadarOption(chart_option, chart) { chart_option.series.push(d) maxValues.push(Math.max.apply(null, y.value)) + minValues.push(Math.min.apply(null, y.value)) } let max = Math.max.apply(null, maxValues) - let min + let min = Math.min.apply(null, minValues) const customStyle = JSON.parse(chart.customStyle) if (customStyle?.split?.axisValue?.auto === false) { - min = customStyle.split.axisValue.min + min = Math.min(customStyle.split.axisValue.min, min) max = Math.max(customStyle.split.axisValue.max, max) } chart.data.x.forEach(function(ele) { diff --git a/core/frontend/src/views/chart/chart/radar/radar_antv.js b/core/frontend/src/views/chart/chart/radar/radar_antv.js index b2c1e19ad2..11dc0cc9b5 100644 --- a/core/frontend/src/views/chart/chart/radar/radar_antv.js +++ b/core/frontend/src/views/chart/chart/radar/radar_antv.js @@ -1,6 +1,7 @@ import { getLabel, getLegend, getPadding, getTheme, getTooltip } from '@/views/chart/chart/common/common_antv' import { Radar } from '@antv/g2plot' import { antVCustomColor } from '@/views/chart/chart/util' +import { minBy, maxBy } from 'lodash' export function baseRadarOptionAntV(plot, container, chart, action) { // theme @@ -124,8 +125,9 @@ export function baseRadarOptionAntV(plot, container, chart, action) { } } if (s.axisValue?.auto === false) { - yAxis.min = yAxis.minLimit = s.axisValue.min - const dataMax = _.maxBy(data, 'value') + const dataMin = minBy(data, 'value') + yAxis.min = yAxis.minLimit = Math.min(s.axisValue.min, dataMin.value) + const dataMax = maxBy(data, 'value') yAxis.max = yAxis.maxLimit = Math.max(s.axisValue.max, dataMax.value) } } diff --git a/core/frontend/src/views/chart/components/componentStyle/SplitSelector.vue b/core/frontend/src/views/chart/components/componentStyle/SplitSelector.vue index 8c3774fd40..0781a9e856 100644 --- a/core/frontend/src/views/chart/components/componentStyle/SplitSelector.vue +++ b/core/frontend/src/views/chart/components/componentStyle/SplitSelector.vue @@ -161,7 +161,7 @@ >