From 3140b58a56be4b1693766121dacb83fe6f6f21df Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 26 九月 2023 14:48:30 +0800 Subject: [PATCH] 2023-09-26 --- src/utils/utils.js | 185 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 165 insertions(+), 20 deletions(-) diff --git a/src/utils/utils.js b/src/utils/utils.js index 44c6a54..f7bd5ee 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -138,7 +138,7 @@ ] if (type === 'customscript') { - chars = chars.filter(char => !['insert', 'delete', 'update', 'set', 'if', 'exec'].includes(char.key)) + chars = chars.filter(char => !['create', 'insert', 'delete', 'update', 'set', 'drop', 'if', 'exec'].includes(char.key)) } let error = '' @@ -275,6 +275,10 @@ let roleId = sessionStorage.getItem('role_id') || '' let required = false let keys = [] + let values = null + if (config.wrap && config.wrap.cacheSearch === 'true') { + values = window.GLOB.SearchBox.get(config.$searchId + 'cache') + } config.search = config.search.map(item => { item.hidden = item.Hide === 'true' @@ -387,6 +391,10 @@ item.oriInitval = item.initval + if (values) { + item.initval = values[item.field] || '' + } + if (item.blacklist && item.blacklist.length > 0 && !item.hidden) { if (item.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) { item.hidden = true @@ -399,6 +407,10 @@ } if (item.type === 'text' || item.type === 'select') { + if (/@username@|@fullName@/ig.test(item.initval)) { + item.initval = item.initval.replace(/@username@/ig, sessionStorage.getItem('User_Name') || '').replace(/@fullName@/ig, sessionStorage.getItem('Full_Name') || '') + item.oriInitval = item.initval + } if (/,/.test(item.field)) { item.field.split(',').forEach(field => { keys.push(field.toLowerCase()) @@ -538,8 +550,16 @@ } } - newsearches[item.key] = _startval - newsearches[item.key + '1'] = _endval + let _skey = item.key + let _ekey = item.key + '1' + + if (/,/.test(item.key)) { + _skey = item.key.split(',')[0] + _ekey = item.key.split(',')[1] + } + + newsearches[_skey] = _startval + newsearches[_ekey] = _endval } else if (item.type === 'text' || item.type === 'select') { item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴 newsearches[field] = item.value @@ -630,7 +650,15 @@ _endval = val[1] + '.000' } - searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')') + let _skey = item.key + let _ekey = item.key + + if (/,/.test(item.key)) { + _skey = item.key.split(',')[0] + _ekey = item.key.split(',')[1] + } + + searchText.push('(' + _skey + ' >= \'' + _startval + '\' AND ' + _ekey + ' < \'' + _endval + '\')') } else if (item.type === 'range') { let val = item.value.split(',') @@ -846,7 +874,9 @@ sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase) } + sql = sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`) sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`) + sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`) sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`) return { @@ -2077,6 +2107,135 @@ ` } + if (btn.$process && verify.workFlow === 'true' && window.GLOB.UserCacheMap.has(btn.$flowId)) { + let flow = window.GLOB.UserCacheMap.get(btn.$flowId) + let node = null + let line = null + let target = null + let status = 0 + let statusName = '' + let detailId = '' + + if (verify.flowType === 'start') { + target = flow.cells.filter(cell => cell.mknode === 'start')[0] + + if (target) { + detailId = target.id + status = target.mkdata.status + statusName = target.mkdata.statusName + } + } else if (_data.works_flow_param) { + node = JSON.parse(window.decodeURIComponent(window.atob(_data.works_flow_param))) + + if (node) { + let lines = flow.cells.filter(cell => cell.shape === 'edge' && cell.source.cell === node.id) + if (verify.flowType === 'reject') { + line = lines.filter(cell => cell.mkdata.flowType === 'reject')[0] + } else { + line = lines.filter(cell => cell.mkdata.flowType !== 'reject')[0] + } + } + + if (line) { + detailId = line.id + status = line.mkdata.status + statusName = line.mkdata.statusName + target = flow.cells.filter(cell => cell.id === line.target.cell)[0] + } + } + + if (verify.flowSql === 'true' && target) { + if (verify.flowType === 'start') { + _sql += ` + /* 宸ヤ綔娴侀粯璁ql */ + insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid) + select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@ + insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid) + select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@ + insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid) + select @ID@,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@ + ` + } else { + _sql += ` + /* 宸ヤ綔娴侀粯璁ql */ + update s_my_works_flow set status=@status@,statusname=@statusname@,modifydate=getdate(),modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname + where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 + insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid) + select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@ + if @check_userids@ != '' + begin + delete s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 + insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid) + select @ID@,@works_flow_code@,ID,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@) + insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid) + select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@check_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@) + end + if @notice_userids@ != '' + begin + delete n + from (select * from s_my_works_flow_notice where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0) n + inner join (select ID from dbo.SplitComma(@notice_userids@)) s + on n.userid = s.id + insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid) + select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@notice_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@notice_userids@) + end + ` + } + } else if (verify.flowSql === 'true') { + target = flow.cells.filter(cell => cell.mknode === 'start')[0] + + if (target) { + detailId = target.id + } + + status = 0 + statusName = '寮傚父' + _sql += ` + /* 宸ヤ綔娴佸紓甯竤ql */ + update s_my_works_flow set status=@status@,statusname=@statusname@,modifydate=getdate(),modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname + where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 + insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid) + select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@ + ` + } + + if (verify.flowType !== 'start') { + if (line) { + let checkIds = [] + let noticeIds = [] + line.mkdata.members && line.mkdata.members.forEach(item => { + checkIds.push(item.worker_id) + }) + line.mkdata.copys && line.mkdata.copys.forEach(item => { + noticeIds.push(item.worker_id) + }) + _sql = _sql.replace(/@check_userids@/ig, `'${checkIds.join(',')}'`) + _sql = _sql.replace(/@notice_userids@/ig, `'${noticeIds.join(',')}'`) + } else { + _sql = _sql.replace(/@check_userids@/ig, `''`) + _sql = _sql.replace(/@notice_userids@/ig, `''`) + } + } + + _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`) + _sql = _sql.replace(/@check_type@/ig, verify.flowType === 'reject' ? `'椹冲洖'` : `'瀹℃牳'`) + _sql = _sql.replace(/@notice_type@/ig, `'鎶勯��'`) + + _sql = _sql.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`) + _sql = _sql.replace(/@works_flow_name@/ig, `'${flow.flow_name}'`) + if (target) { + let msg = {...target.mkdata, id: target.id} + _sql = _sql.replace(/@works_flow_param@/ig, `'${window.btoa(window.encodeURIComponent(JSON.stringify(msg)))}'`) + } else { + _sql = _sql.replace(/@works_flow_param@/ig, `''`) + } + _sql = _sql.replace(/@works_flow_detail_id@/ig, `'${detailId}'`) + _sql = _sql.replace(/@status@/ig, `'${status}'`) + _sql = _sql.replace(/@statusname@/ig, `'${statusName}'`) + _sql = _sql.replace(/@work_group@/ig, `'${sessionStorage.getItem('work_group') || ''}'`) + _sql = _sql.replace(/@work_grade@/ig, `'${sessionStorage.getItem('work_grade') || 0}'`) + } + if (_backCustomScript) { _sql += _backCustomScript } @@ -2116,9 +2275,9 @@ _sql = _sql.replace(/@typename@/ig, `'admin'`) if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺 - _sql = _sql.replace(/@datam@/ig, '\'Y\'') + _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, `'Y'`) } else { - _sql = _sql.replace(/@datam@/ig, '\'\'') + _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, `''`) } if (window.GLOB.debugger === true) { @@ -2127,20 +2286,6 @@ } if (retmsg) { - _callbacksql = _callbacksql.replace(/@ID@/ig, `'${primaryId || ''}'`) - _callbacksql = _callbacksql.replace(/@BID@/ig, `'${BID}'`) - _callbacksql = _callbacksql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`) - _callbacksql = _callbacksql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`) - _callbacksql = _callbacksql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`) - _callbacksql = _callbacksql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`) - _callbacksql = _callbacksql.replace(/@typename@/ig, `'admin'`) - - if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺 - _callbacksql = _callbacksql.replace(/@datam@/ig, '\'Y\'') - } else { - _callbacksql = _callbacksql.replace(/@datam@/ig, '\'\'') - } - return { sql: _sql, callbacksql: _callbacksql -- Gitblit v1.8.0