Skip to content

fix:When merging cells, the data of the cells that are not displayed is not cleared #612

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix:When merging cells, the data of the cells that are not displayed is not cleared #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04b3207
doc: Add JavaDoc for read cases
tmlx1990 Mar 31, 2025
9c874db
Merge branch 'main' of github.com:tmlx1990/fastexcel into main
tmlx1990 Jun 19, 2025
0f3483d
Merge branch 'main' of github.com:tmlx1990/fastexcel into main
tmlx1990 Sep 27, 2025
1ae633b
fix: When merging cells, the data of the cells that are not displayed…
tmlx1990 Sep 27, 2025
4b8b4a6
fix: When merging cells, the data of the cells that are not displayed…
tmlx1990 Sep 29, 2025
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
6 changes: 6 additions & 0 deletions fesod/src/main/java/org/apache/fesod/excel/write/merge/LoopMergeStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ public void afterRowDispose(RowWriteHandlerContext context) {
columnIndex,
columnIndex + columnExtend - 1);
context.getWriteSheetHolder().getSheet().addMergedRegionUnsafe(cellRangeAddress);
} else {
// Iterate through the columns to clear the content of merged cells
for (int i = 0; i < columnExtend; i++) {
// Access the cell at the specified column index in the current row and set it to blank
context.getRow().getCell(columnIndex + i).setBlank();
Copy link

Copilot AI Sep 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potential NullPointerException if getCell(columnIndex + i) returns null. The cell should be created if it doesn't exist before calling setBlank().

Copilot uses AI. Check for mistakes.
}
}
}
}
4 changes: 2 additions & 2 deletions fesod/src/test/java/org/apache/fesod/excel/fill/FillDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ private void complexFill(File file, File template) {
}
List<Object> list = FastExcel.read(file).sheet().headRowNumber(3).doReadSync();
Assertions.assertEquals(list.size(), 21L);
Map<String, String> map19 = (Map<String, String>) list.get(19);
Assertions.assertEquals("Zhang San", map19.get(0));
Map<String, String> map18 = (Map<String, String>) list.get(18);
Assertions.assertEquals("Zhang San", map18.get(0));
}

private void fill(File file, File template) {
Expand Down