From deab3ddf1990cd25b4692d1358ac9d50856644f0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 24 三月 2023 14:28:31 +0800
Subject: [PATCH] 2023-03-24
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 86 +++++++++++++++++++++++++++++++++++-------
1 files changed, 71 insertions(+), 15 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index ff8e714..e307490 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -231,6 +231,15 @@
col.type = col.type || 'text'
col.output = col.output || 'true'
col.required = col.required || 'false'
+
+ if (!['text', 'image', 'number'].includes(col.type)) {
+ if (/^Decimal/ig.test(col.type)) {
+ col.type = 'number'
+ } else {
+ col.type = 'text'
+ }
+ }
+
return col
})
@@ -682,6 +691,13 @@
duration: 5
})
return
+ } else if (/,,/ig.test(values.sql)) {
+ notification.warning({
+ top: 92,
+ message: '鑷畾涔塻ql璇彞涓紝涓嶅彲鍑虹幇杩炵画鐨勮嫳鏂囬�楀彿锛�,,锛�',
+ duration: 5
+ })
+ return
}
let error = Utils.verifySql(values.sql, 'customscript')
@@ -776,6 +792,31 @@
columns.push(cell)
})
+ if (config.subtype === 'dualdatacard') {
+ config.subColumns.forEach(item => {
+ if (fields.includes(item.field) || !item.field) return
+ fields.push(item.field)
+
+ let cell = {
+ Column: item.field,
+ Text: item.label,
+ Width: 20,
+ abs: 'false',
+ output: 'true',
+ required: 'false',
+ type: 'text',
+ uuid: Utils.getuuid()
+ }
+
+ if (item.type === 'number') {
+ cell.type = 'number'
+ cell.decimal = item.decimal
+ }
+
+ columns.push(cell)
+ })
+ }
+
this.setState({
verify: {...verify, columns: columns}
})
@@ -802,22 +843,37 @@
changeColumns = (columns) => {
const { verify } = this.state
- if (columns[0] && !['image', 'text', 'number'].includes(columns[0].type)) {
- columns = columns.map(col => {
- let _cell = {
- uuid: Utils.getuuid(),
- Column: col.Column,
- Text: col.Text,
- Width: 20,
- abs: 'false',
- output: col.output || 'true',
- required: col.required || 'false',
- type: 'text',
- }
+ columns = columns.map(col => {
+ col.type = col.type || 'text'
+ col.output = col.output || 'true'
+ col.required = col.required || 'false'
- return _cell
- })
- }
+ if (!['text', 'image', 'number'].includes(col.type)) {
+ if (/^Decimal/ig.test(col.type)) {
+ col.type = 'number'
+ } else {
+ col.type = 'text'
+ }
+ }
+
+ return col
+ })
+ // if (columns[0] && !['image', 'text', 'number'].includes(columns[0].type)) {
+ // columns = columns.map(col => {
+ // let _cell = {
+ // uuid: Utils.getuuid(),
+ // Column: col.Column,
+ // Text: col.Text,
+ // Width: 20,
+ // abs: 'false',
+ // output: col.output || 'true',
+ // required: col.required || 'false',
+ // type: 'text',
+ // }
+
+ // return _cell
+ // })
+ // }
this.setState({verify: {...verify, columns}})
}
--
Gitblit v1.8.0