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

feat(视图): 堆叠项支持自定义排序

Browse Source
This commit is contained in:
junjun 2022-09-20 11:31:44 +08:00
parent daed174fda
commit 44720e4e33
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -1521,6 +1521,12 @@ public class ChartViewService {
getIndex = i; getIndex = i;
} }
} }
if (StringUtils.equalsIgnoreCase(fieldType, "extStack")) {
List<ChartViewFieldDTO> stack = gson.fromJson(view.getXAxis(), new TypeToken<List<ChartViewFieldDTO>>() {
}.getType());
index += stack.size();
getIndex += stack.size();
}
List<String[]> sortResult = resultCustomSort(fieldList, sqlData); List<String[]> sortResult = resultCustomSort(fieldList, sqlData);
if (ObjectUtils.isNotEmpty(chartViewFieldDTO) && (getIndex >= index)) { if (ObjectUtils.isNotEmpty(chartViewFieldDTO) && (getIndex >= index)) {
// 获取自定义值与data对应列的结果 // 获取自定义值与data对应列的结果