-
Notifications
You must be signed in to change notification settings - Fork 487
feature: support multi-rows loop filling and merge strategies #842
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.
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
bengbengbalabalabeng
wants to merge
8
commits into
apache:main
Choose a base branch
from
bengbengbalabalabeng:feature-issues-836
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
9dc4e9e
feature: support multi-row loop filling with merge strategies
bengbengbalabalabeng a989a16
fix: correct errors when combining collection and common data filling
bengbengbalabalabeng 873a019
refactor: adjust multi-row merge handling timing
bengbengbalabalabeng 7127ff9
docs: add document for loop filling merge strategies
bengbengbalabalabeng 5f7d288
refactor: trigger merge strategy within doFill before afterRowDispose
bengbengbalabalabeng ab370dd
Merge branch 'main' into feature-issues-836
alaahong 021944f
Merge branch 'main' into feature-issues-836
bengbengbalabalabeng 67a5bcc
refactor/docs: refine merge strategy logic and wording per partial Co…
bengbengbalabalabeng File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
44 changes: 44 additions & 0 deletions
44
fesod-sheet/src/main/java/org/apache/fesod/sheet/enums/FillMergeStrategy.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fesod.sheet.enums; | ||
|
|
||
| /** | ||
| * Strategy for handling merged regions during loop filling. | ||
| */ | ||
| public enum FillMergeStrategy { | ||
|
|
||
| /** | ||
| * Merged regions in the fill template will NOT be handled. | ||
| */ | ||
| NONE, | ||
|
|
||
| /** | ||
| * Automatically handling merged regions based on the fill template. | ||
| */ | ||
| AUTO, | ||
|
|
||
| /** | ||
| * Automatically handling merged regions and unifying the style using anchor cells based on the fill template. | ||
| * <p /> | ||
| * <b>Warning: Too many CellStyle instances may lead to performance issues and can exceed number of cell styles | ||
| * limits (64000 for .xlsx and 4000 for .xls).</b> | ||
| */ | ||
| MERGE_CELL_STYLE | ||
| } |
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Current merge replication will also re-add the template’s existing merged regions for the first loop item (offset 0), which can create duplicate merged regions in the sheet. It would be safer to skip adding merges when the computed offset is 0 and the merged region already exists, or de-duplicate against existing merged regions before calling
addMergedRegionUnsafe.