From 2ed2188bb01fa321177125917102e5f664497d2a Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 12 八月 2020 16:41:25 +0800 Subject: [PATCH] 2020-08-12 --- src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx index d3d057d..b4481c0 100644 --- a/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx +++ b/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx @@ -42,11 +42,16 @@ const workbook = XLSX.read(result, { type: 'binary' }) let errors = null + let sheetName = btn.verify.sheet - if (!workbook.Sheets.hasOwnProperty(btn.verify.sheet)) { + if (Object.keys(workbook.Sheets).length === 1) { + sheetName = Object.keys(workbook.Sheets)[0] + } + + if (!workbook.Sheets.hasOwnProperty(sheetName)) { errors = 'notexit' } else if (range === 1) { - let header = XLSX.utils.sheet_to_json(workbook.Sheets[btn.verify.sheet], {header: columns})[0] + let header = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName], {header: columns})[0] if (!header) { errors = 'empty' @@ -67,11 +72,11 @@ let data = [] if (!errors) { - data = XLSX.utils.sheet_to_json(workbook.Sheets[btn.verify.sheet], {header: columns, range: (range)}) + data = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName], {header: columns, range: (range)}) } // 鏈�缁堣幏鍙栧埌骞朵笖鏍煎紡鍖栧悗鐨� json 鏁版嵁 - this.props.returndata(data, errors) + this.props.returndata(data, errors, sheetName) this.setState({ excelId: '', }, () => { -- Gitblit v1.8.0