feat: introduce header merge strategy for Excel writing by liugddx · Pull Request #674 · apache/fesod

liugddx · 2025-11-03T14:56:54Z

Related to #666

…ved documentation

…ix issue apache#666

liugddx · 2025-11-04T06:54:09Z

@delei PTAL

Copilot

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 HeaderMergeStrategy enum with five options: NONE, HORIZONTAL_ONLY, VERTICAL_ONLY, FULL_RECTANGLE, and AUTO
Refactors the header merge logic in ExcelWriteHeadProperty to 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.

…ategyTest.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

psxjoy · 2025-11-05T07:14:40Z

Very interesting PR,thanks @liugddx
I will handle in this week.

psxjoy · 2025-11-12T12:12:57Z

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

liugddx · 2025-11-12T14:26:18Z

Hi @liugddx , we have updated some package-name. Your PR is very useful,could you mind resolve these conflicts?

Done.

psxjoy

LGTM

psxjoy · 2025-11-17T12:24:29Z

If no one has any other views.I will merge this PR in 24 hours.

如果没人对此有其他的看法，我将在 24 小时内合并此 PR。感谢 @liugddx 的贡献:)

psxjoy · 2025-11-18T16:00:41Z

@liugddx I have submitted a PR(liugddx#1) to fix conflicts .
Please make sure If no any changes, merge that PR ,and we can carry on :)

Hi, 我发现还有些冲突，这不是你的问题。我已经在你的分支上提交了相关的PR。等冲突的PR解决后，我将合并这个PR :)

# Conflicts: # website/docs/sheet/help/parameter.md # website/i18n/zh-cn/docusaurus-plugin-content-docs/current/sheet/help/parameter.md

liugddx · 2025-11-22T06:13:05Z

@liugddx I have submitted a PR(liugddx#1) to fix conflicts . Please make sure If no any changes, merge that PR ,and we can carry on :)

Hi, 我发现还有些冲突，这不是你的问题。我已经在你的分支上提交了相关的PR。等冲突的PR解决后，我将合并这个PR :)

PTAL

netlify · 2025-11-23T14:21:20Z

❌ Deploy Preview for fesod failed.

Name	Link
🔨 Latest commit	`d9a60bb`
🔍 Latest deploy log	https://app.netlify.com/projects/fesod/deploys/69231855ff30520008af3384

delei · 2025-12-08T14:56:24Z

Hi, @liugddx
We have introduced markdownlint-cli2 to format .md files. When you have time, please run pnpm run md-lint-fix in the website directory to automatically fix the issues.

After the processing is completed, we will merge this PR ASAP.

liugddx · 2025-12-09T01:46:06Z

pnpm run md-lint-fix

Done.

delei

LGTM

liugddx added 4 commits November 3, 2025 22:55

feat: introduce header merge strategy for Excel writing

0544577

feat: enhance header merge strategy with context validation and impro…

5d1df47

…ved documentation

feat: enhance header merge strategy with context validation and impro…

b8035d2

…ved documentation

feat: introduce HeaderMergeStrategy for flexible header merging and f…

74eb525

…ix issue apache#666

liugddx force-pushed the feat-666 branch from b003432 to 74eb525 Compare November 3, 2025 15:10

feat: introduce HeaderMergeStrategy for flexible header merging and f…

86782d8

…ix issue apache#666

delei requested a review from Copilot November 4, 2025 12:31

Copilot AI reviewed Nov 4, 2025

View reviewed changes

delei and others added 4 commits November 4, 2025 20:45

Merge branch 'main' into feat-666

e31e9ba

Update fesod/src/test/java/org/apache/fesod/excel/head/HeaderMergeStr…

440940c

…ategyTest.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update fesod/src/test/java/org/apache/fesod/excel/head/HeaderMergeStr…

2d4107c

…ategyTest.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

feat: simplify canMergeVertically method by removing unused parameter

b021ec1

psxjoy self-requested a review November 5, 2025 07:14

psxjoy added the PR: reviewing Currently under active review. label Nov 5, 2025

Merge branch 'main' into feat-666

5ecb0fa

Merge branch 'main' into feat-666

b6d0ef4

psxjoy previously approved these changes Nov 17, 2025

View reviewed changes

Merge remote-tracking branch 'upstream/main' into feat-666

7b405f1

# Conflicts: # website/docs/sheet/help/parameter.md # website/i18n/zh-cn/docusaurus-plugin-content-docs/current/sheet/help/parameter.md

liugddx dismissed psxjoy’s stale review via 7b405f1 November 22, 2025 06:08

Merge branch 'main' into feat-666

d9a60bb

Merge branch 'main' into feat-666

0a07509

liugddx requested a review from psxjoy November 28, 2025 01:53

Merge branch 'main' into feat-666

e044e1d

doc: add line breaks for better readability in parameter documentation

1c9f145

delei approved these changes Dec 9, 2025

View reviewed changes

delei merged commit a501139 into apache:main Dec 9, 2025
11 checks passed

GOODBOY008 mentioned this pull request Jan 3, 2026

refactor: replace FastExcel with FesodSheet in header merge strategy #772

Merged

Uh oh!

Conversation

liugddx commented Nov 3, 2025

Uh oh!

liugddx commented Nov 4, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

psxjoy commented Nov 5, 2025

Uh oh!

psxjoy commented Nov 12, 2025

Uh oh!

liugddx commented Nov 12, 2025

Uh oh!

psxjoy left a comment

Choose a reason for hiding this comment

Uh oh!

psxjoy commented Nov 17, 2025

Uh oh!

psxjoy commented Nov 18, 2025

Uh oh!

liugddx commented Nov 22, 2025

Uh oh!

netlify Bot commented Nov 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

❌ Deploy Preview for fesod failed.

Uh oh!

delei commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

liugddx commented Dec 9, 2025

Uh oh!

delei left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

netlify Bot commented Nov 23, 2025 •

edited

Loading

delei commented Dec 8, 2025 •

edited

Loading