From 947d0ed1a628353f42ac4c2aa817a4579cdf126d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 05 十一月 2023 11:29:04 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index 7b474da..c4708cd 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -530,7 +530,6 @@
changeColumns = (columns) => {
const { verify } = this.state
- let reset = false
columns = columns.map(col => {
col.type = col.type || 'Nvarchar(50)'
if (col.type === 'text' || col.type === 'image') {
@@ -539,19 +538,18 @@
col.type = 'Decimal(18,2)'
}
+ if (col.import === 'init') {
+ col.required = 'false'
+ col.min = ''
+ col.max = ''
+ }
+
if (/^Nvarchar/ig.test(col.type)) {
col.limit = col.type.match(/\d+/) ? col.type.match(/\d+/)[0] : '20000'
} else if (/^Decimal/ig.test(col.type)) {
col.limit = col.type.match(/\d+/ig)[1]
- if (col.required === 'false') {
- reset = true
- }
- col.required = 'true'
} else if (/^int/ig.test(col.type)) {
- if (col.required === 'false') {
- reset = true
- }
- col.required = 'true'
+
} else {
col.limit = ''
}
@@ -561,10 +559,6 @@
return col
})
-
- if (reset) {
- message.warning('鏁板�肩被鍨嬪潎涓哄繀濉��')
- }
this.setState({verify: {...verify, columns}}, () => {
this.resetUniqueColumns()
--
Gitblit v1.8.0