From 2e42fd1037511b8efe394cb37db4cf7224f0027c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 10 Jan 2025 17:01:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=B8=AD=E5=BF=83=E3=80=91=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=BA=E5=B8=A6=E5=B0=8F=E6=95=B0=E6=95=B0?= =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8B=E6=97=B6=EF=BC=8C=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=BAExcel=E4=BC=9A=E5=B0=860=E5=AD=98?= =?UTF-8?q?=E4=B8=BA0E-8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/exportCenter/manage/ExportCenterManage.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java index e19512537e..50ff963af3 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java @@ -736,7 +736,14 @@ public class ExportCenterManage implements BaseExportApi { ViewDetailField[] detailFields = request.getDetailFields(); Object[] header = request.getHeader(); Sheet detailsSheet = wb.createSheet("数据"); - ChartDataServer.setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, null, null); + if (request.getViewInfo().getType().equalsIgnoreCase("table-normal")) { + List xAxis = new ArrayList<>(); + xAxis.addAll(request.getViewInfo().getXAxis()); + xAxis.addAll(request.getViewInfo().getYAxis()); + ChartDataServer.setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, xAxis, wb); + } else { + ChartDataServer.setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, null, null); + } } } else { //多个sheet