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

refactor(视图): 下钻后延续第一层排序规则（仅对升降序有效）

Browse Source
This commit is contained in:
junjun 2022-07-08 15:59:28 +08:00
parent c5edb219c6
commit 40357d5382
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -776,6 +776,8 @@ public class ChartViewService {
if (i == drillRequest.size() - 1) { if (i == drillRequest.size() - 1) {
ChartViewFieldDTO nextDrillField = drill.get(i + 1); ChartViewFieldDTO nextDrillField = drill.get(i + 1);
if (!checkDrillExist(xAxis, extStack, nextDrillField, view)) { if (!checkDrillExist(xAxis, extStack, nextDrillField, view)) {
// get drill list first element's sort,then assign to nextDrillField
nextDrillField.setSort(getDrillSort(xAxis, drill.get(0)));
xAxis.add(nextDrillField); xAxis.add(nextDrillField);
} }
} }
@ -1533,4 +1535,17 @@ public class ChartViewService {
sql = dataSetTableService.removeVariables(sql); sql = dataSetTableService.removeVariables(sql);
return sql; return sql;
} }
private String getDrillSort(List<ChartViewFieldDTO> xAxis, ChartViewFieldDTO field) {
String res = "";
for (ChartViewFieldDTO f : xAxis) {
if (StringUtils.equalsIgnoreCase(f.getId(), field.getId())) {
if (StringUtils.equalsIgnoreCase(f.getSort(), "asc") || StringUtils.equalsIgnoreCase(f.getSort(), "desc")) {
res = f.getSort();
break;
}
}
}
return res;
}
} }