From 7e9d9b4f5910c5bd7270880dec782c19f81c1067 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 4 Dec 2024 18:35:25 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=9B=BE=E8=A1=A8=E4=BE=A7?= =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E6=98=8E=E7=BB=86=E5=AF=BC=E5=87=BA=E5=8F=96?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=92=8C=E6=95=B0=E6=8D=AE=E9=9B=86=E6=9D=A1?= =?UTF-8?q?=E6=95=B0=E9=99=90=E5=88=B6=E7=9A=84=E8=BE=83=E5=B0=8F=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/chart/server/ChartDataServer.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java index 49d2be8dd3..abad107f03 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java @@ -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 tableRow = (List) chartViewInfo.getData().get("sourceData");