github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #11557 from ulleo/dev-v2

Browse Source 
fix(图表): 修复柱线组合图左轴无法根据维度进行自定义颜色问题
This commit is contained in:
ulleo 2024-08-14 16:58:30 +08:00 committed by GitHub
commit 6e2b709c4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix-common.ts
View File

@ -29,7 +29,8 @@ export const CHART_MIX_EDITOR_PROPERTY_INNER: EditorPropertyInner = {
'lineSymbolSize',
'lineSmooth',
'radiusColumnBar',
'subSeriesColor'
'subSeriesColor',
'seriesColor'
],
'x-axis-selector': [
'name',

27
core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts
View File

@ -279,6 +279,25 @@ export class ColumnLineMix extends G2PlotChartView<DualAxesOptions, DualAxes> {
...options
}
const basicStyle = parseJson(chart.customAttr).basicStyle as MixChartBasicStyle
const { seriesColor } = basicStyle
if (seriesColor?.length) {
const seriesMap = seriesColor.reduce((p, n) => {
p[n.id] = n
return p
}, {})
const { yAxis } = chart
yAxis?.forEach((axis, index) => {
const curAxisColor = seriesMap[axis.id]
if (curAxisColor) {
if (index + 1 > basicStyle.colors.length) {
basicStyle.colors.push(curAxisColor.color)
} else {
basicStyle.colors[index] = curAxisColor.color
}
}
})
}
//左轴
const color = basicStyle.colors.map(ele => {
const tmp = hexColorToRGBA(ele, basicStyle.alpha)
@ -568,10 +587,6 @@ export class GroupColumnLineMix extends ColumnLineMix {
axis: AxisType[] = [...this['axis'], 'xAxisExt']
propertyInner = {
...CHART_MIX_EDITOR_PROPERTY_INNER,
'dual-basic-style-selector': [
...CHART_MIX_EDITOR_PROPERTY_INNER['dual-basic-style-selector'],
'seriesColor'
],
'label-selector': ['vPosition', 'seriesLabelFormatter'],
'tooltip-selector': [
...CHART_MIX_EDITOR_PROPERTY_INNER['tooltip-selector'],
@ -683,10 +698,6 @@ export class StackColumnLineMix extends ColumnLineMix {
axis: AxisType[] = [...this['axis'], 'extStack']
propertyInner = {
...CHART_MIX_EDITOR_PROPERTY_INNER,
'dual-basic-style-selector': [
...CHART_MIX_EDITOR_PROPERTY_INNER['dual-basic-style-selector'],
'seriesColor'
],
'label-selector': ['vPosition', 'seriesLabelFormatter'],
'tooltip-selector': [
...CHART_MIX_EDITOR_PROPERTY_INNER['tooltip-selector'],