Browse Source

发布4.2.0版本

master
jueyue 4 years ago
parent
commit
202aa3fe42
10 changed files with 31 additions and 23 deletions
  1. +4
    -4
      README-cn.md
  2. +4
    -4
      README.md
  3. +1
    -1
      easypoi-annotation/pom.xml
  4. +1
    -1
      easypoi-base/pom.xml
  5. +1
    -1
      easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java
  6. +7
    -7
      easypoi-base/src/main/java/cn/afterturn/easypoi/excel/html/helper/MergedRegionHelper.java
  7. +1
    -1
      easypoi-web/pom.xml
  8. +1
    -1
      easypoi-wps/pom.xml
  9. +9
    -1
      history-cn.md
  10. +2
    -2
      pom.xml

+ 4
- 4
README-cn.md View File

@@ -134,22 +134,22 @@ https://oss.sonatype.org/content/groups/public/
<dependency> <dependency>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi-spring-boot-starter</artifactId> <artifactId>easypoi-spring-boot-starter</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId> <artifactId>easypoi-base</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi-web</artifactId> <artifactId>easypoi-web</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId> <artifactId>easypoi-annotation</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
</dependency> </dependency>
``` ```


+ 4
- 4
README.md View File

@@ -161,22 +161,22 @@ https://oss.sonatype.org/content/groups/public/
<dependency> <dependency>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi-spring-boot-starter</artifactId> <artifactId>easypoi-spring-boot-starter</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId> <artifactId>easypoi-base</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi-web</artifactId> <artifactId>easypoi-web</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId> <artifactId>easypoi-annotation</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
</dependency> </dependency>
``` ```


+ 1
- 1
easypoi-annotation/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi</artifactId> <artifactId>easypoi</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
</parent> </parent>
<artifactId>easypoi-annotation</artifactId> <artifactId>easypoi-annotation</artifactId>
<description>base annotation</description> <description>base annotation</description>

+ 1
- 1
easypoi-base/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi</artifactId> <artifactId>easypoi</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
</parent> </parent>
<artifactId>easypoi-base</artifactId> <artifactId>easypoi-base</artifactId>
<dependencies> <dependencies>


+ 1
- 1
easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java View File

@@ -175,7 +175,7 @@ public final class ExcelExportOfTemplateUtil extends BaseExportService {
private ExcelForEachParams getIndexColumn(List<ExcelForEachParams> columns) { private ExcelForEachParams getIndexColumn(List<ExcelForEachParams> columns) {
for (int i = 0; i < columns.size(); i++) { for (int i = 0; i < columns.size(); i++) {
if (INDEX.equals(columns.get(i).getConstValue())) {
if (columns.get(i) != null && INDEX.equals(columns.get(i).getConstValue())) {
columns.get(i).setConstValue("1"); columns.get(i).setConstValue("1");
return columns.get(i); return columns.get(i);
} }


+ 7
- 7
easypoi-base/src/main/java/cn/afterturn/easypoi/excel/html/helper/MergedRegionHelper.java View File

@@ -105,13 +105,6 @@ public class MergedRegionHelper {
public void shiftRows(Sheet sheet, int rowIndex, int size, int shiftRows) { public void shiftRows(Sheet sheet, int rowIndex, int size, int shiftRows) {
Set<String> keys = new HashSet<String>(); Set<String> keys = new HashSet<String>();
keys.addAll(mergedCache.keySet()); keys.addAll(mergedCache.keySet());
//删除掉原始的缓存KEY
for (String key : keys) {
String[] temp = key.split("_");
if (Integer.parseInt(temp[0]) >= rowIndex + size && Integer.parseInt(temp[0]) <= rowIndex + size + shiftRows) {
mergedCache.remove(key);
}
}
for (String key : keys) { for (String key : keys) {
String[] temp = key.split("_"); String[] temp = key.split("_");
if (Integer.parseInt(temp[0]) >= rowIndex) { if (Integer.parseInt(temp[0]) >= rowIndex) {
@@ -132,6 +125,13 @@ public class MergedRegionHelper {
} }
} }
} }
//删除掉原始的缓存KEY
for (String key : keys) {
String[] temp = key.split("_");
if (Integer.parseInt(temp[0]) >= rowIndex + size && Integer.parseInt(temp[0]) <= rowIndex + size + shiftRows) {
mergedCache.remove(key);
}
}
} }
} }

+ 1
- 1
easypoi-web/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi</artifactId> <artifactId>easypoi</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
</parent> </parent>
<artifactId>easypoi-web</artifactId> <artifactId>easypoi-web</artifactId>
<dependencies> <dependencies>


+ 1
- 1
easypoi-wps/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi</artifactId> <artifactId>easypoi</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
</parent> </parent>
<artifactId>easypoi-wps</artifactId> <artifactId>easypoi-wps</artifactId>
<dependencies> <dependencies>


+ 9
- 1
history-cn.md View File

@@ -2,7 +2,15 @@
-------------------------- --------------------------
版本修改 版本修改
-------------------------- --------------------------
- 4.1.3
- 4.2.0
- 增加wps模块
- 模板添加了index常量列
- 修复横向迭代的时候,合并问题
- 添加XLSX水印工具类
- 修复 SAX SheetHandler 特殊情境下导致列错位
- 横向循环的时候同步宽度设置
- 注解支持生成下拉选择
- 4.1.3
- csv导出模式修改为write - csv导出模式修改为write
- 4.1.2 - 4.1.2
- 修复shift时候最后一行问题 - 修复shift时候最后一行问题


+ 2
- 2
pom.xml View File

@@ -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>4.1.3</version>
<version>4.2.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>easypoi</name> <name>easypoi</name>
<modules> <modules>
@@ -46,7 +46,7 @@
</organization> </organization>


<properties> <properties>
<sub.version>4.1.3</sub.version>
<sub.version>4.2.0</sub.version>
<poi.version>4.1.1</poi.version> <poi.version>4.1.1</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>


Loading…
Cancel
Save