From 89e7167a83e0d8409ca87698e4c08651a37cc26e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 12 六月 2020 18:19:35 +0800
Subject: [PATCH] 2020-06-12
---
src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelin/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx
similarity index 75%
rename from src/tabviews/zshare/actionList/excelin/index.jsx
rename to src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx
index 937043a..1e36bfa 100644
--- a/src/tabviews/zshare/actionList/excelin/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx
@@ -7,23 +7,17 @@
class ExcelIn extends Component {
static propTpyes = {
+ btn: PropTypes.object, // 鎸夐挳淇℃伅
MenuID: PropTypes.string, // 鑿滃崟ID
- returndata: PropTypes.func // 鑿滃崟ID
+ returndata: PropTypes.func // 鑾峰彇杩斿洖鏁版嵁
}
state = {
- excelbtn: null,
- primaryId: '', // 琛孖d
excelId: Utils.getuuid()
}
- exceltrigger = (item, primaryId) => {
+ exceltrigger = () => {
const { excelId } = this.state
- this.setState({
- excelbtn: item,
- primaryId: primaryId
- })
-
let _excelInput = document.getElementById(excelId + this.props.MenuID)
if (_excelInput) {
@@ -31,10 +25,10 @@
}
}
onImportExcel = file => {
- const { excelbtn, primaryId } = this.state
+ const { btn } = this.props
- let columns = excelbtn.verify.columns.map(option => option.Column)
- let range = excelbtn.verify.range || 0
+ let columns = btn.verify.columns.map(option => option.Column)
+ let range = btn.verify.range || 0
// excel鏁版嵁澶勭悊
const { files } = file.target
@@ -48,16 +42,16 @@
let errors = null
- if (!workbook.Sheets.hasOwnProperty(excelbtn.verify.sheet)) {
+ if (!workbook.Sheets.hasOwnProperty(btn.verify.sheet)) {
errors = 'notexit'
} else if (range === 1) {
- let header = XLSX.utils.sheet_to_json(workbook.Sheets[excelbtn.verify.sheet], {header: columns})[0]
+ let header = XLSX.utils.sheet_to_json(workbook.Sheets[btn.verify.sheet], {header: columns})[0]
if (!header) {
errors = 'empty'
} else {
let iserror = false
- excelbtn.verify.columns.forEach(op => {
+ btn.verify.columns.forEach(op => {
if (header[op.Column] !== op.Text) {
iserror = true
}
@@ -72,14 +66,13 @@
let data = []
if (!errors) {
- data = XLSX.utils.sheet_to_json(workbook.Sheets[excelbtn.verify.sheet], {header: columns, range: (range)})
+ data = XLSX.utils.sheet_to_json(workbook.Sheets[btn.verify.sheet], {header: columns, range: (range)})
}
// 鏈�缁堣幏鍙栧埌骞朵笖鏍煎紡鍖栧悗鐨� json 鏁版嵁
- this.props.returndata(data, excelbtn, errors, primaryId)
+ this.props.returndata(data, errors)
this.setState({
excelId: '',
- primaryId: ''
}, () => {
this.setState({
excelId: Utils.getuuid()
@@ -98,6 +91,8 @@
message: '鏂囦欢瑙ｆ瀽閿欒锛岃妫�鏌ユ枃浠舵牸寮忥紒',
duration: 5
})
+ // 閿欒浼犻��
+ this.props.returndata([], 'other')
}
}
--
Gitblit v1.8.0