Merge branch 'alibaba:master' into master

README.md

@@ -1,5 +1,5 @@
 # 🔥作者最新开源项目[Chat2DB](https://github.com/alibaba/Chat2DB)
-[Chat2DB](https://github.com/alibaba/Chat2DB) 智能数据库客户端，比Navicat、DataGrip更智能，体验更好，永久免费无需破解。 GitHub地址 [https://github.com/alibaba/Chat2DB](https://github.com/alibaba/Chat2DB)
+[Chat2DB](https://github.com/alibaba/Chat2DB) 智能数据库客户端，数据报表工具，自然语言生成SQL，生成报表。 GitHub地址 [https://github.com/alibaba/Chat2DB](https://github.com/alibaba/Chat2DB)
 
 EasyExcel
 ======================
@@ -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 org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
+import java.io.File;
+import java.util.*;
 
 /**
  * @author Jiaju Zhuang
@@ -203,7 +194,9 @@ 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)
+                .sheet()
+                .includeColumnFieldNames(includeColumnFieldNames)
                 .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());

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,19 +705,6 @@ public class WriteTest {
         EasyExcel.write(fileName).head(head()).sheet("模板").doWrite(dataList());
     }
 
-    @Test
-    public void sheetCol(){
-        String fileName = TestFileUtil.getPath() + "customCol" + System.currentTimeMillis() + ".xlsx";
-        try (ExcelWriter excelWriter = EasyExcel.write(fileName, DemoData.class).includeColumnFieldNames(Arrays.asList("string","date","doubleData")).build()) {
-            // 把sheet设置为不需要头 不然会输出sheet的头 这样看起来第一个table 就有2个头了
-            WriteSheet writeSheet = EasyExcel.writerSheet("模板").includeColumnFieldNames(Arrays.asList("string","date")).build();
-            excelWriter.write(data(), writeSheet);
-            writeSheet = EasyExcel.writerSheet(1,"模板1").needHead(false).build();
-            // 第二次写如也会创建头，然后在第一次的后面写入数据
-            WriteTable string = EasyExcel.writerTable().needHead(true).includeColumnFieldNames(Arrays.asList("string")).build();
-            excelWriter.write(data(),writeSheet,string);
-        }
-    }
     private List<LongestMatchColumnWidthData> dataLong() {
         List<LongestMatchColumnWidthData> list = ListUtils.newArrayList();
         for (int i = 0; i < 10; i++) {

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
 
 * 修改版本发布问题