From ef8acbf3859bd13e759fbb9b8ba726039c1fb2c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 十一月 2023 15:51:59 +0800
Subject: [PATCH] 2023-11-14
---
src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx
index 86891ed..ee748ae 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx
@@ -27,7 +27,8 @@
onImportExcel = file => {
const { btn } = this.props
- let columns = btn.verify.columns.map(option => option.Column)
+ let btnColumns = btn.verify.columns.filter(option => option.import !== 'init')
+ let columns = btnColumns.map(option => option.Column)
let range = btn.verify.range || 0
// excel鏁版嵁澶勭悊
@@ -45,7 +46,7 @@
let sheetName = btn.verify.sheet
let errDetail = ''
- if (Object.keys(workbook.Sheets).length === 1) {
+ if (sheetName === 'Sheet1' && Object.keys(workbook.Sheets).length === 1) {
sheetName = Object.keys(workbook.Sheets)[0]
}
@@ -58,15 +59,17 @@
errors = 'empty'
} else {
let iserror = false
- btn.verify.columns.forEach(op => {
+ btnColumns.forEach(op => {
+ if (iserror) return
+
let _name = typeof(header[op.Column]) === 'string' ? header[op.Column].replace(/(^\s*|\s*$)/g, '') : header[op.Column]
let _text = op.Text ? op.Text.replace(/(^\s*|\s*$)/g, '') : op.Text
- if (!_name && !iserror) {
+ if (!_name) {
iserror = true
errors = 'headerError'
errDetail = `Excel涓笉瀛樺湪锛�${_text}锛夊垪锛乣
- } else if (_name !== _text && !iserror) {
+ } else if (_name !== _text) {
iserror = true
errors = 'headerError'
errDetail = `Excel涓紙${_name}锛変笌鎸夐挳鍒椾俊鎭紙${_text}锛変笉涓�鑷达紒`
--
Gitblit v1.8.0