From 27eb6c35533be910488869c393e2c89e3c0a5b20 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 九月 2020 23:33:23 +0800
Subject: [PATCH] 2020-09-07
---
src/templates/sharecomponent/settingcomponent/settingform/utils.jsx | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index ebd508d..c5bb301 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
@@ -7,12 +7,25 @@
* @return {Object} setting 椤甸潰璁剧疆
* @return {Array} regoptions 鎼滅储鏉′欢姝ｅ垯鏇挎崲
*/
- static getDebugSql (setting, arr_field, regoptions, search) {
+ static getDebugSql (setting, scripts, arr_field, regoptions, search) {
let sql = ''
let _dataresource = setting.dataresource
- let _customScript = setting.customScript
+ let _customScript = ''
+ scripts && scripts.forEach(script => {
+ if (script.status !== 'false') {
+ _customScript += `
+ ${script.sql}
+ `
+ }
+ })
- if (setting.interType === 'inner' && !setting.innerFunc && setting.default === 'false') {
+ if (_customScript) {
+ _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg =''
+ ${_customScript}
+ `
+ }
+
+ if (setting.interType === 'system' && setting.default === 'false') {
_dataresource = ''
}
@@ -30,30 +43,28 @@
value: `'${item.value}'`
}
})
+
+ _regoptions.push({
+ reg: new RegExp('@orderBy@', 'ig'),
+ value: setting.order
+ }, {
+ reg: new RegExp('@pageSize@', 'ig'),
+ value: 10
+ }, {
+ reg: new RegExp('@pageIndex@', 'ig'),
+ value: 1
+ })
+
let _search = search
if (setting.queryType === 'statistics' && _dataresource) {
_regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
})
-
_search = ''
}
if (_customScript) {
- _regoptions.push({
- reg: new RegExp('@orderBy@', 'ig'),
- value: setting.order
- })
- if (setting.laypage !== 'false') {
- _regoptions.push({
- reg: new RegExp('@pageSize@', 'ig'),
- value: 10
- }, {
- reg: new RegExp('@pageIndex@', 'ig'),
- value: 1
- })
- }
_regoptions.forEach(item => {
_customScript = _customScript.replace(item.reg, item.value)
})
--
Gitblit v1.8.0