public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-20 19:48:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 视图下钻

Browse Source
This commit is contained in:
junjie
2021-08-10 17:00:15 +08:00
parent 18b68616ac
commit affdf3ad00
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java
View File

@@ -23,5 +23,5 @@ public class ChartViewDTO extends ChartViewWithBLOBs {
private String pid;
private String sql;
private List<ChartDrillRequest> dimensionList;
private boolean drill;
}

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

@@ -258,7 +258,7 @@ public class ChartViewService {
// 下钻
boolean isDrill = false;
List<ChartDrillRequest> drillRequest = requestList.getDrill();
if (drill.size() > drillRequest.size()) {
if (CollectionUtils.isNotEmpty(drillRequest) && (drill.size() >= drillRequest.size())) {
for (int i = 0; i < drillRequest.size(); i++) {
ChartDrillRequest request = drillRequest.get(i);
for (ChartDimensionDTO dto : request.getDimensionList()) {
@@ -385,7 +385,9 @@ public class ChartViewService {
data = (List<String[]>) cache;
}*/
// 仪表板有参数不实用缓存
if (CollectionUtils.isNotEmpty(requestList.getFilter()) || CollectionUtils.isNotEmpty(requestList.getLinkageFilters())) {
if (CollectionUtils.isNotEmpty(requestList.getFilter())
|| CollectionUtils.isNotEmpty(requestList.getLinkageFilters())
|| CollectionUtils.isNotEmpty(requestList.getDrill())) {
data = datasourceProvider.getData(datasourceRequest);
} else {
try {
@@ -430,10 +432,7 @@ public class ChartViewService {
dto.setData(map);
dto.setSql(datasourceRequest.getQuery());
if (CollectionUtils.isNotEmpty(drillRequest) && !isDrill) {
drillRequest = drillRequest.subList(0, drillRequest.size() - 1);
}
dto.setDimensionList(drillRequest);
dto.setDrill(isDrill);
return dto;
}