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-26 16:41:07 +08:00
parent 91e29bd747
commit ad3dd7f5b0
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/core-frontend/src/views/chart/components/editor/editor-senior/components/FunctionCfg.vue
View File

@ -54,7 +54,10 @@ const init = () => {
} }
} }
const showIgnoreOption = computed(() => { const showIgnoreOption = computed(() => {
return !equalsAny(props.chart.type, 'table-pivot', 'table-info', 'indicator') return !(
equalsAny(props.chart.type, 'table-pivot', 'table-info', 'indicator') ||
props.chart.type.includes('chart-mix')
)
}) })
const showEmptyDataFieldCtrl = computed(() => { const showEmptyDataFieldCtrl = computed(() => {

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

@ -273,6 +273,17 @@ export class ColumnLineMix extends G2PlotChartView<DualAxesOptions, DualAxes> {
return tempOption return tempOption
} }
setupDefaultOptions(chart: ChartObj): ChartObj {
const { customAttr, senior } = chart
if (
senior.functionCfg.emptyDataStrategy == undefined ||
senior.functionCfg.emptyDataStrategy === 'ignoreData'
) {
senior.functionCfg.emptyDataStrategy = 'breakLine'
}
return chart
}
protected configCustomColors(chart: Chart, options: DualAxesOptions): DualAxesOptions { protected configCustomColors(chart: Chart, options: DualAxesOptions): DualAxesOptions {
const basicStyle = parseJson(chart.customAttr).basicStyle const basicStyle = parseJson(chart.customAttr).basicStyle
const color = basicStyle.colors.map(item => hexColorToRGBA(item, basicStyle.alpha)) const color = basicStyle.colors.map(item => hexColorToRGBA(item, basicStyle.alpha))