From c96108bd84050feb01b47db3f5cae96670fda435 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 30 十月 2024 12:54:24 +0800
Subject: [PATCH] 2024-10-30
---
src/utils/utils.js | 431 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 368 insertions(+), 63 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index ea19a1d..a93c540 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -71,6 +71,7 @@
uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
}
uuid = timestamp + uuid.join('')
+ uuid = uuid.replace(/minke/ig, 'mnkie')
return uuid
}
@@ -416,7 +417,11 @@
item.$first = true
}
}
-
+
+ if (window.backend && ['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(item.type) && item.resourceType === '1') {
+ item.uuid = md5(config.uuid + item.uuid)
+ }
+
item.oriInitval = item.initval
if (values) {
@@ -712,6 +717,157 @@
return searchText.join(' AND ')
}
+ static getSearchkeys (searches) {
+ let searchText = []
+ let matchs = {
+ 'like': '01',
+ 'not like': '02',
+ '=': '03',
+ '>': '04',
+ '<': '05',
+ '>=': '06',
+ '<=': '07',
+ }
+
+ searches.forEach(item => {
+ if (item.forbid || !item.value) return
+
+ let cell = {
+ key: item.key,
+ match: item.match,
+ type: 'text',
+ value: item.value
+ }
+
+ if (item.type === 'text' || item.type === 'select') { // 缁煎悎鎼滅储锛屾枃鏈垨涓嬫媺锛屾墍鏈夊瓧娈垫嫾鎺�
+ if (/,/.test(item.key)) {
+ cell.type = 'text_or'
+ }
+ } else if (item.type === 'multi') {
+ cell.type = 'text_multi'
+ } else if (item.type === 'date') {
+ let _val = item.value
+ let timetail = ''
+
+ if (item.match === '<' || item.match === '<=') { // 鏃堕棿涓�<=鏃讹紝鍖归厤鍚庝竴澶╃殑0鐐癸紝鍖归厤鏂瑰紡涓�<
+ cell.match = '<'
+ if (item.precision === 'day') {
+ _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ }
+ }
+ if (item.match === '=') {
+ timetail = ''
+ } else if (item.precision === 'day') {
+ timetail = ' 00:00:00.000'
+ } else if (item.precision === 'hour') {
+ timetail = ':00:00.000'
+ } else if (item.precision === 'minute') {
+ timetail = ':00.000'
+ } else if (item.precision === 'second') {
+ timetail = '.000'
+ }
+
+ cell.value = _val + timetail
+ }
+
+ if (item.type === 'datemonth') { // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫锛岀粨鏉熸椂闂翠负鏈堟湯鍔犱竴澶╃殑0鐐癸紝鏂瑰紡涓�<
+ if (item.match === '=') {
+ searchText.push(cell)
+ } else {
+ let _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
+ let _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+
+ searchText.push({
+ key: item.key,
+ match: '>=',
+ type: 'text',
+ value: _startval
+ }, {
+ key: item.key,
+ match: '<',
+ type: 'text',
+ value: _endval
+ })
+ }
+ } else if (item.type === 'dateweek') { // 鍛�-杩囨护鏉′欢
+ let _startval = moment(item.value, 'YYYY-MM-DD' ).startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000'
+ let _endval = moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+
+ searchText.push({
+ key: item.key,
+ match: '>=',
+ type: 'text',
+ value: _startval
+ }, {
+ key: item.key,
+ match: '<',
+ type: 'text',
+ value: _endval
+ })
+ } else if (item.type === 'daterange') {
+ let val = item.value.split(',')
+ let _startval = ''
+ let _endval = ''
+
+ if (item.precision === 'day') {
+ _startval = val[0] + ' 00:00:00.000'
+ _endval = moment(val[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ } else if (item.precision === 'hour') {
+ _startval = val[0] + ':00:00.000'
+ _endval = val[1] + ':00:00.000'
+ } else if (item.precision === 'minute') {
+ _startval = val[0] + ':00.000'
+ _endval = val[1] + ':00.000'
+ } else if (item.precision === 'second') {
+ _startval = val[0] + '.000'
+ _endval = val[1] + '.000'
+ }
+
+ let _skey = item.key
+ let _ekey = item.key
+
+ if (/,/.test(item.key)) {
+ _skey = item.key.split(',')[0]
+ _ekey = item.key.split(',')[1]
+ }
+
+ searchText.push({
+ key: _skey,
+ match: '>=',
+ type: 'text',
+ value: _startval
+ }, {
+ key: _ekey,
+ match: '<',
+ type: 'text',
+ value: _endval
+ })
+ } else if (item.type === 'range') {
+ let val = item.value.split(',')
+
+ searchText.push({
+ key: item.key,
+ match: '>=',
+ type: 'text',
+ value: val[0] || -999999999
+ }, {
+ key: item.key,
+ match: '<=',
+ type: 'text',
+ value: val[1] || 999999999
+ })
+ } else {
+ searchText.push(cell)
+ }
+ })
+
+ searchText.forEach(item => {
+ item.match = matchs[item.match] || '01'
+ })
+
+ return searchText
+ }
+
/**
* @description 鑾峰彇鎼滅储鐢ㄤ簬姝ｅ垯鏇挎崲
* @param {Array} searches 鎼滅储鏉′欢
@@ -916,6 +1072,7 @@
sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ sql = sql.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
return {
sql: sql,
@@ -1094,6 +1251,7 @@
{reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
{reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
{reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ {reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
{reg: /@typename@/ig, value: `'admin'`},
{reg: /\$@/ig, value: isDM ? '/*' : ''},
{reg: /@\$/ig, value: isDM ? '*/' : ''},
@@ -1256,18 +1414,90 @@
${_uniquesql}
${_prevCustomScript}
- ${_insert}
+ ${_insert}`
+
+ if (item.$process && btn.workFlow === 'true' && window.GLOB.UserCacheMap.has(item.$flowId)) {
+ let flow = window.GLOB.UserCacheMap.get(item.$flowId)
+ let target = flow.cells.filter(cell => cell.mknode === 'start')[0]
+
+ let flowsql = ''
+ let status = 0
+ let statusName = ''
+ let detailId = ''
+ let work_grade = sessionStorage.getItem('work_grade') || 0
+
+ if (target) {
+ detailId = target.id
+ status = target.mkdata.status
+ statusName = target.mkdata.statusName
+ }
+
+ if (!target) {
+ status = 0
+ statusName = '寮傚父'
+
+ flowsql = `
+ /* 宸ヤ綔娴佸紓甯竤ql */
+ select @ErrorCode='E',@retmsg='宸ヤ綔娴佹棤寮�濮嬭妭鐐�' goto aaa
+ `
+ } else if (btn.flowSql === 'true') {
+ flowsql = `
+ /* 宸ヤ綔娴侀粯璁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 jskey,@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@
+ from #${sheet}
+
+ 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,bid,createuserid,CreateUser,CreateStaff,upid)
+ select jskey,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
+ from #${sheet}
+
+ 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 jskey,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@
+ from #${sheet}
+
+ insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid,typecharone)
+ select jskey,@works_flow_code@,@userid@,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@,'begin'
+ from #${sheet}
+ `
+ }
+ sql += `
+ ${flowsql}
${_backCustomScript}
drop table #${sheet}
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+ sql = sql.replace(/@start_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 label = target.attrs && target.attrs.text && target.attrs.text.text ? target.attrs.text.text : ''
+ let msg = {...target.mkdata, label: label, id: target.id, checkIds: [], checkUsers: []}
+ 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, `'${work_grade}'`)
+ } else {
+ sql += `
+ ${_backCustomScript}
+
+ drop table #${sheet}
+
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+ }
+
sql = sql.replace(/\n\s{6}/ig, '\n')
if (window.GLOB.debugger === true) {
- console.info('%c' + item.logLabel, 'color: blue')
- console.info(sql)
+ window.mkInfo('%c' + item.logLabel, 'color: blue')
+ window.mkInfo(sql)
}
} else {
for(let i = 0; i < _Ltext.length; i += 20) {
@@ -1353,6 +1583,7 @@
{reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
{reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
{reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ {reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
{reg: /@typename@/ig, value: `'admin'`},
{reg: /\$@/ig, value: isDM ? '/*' : ''},
{reg: /@\$/ig, value: isDM ? '*/' : ''},
@@ -1510,8 +1741,8 @@
sql = sql.replace(/\n\s{6}/ig, '\n')
if (window.GLOB.debugger === true) {
- console.info('%c' + btn.logLabel, 'color: blue')
- console.info(sql)
+ window.mkInfo('%c' + btn.logLabel, 'color: blue')
+ window.mkInfo(sql)
}
} else {
for(let i = 0; i < _Ltext.length; i += 20) {
@@ -1540,7 +1771,7 @@
* @return {Array} columns 鏄剧ず鍒�
* @return {Boolean} retmsg 鏄惁闇�瑕佹暟鎹繑鍥�
*/
-export function getSysDefaultSql (btn, setting, formdata, param, data, columns, retmsg = false, moduleParams) {
+export function getSysDefaultSql (btn, setting, formdata, param, data, columns, retmsg = false) {
let primaryId = param.ID
let BID = param.BID || ''
let verify = btn.verify || {}
@@ -1789,9 +2020,31 @@
}
// 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
- if (verify.invalid === 'true' && moduleParams && moduleParams.dataresource) {
- let datasource = moduleParams.dataresource
- let customScript = moduleParams.customScript || ''
+ if (verify.invalid === 'true' && setting.dataresource) {
+ let datasource = setting.dataresource
+ let customScript = setting.customScript || ''
+
+ let regoptions = [{
+ reg: new RegExp('@userName@', 'ig'),
+ value: `'${sessionStorage.getItem('User_Name') || ''}'`
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: `'${sessionStorage.getItem('Full_Name') || ''}'`
+ }, {
+ reg: new RegExp('@orderBy@', 'ig'),
+ value: setting.order || primaryKey
+ }, {
+ reg: new RegExp('@pageSize@', 'ig'),
+ value: 1
+ }, {
+ 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 += `
@@ -1866,7 +2119,6 @@
if (!keys.includes(_key)) return // 琛ㄥ崟涓笉鍚崟鍙风敓鎴愬瓧娈�
- let _ModularDetailCode = ''
let _lpline = ''
if (item.TypeCharOne === 'Lp') {
if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
@@ -1874,33 +2126,29 @@
} else {
_lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${_linkKey},48)`
}
- _ModularDetailCode = '@ModularDetailCode'
} else if (item.TypeCharOne === 'BN') {
- let _val = ''
if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
- _val = BID
- } else if (_data.hasOwnProperty(_linkKey)) {
- _val = _data[_linkKey]
+ _lpline = `set @ModularDetailCode= 'BN'+ right(@BID@,48)`
+ } else {
+ _lpline = `set @ModularDetailCode= 'BN'+ right(@${_linkKey},48)`
}
- _ModularDetailCode = `'${item.TypeCharOne + _val}'`
} else {
- _ModularDetailCode = `'${item.ModularDetailCode}'`
+ _lpline = `set @ModularDetailCode= right('${item.ModularDetailCode}',50)`
}
- let _declare = ''
+ // let _declare = ''
- if (!_vars.includes(_key)) {
- _declare = `Declare @${_key} nvarchar(50)`
- _vars.push(_key)
- }
+ // if (!_vars.includes(_key)) {
+ // _declare = `Declare @${_key} nvarchar(50)`
+ // _vars.push(_key)
+ // }
_billcodesSql += `
/* 鍗曞彿鐢熸垚 */
- ${_declare}
select @BillCode='', @${_key}='', @ModularDetailCode=''
${_lpline}
exec s_get_BillCode
- @ModularDetailCode=${_ModularDetailCode},
+ @ModularDetailCode=@ModularDetailCode,
@Type=${item.Type},
@TypeCharOne='${item.TypeCharOne}',
@TypeCharTwo ='${item.TypeCharTwo}',
@@ -1939,11 +2187,6 @@
_value.push(`${_labels[index] || ''}锛�${_val || ''}`)
})
- let _verifyType = ''
- if (item.verifyType === 'logic') {
- _verifyType = ' and deleted=0'
- }
-
if (!arr.includes(primaryKey.toLowerCase())) {
_fieldValue.push(`${primaryKey} !='${primaryId}'`)
}
@@ -1951,7 +2194,7 @@
_sql += `
/* 鍞竴鎬ч獙璇� */
select @tbid='', @ErrorCode='',@retmsg=''
- select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')}${_verifyType}
+ select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')}${item.verifyType === 'logic' ? ' and deleted=0' : ''}
If @tbid!=''
Begin
select @ErrorCode='${item.errorCode}',@retmsg='${_value.join(', ')} 宸插瓨鍦�'
@@ -2158,7 +2401,7 @@
if (data && columns && columns.length > 0 && btn.Ot !== 'notRequired') {
let _index = 0
columns.forEach(col => {
- if (!col.field || col.Hide === 'true' || _index >= 4) return
+ if (!col.field || col.Hide === 'true' || _index >= 4 || col.field === primaryKey) return
_msg += col.label + '=' + data[col.field] + ','
_index++
})
@@ -2381,6 +2624,10 @@
error = '琛屼俊鎭腑鏃犲伐浣滄祦鍙傛暟'
}
+ if (!error && verify.flowSql !== 'true' && verify.flowType !== 'start' && line && line.approvalMethod === 'countersign') {
+ error = '浼氱娴佺▼闇�瑕佷娇鐢ㄩ粯璁よ剼鏈�'
+ }
+
if (error) {
status = 0
statusName = '寮傚父'
@@ -2429,6 +2676,33 @@
_sql += `
/* 宸ヤ綔娴侀粯璁ql */
+ set @retmsg =''
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg =''
+ begin
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
+ if @retmsg !=''
+ begin
+ select @ErrorCode='E', @retmsg='褰撳墠鍗曟嵁宸插鏍革紝璇峰埛鏂板悗閲嶈瘯'
+ goto aaa
+ end
+
+ set @retmsg =''
+ select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg !=''
+ begin
+ select @retmsg=workerCode+workerName from BD_workers where id=@retmsg
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+ goto aaa
+ end
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
+ goto aaa
+ end
+
declare ${_declare},@works_flow_key_id nvarchar(50),@works_flow_key_status nvarchar(20),@s_my_works_flow_log_param nvarchar(max),@s_my_works_flow_log_status int,@s_my_works_flow_log_statusname nvarchar(50),@s_my_works_flow_log_detail_id nvarchar(50)
select ${_select},@works_flow_key_id='',@works_flow_key_status ='',@s_my_works_flow_log_param='',@s_my_works_flow_log_status=0,@s_my_works_flow_log_statusname='',@s_my_works_flow_log_detail_id=''
@@ -2485,21 +2759,48 @@
_sql += `
/* 宸ヤ綔娴侀粯璁ql */
set @retmsg =''
- select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
if @retmsg =''
begin
- select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
- if @retmsg !=''
+ if @retmsg !=''
begin
select @ErrorCode='E', @retmsg='褰撳墠鍗曟嵁宸插鏍革紝璇峰埛鏂板悗閲嶈瘯'
- goto aaa
+ goto aaa
+ end
+
+ if @dataM@ !=''
+ begin
+ set @retmsg =''
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg != ''
+ begin
+ goto goto_mk
+ end
+ end
+ else
+ begin
+ set @retmsg =''
+ select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg !=''
+ begin
+ select @retmsg=workerCode+workerName from BD_workers where id=@retmsg
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+ goto aaa
+ end
end
select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
- goto aaa
+ goto aaa
end
+
+ goto_mk:
+
set @retmsg=''
update s_my_works_flow set status=@status@,statusname=@statusname@,works_flow_param=@works_flow_param@,works_flow_detail_id=@works_flow_detail_id@,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname${verify.flowRemark ? ',remark=@' + verify.flowRemark : ''}
@@ -2510,7 +2811,7 @@
update s_my_works_flow_role set deleted=10,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
- ${line.mknode === 'startEdge' ? `update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ ${line.mknode === 'startEdge' ? `update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname,works_flow_detail_id=@works_flow_detail_id@
where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and typecharone='begin'` : ''}
if @check_userids@ != ''
@@ -2538,14 +2839,17 @@
_sql += _backCustomScript
}
- _sql = _sql.replace(/@works_flow_sign@/ig, `'${sign}'`)
+ if (verify.flowType === 'start') {
+ _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)
+ } else {
+ _sql = _sql.replace(/@works_flow_sign@/ig, `'${sign}'`)
- _sql = _sql.replace(/@check_userids@/ig, `'${checkIds.join(',')}'`)
- _sql = _sql.replace(/@notice_userids@/ig, `'${noticeIds.join(',')}'`)
+ _sql = _sql.replace(/@check_type@/ig, verify.flowType === 'reject' ? `'椹冲洖'` : `'瀹℃牳'`)
+ _sql = _sql.replace(/@notice_type@/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(/@check_userids@/ig, `'${checkIds.join(',')}'`)
+ _sql = _sql.replace(/@notice_userids@/ig, `'${noticeIds.join(',')}'`)
+ }
_sql = _sql.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
_sql = _sql.replace(/@works_flow_name@/ig, `'${flow.flow_name}'`)
@@ -2598,6 +2902,7 @@
_sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
_sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
_sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sql = _sql.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
_sql = _sql.replace(/@typename@/ig, `'admin'`)
if (window.GLOB.externalDatabase !== null) {
@@ -2611,8 +2916,8 @@
}
if (window.GLOB.debugger === true) {
- console.info('%c' + btn.logLabel, 'color: blue')
- console.info(_sql)
+ window.mkInfo('%c' + btn.logLabel, 'color: blue')
+ window.mkInfo(_sql)
}
if (retmsg) {
@@ -2709,23 +3014,23 @@
/**
* @description 鐢熸垚鏇挎崲鍑芥暟鍒楄〃
*/
-export function setGLOBFuncs () {
- window.GLOB.funcs = []
- if (!window.GLOB.IndexDB) {
- return
- }
+// export function setGLOBFuncs () {
+// window.GLOB.funcs = []
+// if (!window.GLOB.IndexDB) {
+// return
+// }
- let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
+// let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
- objectStore.openCursor().onsuccess = (event) => {
- let cursor = event.target.result
+// objectStore.openCursor().onsuccess = (event) => {
+// let cursor = event.target.result
- if (cursor) {
- window.GLOB.funcs.push({
- func_code: cursor.value.func_code,
- key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
- })
- cursor.continue()
- }
- }
-}
\ No newline at end of file
+// if (cursor) {
+// window.GLOB.funcs.push({
+// func_code: cursor.value.func_code,
+// key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
+// })
+// cursor.continue()
+// }
+// }
+// }
\ No newline at end of file
--
Gitblit v1.8.0