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

fix(图表): 修复从对称条形图切换为柱线组合组后，右轴显示不正确的问题

Browse Source
This commit is contained in:
ulleo 2024-06-05 11:25:10 +08:00
parent 049c661fd5
commit 3ba3ed27e4
1 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,57 +246,63 @@ export class ColumnLineMix extends G2PlotChartView<DualAxesOptions, DualAxes> {
...options
}
tempOption.yAxis = {}
if (!yAxis) {
//左右轴都要隐藏
tempOption.yAxis = {
value: false,
valueExt: false
}
tempOption.yAxis.value = false
} else {
tempOption.yAxis = {
value: undefined,
valueExt: undefined
tempOption.yAxis.value = undefined
yAxis.position = 'left'
const yAxisTmp = parseJson(chart.customStyle).yAxis
if (yAxis.label) {
yAxis.label.style.textAlign = 'end'
yAxis.label.formatter = value => {
return valueFormatter(value, yAxisTmp.axisLabelFormatter)
}
}
const axisValue = yAxisTmp.axisValue
if (!axisValue?.auto) {
tempOption.yAxis.value = {
...yAxis,
min: axisValue.min,
max: axisValue.max,
minLimit: axisValue.min,
maxLimit: axisValue.max,
tickCount: axisValue.splitCount
}
} else {
tempOption.yAxis.value = yAxis
}
}
const yAxisTmp = parseJson(chart.customStyle).yAxis
if (yAxis.label) {
yAxis.label.formatter = value => {
return valueFormatter(value, yAxisTmp.axisLabelFormatter)
}
}
const axisValue = yAxisTmp.axisValue
if (!axisValue?.auto) {
tempOption.yAxis.value = {
...yAxis,
min: axisValue.min,
max: axisValue.max,
minLimit: axisValue.min,
maxLimit: axisValue.max,
tickCount: axisValue.splitCount
}
if (!yAxisExt) {
//左右轴都要隐藏
tempOption.yAxis.valueExt = false
} else {
tempOption.yAxis.value = yAxis
}
tempOption.yAxis.valueExt = undefined
yAxisExt.position = 'right'
const yAxisExtTmp = parseJson(chart.customStyle).yAxisExt
if (yAxisExt.label) {
yAxisExt.label.formatter = value => {
return valueFormatter(value, yAxisExtTmp.axisLabelFormatter)
const yAxisExtTmp = parseJson(chart.customStyle).yAxisExt
if (yAxisExt.label) {
yAxisExt.label.style.textAlign = 'start'
yAxisExt.label.formatter = value => {
return valueFormatter(value, yAxisExtTmp.axisLabelFormatter)
}
}
}
const axisExtValue = yAxisExtTmp.axisValue
if (!axisExtValue?.auto) {
tempOption.yAxis.valueExt = {
...yAxisExt,
min: axisExtValue.min,
max: axisExtValue.max,
minLimit: axisExtValue.min,
maxLimit: axisExtValue.max,
tickCount: axisExtValue.splitCount
const axisExtValue = yAxisExtTmp.axisValue
if (!axisExtValue?.auto) {
tempOption.yAxis.valueExt = {
...yAxisExt,
min: axisExtValue.min,
max: axisExtValue.max,
minLimit: axisExtValue.min,
maxLimit: axisExtValue.max,
tickCount: axisExtValue.splitCount
}
} else {
tempOption.yAxis.valueExt = yAxisExt
}
} else {
tempOption.yAxis.valueExt = yAxisExt
}
return tempOption