diff --git a/README-cn.md b/README-cn.md index c3ae846..5775cb7 100644 --- a/README-cn.md +++ b/README-cn.md @@ -134,22 +134,22 @@ https://oss.sonatype.org/content/groups/public/ cn.afterturn easypoi-spring-boot-starter - 4.1.3 + 4.2.0 cn.afterturn easypoi-base - 4.1.3 + 4.2.0 cn.afterturn easypoi-web - 4.1.3 + 4.2.0 cn.afterturn easypoi-annotation - 4.1.3 + 4.2.0 ``` diff --git a/README.md b/README.md index 37934e6..f3e4f61 100644 --- a/README.md +++ b/README.md @@ -161,22 +161,22 @@ https://oss.sonatype.org/content/groups/public/ cn.afterturn easypoi-spring-boot-starter - 4.1.3 + 4.2.0 cn.afterturn easypoi-base - 4.1.3 + 4.2.0 cn.afterturn easypoi-web - 4.1.3 + 4.2.0 cn.afterturn easypoi-annotation - 4.1.3 + 4.2.0 ``` diff --git a/easypoi-annotation/pom.xml b/easypoi-annotation/pom.xml index fe598d3..c23a631 100644 --- a/easypoi-annotation/pom.xml +++ b/easypoi-annotation/pom.xml @@ -4,7 +4,7 @@ cn.afterturn easypoi - 4.1.3 + 4.2.0 easypoi-annotation base annotation diff --git a/easypoi-base/pom.xml b/easypoi-base/pom.xml index 76100a3..72f3765 100644 --- a/easypoi-base/pom.xml +++ b/easypoi-base/pom.xml @@ -4,7 +4,7 @@ cn.afterturn easypoi - 4.1.3 + 4.2.0 easypoi-base diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java index 5acf4ad..34a9d26 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java @@ -175,7 +175,7 @@ public final class ExcelExportOfTemplateUtil extends BaseExportService { private ExcelForEachParams getIndexColumn(List columns) { for (int i = 0; i < columns.size(); i++) { - if (INDEX.equals(columns.get(i).getConstValue())) { + if (columns.get(i) != null && INDEX.equals(columns.get(i).getConstValue())) { columns.get(i).setConstValue("1"); return columns.get(i); } diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/html/helper/MergedRegionHelper.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/html/helper/MergedRegionHelper.java index b38b6be..1fd6b6c 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/html/helper/MergedRegionHelper.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/html/helper/MergedRegionHelper.java @@ -105,13 +105,6 @@ public class MergedRegionHelper { public void shiftRows(Sheet sheet, int rowIndex, int size, int shiftRows) { Set keys = new HashSet(); keys.addAll(mergedCache.keySet()); - //删除掉原始的缓存KEY - for (String key : keys) { - String[] temp = key.split("_"); - if (Integer.parseInt(temp[0]) >= rowIndex + size && Integer.parseInt(temp[0]) <= rowIndex + size + shiftRows) { - mergedCache.remove(key); - } - } for (String key : keys) { String[] temp = key.split("_"); if (Integer.parseInt(temp[0]) >= rowIndex) { @@ -132,6 +125,13 @@ public class MergedRegionHelper { } } } + //删除掉原始的缓存KEY + for (String key : keys) { + String[] temp = key.split("_"); + if (Integer.parseInt(temp[0]) >= rowIndex + size && Integer.parseInt(temp[0]) <= rowIndex + size + shiftRows) { + mergedCache.remove(key); + } + } } } diff --git a/easypoi-web/pom.xml b/easypoi-web/pom.xml index 2d4fb2e..df81213 100644 --- a/easypoi-web/pom.xml +++ b/easypoi-web/pom.xml @@ -4,7 +4,7 @@ cn.afterturn easypoi - 4.1.3 + 4.2.0 easypoi-web diff --git a/easypoi-wps/pom.xml b/easypoi-wps/pom.xml index f22e4b4..2b1e3b9 100644 --- a/easypoi-wps/pom.xml +++ b/easypoi-wps/pom.xml @@ -4,7 +4,7 @@ cn.afterturn easypoi - 4.1.3 + 4.2.0 easypoi-wps diff --git a/history-cn.md b/history-cn.md index 002370d..cff8ca2 100644 --- a/history-cn.md +++ b/history-cn.md @@ -2,7 +2,15 @@ -------------------------- 版本修改 -------------------------- - - 4.1.3 + - 4.2.0 + - 增加wps模块 + - 模板添加了index常量列 + - 修复横向迭代的时候,合并问题 + - 添加XLSX水印工具类 + - 修复 SAX SheetHandler 特殊情境下导致列错位 + - 横向循环的时候同步宽度设置 + - 注解支持生成下拉选择 + - 4.1.3 - csv导出模式修改为write - 4.1.2 - 修复shift时候最后一行问题 diff --git a/pom.xml b/pom.xml index dcc2a8e..067962c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.afterturn easypoi - 4.1.3 + 4.2.0 pom easypoi @@ -46,7 +46,7 @@ - 4.1.3 + 4.2.0 4.1.1 2.9.1 16.0.1