| @@ -4,7 +4,7 @@ | |||||
| <parent> | <parent> | ||||
| <groupId>cn.afterturn</groupId> | <groupId>cn.afterturn</groupId> | ||||
| <artifactId>easypoi</artifactId> | <artifactId>easypoi</artifactId> | ||||
| <version>3.0.2-SNAPSHOT</version> | |||||
| <version>3.0.2</version> | |||||
| </parent> | </parent> | ||||
| <artifactId>easypoi-annotation</artifactId> | <artifactId>easypoi-annotation</artifactId> | ||||
| <description>基础注解类,解耦合</description> | <description>基础注解类,解耦合</description> | ||||
| @@ -4,7 +4,7 @@ | |||||
| <parent> | <parent> | ||||
| <groupId>cn.afterturn</groupId> | <groupId>cn.afterturn</groupId> | ||||
| <artifactId>easypoi</artifactId> | <artifactId>easypoi</artifactId> | ||||
| <version>3.0.2-SNAPSHOT</version> | |||||
| <version>3.0.2</version> | |||||
| </parent> | </parent> | ||||
| <artifactId>easypoi-base</artifactId> | <artifactId>easypoi-base</artifactId> | ||||
| <dependencies> | <dependencies> | ||||
| @@ -337,6 +337,9 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { | |||||
| Object t = its.next(); | Object t = its.next(); | ||||
| setForEeachRowCellValue(true, cell.getRow(), cell.getColumnIndex(), t, columns, map, | setForEeachRowCellValue(true, cell.getRow(), cell.getColumnIndex(), t, columns, map, | ||||
| rowspan, colspan, mergedRegionHelper); | rowspan, colspan, mergedRegionHelper); | ||||
| if(cell.getRow().getCell(cell.getColumnIndex() + colspan) == null){ | |||||
| cell.getRow().createCell(cell.getColumnIndex() + colspan); | |||||
| } | |||||
| cell = cell.getRow().getCell(cell.getColumnIndex() + colspan); | cell = cell.getRow().getCell(cell.getColumnIndex() + colspan); | ||||
| } | } | ||||
| if (isCreate) { | if (isCreate) { | ||||
| @@ -4,7 +4,7 @@ | |||||
| <parent> | <parent> | ||||
| <groupId>cn.afterturn</groupId> | <groupId>cn.afterturn</groupId> | ||||
| <artifactId>easypoi</artifactId> | <artifactId>easypoi</artifactId> | ||||
| <version>3.0.2-SNAPSHOT</version> | |||||
| <version>3.0.2</version> | |||||
| </parent> | </parent> | ||||
| <artifactId>easypoi-web</artifactId> | <artifactId>easypoi-web</artifactId> | ||||
| <dependencies> | <dependencies> | ||||
| @@ -2,6 +2,14 @@ | |||||
| -------------------------- | -------------------------- | ||||
| 版本修改 | 版本修改 | ||||
| -------------------------- | -------------------------- | ||||
| - 3.0.2 版本 新包名版本,看自己需求跟新 | |||||
| - word 遍历样式复制 | |||||
| - 导入校验返回增强 | |||||
| - 导入校验,校验组参数 | |||||
| - Excel--html图标不在单独生成 | |||||
| - Excel模板导出加入了图片支持 | |||||
| - 修复了dubbo处理问题 | |||||
| - 3.0.1 版本 新包名版本,看自己需求跟新 | - 3.0.1 版本 新包名版本,看自己需求跟新 | ||||
| - 加了一个numformat 属性,方便格式化数字 | - 加了一个numformat 属性,方便格式化数字 | ||||
| - 修复view 再特定情况无法找到的bug | - 修复view 再特定情况无法找到的bug | ||||
| @@ -3,7 +3,7 @@ | |||||
| <modelVersion>4.0.0</modelVersion> | <modelVersion>4.0.0</modelVersion> | ||||
| <groupId>cn.afterturn</groupId> | <groupId>cn.afterturn</groupId> | ||||
| <artifactId>easypoi</artifactId> | <artifactId>easypoi</artifactId> | ||||
| <version>3.0.2-SNAPSHOT</version> | |||||
| <version>3.0.2</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>3.0.2-SNAPSHOT</sub.version> | |||||
| <sub.version>3.0.2</sub.version> | |||||
| <poi.version>3.16</poi.version> | <poi.version>3.16</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> | ||||