mirror of
https://github.com/dataease/dataease.git
synced 2025-02-24 11:32:57 +08:00
Merge pull request #11928 from dataease/pr@dev-v2@chart-word-cloud-max-fix
fix(图表-词云图): 修复大小配置中最大最小值都为0时无法获取默认值的问题
This commit is contained in:
commit
456550a6bd
@ -630,21 +630,37 @@ export const getMaxAndMinValueByData = (
|
|||||||
minValue: number,
|
minValue: number,
|
||||||
callback: (max: number, min: number) => void
|
callback: (max: number, min: number) => void
|
||||||
) => {
|
) => {
|
||||||
if ((minValue === 0 && maxValue === 0) || minValue === null || maxValue === null) {
|
// 定义一个辅助函数来计算最大值或最小值
|
||||||
|
const calculateExtreme = (isMax: boolean) => {
|
||||||
|
return data.reduce(
|
||||||
|
(extreme, current) => {
|
||||||
|
return isMax
|
||||||
|
? current[field] > extreme
|
||||||
|
? current[field]
|
||||||
|
: extreme
|
||||||
|
: current[field] < extreme
|
||||||
|
? current[field]
|
||||||
|
: extreme
|
||||||
|
},
|
||||||
|
isMax ? Number.MIN_SAFE_INTEGER : Number.MAX_SAFE_INTEGER
|
||||||
|
)
|
||||||
|
}
|
||||||
|
if (minValue === null || maxValue === null) {
|
||||||
let maxResult = maxValue
|
let maxResult = maxValue
|
||||||
let minResult = minValue
|
let minResult = minValue
|
||||||
if (maxResult === null) {
|
if (maxResult === null) {
|
||||||
maxResult = data.reduce((max, current) => {
|
maxResult = calculateExtreme(true)
|
||||||
return current[field] > max ? current[field] : max
|
|
||||||
}, Number.MIN_SAFE_INTEGER)
|
|
||||||
}
|
}
|
||||||
if (minResult === null) {
|
if (minResult === null) {
|
||||||
minResult = data.reduce((min, current) => {
|
minResult = calculateExtreme(false)
|
||||||
return current[field] < min ? current[field] : min
|
|
||||||
}, Number.MAX_SAFE_INTEGER)
|
|
||||||
}
|
}
|
||||||
callback(maxResult, minResult)
|
callback(maxResult, minResult)
|
||||||
}
|
}
|
||||||
|
if (minValue === 0 && maxValue === 0) {
|
||||||
|
const maxResult = calculateExtreme(true)
|
||||||
|
const minResult = calculateExtreme(false)
|
||||||
|
callback(maxResult, minResult)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const stepsColor = (start, end, steps, gamma) => {
|
export const stepsColor = (start, end, steps, gamma) => {
|
||||||
|
Loading…
Reference in New Issue
Block a user