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 9e2321cf94..9f42257fcf 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 @@ -589,6 +589,11 @@ public class ChartDataManage { // get all fields List allFields = getAllChartFields(view); + // 针对分组切换堆叠时会遇到的问题 + if (StringUtils.equalsIgnoreCase(view.getType(), "bar-stack") || StringUtils.equalsIgnoreCase(view.getType(), "chart-mix-stack")) { + view.setXAxisExt(new ArrayList<>()); + } + List xAxisBase = new ArrayList<>(view.getXAxis()); List xAxis = new ArrayList<>(view.getXAxis()); List xAxisExt = new ArrayList<>(view.getXAxisExt()); diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts index a5ff2ac46b..5a6dbf75a8 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts @@ -45,7 +45,10 @@ export class ColumnLineMix extends G2PlotChartView { } axis: AxisType[] = [...CHART_MIX_AXIS_TYPE, 'xAxisExtRight', 'yAxisExt'] axisConfig = { - ...this['axisConfig'], + xAxis: { + name: `${t('chart.drag_block_type_axis')} / ${t('chart.dimension')}`, + type: 'd' + }, yAxis: { name: `${t('chart.drag_block_value_axis_left')} / ${t('chart.column_quota')}`, limit: 1, @@ -595,10 +598,10 @@ export class GroupColumnLineMix extends ColumnLineMix { } axisConfig = { ...this['axisConfig'], - yAxis: { - name: `${t('chart.drag_block_value_axis_left')} / ${t('chart.column_quota')}`, - limit: 1, - type: 'q' + xAxisExt: { + name: `${t('chart.chart_group')} / ${t('chart.dimension')}`, + type: 'd', + limit: 1 } } @@ -706,10 +709,10 @@ export class StackColumnLineMix extends ColumnLineMix { } axisConfig = { ...this['axisConfig'], - yAxis: { - name: `${t('chart.drag_block_value_axis_left')} / ${t('chart.column_quota')}`, - limit: 1, - type: 'q' + extStack: { + name: `${t('chart.stack_item')} / ${t('chart.dimension')}`, + type: 'd', + limit: 1 } }