From ab949bb71eadda3ec1736ccdcfaa1b12b04cce6a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 05 十一月 2023 10:35:56 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils.js | 210 +++++++++++++++++++++++++++++++++------------------
1 files changed, 135 insertions(+), 75 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index e874151..74db930 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,3 +1,4 @@
+import React from 'react'
import moment from 'moment'
import md5 from 'md5'
@@ -112,46 +113,6 @@
let _str = salt + timestamp + secretkey
return md5(_str)
- }
-
- /**
- * @description sql璇硶楠岃瘉
- * @return {String} sql sql璇彞
- * @return {String} type 楠岃瘉绫诲瀷
- */
- static verifySql (sql, type) {
- if (!sql) return ''
- let chars = [
- {key: 'create', reg: /(^|\s|\(|\))create\s/ig},
- {key: 'insert', reg: /(^|\s|\(|\))insert\s/ig},
- {key: 'delete', reg: /(^|\s|\(|\))delete\s/ig},
- {key: 'update', reg: /(^|\s|\(|\))update\s/ig},
- {key: 'set', reg: /(^|\s|\(|\))set\s/ig},
- {key: 'drop', reg: /(^|\s|\(|\))drop\s/ig},
- {key: 'alter', reg: /(^|\s|\(|\))alter\s/ig},
- {key: 'truncate', reg: /(^|\s|\(|\))truncate\s/ig},
- {key: 'if', reg: /(^|\s|\(|\))if\s/ig},
- {key: 'exec', reg: /(^|\s|\(|\))exec(\s|\()/ig},
- {key: 'OBJECT', reg: /(^|\s|\(|\))object(\s|\()/ig},
- {key: 'sys.', reg: /(^|\s|\(|\))sys\./ig},
- {key: 'kill', reg: /(^|\s|\(|\))kill\s/ig}
- ]
-
- if (type === 'customscript') {
- chars = chars.filter(char => !['create', 'insert', 'delete', 'update', 'set', 'drop', 'if', 'exec'].includes(char.key))
- }
-
- let error = ''
-
- sql = sql.replace(/sys\.fn_/ig, '') // 璺宠繃sys.fn_楠岃瘉
-
- chars.forEach(char => {
- if (!error && char.reg.test(sql)) {
- error = char.key
- }
- })
-
- return error
}
/**
@@ -978,7 +939,11 @@
})
}
} else if (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type)) {
- if (!val && val !== 0) {
+ if (col.required === 'false') {
+ if (!val || isNaN(val)) {
+ val = 0
+ }
+ } else if (!val && val !== 0) {
errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else if (isNaN(val)) { // 妫�楠屾槸鍚︿负鏁板��
errors.push(_position + '鍐呭搴斾负鏁板��')
@@ -2117,6 +2082,7 @@
let status = 0
let statusName = ''
let detailId = ''
+ let error = ''
if (verify.flowType === 'start') {
target = flow.cells.filter(cell => cell.mknode === 'start')[0]
@@ -2125,17 +2091,112 @@
detailId = target.id
status = target.mkdata.status
statusName = target.mkdata.statusName
+ } else {
+ error = '宸ヤ綔娴佹棤寮�濮嬭妭鐐�'
}
} else if (_data.works_flow_param) {
- node = JSON.parse(window.decodeURIComponent(window.atob(_data.works_flow_param)))
+ try {
+ node = JSON.parse(window.decodeURIComponent(window.atob(_data.works_flow_param)))
+ } catch (e) {
+ node = null
+ }
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' || cell.mknode === 'startEdge')[0]
} else {
- line = lines.filter(cell => cell.mkdata.flowType !== 'reject' && cell.mknode !== 'startEdge')[0]
+ let endEdge = null
+ lines = lines.filter(cell => {
+ if (cell.mknode === 'endEdge') {
+ endEdge = cell
+ return false
+ }
+
+ return cell.mkdata.flowType !== 'reject' && cell.mknode !== 'startEdge'
+ })
+
+ if (lines.length === 0) {
+ if (!endEdge) {
+ error = '鏃犲彲鎵ц鐨勬祦绋嬪垎鏀�'
+ } else {
+ line = endEdge
+ }
+ } else {
+ let branchKey = verify.flowBranch ? verify.flowBranch.toLowerCase() : ''
+
+ if (!branchKey) {
+ lines.forEach(line => {
+ if (line.mkdata.execCondition === 'open') {
+ error = '鎸夐挳鏈缃祦绋嬫帶鍒跺瓧娈点��'
+ }
+ })
+ if (!error) {
+ line = lines[0]
+ }
+ } else if (!_data.hasOwnProperty(branchKey)) {
+ error = '琛屼俊鎭腑鏃犳祦绋嬫帶鍒跺瓧娈点��'
+ } else {
+ if (endEdge) {
+ line = endEdge
+ }
+
+ let equalLine = null
+ let gtOrLtLine = []
+ let unEqualLine = null
+ let branchVal = _data[branchKey]
+
+ if (branchVal && typeof(branchVal) === 'string' && !isNaN(branchVal)) {
+ branchVal = +branchVal
+ }
+
+ lines.forEach(item => {
+ if (item.mkdata.execCondition !== 'open') {
+ line = item
+ } else {
+ if (item.mkdata.match === '=') {
+ if (item.mkdata.matchVal === branchVal + '') {
+ equalLine = item
+ }
+ } else if (item.mkdata.match === '!=') {
+ if (item.mkdata.matchVal !== branchVal + '') {
+ unEqualLine = item
+ }
+ } else {
+ if (item.mkdata.match === '<') {
+ if (item.mkdata.matchVal < branchVal) {
+ gtOrLtLine.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+ }
+ } else if (item.mkdata.match === '>') {
+ if (item.mkdata.matchVal > branchVal) {
+ gtOrLtLine.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+ }
+ } else if (item.mkdata.match === '<=') {
+ if (item.mkdata.matchVal <= branchVal) {
+ gtOrLtLine.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+ }
+ } else if (item.mkdata.match === '>=') {
+ if (item.mkdata.matchVal >= branchVal) {
+ gtOrLtLine.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+ }
+ }
+ }
+ }
+ })
+
+ if (equalLine) {
+ line = equalLine
+ } else if (gtOrLtLine.length > 0) {
+ gtOrLtLine.sort((a, b) => a.dist - b.dist)
+ line = gtOrLtLine[0]
+ } else if (unEqualLine) {
+ line = unEqualLine
+ }
+ }
+ }
}
+ } else {
+ error = '琛屼俊鎭腑宸ヤ綔娴佸弬鏁版棤娉曡В鏋�'
}
if (line) {
@@ -2143,7 +2204,11 @@
status = line.mkdata.status
statusName = line.mkdata.statusName
target = flow.cells.filter(cell => cell.id === line.target.cell)[0]
+ } else if (!error) {
+ error = '宸ヤ綔娴佷腑鏃犲搴旀祦绋�'
}
+ } else {
+ error = '琛屼俊鎭腑鏃犲伐浣滄祦鍙傛暟'
}
if (verify.flowSql === 'true' && target) {
@@ -2184,20 +2249,12 @@
`
}
} 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@,works_flow_param=@works_flow_param@,works_flow_detail_id=@works_flow_detail_id@,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@
+ select @ErrorCode='E',@retmsg='${error || '宸ヤ綔娴佹墽琛屽紓甯�'}' goto aaa
`
}
@@ -2277,6 +2334,10 @@
_sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
_sql = _sql.replace(/@typename@/ig, `'admin'`)
+ if (window.GLOB.externalDatabase !== null) {
+ _sql = _sql.replace(/@db@/ig, window.GLOB.externalDatabase)
+ }
+
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
_sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, `'Y'`)
} else {
@@ -2301,12 +2362,8 @@
/**
* @description 鑾峰彇鏍囪淇℃伅
*/
-export function getMark (marks, record, style = {}) {
- let icon = null
- let innerStyle = null
- let position = null
- let signType = ''
- style = JSON.parse(JSON.stringify(style))
+export function getMark (marks, record, style) {
+ let res = {signType: ''}
marks.some(mark => {
let originVal = record[mark.field[0]]
@@ -2342,42 +2399,45 @@
if (type === 'font') {
style.color = mark.color
- innerStyle = {color: mark.color}
- signType = ' sign-font'
+ res.innerStyle = {color: mark.color}
+ res.signType = ' sign-font'
} else if (type === 'background') {
style.backgroundColor = mark.color
if (mark.fontColor) {
style.color = mark.fontColor
- innerStyle = {color: mark.fontColor}
+ res.innerStyle = {color: mark.fontColor}
}
} else if (type === 'underline') {
style.textDecoration = 'underline'
style.color = mark.color
- innerStyle = {color: mark.color, textDecoration: 'underline'}
+ res.innerStyle = {color: mark.color, textDecoration: 'underline'}
} else if (type === 'line-through') {
style.textDecoration = 'line-through'
style.color = mark.color
- innerStyle = {color: mark.color, textDecoration: 'line-through'}
+ res.innerStyle = {color: mark.color, textDecoration: 'line-through'}
} else if (type.indexOf('icon') > -1) {
- icon = mark.signType[mark.signType.length - 1]
- innerStyle = {color: mark.color}
+ res.icon = mark.signType[mark.signType.length - 1]
+ res.innerStyle = {color: mark.color}
if (type === 'iconfront' || mark.signType[1] === 'front') {
- position = 'front'
+ res.position = 'front'
} else {
- position = 'back'
+ res.position = 'back'
}
+ } else if (type === 'indent') {
+ style.color = mark.color
+ res.space = Array(mark.signType[1] + 1).join(' ')
+ } else if (type === 'pointfront') {
+ res.position = 'front'
+ res.point = <span style={{display: 'inline-block', marginRight: '3px', width: '8px', height: '8px', borderRadius: '14px', background: mark.color, verticalAlign: 'middle'}}></span>
+ } else if (type === 'pointback') {
+ res.position = 'back'
+ res.point = <span style={{display: 'inline-block', marginLeft: '3px', width: '8px', height: '8px', borderRadius: '14px', background: mark.color, verticalAlign: 'middle'}}></span>
}
return true
})
- return {
- style,
- icon,
- innerStyle,
- position,
- signType
- }
+ return res
}
/**
--
Gitblit v1.8.0