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

refactor: 图表侧原始明细导出取图表和数据集条数限制的较小值

Browse Source
This commit is contained in:
wangjiahao 2024-12-04 18:35:25 +08:00
parent 789992ce17
commit 7e9d9b4f59
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
View File

@ -115,11 +115,17 @@ public class ChartDataServer implements ChartDataApi {
viewDTO.setXAxis(JsonUtil.parseList(JsonUtil.toJSONString(sourceFields).toString(), listTypeReference));
}
int curLimit = Math.toIntExact(ExportCenterUtils.getExportLimit("view"));
int curDsLimit = Math.toIntExact(ExportCenterUtils.getExportLimit("dataset"));
if (ChartConstants.VIEW_RESULT_MODE.CUSTOM.equals(viewDTO.getResultMode())) {
Integer limitCount = viewDTO.getResultCount();
viewDTO.setResultCount(Math.min(curLimit, limitCount));
} else {
viewDTO.setResultCount(curLimit);
// 普通导出取图表限制 原始明细导出时 取图表和数据集限制最小的值
if("dataset".equals(request.getDownloadType())){
viewDTO.setResultCount(Math.min(curLimit,curDsLimit));
}else{
viewDTO.setResultCount(curLimit);
}
}
chartViewInfo = getData(viewDTO);
List<Object[]> tableRow = (List) chartViewInfo.getData().get("sourceData");