From 76427d51a079a5fd1f45bf7188249e7a4647ae05 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 九月 2020 10:37:25 +0800
Subject: [PATCH] 2020-09-14
---
src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx
index 70b0c70..b4481c0 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx
@@ -42,12 +42,17 @@
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'
} else {
@@ -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: '',
}, () => {
@@ -89,7 +94,7 @@
})
notification.warning({
top: 92,
- message: '鏂囦欢瑙ｆ瀽閿欒锛岃妫�鏌ユ枃浠舵牸寮忥紒',
+ message: '鏂囦欢瑙ｆ瀽閿欒锛�',
duration: 5
})
// 閿欒浼犻��
--
Gitblit v1.8.0