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 a21586c38f..bbb0327df2 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 @@ -344,6 +344,7 @@ public class ChartDataServer implements ChartDataApi { xAxis.addAll(viewInfo.getXAxisExt()); xAxis.addAll(viewInfo.getYAxisExt()); xAxis.addAll(viewInfo.getExtStack()); + xAxis.addAll(viewInfo.getDrillFields()); TableHeader tableHeader = null; Integer totalDepth = 0; if (viewInfo.getType().equalsIgnoreCase("table-normal") || viewInfo.getType().equalsIgnoreCase("table-info")) { diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java index 9b1333846e..39665c2fed 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java @@ -484,6 +484,7 @@ public class ExportCenterDownLoadManage { xAxis.addAll(request.getViewInfo().getXAxisExt()); xAxis.addAll(request.getViewInfo().getYAxisExt()); xAxis.addAll(request.getViewInfo().getExtStack()); + xAxis.addAll(request.getViewInfo().getDrillFields()); header = Arrays.stream(request.getHeader()).filter(item -> xAxis.stream().map(DatasetTableFieldDTO::getName).collect(Collectors.toList()).contains(item)).collect(Collectors.toList()).toArray(); details.add(0, header); ChartDataServer.setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), wb);