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

Merge pull request #11654 from ulleo/dev-v2

Browse Source 
fix(图表): 修复从分组柱线图切换堆叠柱线组合图后，堆叠项排序选项不正确问题
This commit is contained in:
ulleo 2024-08-20 15:16:32 +08:00 committed by GitHub
commit 12f1875c5b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
View File

@ -589,6 +589,11 @@ public class ChartDataManage {
// get all fields // get all fields
List<ChartViewFieldDTO> allFields = getAllChartFields(view); List<ChartViewFieldDTO> allFields = getAllChartFields(view);
// 针对分组切换堆叠时会遇到的问题
if (StringUtils.equalsIgnoreCase(view.getType(), "bar-stack") || StringUtils.equalsIgnoreCase(view.getType(), "chart-mix-stack")) {
view.setXAxisExt(new ArrayList<>());
}
List<ChartViewFieldDTO> xAxisBase = new ArrayList<>(view.getXAxis()); List<ChartViewFieldDTO> xAxisBase = new ArrayList<>(view.getXAxis());
List<ChartViewFieldDTO> xAxis = new ArrayList<>(view.getXAxis()); List<ChartViewFieldDTO> xAxis = new ArrayList<>(view.getXAxis());
List<ChartViewFieldDTO> xAxisExt = new ArrayList<>(view.getXAxisExt()); List<ChartViewFieldDTO> xAxisExt = new ArrayList<>(view.getXAxisExt());

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

@ -45,7 +45,10 @@ export class ColumnLineMix extends G2PlotChartView<DualAxesOptions, DualAxes> {
} }
axis: AxisType[] = [...CHART_MIX_AXIS_TYPE, 'xAxisExtRight', 'yAxisExt'] axis: AxisType[] = [...CHART_MIX_AXIS_TYPE, 'xAxisExtRight', 'yAxisExt']
axisConfig = { axisConfig = {
...this['axisConfig'], xAxis: {
name: `${t('chart.drag_block_type_axis')} / ${t('chart.dimension')}`,
type: 'd'
},
yAxis: { yAxis: {
name: `${t('chart.drag_block_value_axis_left')} / ${t('chart.column_quota')}`, name: `${t('chart.drag_block_value_axis_left')} / ${t('chart.column_quota')}`,
limit: 1, limit: 1,
@ -595,10 +598,10 @@ export class GroupColumnLineMix extends ColumnLineMix {
} }
axisConfig = { axisConfig = {
...this['axisConfig'], ...this['axisConfig'],
yAxis: { xAxisExt: {
name: `${t('chart.drag_block_value_axis_left')} / ${t('chart.column_quota')}`, name: `${t('chart.chart_group')} / ${t('chart.dimension')}`,
limit: 1, type: 'd',
type: 'q' limit: 1
} }
} }
@ -706,10 +709,10 @@ export class StackColumnLineMix extends ColumnLineMix {
} }
axisConfig = { axisConfig = {
...this['axisConfig'], ...this['axisConfig'],
yAxis: { extStack: {
name: `${t('chart.drag_block_value_axis_left')} / ${t('chart.column_quota')}`, name: `${t('chart.stack_item')} / ${t('chart.dimension')}`,
limit: 1, type: 'd',
type: 'q' limit: 1
} }
} }