From 9a1416e0b5cdb40f49b3c2061b04b35551d77e99 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 19 九月 2023 18:14:21 +0800
Subject: [PATCH] 2023-09-19
---
src/utils/utils.js | 100 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 81 insertions(+), 19 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 247f4b3..86577d3 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -546,8 +546,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
@@ -638,7 +646,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(',')
@@ -854,7 +870,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 {
@@ -1539,6 +1557,8 @@
}
columns.forEach(col => {
+ if (col.field === 'works_flow_param') return
+
if (col.type === 'colspan' || col.type === 'old_colspan') {
col.subcols.forEach(cell => {
setField(cell)
@@ -2085,6 +2105,62 @@
`
}
+ 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.flowSql === 'true') {
+ 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) {
+ line = flow.cells.filter(cell => cell.shape === 'edge' && cell.source.cell === node.id)[0]
+ }
+
+ if (line) {
+ target = flow.cells.filter(cell => cell.id === line.target.cell)[0]
+ }
+ }
+
+ if (target) {
+ _sql += `
+ /* 宸ヤ綔娴侀粯璁ql */
+ insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff)
+ select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName
+ 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)
+ select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@
+ `
+ }
+ }
+
+ _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
}
@@ -2124,9 +2200,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) {
@@ -2135,20 +2211,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