github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(图表): 修复分组柱状图下钻字段自定义排序失效 #13598

Browse Source
This commit is contained in:
wisonic 2024-12-03 16:40:48 +08:00
parent 21acb647b5
commit cc64cd45c0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/GroupBarHandler.java
View File

@ -49,10 +49,10 @@ public class GroupBarHandler extends BarHandler {
if (ObjectUtils.isNotEmpty(xAxisExt) &&
Objects.equals(drillFields.get(0).getId(), xAxisExt.get(0).getId())) {
fieldsToFilter.addAll(view.getXAxis());
groupStackDrill(noDrillFieldAxis, noDrillFilterList, fieldsToFilter, drillFields, drillRequestList);
formatResult.getAxisMap().put(ChartAxis.xAxis, noDrillFieldAxis);
result.setFilterList(noDrillFilterList);
}
groupStackDrill(noDrillFieldAxis, noDrillFilterList, fieldsToFilter, drillFields, drillRequestList);
formatResult.getAxisMap().put(ChartAxis.xAxis, noDrillFieldAxis);
result.setFilterList(noDrillFilterList);
}
return (T) result;
}

6
core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackGroupBarHandler.java
View File

@ -63,10 +63,10 @@ public class StackGroupBarHandler extends BarHandler {
fieldsToFilter.addAll(view.getXAxis());
fieldsToFilter.addAll(xAxisExt);
}
groupStackDrill(noDrillFieldAxis, noDrillFilterList, fieldsToFilter, drillFields, drillRequestList);
formatResult.getAxisMap().put(ChartAxis.xAxis, noDrillFieldAxis);
result.setFilterList(noDrillFilterList);
}
groupStackDrill(noDrillFieldAxis, noDrillFilterList, fieldsToFilter, drillFields, drillRequestList);
formatResult.getAxisMap().put(ChartAxis.xAxis, noDrillFieldAxis);
result.setFilterList(noDrillFilterList);
}
return (T) result;
}