From c3155204ebf7aad8f58b69191f387e1c279acd11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E9=9B=84?= <admin@cxcp.com>
Date: Thu, 21 Mar 2024 06:43:58 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90csv=20=E6=9F=90=E4=BA=9B=E6=96=87=E4=BB=B6=E8=A7=A3?=
 =?UTF-8?q?=E7=A0=81=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=89=8D=E7=AB=AF=E8=A7=A3=E6=9E=90csv=20=E6=9F=90?=
 =?UTF-8?q?=E4=BA=9B=E6=96=87=E4=BB=B6=E8=A7=A3=E7=A0=81=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 高雄 <admin@cxcp.com>
---
 server/src/main/resources/web/csv.ftl | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/server/src/main/resources/web/csv.ftl b/server/src/main/resources/web/csv.ftl
index d41dd31a..d3a3a59b 100644
--- a/server/src/main/resources/web/csv.ftl
+++ b/server/src/main/resources/web/csv.ftl
@@ -9,7 +9,6 @@
 <script src="xspreadsheet/is-utf8.js"></script>
 <script src="xspreadsheet/xlsx.full.min.js"></script>
 <script src="xspreadsheet/xlsxspread.min.js"></script>
-<script src="xspreadsheet/cptable.full.js"></script>
 <script src="xspreadsheet/zh-cn.js"></script>
 <script src="js/base64.min.js" type="text/javascript"></script>
 </head>
@@ -55,12 +54,20 @@ reader.onload = function(e) {
           data = new Uint8Array(data);
           let f = isUTF8(data);
             if (f) {
-              var str = cptable.utils.decode(65001, data);
-              process_wb(XLSX.read(str, { type: "string" }));
-                    } else {
-          var str = cptable.utils.decode(936, data);
+             try {
+         var str = cptable.utils.decode(65001, data);
           process_wb(XLSX.read(str, { type: "string" }));
-                    }
+        } catch (error) {
+       process_wb(XLSX.read(data));
+          }
+              } else {
+              try {
+         var str = cptable.utils.decode(936, data);
+          process_wb(XLSX.read(str, { type: "string" }));
+        } catch (error) {
+       process_wb(XLSX.read(data));
+          }
+           }
 };
 reader.readAsArrayBuffer(file);
         }