Merge pull request #382 from liaochong/Hotfix/4.3.0.RC1

Hotfix/4.3.0.rc1
liaochong · Sep 20, 2022 · d8fa549 · d8fa549
2 parents 608ce14 + eec1703
commit d8fa549
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>com.github.liaochong</groupId>
     <artifactId>myexcel</artifactId>
-    <version>4.3.0.RC</version>
+    <version>4.3.0.RC1</version>
     <packaging>jar</packaging>
 
     <name>myexcel</name>
@@ -22,8 +22,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <poi.version>5.2.2</poi.version>
-        <jsoup.version>1.15.2</jsoup.version>
+        <poi.version>5.2.3</poi.version>
+        <jsoup.version>1.15.3</jsoup.version>
         <lombok.version>1.18.22</lombok.version>
         <beetl.version>3.9.0.RELEASE</beetl.version>
         <velocity.version>2.3</velocity.version>

diff --git a/src/main/java/com/github/liaochong/myexcel/core/AbstractExcelFactory.java b/src/main/java/com/github/liaochong/myexcel/core/AbstractExcelFactory.java
@@ -150,7 +150,7 @@ public abstract class AbstractExcelFactory implements ExcelFactory {
     /**
      * 暂存单元格，由后续行认领
      */
-    private final List<Td> stagingTds = new LinkedList<>();
+    protected List<Td> stagingTds = new LinkedList<>();
 
     private CreationHelper createHelper;
 

diff --git a/src/main/java/com/github/liaochong/myexcel/core/HtmlToExcelFactory.java b/src/main/java/com/github/liaochong/myexcel/core/HtmlToExcelFactory.java
@@ -30,6 +30,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.NoSuchFileException;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -252,6 +253,7 @@ private void setTdOfTable(Table table, Sheet sheet) {
             this.createRow(tr, sheet);
             tr.tdList = null;
         }
+        stagingTds = new LinkedList<>();
         table.trList = null;
         this.setColWidth(colMaxWidthMap, sheet, maxColIndex);
     }