!281 修复前端解析csv 某些文件解码错误问题

Merge pull request !281 from 高雄/N/A
pull/282/head
陈精华 2024-03-25 02:27:08 +00:00 committed by Gitee
commit 5be0d60caf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 13 additions and 6 deletions

View File

@ -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);
}