From 0594fe8d97286a535177f8ba05972d0305fc7dee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 二月 2020 14:15:58 +0800
Subject: [PATCH] 2020-02-17
---
src/tabviews/tableshare/excelin/index.jsx | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/tabviews/tableshare/excelin/index.jsx b/src/tabviews/tableshare/excelin/index.jsx
index d0906a8..4d015b2 100644
--- a/src/tabviews/tableshare/excelin/index.jsx
+++ b/src/tabviews/tableshare/excelin/index.jsx
@@ -13,13 +13,15 @@
state = {
excelbtn: null,
+ primaryId: '', // 琛孖d
excelId: Utils.getuuid()
}
- exceltrigger = (item) => {
+ exceltrigger = (item, primaryId) => {
const { excelId } = this.state
this.setState({
- excelbtn: item
+ excelbtn: item,
+ primaryId: primaryId
})
let _excelInput = document.getElementById(excelId + this.props.MenuID)
@@ -29,7 +31,7 @@
}
}
onImportExcel = file => {
- const { excelbtn } = this.state
+ const { excelbtn, primaryId } = this.state
let columns = excelbtn.verify.columns.map(option => option.Column)
let range = excelbtn.verify.range || 0
@@ -44,42 +46,40 @@
// 浠ヤ簩杩涘埗娴佹柟寮忚鍙栧緱鍒版暣浠絜xcel琛ㄦ牸瀵硅薄
const workbook = XLSX.read(result, { type: 'binary' })
- let errors = []
- if (range === 1) {
- workbook.SheetNames.forEach(sheetname => {
- if (workbook.Sheets.hasOwnProperty(sheetname)) {
- let header = XLSX.utils.sheet_to_json(workbook.Sheets[sheetname], {header: columns})[0]
-
- if (!header) {
- errors.push(sheetname)
- } else {
- let iserror = false
- excelbtn.verify.columns.forEach(op => {
- if (header[op.Column] !== op.Text) {
- iserror = true
- }
- })
+ let errors = null
- if (iserror) {
- errors.push(sheetname)
- }
+ if (!workbook.Sheets.hasOwnProperty(excelbtn.verify.sheet)) {
+ errors = 'notexit'
+ } else if (range === 1) {
+ let header = XLSX.utils.sheet_to_json(workbook.Sheets[excelbtn.verify.sheet], {header: columns})[0]
+
+ if (!header) {
+ errors = 'empty'
+ } else {
+ let iserror = false
+ excelbtn.verify.columns.forEach(op => {
+ if (header[op.Column] !== op.Text) {
+ iserror = true
}
+ })
+
+ if (iserror) {
+ errors = 'headerError'
}
- })
+ }
}
let data = []
- workbook.SheetNames.forEach(sheetname => {
- if (workbook.Sheets.hasOwnProperty(sheetname)) {
- data = data.concat(XLSX.utils.sheet_to_json(workbook.Sheets[sheetname], {header: columns, range: (range)}))
- }
- })
+ if (!errors) {
+ data = XLSX.utils.sheet_to_json(workbook.Sheets[excelbtn.verify.sheet], {header: columns, range: (range)})
+ }
// 鏈�缁堣幏鍙栧埌骞朵笖鏍煎紡鍖栧悗鐨� json 鏁版嵁
- this.props.returndata(data, excelbtn, errors)
+ this.props.returndata(data, excelbtn, errors, primaryId)
this.setState({
- excelId: ''
+ excelId: '',
+ primaryId: ''
}, () => {
this.setState({
excelId: Utils.getuuid()
--
Gitblit v1.8.0