From b7cea5d42cfb64400e1c7fb12ecb3a16dae656e7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:07:31 +0800
Subject: [PATCH] 2022-12-06
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 16 ----------------
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 4 ++--
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index bf2bcc7..555ed77 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -442,22 +442,6 @@
changeColumns = (columns) => {
const { verify } = this.state
- if (columns[0] && (columns[0].type === 'image' || columns[0].type === 'text')) {
- columns = columns.map(col => {
- let _cell = {
- uuid: Utils.getuuid(),
- Column: col.Column,
- Text: col.Text,
- type: 'Nvarchar(50)',
- limit: '50',
- import: 'true',
- required: 'true'
- }
-
- return _cell
- })
- }
-
columns = columns.map(col => {
if (/^Nvarchar/ig.test(col.type)) {
col.limit = col.type.match(/\d+/) ? col.type.match(/\d+/)[0] : '20000'
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 798b5b2..eb8ffeb 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -841,7 +841,7 @@
changeColumns = (columns) => {
const { verify } = this.state
- if (columns[0] && (columns[0].type !== 'image' && columns[0].type !== 'text' && columns[0].type !== 'number')) {
+ if (columns[0] && !['image', 'text', 'number'].includes(columns[0].type)) {
columns = columns.map(col => {
let _cell = {
uuid: Utils.getuuid(),
@@ -849,7 +849,7 @@
Text: col.Text,
Width: 20,
abs: 'false',
- output: 'true',
+ output: col.output || 'true',
type: 'text',
}
--
Gitblit v1.8.0