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/templates/comtableconfig/index.jsx | 82 ++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 50 deletions(-)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index ea8f770..0b67ebd 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -1303,9 +1303,10 @@
verifySubmit = () => {
const { card } = this.state
let config = JSON.parse(JSON.stringify(this.state.config))
- let _verify = this.verifyRef.state.verify
-
+
if (card.OpenType !== 'excelIn') {
+ let _verify = this.verifyRef.state.verify
+
if (_verify.default === 'false' && _verify.scripts.length === 0) {
notification.warning({
top: 92,
@@ -1314,57 +1315,38 @@
})
return
}
- } else if (card.OpenType === 'excelIn') {
- let cols = _verify.columns.map(col => col.Column)
- cols = Array.from(new Set(cols))
- if (!_verify.sheet) {
- notification.warning({
- top: 92,
- message: '璇疯缃鍏ヨ〃鍚�!',
- duration: 10
- })
- return
- } else if (_verify.columns.length === 0) {
- notification.warning({
- top: 92,
- message: '璇疯缃瓻xcel鍒楀瓧娈�!',
- duration: 10
- })
- return
- } else if (_verify.columns.length > cols.length) {
- notification.warning({
- top: 92,
- message: 'Excel鍒楀瓧娈靛悕锛屼笉鍙噸澶�!',
- duration: 10
- })
- return
- } else if (_verify.range === 1) {
- let tEmptys = _verify.columns.filter(op => !op.Text)
- if (tEmptys.length > 0) {
- notification.warning({
- top: 92,
- message: '蹇界暐棣栬鏃讹紝浼氫娇鐢═ext鍊兼牎楠孍xcel棣栬鍐呭锛孴ext鍊间笌Excel琛ㄩ琛屽唴瀹圭浉鍚岋紝涓斿潎涓嶅彲涓虹┖锛�',
- duration: 10
- })
- return
+ config.action = config.action.map(item => {
+ if (item.uuid === card.uuid) {
+ item.verify = _verify
}
- }
+
+ return item
+ })
+
+ this.setState({
+ profileVisible: false,
+ config: config,
+ card: '',
+ })
+ } else if (card.OpenType === 'excelIn') {
+ this.verifyRef.handleConfirm().then(res => {
+
+ config.action = config.action.map(item => {
+ if (item.uuid === card.uuid) {
+ item.verify = res
+ }
+
+ return item
+ })
+
+ this.setState({
+ profileVisible: false,
+ config: config,
+ card: '',
+ })
+ })
}
-
- config.action = config.action.map(item => {
- if (item.uuid === card.uuid) {
- item.verify = _verify
- }
-
- return item
- })
-
- this.setState({
- profileVisible: false,
- config: config,
- card: '',
- })
}
/**
--
Gitblit v1.8.0