From b58d2d0277eecbae9348d633e7dc805771962024 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 九月 2023 19:59:14 +0800
Subject: [PATCH] 2023-09-18
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx | 113 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 64 insertions(+), 49 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
index 306c80d..939f64d 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
@@ -5,7 +5,7 @@
/**
* @description 鐢熸垚椤甸潰鏌ヨ璇彞
*/
- static getDebugSql (verify, scripts, searches, Utils, timestamp) {
+ static getDebugSql (verify, scripts, searches, Utils) {
let sql = ''
let _dataresource = verify.dataresource || ''
let regoptions = this.getRegOptions(searches)
@@ -28,50 +28,55 @@
}
let _customScript = ''
+ let _tailScript = ''
scripts && scripts.forEach(script => {
if (script.status === 'false') return
- _customScript += `
- ${script.sql}
- `
+ if (script.position !== 'back') {
+ _customScript += `
+ ${script.sql}
+ `
+ } else {
+ _tailScript += `
+ ${script.sql}
+ `
+ }
})
- if (_customScript) {
- _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg =''
- ${_customScript}
- `
- }
+ let declare = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg =''`
if (verify.defaultSql === 'false') {
_dataresource = ''
}
+
+ if (/\s/.test(_dataresource)) {
+ _dataresource = '(' + _dataresource + ') tb'
+ }
- _dataresource = _dataresource.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${timestamp}'`)
- _customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${timestamp}'`)
+ _dataresource = _dataresource.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'1949-10-01 15:00:00'`)
+ _customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'1949-10-01 15:00:00'`)
+ _tailScript = _tailScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'1949-10-01 15:00:00'`)
_dataresource = _dataresource.replace(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
+ _tailScript = _tailScript.replace(/@\$|\$@/ig, '')
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
_dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
_customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
+ _tailScript = _tailScript.replace(/@db@/ig, window.GLOB.externalDatabase)
}
+
+ let custompage = /@pageSize@|@orderBy@/i.test(_dataresource + _customScript)
// 姝ｅ垯鏇挎崲
let _regoptions = regoptions.map(item => {
return {
reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `'0'`,
- type: item.type || ''
+ value: `'0'`
}
})
_regoptions.push({
- reg: new RegExp('@userName@', 'ig'),
- value: `''`
- }, {
- reg: new RegExp('@fullName@', 'ig'),
- value: `''`
- }, {
reg: new RegExp('@orderBy@', 'ig'),
value: verify.order
}, {
@@ -82,53 +87,46 @@
value: 1
})
+ _regoptions.forEach(item => {
+ _dataresource = _dataresource.replace(item.reg, item.value)
+ _customScript = _customScript.replace(item.reg, item.value)
+ _tailScript = _tailScript.replace(item.reg, item.value)
+ })
+
if (verify.queryType === 'statistics' && _dataresource) {
- _regoptions.forEach(item => {
- _dataresource = _dataresource.replace(item.reg, item.value)
- })
_search = ''
- } else if (_dataresource) {
- _regoptions.forEach(item => {
- if (item.type !== 'url') return
- _dataresource = _dataresource.replace(item.reg, item.value)
- })
}
- if (_customScript) {
- _regoptions.forEach(item => {
- _customScript = _customScript.replace(item.reg, item.value)
- })
- }
-
- // 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
+ // 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
if (_dataresource) {
- if (/\s/.test(_dataresource)) {
- _dataresource = '(' + _dataresource + ') tb'
- }
-
- if (verify.order) {
- _dataresource = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${verify.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows`
- } else {
+ if (custompage || !verify.order) {
_dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search}`
+ } else {
+ _dataresource = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${verify.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
}
}
if (_customScript) {
- sql = `/* sql 楠岃瘉 */
+ sql = `${declare}
${_customScript}
${_dataresource}
+ ${_tailScript}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '1949-10-01 15:00:00',@ErrorCode, @retmsg,'1949-10-01 15:00:00'
+ `
+ } else if (_tailScript) {
+ sql = `${declare}
+ ${_dataresource}
+ ${_tailScript}
+ aaa:
+ if @ErrorCode!=''
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '1949-10-01 15:00:00',@ErrorCode, @retmsg,'1949-10-01 15:00:00'
`
} else {
- sql = `/* sql 楠岃瘉 */
- declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg =''
+ sql = `${declare}
${_dataresource}`
}
- sql = sql.replace(/\n\s{8}/ig, '\n')
- console.info(sql)
- sql = sql.replace(/\n/g, ' ')
return sql
}
@@ -217,12 +215,29 @@
value: '0'
})
options.push(item)
- } else if (['datemonth', 'dateweek', 'daterange'].includes(search.type)) {
+ } else if (['datemonth', 'dateweek'].includes(search.type)) {
options.push(item)
options.push({
key: item.key + '1',
value: '0'
})
+ } else if (search.type === 'daterange') {
+ let _skey = search.field
+ let _ekey = search.field + '1'
+
+ if (/,/.test(search.field)) {
+ _skey = search.field.split(',')[0]
+ _ekey = search.field.split(',')[1]
+ }
+
+ options.push({
+ key: _skey,
+ value: '0'
+ })
+ options.push({
+ key: _ekey,
+ value: '0'
+ })
} else if (search.type === 'text' || search.type === 'select') {
item.key.split(',').forEach(field => {
let cell = JSON.parse(JSON.stringify(item))
--
Gitblit v1.8.0