| @@ -56,17 +56,17 @@ https://oss.sonatype.org/content/repositories/snapshots/ | |||||
| <dependency> | <dependency> | ||||
| <groupId>org.jeecg</groupId> | <groupId>org.jeecg</groupId> | ||||
| <artifactId>easypoi-base</artifactId> | <artifactId>easypoi-base</artifactId> | ||||
| <version>2.1.5</version> | |||||
| <version>2.1.6</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>org.jeecg</groupId> | <groupId>org.jeecg</groupId> | ||||
| <artifactId>easypoi-web</artifactId> | <artifactId>easypoi-web</artifactId> | ||||
| <version>2.1.5</version> | |||||
| <version>2.1.6</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>org.jeecg</groupId> | <groupId>org.jeecg</groupId> | ||||
| <artifactId>easypoi-annotation</artifactId> | <artifactId>easypoi-annotation</artifactId> | ||||
| <version>2.1.5</version> | |||||
| <version>2.1.6</version> | |||||
| </dependency> | </dependency> | ||||
| ``` | ``` | ||||
| @@ -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修复,建议升级 | - 2.1.5 bug修复,建议升级 | ||||
| - fix指定sheetNum导入的bug | - fix指定sheetNum导入的bug | ||||
| - add导入时候setIndex(null) 可以防止识别为集合的问题 | - add导入时候setIndex(null) 可以防止识别为集合的问题 | ||||
| @@ -4,7 +4,7 @@ | |||||
| <parent> | <parent> | ||||
| <groupId>org.jeecg</groupId> | <groupId>org.jeecg</groupId> | ||||
| <artifactId>easypoi</artifactId> | <artifactId>easypoi</artifactId> | ||||
| <version>2.1.6-SNAPSHOT</version> | |||||
| <version>2.1.6</version> | |||||
| </parent> | </parent> | ||||
| <artifactId>easypoi-annotation</artifactId> | <artifactId>easypoi-annotation</artifactId> | ||||
| <description>基础注解类,解耦合</description> | <description>基础注解类,解耦合</description> | ||||
| @@ -4,7 +4,7 @@ | |||||
| <parent> | <parent> | ||||
| <groupId>org.jeecg</groupId> | <groupId>org.jeecg</groupId> | ||||
| <artifactId>easypoi</artifactId> | <artifactId>easypoi</artifactId> | ||||
| <version>2.1.6-SNAPSHOT</version> | |||||
| <version>2.1.6</version> | |||||
| </parent> | </parent> | ||||
| <artifactId>easypoi-base</artifactId> | <artifactId>easypoi-base</artifactId> | ||||
| <dependencies> | <dependencies> | ||||
| @@ -448,6 +448,9 @@ public final class PoiPublicUtil { | |||||
| String[] tempArr; | String[] tempArr; | ||||
| for (String str : arr) { | for (String str : arr) { | ||||
| tempArr = str.split("_"); | tempArr = str.split("_"); | ||||
| if(tempArr == null || tempArr.length < 2){ | |||||
| return defalut; | |||||
| } | |||||
| if (targetId.equals(tempArr[1])) { | if (targetId.equals(tempArr[1])) { | ||||
| return tempArr[0]; | return tempArr[0]; | ||||
| } | } | ||||
| @@ -4,7 +4,7 @@ | |||||
| <parent> | <parent> | ||||
| <groupId>org.jeecg</groupId> | <groupId>org.jeecg</groupId> | ||||
| <artifactId>easypoi</artifactId> | <artifactId>easypoi</artifactId> | ||||
| <version>2.1.6-SNAPSHOT</version> | |||||
| <version>2.1.6</version> | |||||
| </parent> | </parent> | ||||
| <artifactId>easypoi-web</artifactId> | <artifactId>easypoi-web</artifactId> | ||||
| <dependencies> | <dependencies> | ||||
| @@ -3,7 +3,7 @@ | |||||
| <modelVersion>4.0.0</modelVersion> | <modelVersion>4.0.0</modelVersion> | ||||
| <groupId>org.jeecg</groupId> | <groupId>org.jeecg</groupId> | ||||
| <artifactId>easypoi</artifactId> | <artifactId>easypoi</artifactId> | ||||
| <version>2.1.6-SNAPSHOT</version> | |||||
| <version>2.1.6</version> | |||||
| <packaging>pom</packaging> | <packaging>pom</packaging> | ||||
| <name>easypoi</name> | <name>easypoi</name> | ||||
| <modules> | <modules> | ||||
| @@ -38,7 +38,7 @@ | |||||
| </developers> | </developers> | ||||
| <properties> | <properties> | ||||
| <sub.version>2.1.6-SNAPSHOT</sub.version> | |||||
| <sub.version>2.1.6</sub.version> | |||||
| <poi.version>3.9</poi.version> | <poi.version>3.9</poi.version> | ||||
| <xerces.version>2.9.1</xerces.version> | <xerces.version>2.9.1</xerces.version> | ||||
| <guava.version>16.0.1</guava.version> | <guava.version>16.0.1</guava.version> | ||||