diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java index 4f53fb57a0..6a263eabc5 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java @@ -54,14 +54,18 @@ public class CoreVisualizationExportManage { } if (CollectionUtils.isEmpty(chartViewDTOS)) return null; Map chartExtRequestMap = buildViewRequest(visualization, onlyDisplay); - List sheets = chartViewDTOS.stream().map(view -> { + List sheets = new ArrayList<>(); + for (int i = 0; i < chartViewDTOS.size(); i++) { + ChartViewDTO view = chartViewDTOS.get(i); ChartExtRequest extRequest = chartExtRequestMap.get(view.getId().toString()); if (ObjectUtils.isNotEmpty(extRequest)) { view.setChartExtRequest(extRequest); } view.getChartExtRequest().setUser(AuthUtils.getUser().getUserId()); - return exportViewData(view); - }).toList(); + view.setTitle((i + 1) + "-" + view.getTitle()); + sheets.add(exportViewData(view)); + } + return VisualizationExcelUtils.exportExcel(sheets, visualization.getName(), visualization.getId().toString()); } diff --git a/de-xpack b/de-xpack index e22c8ef0d9..0cf469c20f 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit e22c8ef0d999bdf902fd8b5f537c0830d5261b7a +Subproject commit 0cf469c20f184e57c2e7e88e99896b2f6baed265