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

feat: 视图上卷

Browse Source
This commit is contained in:
junjie
2021-08-11 17:01:51 +08:00
parent 5d2340975c
commit 85c744f679
4 changed files with 68 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,11 @@
package io.dataease.dto.chart;
import io.dataease.base.domain.ChartViewWithBLOBs;
import io.dataease.controller.request.chart.ChartExtFilterRequest;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
import java.util.Map;
/**
@@ -22,4 +24,6 @@ public class ChartViewDTO extends ChartViewWithBLOBs {
private String sql;
private boolean drill;
private List<ChartExtFilterRequest> drillFilters;
}

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

@@ -256,6 +256,7 @@ public class ChartViewService {
}
// 下钻
List<ChartExtFilterRequest> drillFilters = new ArrayList<>();
boolean isDrill = false;
List<ChartDrillRequest> drillRequest = requestList.getDrill();
if (CollectionUtils.isNotEmpty(drillRequest) && (drill.size() > drillRequest.size())) {
@@ -279,6 +280,8 @@ public class ChartViewService {
drillFilter.setDatasetTableField(datasetTableField);
extFilterList.add(drillFilter);
drillFilters.add(drillFilter);
if (!checkDrillExist(xAxis, extStack, d, view)) {
xAxis.add(d);
}
@@ -439,6 +442,7 @@ public class ChartViewService {
dto.setSql(datasourceRequest.getQuery());
dto.setDrill(isDrill);
dto.setDrillFilters(drillFilters);
return dto;
}