From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 47fe124..eb8ffeb 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -743,7 +743,8 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
-
+ param.LText = param.LText.replace(/\n/g, ' ')
+
param.LText = Utils.formatOptions(param.LText)
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -840,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(),
@@ -848,7 +849,7 @@
Text: col.Text,
Width: 20,
abs: 'false',
- output: 'true',
+ output: col.output || 'true',
type: 'text',
}
--
Gitblit v1.8.0