Skip to content
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

for issue 5248 加强继承扩展便利性 #99

Merged
merged 2 commits into from
Jan 7, 2024
Merged

for issue 5248 加强继承扩展便利性 #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
738e754
---author:chenrui---date:2024/1/3-----for:[issue/#5248]加强继承扩展便利性---
Jan 3, 2024
a20b023
Merge branch 'master' into issue/#5248
zhangdaiscott Jan 7, 2024
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
4 changes: 3 additions & 1 deletion autopoi/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
* @version 1.0
* @date 2013-10-17
*/
public final class ExcelExportUtil {
//update-begin---author:chenrui ---date:20231221 for：[issue/#5248]加强继承扩展便利性(删除final)------------
public class ExcelExportUtil {
//update-end---author:chenrui ---date:20231221 for：[issue/#5248]加强继承扩展便利性(删除final)------------
//update-begin---author:liusq Date:20211217 for：[LOWCOD-2521]【autopoi】大数据导出方法【全局】----
//单sheet最大值
public static int USE_SXSSF_LIMIT = 100000;
Expand Down
4 changes: 4 additions & 0 deletions autopoi/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.lang.annotation.Inherited;

/**
* Excel 导出基本注释
Expand All @@ -28,6 +29,9 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
//update-begin---author:chenrui ---date:20231221 for：[issue/#5248]加强继承扩展便利性------------
@Inherited
//update-end---author:chenrui ---date:20231221 for：[issue/#5248]加强继承扩展便利性------------
public @interface Excel {

/**
Expand Down
7 changes: 6 additions & 1 deletion docs/修改日志.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,9 @@ org\jeecgframework\poi\excel\imports\ExcelImportServer.java
autopoi/src/main/java/org/jeecgframework/poi/excel/html/helper/MergedRegionHelper.java
autopoi-web/src/test/java/DaoChuTest.java
autopoi-web/src/test/resources/templates/testNextMarge.xlsx
---author:chenrui---date:2024/1/2-----for:[issue/5167]遍历单元格次行原本的合并缓存未正确删除导致最终输出合并样式有问题---
---author:chenrui---date:2024/1/2-----for:[issue/5167]遍历单元格次行原本的合并缓存未正确删除导致最终输出合并样式有问题---

---author:chenrui---date:2024/1/3-----for:[issue/#5248]加强继承扩展便利性---
autopoi/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java
autopoi/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java
---author:chenrui---date:2024/1/3-----for:[issue/#5248]加强继承扩展便利性---