feat: introduce header merge strategy for Excel writing #674
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ved documentation
…ved documentation
Member
Author
|
@delei PTAL |
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR introduces a new HeaderMergeStrategy enum to provide fine-grained control over how Excel headers are merged during writing. The enhancement maintains backward compatibility with the existing automaticMergeHead parameter while offering more nuanced merge behaviors.
- Adds
HeaderMergeStrategyenum with five options: NONE, HORIZONTAL_ONLY, VERTICAL_ONLY, FULL_RECTANGLE, and AUTO - Refactors the header merge logic in
ExcelWriteHeadPropertyto support different merge strategies - Updates documentation in both English and Chinese to explain the new parameter and its usage
Reviewed Changes
Copilot reviewed 12 out of 12 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| fesod/src/main/java/org/apache/fesod/excel/enums/HeaderMergeStrategy.java | New enum defining five merge strategies for header cells |
| fesod/src/main/java/org/apache/fesod/excel/write/property/ExcelWriteHeadProperty.java | Refactored merge logic to support different strategies, added helper methods for validation |
| fesod/src/main/java/org/apache/fesod/excel/write/metadata/WriteBasicParameter.java | Added headerMergeStrategy field to parameter class |
| fesod/src/main/java/org/apache/fesod/excel/write/metadata/holder/AbstractWriteHolder.java | Added headerMergeStrategy field and backward compatibility logic |
| fesod/src/main/java/org/apache/fesod/excel/write/metadata/holder/WriteHolder.java | Added headerMergeStrategy() method to interface |
| fesod/src/main/java/org/apache/fesod/excel/write/builder/AbstractExcelWriterParameterBuilder.java | Added headerMergeStrategy() builder method |
| fesod/src/main/java/org/apache/fesod/excel/context/WriteContextImpl.java | Updated to use new merge strategy parameter when initializing headers |
| fesod/src/test/java/org/apache/fesod/excel/head/HeaderMergeStrategyTest.java | Comprehensive test coverage for all merge strategies |
| website/docs/write/head.md | English documentation for the new feature |
| website/i18n/zh-cn/docusaurus-plugin-content-docs/current/write/head.md | Chinese documentation for the new feature |
| website/docs/help/parameter.md | Updated parameter reference in English |
| website/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/parameter.md | Updated parameter reference in Chinese |
Comments suppressed due to low confidence (1)
fesod/src/main/java/org/apache/fesod/excel/write/property/ExcelWriteHeadProperty.java:237
- The parameter 'cellName' is never used.
List<Head> headList, int row1, int row2, int startCol, int endCol, String cellName) {
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
fesod/src/test/java/org/apache/fesod/excel/head/HeaderMergeStrategyTest.java
Outdated
Show resolved
Hide resolved
fesod/src/test/java/org/apache/fesod/excel/head/HeaderMergeStrategyTest.java
Outdated
Show resolved
Hide resolved
fesod/src/main/java/org/apache/fesod/excel/write/property/ExcelWriteHeadProperty.java
Outdated
Show resolved
Hide resolved
…ategyTest.java Co-authored-by: Copilot <[email protected]>
…ategyTest.java Co-authored-by: Copilot <[email protected]>
Member
|
Very interesting PR,thanks @liugddx |
Member
|
Hi @liugddx , we have updated some package-name. Your PR is very useful,could you mind resolve these conflicts? |
# Conflicts: # fesod/src/main/java/org/apache/fesod/sheet/context/WriteContextImpl.java # fesod/src/main/java/org/apache/fesod/sheet/enums/HeaderMergeStrategy.java # fesod/src/main/java/org/apache/fesod/sheet/write/builder/AbstractExcelWriterParameterBuilder.java # fesod/src/main/java/org/apache/fesod/sheet/write/metadata/WriteBasicParameter.java # fesod/src/main/java/org/apache/fesod/sheet/write/metadata/holder/AbstractWriteHolder.java # fesod/src/main/java/org/apache/fesod/sheet/write/metadata/holder/WriteHolder.java # fesod/src/main/java/org/apache/fesod/sheet/write/property/ExcelWriteHeadProperty.java # fesod/src/test/java/org/apache/fesod/sheet/head/HeaderMergeStrategyTest.java
Member
Author
Done. |
Member
|
If no one has any other views.I will merge this PR in 24 hours. 如果没人对此有其他的看法，我将在 24 小时内合并此 PR。感谢 @liugddx 的贡献:) |
Member
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to #666