center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat(视图): AntV 堆叠柱状图按照指标整体排序 #5872

Browse Source
This commit is contained in:
wisonic-s 2024-04-28 20:12:51 +08:00
parent 899e8b16d4
commit 1b7c662642
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/frontend/src/views/chart/chart/bar/bar_antv.js
View File

@ -14,7 +14,7 @@ import {
configPlotTooltipEvent,
configAxisLabelLengthLimit
} from '@/views/chart/chart/common/common_antv'
import { antVCustomColor, getColors, handleEmptyDataStrategy, hexColorToRGBA } from '@/views/chart/chart/util'
import { antVCustomColor, getColors, handleEmptyDataStrategy, hexColorToRGBA, handleStackSort } from '@/views/chart/chart/util'
import { cloneDeep, find } from 'lodash-es'
export function baseBarOptionAntV(container, chart, action, isGroup, isStack) {
@ -131,6 +131,8 @@ export function baseBarOptionAntV(container, chart, action, isGroup, isStack) {
}
handleEmptyDataStrategy(emptyDataStrategy, chart, data, options)
}
// 处理堆叠排序
handleStackSort(chart, data)
// 开始渲染
const plot = new Column(container, options)
@ -240,6 +242,8 @@ export function hBaseBarOptionAntV(container, chart, action, isGroup, isStack) {
return setGradientColor(ele, customAttr.color.gradient)
})
}
// 处理堆叠排序
handleStackSort(chart, data)
// 处理空值
if (chart.senior) {
let emptyDataStrategy = JSON.parse(chart.senior)?.functionCfg?.emptyDataStrategy

26
core/frontend/src/views/chart/chart/util.js
View File

@ -3967,3 +3967,29 @@ export function adjustPosition(targetDom, parentDom, clickPosition, offset, init
}
return result
}
export function handleStackSort(chart, data) {
if (!data?.length) {
return
}
if (!chart.type.includes('stack') ||
chart.type.includes('group')) {
return
}
const { xaxis, yaxis, extStack } = chart
const xAxis = JSON.parse(xaxis)
const yAxis = JSON.parse(yaxis)
const stack = JSON.parse(extStack)
if (!(stack.length && xAxis.length && yAxis.length) ||
yAxis[0].sort === 'none' ||
!xAxis.every(i => i.sort === 'none')) {
return
}
const result = data.reduce((p, n, i) => {
p[n.field] = (p[n.field] || 0) + (n.value ?? 0)
return p
}, {})
data.sort((p, n) => {
return yAxis[0].sort === 'asc' ? result[p.field] - result[n.field] : result[n.field] - result[p.field]
})
}