From ac27336985cf12d0664882f20463388e963ad84e Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 2 Nov 2023 17:09:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=93=E5=BC=80200HTML=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E8=A7=A3=E6=9E=90=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/execl-utils.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/utils/execl-utils.ts b/src/utils/execl-utils.ts index 45774aec..928843b6 100644 --- a/src/utils/execl-utils.ts +++ b/src/utils/execl-utils.ts @@ -21,11 +21,19 @@ export const xlsxUrl = `${ */ export async function readLoalXlsx(id: string): Promise[]> { let result = await fetch(`${xlsxUrl}/${id}.xlsx`); - if (result.status !== 200) { + let fileBuffer = await result.arrayBuffer(); + // 判断是否xlsx文件 + const data = new Uint8Array(fileBuffer); + const isXlsxFile = + data[0] === 0x50 && + data[1] === 0x4b && + data[2] === 0x03 && + data[3] === 0x04; + if (!isXlsxFile) { result = await fetch(`${xlsxUrl}/all.xlsx`); + fileBuffer = await result.arrayBuffer(); } - const fileBolb = await result.arrayBuffer(); - return readSheet(fileBolb, 0); + return readSheet(fileBuffer, 0); } /**