Merge pull request #376 from liaochong/Hotfix/4.2.2

Hotfix/4.2.2

Author: liaochong

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.github.liaochong</groupId>
     <artifactId>myexcel</artifactId>
-    <version>4.2.1</version>
+    <version>4.2.2</version>
     <packaging>jar</packaging>
 
     <name>myexcel</name>

src/main/java/com/github/liaochong/myexcel/core/AbstractSimpleExcelBuilder.java

@@ -241,13 +241,11 @@ protected List<Tr> createThead() {
             }
             tdLists.add(tds);
         }
-
         // 调整rowSpan
         for (List<Td> tdList : tdLists) {
             Td last = tdList.get(tdList.size() - 1);
             last.setRowSpan(titleLevel - last.row);
         }
-
         // 调整colSpan
         for (int i = 0; i < titleLevel; i++) {
             int level = i;
@@ -300,15 +298,15 @@ protected List<Tr> createThead() {
         boolean isComputeAutoWidth = WidthStrategy.isComputeAutoWidth(configuration.widthStrategy);
         rowTds.forEach((k, v) -> {
             Tr tr = new Tr(k, configuration.titleRowHeight);
-            tr.colWidthMap = isComputeAutoWidth ? new HashMap<>(titles.size()) : Collections.emptyMap();
-            List<Td> tds = v.stream().sorted(Comparator.comparing(td -> td.col))
+            tr.colWidthMap = isComputeAutoWidth || !customWidthMap.isEmpty() ? new HashMap<>(titles.size()) : Collections.emptyMap();
+            tr.tdList = v.stream().sorted(Comparator.comparing(td -> td.col))
                     .peek(td -> {
                         if (isComputeAutoWidth) {
                             tr.colWidthMap.put(td.col, TdUtil.getStringWidth(td.content, 0.25));
                         }
                     })
                     .collect(Collectors.toList());
-            tr.tdList = tds;
+            tr.colWidthMap.putAll(customWidthMap);
             trs.add(tr);
         });
         return trs;
@@ -344,7 +342,7 @@ protected Tr createTr(List<Pair<? extends Class, ?>> contents) {
             this.setTdWidth(tr.colWidthMap, td);
             return td;
         }).collect(Collectors.toList());
-        customWidthMap.forEach(tr.colWidthMap::put);
+        tr.colWidthMap.putAll(customWidthMap);
         tr.tdList = tdList;
         return tr;
     }