From e56c865ac3940aef8dc0605a13987d8fa58d1045 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 11 二月 2023 21:56:10 +0800
Subject: [PATCH] 2023-02-11
---
src/menu/datasource/verifycard/utils.jsx | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index d4145df..8b3fd5a 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -22,6 +22,10 @@
})
}
+ if (!arr_field) {
+ arr_field = '*'
+ }
+
if (setting.interType === 'system' && setting.execute !== 'false') {
_dataresource = setting.dataresource || ''
}
@@ -40,8 +44,8 @@
// error = '绯荤粺鍑芥暟' + _customScript.match(/\$ex@.{1,50}@ex\$/g)[0].replace(/\$ex@|@ex\$/g, '') + '鏈畾涔�'
// }
- _dataresource = _dataresource.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid)@/ig, `'${timestamp}'`)
- _customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid)@/ig, `'${timestamp}'`)
+ _dataresource = _dataresource.replace(/@(BID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid)@/ig, `'${timestamp}'`)
+ _customScript = _customScript.replace(/@(BID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid)@/ig, `'${timestamp}'`)
_dataresource = _dataresource.replace(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
@@ -128,7 +132,7 @@
let _search = defSearch
- if (setting.queryType === 'statistics' && _dataresource) {
+ if (_dataresource) {
_regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, '0')
})
@@ -161,7 +165,7 @@
let sumSql = ''
- if (arr_field && _dataresource && /\/\*\$sum@/ig.test(_dataresource)) {
+ if (_dataresource && /\/\*\$sum@/ig.test(_dataresource)) {
let _sql = _dataresource.replace(/\/\*\$sum@|@sum\$\*\//ig, '')
_sql = `/*system_query*/${_sql} ${_search}`
if (_customScript) {
@@ -180,7 +184,7 @@
}
// 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
- if (arr_field && _dataresource) {
+ if (_dataresource) {
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
}
@@ -234,7 +238,7 @@
sumSql = sumSql.replace(/\n/g, ' ')
}
sql = sql.replace(/\n/g, ' ')
-
+
return { error, sql, sumSql, errors: errors.join('锛�') }
}
}
\ No newline at end of file
--
Gitblit v1.8.0