From c6929248588e6f883b0635f30ce366ea3266673e Mon Sep 17 00:00:00 2001 From: jueyue Date: Thu, 26 Nov 2015 00:26:31 +0800 Subject: [PATCH] =?UTF-8?q?2.1.6=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 15 ++++++++++++--- easypoi-annotation/pom.xml | 2 +- easypoi-base/pom.xml | 2 +- .../jeecgframework/poi/util/PoiPublicUtil.java | 3 +++ easypoi-web/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index fc65cf6..203264b 100644 --- a/README.md +++ b/README.md @@ -56,17 +56,17 @@ https://oss.sonatype.org/content/repositories/snapshots/ org.jeecg easypoi-base - 2.1.5 + 2.1.6 org.jeecg easypoi-web - 2.1.5 + 2.1.6 org.jeecg easypoi-annotation - 2.1.5 + 2.1.6 ``` @@ -143,6 +143,15 @@ word和sax读取的时候才使用,就不是必须的了,请手动引用 版本修改 -------------------------- + - 2.1.6 校验规则不向下兼容,升级请自行考虑 + - 其实不想升的,不过有必要的bug要修复,所以就先生上来吧 + - 升级交易为hibernate校验,hibernate的maven自己配置可选 + - WORD的Excel遍历 的Row,改为Insert Row + - 修复了font的数组越界 + - 修复targetId的数组越界 + - 修复多行模板导出的bug + - 增加了验证Excel的功能 + - 2.1.5 bug修复,建议升级 - fix指定sheetNum导入的bug - add导入时候setIndex(null) 可以防止识别为集合的问题 diff --git a/easypoi-annotation/pom.xml b/easypoi-annotation/pom.xml index ff57c11..c41992d 100644 --- a/easypoi-annotation/pom.xml +++ b/easypoi-annotation/pom.xml @@ -4,7 +4,7 @@ org.jeecg easypoi - 2.1.6-SNAPSHOT + 2.1.6 easypoi-annotation 基础注解类,解耦合 diff --git a/easypoi-base/pom.xml b/easypoi-base/pom.xml index 5b01e9b..dbcd279 100644 --- a/easypoi-base/pom.xml +++ b/easypoi-base/pom.xml @@ -4,7 +4,7 @@ org.jeecg easypoi - 2.1.6-SNAPSHOT + 2.1.6 easypoi-base diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java index 6ce816b..a33aaa4 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java @@ -448,6 +448,9 @@ public final class PoiPublicUtil { String[] tempArr; for (String str : arr) { tempArr = str.split("_"); + if(tempArr == null || tempArr.length < 2){ + return defalut; + } if (targetId.equals(tempArr[1])) { return tempArr[0]; } diff --git a/easypoi-web/pom.xml b/easypoi-web/pom.xml index 12eb37a..0b2d112 100644 --- a/easypoi-web/pom.xml +++ b/easypoi-web/pom.xml @@ -4,7 +4,7 @@ org.jeecg easypoi - 2.1.6-SNAPSHOT + 2.1.6 easypoi-web diff --git a/pom.xml b/pom.xml index 709b8e1..2da0f67 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.jeecg easypoi - 2.1.6-SNAPSHOT + 2.1.6 pom easypoi @@ -38,7 +38,7 @@ - 2.1.6-SNAPSHOT + 2.1.6 3.9 2.9.1 16.0.1