From da5bf570afb1d4dbc14078ef5e71cc679c003121 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 九月 2023 10:15:13 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 122 +++++++++++++++++++++++++++++-----------
1 files changed, 87 insertions(+), 35 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index cb4990f..7b474da 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -388,48 +388,100 @@
const { verify } = this.state
let _columns = JSON.parse(JSON.stringify(verify.columns))
+ let _names = {}
+ let _cols = _columns.map(item => {
+ let key = item.Column.toLowerCase()
+ _names[key] = item.Text
- let _cols = _columns.map(col => col.Column)
+ return key
+ })
+ let names = {$up: false}
columns.forEach(col => {
- if (col.field && !_cols.includes(col.field)) {
- let _type = 'Nvarchar(50)'
- let _limit = '50'
- if (col.type === 'number' && !col.decimal) {
- _type = 'Int'
- _limit = ''
- } else if (col.type === 'number') {
- _type = 'Decimal(18,' + col.decimal + ')'
- _limit = col.decimal
+ if (!col.field) return
+ let key = col.field.toLowerCase()
+ if (_cols.includes(key)) {
+ if (_names[key] !== col.label) {
+ names.$up = true
+ names[key] = col.label
}
-
- let _cell = {
- uuid: col.uuid,
- Column: col.field,
- Text: col.label,
- type: _type,
- limit: _limit,
- import: 'true',
- required: 'true'
- }
-
- if (_type !== 'Nvarchar(50)') {
- _cell.min = 0
- _cell.max = 999999
- }
-
- _columns.push(_cell)
+ return
}
+
+ let _type = 'Nvarchar(50)'
+ let _limit = '50'
+ if (col.type === 'number' && !col.decimal) {
+ _type = 'Int'
+ _limit = ''
+ } else if (col.type === 'number') {
+ _type = 'Decimal(18,' + col.decimal + ')'
+ _limit = col.decimal
+ }
+
+ let _cell = {
+ uuid: col.uuid,
+ Column: col.field,
+ Text: col.label,
+ type: _type,
+ limit: _limit,
+ import: 'true',
+ required: 'true'
+ }
+
+ if (_type !== 'Nvarchar(50)') {
+ _cell.min = 0
+ _cell.max = 999999
+ }
+
+ _columns.push(_cell)
})
- this.setState({
- verify: {
- ...verify,
- columns: _columns
- }
- }, () => {
- this.resetUniqueColumns()
- })
+ if (names.$up) {
+ const that = this
+
+ confirm({
+ content: '閮ㄥ垎瀛楁鍚嶇О涓庢樉绀哄垪涓嶄竴鑷达紝鏄惁鏇存柊锛�',
+ onOk() {
+ _columns = _columns.map(item => {
+ let key = item.Column.toLowerCase()
+
+ if (names[key]) {
+ item.Text = names[key]
+ }
+
+ return item
+ })
+
+ that.setState({
+ verify: {
+ ...verify,
+ columns: _columns
+ }
+ }, () => {
+ that.resetUniqueColumns()
+ })
+ },
+ onCancel() {
+ that.setState({
+ verify: {
+ ...verify,
+ columns: _columns
+ }
+ }, () => {
+ that.resetUniqueColumns()
+ })
+ }
+ })
+ } else {
+ this.setState({
+ verify: {
+ ...verify,
+ columns: _columns
+ }
+ }, () => {
+ this.resetUniqueColumns()
+ })
+ }
}
clearField = () => {
--
Gitblit v1.8.0