From f36c523f0d0d949106acd490cdf4394cc68b1ae0 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期六, 29 五月 2021 22:43:13 +0800 Subject: [PATCH] 2021-05-29 --- src/utils/utils.js | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 42 insertions(+), 3 deletions(-) diff --git a/src/utils/utils.js b/src/utils/utils.js index 28da85a..1625ae6 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -1057,7 +1057,7 @@ * @return {Object} tab 鏍囩淇℃伅 * @return {Boolean} retmsg 鏄惁闇�瑕佹暟鎹繑鍥� */ -export function getSysDefaultSql (btn, setting, formdata, param, data, columns, tab, retmsg = false) { +export function getSysDefaultSql (btn, setting, formdata, param, data, columns, tab, retmsg = false, moduleParams) { let primaryId = param.ID let BID = param.BID let verify = btn.verify || {} @@ -1291,14 +1291,53 @@ // 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤 if (btn.sqlType !== 'insert' && btn.Ot !== 'notRequired' && verify.invalid === 'true' && setting.dataresource) { let datasource = setting.dataresource + let customScript = setting.customScript || '' + let search = moduleParams ? moduleParams.search : null + let orderBy = moduleParams ? moduleParams.orderBy : setting.order + if (/\s/.test(datasource) && !/tb$/.test(datasource)) { // 鎷兼帴鍒悕 datasource = '(' + datasource + ') tb' } - if (setting.customScript) { + if (setting.queryType === 'statistics' || customScript) { + let allSearch = this.getAllSearchOptions(search) + + let regoptions = allSearch.map(item => { + return { + reg: new RegExp('@' + item.key + '@', 'ig'), + value: `'${item.value}'` + } + }) + regoptions.push({ + reg: new RegExp('@login_city@', 'ig'), + value: `'${city}'` + }, { + reg: new RegExp('@userName@', 'ig'), + value: `'${userName}'` + }, { + reg: new RegExp('@fullName@', 'ig'), + value: `'${fullName}'` + }, { + reg: new RegExp('@orderBy@', 'ig'), + value: orderBy + }, { + reg: new RegExp('@pageSize@', 'ig'), + value: 999999 + }, { + reg: new RegExp('@pageIndex@', 'ig'), + value: 1 + }) + + regoptions.forEach(item => { + datasource = datasource.replace(item.reg, item.value) + customScript = customScript.replace(item.reg, item.value) + }) + } + + if (customScript) { _sql += ` /* 鏁版嵁婧愯嚜瀹氫箟鑴氭湰锛岃娉ㄦ剰鍙橀噺瀹氫箟鏄惁閲嶅 */ - ${setting.customScript} + ${customScript} ` } -- Gitblit v1.8.0