From 8cb627428e4b5f2b5b39c6fcacc5ac4e71990960 Mon Sep 17 00:00:00 2001 From: jueyue Date: Thu, 26 Nov 2015 21:55:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B02.1.7-SNAPSHOT?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=96=B0=E7=9A=84=E5=BE=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 +++++++++-- easypoi-annotation/pom.xml | 2 +- easypoi-base/pom.xml | 2 +- .../export/template/ExcelExportOfTemplateUtil.java | 5 ++++- easypoi-web/pom.xml | 2 +- pom.xml | 5 +++-- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 203264b..79fb8b6 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ EasyPoi Excel和 Word简易工具类 [测试项目](http://git.oschina.net/jueyue/easypoi-test): http://git.oschina.net/jueyue/easypoi-test -!!!2.1.6-SNAPSHOT 版本开始和之前的版本校验不兼用,使用hibernate的校验,删除了之前的注解,请注意 +!!!2.1.6 版本开始和之前的版本校验不兼用,使用hibernate的校验,删除了之前的注解,请注意 --------------------------- EasyPoi的主要特点 @@ -122,7 +122,7 @@ EasyPoi 模板 表达式支持 -------------------------- pom说明 -------------------------- -word和sax读取的时候才使用,就不是必须的了,请手动引用 +word和sax读取的时候才使用,就不是必须的了,请手动引用,hibernate的校验也是可选的 ```xml @@ -137,6 +137,13 @@ word和sax读取的时候才使用,就不是必须的了,请手动引用 ${poi.version} true + + + org.hibernate + hibernate-validator + 5.1.3.Final + true + ``` -------------------------- diff --git a/easypoi-annotation/pom.xml b/easypoi-annotation/pom.xml index c41992d..49bc06f 100644 --- a/easypoi-annotation/pom.xml +++ b/easypoi-annotation/pom.xml @@ -4,7 +4,7 @@ org.jeecg easypoi - 2.1.6 + 2.1.7-SNAPSHOT easypoi-annotation 基础注解类,解耦合 diff --git a/easypoi-base/pom.xml b/easypoi-base/pom.xml index dbcd279..1b7d006 100644 --- a/easypoi-base/pom.xml +++ b/easypoi-base/pom.xml @@ -4,7 +4,7 @@ org.jeecg easypoi - 2.1.6 + 2.1.7-SNAPSHOT easypoi-base diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java index 6ad92f3..a17c44b 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java @@ -416,8 +416,11 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { //所有的cell创建一遍 for (int i = 0; i < rowspan; i++) { for (int j = columnIndex, max = columnIndex + colspan; j < max; j++) { - if (row.getCell(j) == null) + if (row.getCell(j) == null){ row.createCell(j); + row.getCell(j).setCellStyle(row.getRowNum() % 2 == 0 ? getStyles(false, null) : getStyles(true, null)); + } + } if (i < rowspan - 1) { row = row.getSheet().getRow(row.getRowNum() + 1); diff --git a/easypoi-web/pom.xml b/easypoi-web/pom.xml index 0b2d112..1032331 100644 --- a/easypoi-web/pom.xml +++ b/easypoi-web/pom.xml @@ -4,7 +4,7 @@ org.jeecg easypoi - 2.1.6 + 2.1.7-SNAPSHOT easypoi-web diff --git a/pom.xml b/pom.xml index 2da0f67..64d8b89 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.jeecg easypoi - 2.1.6 + 2.1.7-SNAPSHOT pom easypoi @@ -38,7 +38,7 @@ - 2.1.6 + 2.1.7-SNAPSHOT 3.9 2.9.1 16.0.1 @@ -150,6 +150,7 @@ com.itextpdf itext-asian 5.2.0 + true