public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-13 01:01:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(图表): 修复隐藏指标字段，导出Excel表格后，指标后的维度字段数据会不显示

Browse Source
This commit is contained in:
wisonic-s
2026-05-27 19:07:47 +08:00
committed by wisonic-s
parent 829369e7ba
commit 7f665f0fcf
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -544,7 +544,8 @@ public class ChartDataServer implements ChartDataApi {
cell.setCellValue(cellValObj.toString());
}
} else {
if ((excelTypes[j].equals(DeTypeConstants.DE_INT) || excelTypes[j].equals(DeTypeConstants.DE_FLOAT)) && StringUtils.isNotEmpty(cellValObj.toString())) {
Integer excelType = getExcelType(j, excelTypes, exportFields, viewInfo);
if ((Objects.equals(excelType, DeTypeConstants.DE_INT) || Objects.equals(excelType, DeTypeConstants.DE_FLOAT)) && StringUtils.isNotEmpty(cellValObj.toString())) {
cell.setCellValue(Double.valueOf(cellValObj.toString()));
} else if (cellValObj != null) {
cell.setCellValue(cellValObj.toString());
@@ -578,6 +579,15 @@ public class ChartDataServer implements ChartDataApi {
}
}
private static Integer getExcelType(int columnIndex, Integer[] excelTypes, List<ChartViewFieldDTO> exportFields, ChartViewDTO viewInfo) {
if (viewInfo != null
&& StringUtils.equalsAnyIgnoreCase(viewInfo.getType(), "table-info", "table-normal")
&& columnIndex < exportFields.size()) {
return exportFields.get(columnIndex).getDeType();
}
return ArrayUtils.isNotEmpty(excelTypes) && columnIndex < excelTypes.length ? excelTypes[columnIndex] : null;
}
public static List<ChartViewFieldDTO> resolveExportFields(ChartViewDTO viewInfo, Object[] header) {
List<ChartViewFieldDTO> fields = new ArrayList<>();
if (viewInfo != null && viewInfo.getData() != null && viewInfo.getData().get("fields") != null) {