From 11b6387d74467f81e33eba8f882bff610f240115 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 九月 2023 20:01:09 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/datasource/verifycard/utils.jsx | 57 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index b04140c..ad11e06 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -7,7 +7,7 @@
* @return {Object} setting 椤甸潰璁剧疆
* @return {Array} columns 鏄剧ず瀛楁
*/
- static getDebugSql (setting, scripts, columns, searches = [], defSearch, type, timestamp) {
+ static getDebugSql (setting, scripts, columns, searches = [], defSearch, type) {
let sql = ''
let error = ''
let _dataresource = ''
@@ -47,18 +47,18 @@
})
}
- _dataresource = _dataresource.replace(/@(BID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid|typename)@/ig, `'${timestamp}'`)
- _customScript = _customScript.replace(/@(BID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid|typename)@/ig, `'${timestamp}'`)
- _tailScript = _tailScript.replace(/@(BID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid|typename)@/ig, `'${timestamp}'`)
+ _dataresource = _dataresource.replace(/@(BID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid|typename)@/ig, `'1949-10-01 15:00:00'`)
+ _customScript = _customScript.replace(/@(BID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid|typename)@/ig, `'1949-10-01 15:00:00'`)
+ _tailScript = _tailScript.replace(/@(BID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|upid|typename)@/ig, `'1949-10-01 15:00:00'`)
_dataresource = _dataresource.replace(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
_tailScript = _tailScript.replace(/@\$|\$@/ig, '')
if (window.GLOB.process) {
- _dataresource = _dataresource.replace(/@works_flow_code@/ig, `'${timestamp}'`)
- _customScript = _customScript.replace(/@works_flow_code@/ig, `'${timestamp}'`)
- _tailScript = _tailScript.replace(/@works_flow_code@/ig, `'${timestamp}'`)
+ _dataresource = _dataresource.replace(/@works_flow_code@/ig, `'1949-10-01 15:00:00'`)
+ _customScript = _customScript.replace(/@works_flow_code@/ig, `'1949-10-01 15:00:00'`)
+ _tailScript = _tailScript.replace(/@works_flow_code@/ig, `'1949-10-01 15:00:00'`)
}
_dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
@@ -103,46 +103,53 @@
if (!item.field) return
if (item.datefield) {
_regoptions.push({
- var: new RegExp('@' + item.datefield, 'ig'),
reg: new RegExp('@' + item.datefield + '@', 'ig')
})
_regoptions.push({
- var: new RegExp('@' + item.datefield + '1', 'ig'),
reg: new RegExp('@' + item.datefield + '1@', 'ig')
})
}
- if (['dateweek', 'datemonth', 'daterange', 'range'].includes(item.type)) {
+ if (['dateweek', 'datemonth', 'range'].includes(item.type)) {
_regoptions.push({
- var: new RegExp('@' + item.field, 'ig'),
reg: new RegExp('@' + item.field + '@', 'ig')
})
_regoptions.push({
- var: new RegExp('@' + item.field + '1', 'ig'),
reg: new RegExp('@' + item.field + '1@', 'ig')
+ })
+ } else if (item.type === 'daterange') {
+ let _skey = item.field
+ let _ekey = item.field + '1'
+
+ if (/,/.test(item.field)) {
+ _skey = item.field.split(',')[0]
+ _ekey = item.field.split(',')[1]
+ }
+
+ _regoptions.push({
+ reg: new RegExp('@' + _skey + '@', 'ig')
+ })
+ _regoptions.push({
+ reg: new RegExp('@' + _ekey + '@', 'ig')
})
} else if (item.type === 'date') {
if (_fields.includes(item.field)) {
_regoptions.push({
- var: new RegExp('@' + item.field + '1', 'ig'),
reg: new RegExp('@' + item.field + '1@', 'ig')
})
} else {
_fields.push(item.field)
_regoptions.push({
- var: new RegExp('@' + item.field, 'ig'),
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'),
reg: new RegExp('@' + item.field + '@', 'ig')
})
}
@@ -184,31 +191,25 @@
}
if (_customScript) {
- sql = `/* sql 楠岃瘉 */
- ${_customScript}
+ sql = `${_customScript}
${_dataresource}
${_tailScript}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '${timestamp}',@ErrorCode, @retmsg,'${timestamp}'
+ 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 = `/* 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 @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 =''
${_dataresource}
${_tailScript}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '${timestamp}',@ErrorCode, @retmsg,'${timestamp}'
+ 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 @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 =''
${_dataresource}`
}
- sql = sql.replace(/\n\s{8}/ig, '\n')
-
- console.info(sql)
let errors = []
@@ -253,8 +254,6 @@
})
})
}
-
- sql = sql.replace(/\n/g, ' ')
return { error, sql, errors: errors.join('锛�') }
}
--
Gitblit v1.8.0