From 0d635644ba732ee70baa4d8dd0ee7d4a8101889a Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Wed, 16 Nov 2022 10:44:11 +0800
Subject: [PATCH] =?UTF-8?q?*=20=E6=8F=90=E4=BE=9Bxlsx=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=80=A7=EF=BC=9A=E5=85=BC=E5=AE=B9`sharedStrings.xml`=20?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=9C=A8=20`x:t`=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   2 +-
 .../sax/SharedStringsTableHandler.java        |  73 +++++++++++-------
 .../excel/constant/ExcelXmlConstants.java     |  24 ++++++
 .../core/compatibility/CompatibilityTest.java |  12 +++
 .../src/test/resources/compatibility/t02.xlsx | Bin 0 -> 10366 bytes
 pom.xml                                       |   2 +-
 6 files changed, 84 insertions(+), 29 deletions(-)
 create mode 100644 easyexcel-test/src/test/resources/compatibility/t02.xlsx

diff --git a/README.md b/README.md
index 58018547..a9ac8647 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Java解析、生成Excel比较有名的框架有Apache poi、jxl。但他们都
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>3.1.2</version>
+            <version>3.1.3</version>
         </dependency>
 ```
 
diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/analysis/v07/handlers/sax/SharedStringsTableHandler.java b/easyexcel-core/src/main/java/com/alibaba/excel/analysis/v07/handlers/sax/SharedStringsTableHandler.java
index f4514e43..83e92df3 100644
--- a/easyexcel-core/src/main/java/com/alibaba/excel/analysis/v07/handlers/sax/SharedStringsTableHandler.java
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/analysis/v07/handlers/sax/SharedStringsTableHandler.java
@@ -4,6 +4,7 @@ import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
 
 import com.alibaba.excel.cache.ReadCache;
+import com.alibaba.excel.constant.ExcelXmlConstants;
 
 /**
  * Sax read sharedStringsTable.xml
@@ -11,12 +12,6 @@ import com.alibaba.excel.cache.ReadCache;
  * @author Jiaju Zhuang
  */
 public class SharedStringsTableHandler extends DefaultHandler {
-    private static final String T_TAG = "t";
-    private static final String SI_TAG = "si";
-    /**
-     * Mac 2016 2017 will have this extra field to ignore
-     */
-    private static final String RPH_TAG = "rPh";
 
     /**
      * The final piece of data
@@ -43,34 +38,58 @@ public class SharedStringsTableHandler extends DefaultHandler {
 
     @Override
     public void startElement(String uri, String localName, String name, Attributes attributes) {
-        if (T_TAG.equals(name)) {
-            currentElementData = null;
-            isTagt = true;
-        } else if (SI_TAG.equals(name)) {
-            currentData = null;
-        } else if (RPH_TAG.equals(name)) {
-            ignoreTagt = true;
+        if (name == null) {
+            return;
+        }
+        switch (name) {
+            case ExcelXmlConstants.SHAREDSTRINGS_T_TAG:
+            case ExcelXmlConstants.SHAREDSTRINGS_X_T_TAG:
+                currentElementData = null;
+                isTagt = true;
+                break;
+            case ExcelXmlConstants.SHAREDSTRINGS_SI_TAG:
+            case ExcelXmlConstants.SHAREDSTRINGS_X_SI_TAG:
+                currentData = null;
+                break;
+            case ExcelXmlConstants.SHAREDSTRINGS_RPH_TAG:
+            case ExcelXmlConstants.SHAREDSTRINGS_X_RPH_TAG:
+                ignoreTagt = true;
+                break;
+            default:
+                // ignore
         }
     }
 
     @Override
     public void endElement(String uri, String localName, String name) {
-        if (T_TAG.equals(name)) {
-            if (currentElementData != null) {
+        if (name == null) {
+            return;
+        }
+        switch (name) {
+            case ExcelXmlConstants.SHAREDSTRINGS_T_TAG:
+            case ExcelXmlConstants.SHAREDSTRINGS_X_T_TAG:
+                if (currentElementData != null) {
+                    if (currentData == null) {
+                        currentData = new StringBuilder();
+                    }
+                    currentData.append(currentElementData);
+                }
+                isTagt = false;
+                break;
+            case ExcelXmlConstants.SHAREDSTRINGS_SI_TAG:
+            case ExcelXmlConstants.SHAREDSTRINGS_X_SI_TAG:
                 if (currentData == null) {
-                    currentData = new StringBuilder();
+                    readCache.put(null);
+                } else {
+                    readCache.put(currentData.toString());
                 }
-                currentData.append(currentElementData);
-            }
-            isTagt = false;
-        } else if (SI_TAG.equals(name)) {
-            if (currentData == null) {
-                readCache.put(null);
-            } else {
-                readCache.put(currentData.toString());
-            }
-        } else if (RPH_TAG.equals(name)) {
-            ignoreTagt = false;
+                break;
+            case ExcelXmlConstants.SHAREDSTRINGS_RPH_TAG:
+            case ExcelXmlConstants.SHAREDSTRINGS_X_RPH_TAG:
+                ignoreTagt = false;
+                break;
+            default:
+                // ignore
         }
     }
 
diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/constant/ExcelXmlConstants.java b/easyexcel-core/src/main/java/com/alibaba/excel/constant/ExcelXmlConstants.java
index bfd319a2..4f5c64dc 100644
--- a/easyexcel-core/src/main/java/com/alibaba/excel/constant/ExcelXmlConstants.java
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/constant/ExcelXmlConstants.java
@@ -59,4 +59,28 @@ public class ExcelXmlConstants {
      */
     public static final String CELL_RANGE_SPLIT = ":";
 
+    // The following is a constant read the `SharedStrings.xml`
+
+    /**
+     * text
+     * https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.spreadsheet
+     * .text?redirectedfrom=MSDN&view=openxml-2.8.1
+     */
+    public static final String SHAREDSTRINGS_T_TAG = "t";
+    public static final String SHAREDSTRINGS_X_T_TAG = "x:t";
+
+    /**
+     * SharedStringItem
+     * https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.spreadsheet
+     * .sharedstringitem?redirectedfrom=MSDN&view=openxml-2.8.1
+     */
+    public static final String SHAREDSTRINGS_SI_TAG = "si";
+    public static final String SHAREDSTRINGS_X_SI_TAG = "x:si";
+
+    /**
+     * Mac 2016 2017 will have this extra field to ignore
+     */
+    public static final String SHAREDSTRINGS_RPH_TAG = "rPh";
+    public static final String SHAREDSTRINGS_X_RPH_TAG = "x:rPh";
+
 }
diff --git a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityTest.java
index 027aa54f..3844978f 100644
--- a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityTest.java
+++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityTest.java
@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.alibaba.easyexcel.test.util.TestFileUtil;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson.JSON;
 
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
@@ -30,4 +31,15 @@ public class CompatibilityTest {
         Map<Integer, Object> row1 = list.get(1);
         Assert.assertEquals("Q235(碳钢)", row1.get(0));
     }
+
+    @Test
+    public void t02() {
+        // Exist in `sharedStrings.xml` `x:t` start tag, need to be compatible
+        List<Map<Integer, Object>> list = EasyExcel.read(TestFileUtil.getPath() + "compatibility/t02.xlsx").sheet()
+            .headRowNumber(0).doReadSync();
+        log.info("data:{}", JSON.toJSONString(list));
+        Assert.assertEquals(3, list.size());
+        Map<Integer, Object> row2 = list.get(2);
+        Assert.assertEquals("1，2-戊二醇", row2.get(2));
+    }
 }
diff --git a/easyexcel-test/src/test/resources/compatibility/t02.xlsx b/easyexcel-test/src/test/resources/compatibility/t02.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..b8d755de85bec3cc84e39ae6c831e48f1a3ec485
GIT binary patch
literal 10366
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
Iif6?C18ms(`v3p{

literal 0
HcmV?d00001

diff --git a/pom.xml b/pom.xml
index 319a85e0..39ca4669 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
 
     <properties>
-        <revision>3.1.2</revision>
+        <revision>3.1.3</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jdk.version>1.8</jdk.version>
         <gpg.skip>true</gpg.skip>