From bc5ec1017fd8a140ec5c30ea9e8ea839d5bf1bda Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 十二月 2020 16:22:20 +0800
Subject: [PATCH] 2020-12-15
---
src/menu/datasource/verifycard/utils.jsx | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index bb94a8f..0857ae5 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -76,6 +76,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'),
@@ -141,19 +148,24 @@
_dataresource = '(' + _dataresource + ') tb'
}
- _dataresource = `select ${setting.laypage !== 'false' ? 'top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage !== 'false' ? 'where rows > 0' : ''} order by tmptable.rows`
+ _dataresource = `select${setting.laypage !== 'false' ? ' top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage !== 'false' ? 'where rows > 0' : ''} order by tmptable.rows`
}
if (_customScript) {
- sql = `${_customScript}
+ sql = `/* sql 楠岃瘉 */
+ ${_customScript}
${_dataresource}
aaa:
if @ErrorCode!=''
insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
`
} else {
- sql = _dataresource
+ sql = `/* sql 楠岃瘉 */
+ ${_dataresource}`
}
+ sql = sql.replace(/\n\s{8}/ig, '\n')
+
+ console.info(sql)
return { error, sql }
}
--
Gitblit v1.8.0