diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index 4b4f8cfa51..90a8228300 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -116,7 +116,9 @@ public class ChartDataManage { xAxis.addAll(xAxisExt); } List yAxis = new ArrayList<>(view.getYAxis()); - if (StringUtils.equalsIgnoreCase(view.getType(), "chart-mix")) { + if (StringUtils.equalsIgnoreCase(view.getType(), "chart-mix") + || StringUtils.equalsIgnoreCase(view.getType(), "bidirectional-bar") + || StringUtils.equalsIgnoreCase(view.getType(), "quadrant")) { List yAxisExt = new ArrayList<>(view.getYAxisExt()); yAxis.addAll(yAxisExt); } @@ -124,10 +126,6 @@ public class ChartDataManage { List sizeField = getSizeField(view); yAxis.addAll(sizeField); } - if (StringUtils.equalsIgnoreCase(view.getType(), "quadrant")) { - List yAxisExt = new ArrayList<>(view.getYAxisExt()); - yAxis.addAll(yAxisExt); - } boolean skipBarRange = false; boolean barRangeDate = false; if (StringUtils.equalsIgnoreCase(view.getType(), "bar-range")) { //针对区间条形图进行处理 @@ -777,7 +775,8 @@ public class ChartDataManage { || StringUtils.containsIgnoreCase(view.getType(), "gauge") || StringUtils.equalsIgnoreCase("liquid", view.getType())) { mapChart = ChartDataBuild.transNormalChartData(xAxis, yAxis, view, data, isDrill); - } else if (StringUtils.containsIgnoreCase(view.getType(), "chart-mix")) { + } else if (StringUtils.containsIgnoreCase(view.getType(), "chart-mix") + || StringUtils.containsIgnoreCase(view.getType(), "bidirectional-bar")) { mapChart = ChartDataBuild.transMixChartDataAntV(xAxis, yAxis, view, data, isDrill); } else if (StringUtils.containsIgnoreCase(view.getType(), "label")) { mapChart = ChartDataBuild.transLabelChartData(xAxis, yAxis, view, data, isDrill); diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index c5b0e64b3c..43178989a6 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -681,6 +681,7 @@ export default { chart_bar_stack_horizontal: '横向堆叠柱状图', chart_percentage_bar_stack_horizontal: '横向百分比柱状图', chart_bar_range: '区间条形图', + chart_bidirectional_bar: '对称柱状图', chart_line: '基础折线图', chart_area_stack: '堆叠折线图', chart_pie: '饼图', diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue index 7c68da39ff..893bb3795f 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue @@ -433,7 +433,7 @@ watch( :change-model="chart.customStyle.xAxis" @modelChange="val => onChangeXAxisForm(val, 'show')" name="xAxis" - :title="t('chart.xAxis')" + :title="chart.type === 'bidirectional-bar' ? $t('chart.yAxis') : t('chart.xAxis')" > { } state.subAxisForm.position = 'right' state.subAxisForm.show = state.axisForm.show + if (chart.type === 'bidirectional-bar') { + state.axisForm.position = customStyle.yAxis.position + state.subAxisForm.position = customStyle.yAxisExt.position + } } } @@ -81,7 +85,14 @@ onMounted(() => {