Skip to content

Commit 8d2cdd7

Browse files
javier-godoypaodb
authored andcommitted
fix: preserve joined headers
Close #176
1 parent 1c116a3 commit 8d2cdd7

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/main/java/com/flowingcode/vaadin/addons/gridexporter/BaseStreamResourceWriter.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,18 +136,18 @@ private String renderHeaderCellTextContent(Grid<T> grid, HeaderRow headerRow, Co
136136
String header = (String) ComponentUtil.getData(column, GridExporter.COLUMN_HEADER);
137137

138138
if (Strings.isBlank(header)) {
139-
header = column.getHeaderText();
140-
141-
if (Strings.isBlank(header)) {
142-
try {
143-
HeaderCell headerCell = headerRow.getCell(column);
144-
header = obtainCellFunction(headerCell, column);
145-
} catch (RuntimeException e) {
146-
throw new IllegalStateException(
139+
HeaderCell headerCell = headerRow.getCell(column);
140+
int columnIndex = grid.getColumns().indexOf(column);
141+
if (columnIndex == 0
142+
|| headerRow.getCell(grid.getColumns().get(columnIndex - 1)) != headerCell) {
143+
try {
144+
header = obtainCellFunction(headerCell, column);
145+
} catch (RuntimeException e) {
146+
throw new IllegalStateException(
147147
"Problem when trying to render header cell text content", e);
148+
}
148149
}
149150
}
150-
}
151151

152152
return header == null ? "" : header;
153153
}

0 commit comments

Comments
 (0)