Merge branch 'master' into testcase

README.md

@@ -31,7 +31,7 @@ easyexcel重写了poi对07版Excel的解析，一个3M的excel用POI sax解析
 <dependency>
     <groupId>com.alibaba</groupId>
     <artifactId>easyexcel</artifactId>
-    <version>3.3.1</version>
+    <version>3.3.2</version>
 </dependency>
 ```
 
@@ -105,7 +105,8 @@ easyexcel重写了poi对07版Excel的解析，一个3M的excel用POI sax解析
 [钉钉7群（已满）: 35235427](https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=ding532b9018c06c7fc8660273c4b78e6440&167fb=ed003&cbdbhh=qwertyuiop)  
 [钉钉8群（已满）: 44752220](https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=dingea96808beee421693fd4ba7542d6e5da&0380092a-fa46=a6a40905-7951&cbdbhh=qwertyuiop)   
 [钉钉9群（已满）: 11045002277](https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=dinge338d2215891c0459c13cd6b2cb108a6&6972d=b92f9&cbdbhh=qwertyuiop)   
-[钉钉10群: 27360019755](https://qr.dingtalk.com/action/joingroup?code=v1,k1,v25LHn2liWmrWUKlkhIzOTcK7s7onp/sZP8mO5oIYSs=&_dt_no_comment=1&origin=11)
+[钉钉10群(已满): 27360019755](https://qr.dingtalk.com/action/joingroup?code=v1,k1,v25LHn2liWmrWUKlkhIzOTcK7s7onp/sZP8mO5oIYSs=&_dt_no_comment=1&origin=11)   
+[钉钉11群:24330026964](https://qr.dingtalk.com/action/joingroup?code=v1,k1,63PjvTncu81oQ3X6XmGEJqnwQHCQxi/jaVlbUStq79o=&_dt_no_comment=1&origin=11)
 
 # 维护者
 

easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java

@@ -1,20 +1,11 @@
 package com.alibaba.easyexcel.test.core.excludeorinclude;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.alibaba.easyexcel.test.util.TestFileUtil;
 import com.alibaba.excel.EasyExcel;
+import org.junit.jupiter.api.*;
 
-import org.junit.jupiter.api.Assertions;
+import java.io.File;
-import org.junit.jupiter.api.BeforeAll;
+import java.util.*;
-import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
 
 /**
  * @author Jiaju Zhuang
@@ -159,7 +150,7 @@ public class ExcludeOrIncludeDataTest {
         excludeColumnIndexes.add(0);
         excludeColumnIndexes.add(3);
         EasyExcel.write(file, ExcludeOrIncludeData.class).excludeColumnIndexes(excludeColumnIndexes).sheet()
-            .doWrite(data());
+                .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());
         Map<Integer, String> record = dataMap.get(0);
@@ -175,7 +166,7 @@ public class ExcludeOrIncludeDataTest {
         excludeColumnFieldNames.add("column3");
         excludeColumnFieldNames.add("column4");
         EasyExcel.write(file, ExcludeOrIncludeData.class).excludeColumnFieldNames(excludeColumnFieldNames).sheet()
-            .doWrite(data());
+                .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());
         Map<Integer, String> record = dataMap.get(0);
@@ -189,7 +180,7 @@ public class ExcludeOrIncludeDataTest {
         includeColumnIndexes.add(1);
         includeColumnIndexes.add(2);
         EasyExcel.write(file, ExcludeOrIncludeData.class).includeColumnIndexes(includeColumnIndexes).sheet()
-            .doWrite(data());
+                .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());
         Map<Integer, String> record = dataMap.get(0);
@@ -203,8 +194,10 @@ public class ExcludeOrIncludeDataTest {
         Set<String> includeColumnFieldNames = new HashSet<String>();
         includeColumnFieldNames.add("column2");
         includeColumnFieldNames.add("column3");
-        EasyExcel.write(file, ExcludeOrIncludeData.class).includeColumnFieldNames(includeColumnFieldNames).sheet()
+        EasyExcel.write(file, ExcludeOrIncludeData.class)
-            .doWrite(data());
+                .sheet()
+                .includeColumnFieldNames(includeColumnFieldNames)
+                .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());
         Map<Integer, String> record = dataMap.get(0);
@@ -220,10 +213,10 @@ public class ExcludeOrIncludeDataTest {
         includeColumnIndexes.add(2);
         includeColumnIndexes.add(0);
         EasyExcel.write(file, ExcludeOrIncludeData.class)
-            .includeColumnIndexes(includeColumnIndexes)
+                .includeColumnIndexes(includeColumnIndexes)
-            .orderByIncludeColumn(true).
+                .orderByIncludeColumn(true).
-            sheet()
+                sheet()
-            .doWrite(data());
+                .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());
         Map<Integer, String> record = dataMap.get(0);
@@ -240,10 +233,10 @@ public class ExcludeOrIncludeDataTest {
         includeColumnFieldNames.add("column2");
         includeColumnFieldNames.add("column3");
         EasyExcel.write(file, ExcludeOrIncludeData.class)
-            .includeColumnFieldNames(includeColumnFieldNames)
+                .includeColumnFieldNames(includeColumnFieldNames)
-            .orderByIncludeColumn(true).
+                .orderByIncludeColumn(true).
-            sheet()
+                sheet()
-            .doWrite(data());
+                .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());
         Map<Integer, String> record = dataMap.get(0);

easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java

@@ -11,7 +11,6 @@ import java.util.List;
 import java.util.Set;
 
 import com.alibaba.easyexcel.test.core.head.ComplexHeadData;
-import com.alibaba.easyexcel.test.demo.read.ConverterData;
 import com.alibaba.easyexcel.test.util.TestFileUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
@@ -706,7 +705,6 @@ public class WriteTest {
         EasyExcel.write(fileName).head(head()).sheet("模板").doWrite(dataList());
     }
 
-
     /**
      * 数据验证自定义拦截器
      * <p>

pom.xml

@@ -20,7 +20,7 @@
 
 
     <properties>
-        <revision>3.3.1</revision>
+        <revision>3.3.2</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jdk.version>1.8</jdk.version>
         <gpg.skip>true</gpg.skip>

update.md

@@ -1,3 +1,7 @@
+# 3.3.2
+
+* 修复`includeColumnIndexes`和`includeColumnFieldNames`在sheet后面失效的问题
+
 # 3.3.1
 
 * 修改版本发布问题