| @@ -11,7 +11,7 @@ EasyPoi Excel和 Word简易工具类 | |||||
| [测试项目](http://git.oschina.net/jueyue/easypoi-test): http://git.oschina.net/jueyue/easypoi-test | [测试项目](http://git.oschina.net/jueyue/easypoi-test): http://git.oschina.net/jueyue/easypoi-test | ||||
| !!!2.1.6-SNAPSHOT 版本开始和之前的版本校验不兼用,使用hibernate的校验,删除了之前的注解,请注意 | |||||
| !!!2.1.6 版本开始和之前的版本校验不兼用,使用hibernate的校验,删除了之前的注解,请注意 | |||||
| --------------------------- | --------------------------- | ||||
| EasyPoi的主要特点 | EasyPoi的主要特点 | ||||
| @@ -122,7 +122,7 @@ EasyPoi 模板 表达式支持 | |||||
| -------------------------- | -------------------------- | ||||
| pom说明 | pom说明 | ||||
| -------------------------- | -------------------------- | ||||
| word和sax读取的时候才使用,就不是必须的了,请手动引用 | |||||
| word和sax读取的时候才使用,就不是必须的了,请手动引用,hibernate的校验也是可选的 | |||||
| ```xml | ```xml | ||||
| <!-- sax 读取时候用到的 --> | <!-- sax 读取时候用到的 --> | ||||
| <dependency> | <dependency> | ||||
| @@ -137,6 +137,13 @@ word和sax读取的时候才使用,就不是必须的了,请手动引用 | |||||
| <version>${poi.version}</version> | <version>${poi.version}</version> | ||||
| <optional>true</optional> | <optional>true</optional> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | |||||
| <groupId>org.hibernate</groupId> | |||||
| <artifactId>hibernate-validator</artifactId> | |||||
| <version>5.1.3.Final</version> | |||||
| <optional>true</optional> | |||||
| </dependency> | |||||
| ``` | ``` | ||||
| -------------------------- | -------------------------- | ||||
| @@ -4,7 +4,7 @@ | |||||
| <parent> | <parent> | ||||
| <groupId>org.jeecg</groupId> | <groupId>org.jeecg</groupId> | ||||
| <artifactId>easypoi</artifactId> | <artifactId>easypoi</artifactId> | ||||
| <version>2.1.6</version> | |||||
| <version>2.1.7-SNAPSHOT</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</version> | |||||
| <version>2.1.7-SNAPSHOT</version> | |||||
| </parent> | </parent> | ||||
| <artifactId>easypoi-base</artifactId> | <artifactId>easypoi-base</artifactId> | ||||
| <dependencies> | <dependencies> | ||||
| @@ -416,8 +416,11 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { | |||||
| //所有的cell创建一遍 | //所有的cell创建一遍 | ||||
| for (int i = 0; i < rowspan; i++) { | for (int i = 0; i < rowspan; i++) { | ||||
| for (int j = columnIndex, max = columnIndex + colspan; j < max; j++) { | for (int j = columnIndex, max = columnIndex + colspan; j < max; j++) { | ||||
| if (row.getCell(j) == null) | |||||
| if (row.getCell(j) == null){ | |||||
| row.createCell(j); | row.createCell(j); | ||||
| row.getCell(j).setCellStyle(row.getRowNum() % 2 == 0 ? getStyles(false, null) : getStyles(true, null)); | |||||
| } | |||||
| } | } | ||||
| if (i < rowspan - 1) { | if (i < rowspan - 1) { | ||||
| row = row.getSheet().getRow(row.getRowNum() + 1); | row = row.getSheet().getRow(row.getRowNum() + 1); | ||||
| @@ -4,7 +4,7 @@ | |||||
| <parent> | <parent> | ||||
| <groupId>org.jeecg</groupId> | <groupId>org.jeecg</groupId> | ||||
| <artifactId>easypoi</artifactId> | <artifactId>easypoi</artifactId> | ||||
| <version>2.1.6</version> | |||||
| <version>2.1.7-SNAPSHOT</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</version> | |||||
| <version>2.1.7-SNAPSHOT</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</sub.version> | |||||
| <sub.version>2.1.7-SNAPSHOT</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> | ||||
| @@ -150,6 +150,7 @@ | |||||
| <groupId>com.itextpdf</groupId> | <groupId>com.itextpdf</groupId> | ||||
| <artifactId>itext-asian</artifactId> | <artifactId>itext-asian</artifactId> | ||||
| <version>5.2.0</version> | <version>5.2.0</version> | ||||
| <optional>true</optional> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||