Skip to content

fix: apply excel format for blank cells #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2024
Merged

fix: apply excel format for blank cells #160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
310afd3
fix: apply excel format for blank cells
mlopezFC Nov 11, 2024
98491e1
refactor: reduce cognitive complexity of buildCell method
mlopezFC Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions src/main/java/com/flowingcode/vaadin/addons/gridexporter/ExcelStreamResourceWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,22 +341,14 @@ private CellStyle createOrRetrieveCellStyle(HorizontalAlignment alignment, Cell

@SuppressWarnings("unchecked")
private void buildCell(Object value, Cell cell, Column<T> column, T item) {
ValueProvider<T,String> provider = null;
provider = (ValueProvider<T, String>) ComponentUtil.getData(column, GridExporter.COLUMN_EXCEL_FORMAT_DATA_PROVIDER);
String excelFormat;
Map<String,CellStyle> cellStyles = (Map<String, CellStyle>) ComponentUtil.getData(column, COLUMN_CELLSTYLE_MAP);
if (cellStyles==null) {
cellStyles = new HashMap<>();
ComponentUtil.setData(column, COLUMN_CELLSTYLE_MAP, cellStyles);
}
if (provider!=null) {
excelFormat = provider.apply(item);
} else {
excelFormat =
(String) ComponentUtil.getData(column, GridExporter.COLUMN_EXCEL_FORMAT_DATA);
}
ValueProvider<T,String> provider = (ValueProvider<T, String>) ComponentUtil.getData(column, GridExporter.COLUMN_EXCEL_FORMAT_DATA_PROVIDER);
Map<String, CellStyle> cellStyles = getCellStyles(column);
String excelFormat = getExcelFormat(column, item, provider);
if (value == null) {
PoiHelper.setBlank(cell);
if(excelFormat != null) {
applyExcelFormat(cell, excelFormat, cellStyles);
}
} else if (value instanceof Number) {
excelFormat = (excelFormat!=null)?excelFormat:"0";
cell.setCellValue(((Number) value).doubleValue());
Expand All @@ -375,6 +367,27 @@ private void buildCell(Object value, Cell cell, Column<T> column, T item) {
}
}

private String getExcelFormat(Column<T> column, T item, ValueProvider<T, String> provider) {
String excelFormat;
if (provider!=null) {
excelFormat = provider.apply(item);
} else {
excelFormat =
(String) ComponentUtil.getData(column, GridExporter.COLUMN_EXCEL_FORMAT_DATA);
}
return excelFormat;
}

@SuppressWarnings("unchecked")
private Map<String, CellStyle> getCellStyles(Column<T> column) {
Map<String,CellStyle> cellStyles = (Map<String, CellStyle>) ComponentUtil.getData(column, COLUMN_CELLSTYLE_MAP);
if (cellStyles==null) {
cellStyles = new HashMap<>();
ComponentUtil.setData(column, COLUMN_CELLSTYLE_MAP, cellStyles);
}
return cellStyles;
}

private void applyExcelFormat(Cell cell, String excelFormat, Map<String, CellStyle> cellStyles) {
DataFormat format = cell.getSheet().getWorkbook().createDataFormat();
if (excelFormat!=null && cellStyles.get(excelFormat)==null) {
Expand Down
Loading