From 1ed217be1abce1a1da18d90a1a9f358beef79acd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 30 十二月 2020 18:31:28 +0800
Subject: [PATCH] 2020-12-30
---
src/menu/datasource/verifycard/utils.jsx | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 109192d..6b8a526 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -34,7 +34,7 @@
}
if (_customScript) {
- _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg =''
+ _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50) select @ErrorCode='',@retmsg =''
${_customScript}
`
}
@@ -44,6 +44,7 @@
let _fields = []
searches.forEach(item => {
+ if (!item.field) return
if (item.datefield) {
_regoptions.push({
var: new RegExp('@' + item.datefield, 'ig'),
@@ -76,6 +77,13 @@
reg: new RegExp('@' + item.field + '@', 'ig')
})
}
+ } else if (item.type === 'text' || item.type === 'select') {
+ item.field.split(',').forEach(field => {
+ _regoptions.push({
+ var: new RegExp('@' + field, 'ig'),
+ reg: new RegExp('@' + field + '@', 'ig')
+ })
+ })
} else {
_regoptions.push({
var: new RegExp('@' + item.field, 'ig'),
@@ -101,6 +109,14 @@
var: new RegExp('@orderBy', 'ig'),
reg: new RegExp('@orderBy@', 'ig'),
})
+ _regoptions.push({
+ var: new RegExp('@UserName', 'ig'),
+ reg: new RegExp('@UserName@', 'ig'),
+ })
+ _regoptions.push({
+ var: new RegExp('@FullName', 'ig'),
+ reg: new RegExp('@FullName@', 'ig'),
+ })
if (setting.laypage !== 'false') {
_regoptions.push({
var: new RegExp('@pageSize', 'ig'),
--
Gitblit v1.8.0