Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
158708c1
authored
Nov 19, 2024
by
YunaiV
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/bpm' of
https://gitee.com/yudaocode/yudao-ui-admin-vue3
into feature/bpm
parents
6304a8e9
2fe28af0
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
278 additions
and
108 deletions
+278
-108
src/components/FormCreate/src/components/useApiSelect.tsx
+1
-1
src/components/SimpleProcessDesignerV2/src/consts.ts
+21
-1
src/components/SimpleProcessDesignerV2/src/node.ts
+111
-80
src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue
+77
-4
src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
+68
-22
No files found.
src/components/FormCreate/src/components/useApiSelect.tsx
View file @
158708c1
...
@@ -185,7 +185,7 @@ export const useApiSelect = (option: ApiSelectProps) => {
...
@@ -185,7 +185,7 @@ export const useApiSelect = (option: ApiSelectProps) => {
</
el
-
select
>
</
el
-
select
>
)
)
}
}
debugger
//
debugger
return
(
return
(
<
el
-
select
<
el
-
select
class=
"w-1/1"
class=
"w-1/1"
...
...
src/components/SimpleProcessDesignerV2/src/consts.ts
View file @
158708c1
...
@@ -79,7 +79,7 @@ export interface SimpleFlowNode {
...
@@ -79,7 +79,7 @@ export interface SimpleFlowNode {
// 审批按钮设置
// 审批按钮设置
buttonsSetting
?:
any
[]
buttonsSetting
?:
any
[]
// 表单权限
// 表单权限
fieldsPermission
?:
Array
<
Record
<
string
,
string
>>
fieldsPermission
?:
Array
<
Record
<
string
,
any
>>
// 审批任务超时处理
// 审批任务超时处理
timeoutHandler
?:
TimeoutHandler
timeoutHandler
?:
TimeoutHandler
// 审批任务拒绝处理
// 审批任务拒绝处理
...
@@ -145,6 +145,14 @@ export enum CandidateStrategy {
...
@@ -145,6 +145,14 @@ export enum CandidateStrategy {
* 指定用户组
* 指定用户组
*/
*/
USER_GROUP
=
40
,
USER_GROUP
=
40
,
/**
* 表单内用户字段
*/
USER_FIELD_ON_FORM
=
50
,
/**
* 表单内部门负责人
*/
DEPT_LEADER_ON_FORM
=
51
,
/**
/**
* 流程表达式
* 流程表达式
*/
*/
...
@@ -424,6 +432,8 @@ export const CANDIDATE_STRATEGY: DictDataVO[] = [
...
@@ -424,6 +432,8 @@ export const CANDIDATE_STRATEGY: DictDataVO[] = [
{
label
:
'发起人部门负责人'
,
value
:
CandidateStrategy
.
START_USER_DEPT_LEADER
},
{
label
:
'发起人部门负责人'
,
value
:
CandidateStrategy
.
START_USER_DEPT_LEADER
},
{
label
:
'发起人连续部门负责人'
,
value
:
CandidateStrategy
.
START_USER_MULTI_LEVEL_DEPT_LEADER
},
{
label
:
'发起人连续部门负责人'
,
value
:
CandidateStrategy
.
START_USER_MULTI_LEVEL_DEPT_LEADER
},
{
label
:
'用户组'
,
value
:
CandidateStrategy
.
USER_GROUP
},
{
label
:
'用户组'
,
value
:
CandidateStrategy
.
USER_GROUP
},
{
label
:
'表单内用户字段'
,
value
:
CandidateStrategy
.
USER_FIELD_ON_FORM
},
{
label
:
'表单内部门负责人'
,
value
:
CandidateStrategy
.
DEPT_LEADER_ON_FORM
},
{
label
:
'流程表达式'
,
value
:
CandidateStrategy
.
EXPRESSION
}
{
label
:
'流程表达式'
,
value
:
CandidateStrategy
.
EXPRESSION
}
]
]
// 审批节点 的审批类型
// 审批节点 的审批类型
...
@@ -548,3 +558,13 @@ export const MULTI_LEVEL_DEPT: DictDataVO = [
...
@@ -548,3 +558,13 @@ export const MULTI_LEVEL_DEPT: DictDataVO = [
{
label
:
'第 14 级部门'
,
value
:
14
},
{
label
:
'第 14 级部门'
,
value
:
14
},
{
label
:
'第 15 级部门'
,
value
:
15
}
{
label
:
'第 15 级部门'
,
value
:
15
}
]
]
/**
* 流程实例的变量枚举
*/
export
enum
ProcessVariableEnum
{
/**
* 发起用户 ID
*/
START_USER_ID
=
'PROCESS_START_USER_ID'
}
src/components/SimpleProcessDesignerV2/src/node.ts
View file @
158708c1
...
@@ -14,7 +14,8 @@ import {
...
@@ -14,7 +14,8 @@ import {
NODE_DEFAULT_NAME
,
NODE_DEFAULT_NAME
,
AssignStartUserHandlerType
,
AssignStartUserHandlerType
,
AssignEmptyHandlerType
,
AssignEmptyHandlerType
,
FieldPermissionType
FieldPermissionType
,
ProcessVariableEnum
}
from
'./consts'
}
from
'./consts'
export
function
useWatchNode
(
props
:
{
flowNode
:
SimpleFlowNode
}):
Ref
<
SimpleFlowNode
>
{
export
function
useWatchNode
(
props
:
{
flowNode
:
SimpleFlowNode
}):
Ref
<
SimpleFlowNode
>
{
const
node
=
ref
<
SimpleFlowNode
>
(
props
.
flowNode
)
const
node
=
ref
<
SimpleFlowNode
>
(
props
.
flowNode
)
...
@@ -27,12 +28,67 @@ export function useWatchNode(props: { flowNode: SimpleFlowNode }): Ref<SimpleFlo
...
@@ -27,12 +28,67 @@ export function useWatchNode(props: { flowNode: SimpleFlowNode }): Ref<SimpleFlo
return
node
return
node
}
}
// 解析 formCreate 所有表单字段, 并返回
const
parseFormCreateFields
=
(
formFields
?:
string
[])
=>
{
const
result
:
Array
<
Record
<
string
,
any
>>
=
[]
if
(
formFields
)
{
formFields
.
forEach
((
fieldStr
:
string
)
=>
{
parseFields
(
JSON
.
parse
(
fieldStr
),
result
)
})
}
// 固定添加发起人 ID 字段
result
.
unshift
(
{
field
:
ProcessVariableEnum
.
START_USER_ID
,
title
:
'发起人'
,
type
:
'UserSelect'
,
required
:
true
})
return
result
}
const
parseFields
=
(
rule
:
Record
<
string
,
any
>
,
fields
:
Array
<
Record
<
string
,
any
>>
,
parentTitle
:
string
=
''
)
=>
{
const
{
type
,
field
,
$required
,
title
:
tempTitle
,
children
}
=
rule
if
(
field
&&
tempTitle
)
{
let
title
=
tempTitle
if
(
parentTitle
)
{
title
=
`
${
parentTitle
}
.
${
tempTitle
}
`
}
let
required
=
false
;
if
(
$required
)
{
required
=
true
;
}
fields
.
push
({
field
,
title
,
type
,
required
})
// TODO 子表单 需要处理子表单字段
// if (type === 'group' && rule.props?.rule && Array.isArray(rule.props.rule)) {
// // 解析子表单的字段
// rule.props.rule.forEach((item) => {
// parseFields(item, fieldsPermission, title)
// })
// }
}
if
(
children
&&
Array
.
isArray
(
children
))
{
children
.
forEach
((
rule
)
=>
{
parseFields
(
rule
,
fields
)
})
}
}
/**
/**
* @description 表单数据权限配置,用于发起人节点 、审批节点、抄送节点
* @description 表单数据权限配置,用于发起人节点 、审批节点、抄送节点
*/
*/
export
function
useFormFieldsPermission
(
defaultPermission
:
FieldPermissionType
)
{
export
function
useFormFieldsPermission
(
defaultPermission
:
FieldPermissionType
)
{
// 字段权限配置. 需要有 field, title, permissioin 属性
// 字段权限配置. 需要有 field, title, permissioin 属性
const
fieldsPermissionConfig
=
ref
<
Array
<
Record
<
string
,
string
>>>
([])
const
fieldsPermissionConfig
=
ref
<
Array
<
Record
<
string
,
any
>>>
([])
const
formType
=
inject
<
Ref
<
number
>>
(
'formType'
)
// 表单类型
const
formType
=
inject
<
Ref
<
number
>>
(
'formType'
)
// 表单类型
...
@@ -45,49 +101,28 @@ export function useFormFieldsPermission(defaultPermission: FieldPermissionType)
...
@@ -45,49 +101,28 @@ export function useFormFieldsPermission(defaultPermission: FieldPermissionType)
}
}
// 默认的表单权限: 获取表单的所有字段,设置字段默认权限为只读
// 默认的表单权限: 获取表单的所有字段,设置字段默认权限为只读
const
getDefaultFieldsPermission
=
(
formFields
?:
string
[])
=>
{
const
getDefaultFieldsPermission
=
(
formFields
?:
string
[])
=>
{
const
defaultFieldsPermission
:
Array
<
Record
<
string
,
string
>>
=
[]
let
defaultFieldsPermission
:
Array
<
Record
<
string
,
any
>>
=
[]
if
(
formFields
)
{
if
(
formFields
)
{
formFields
.
forEach
((
fieldStr
:
string
)
=>
{
defaultFieldsPermission
=
parseFormCreateFields
(
formFields
).
map
(
item
=>
{
parseFieldsSetDefaultPermission
(
JSON
.
parse
(
fieldStr
),
defaultFieldsPermission
)
return
{
})
field
:
item
.
field
,
title
:
item
.
title
,
permission
:
defaultPermission
}
});
}
}
return
defaultFieldsPermission
return
defaultFieldsPermission
}
}
// 解析字段。赋给默认权限
const
parseFieldsSetDefaultPermission
=
(
rule
:
Record
<
string
,
any
>
,
fieldsPermission
:
Array
<
Record
<
string
,
string
>>
,
// 获取表单的所有字段,作为下拉框选项
parentTitle
:
string
=
''
const
formFieldOptions
=
parseFormCreateFields
(
unref
(
formFields
))
)
=>
{
const
{
/**type,*/
field
,
title
:
tempTitle
,
children
}
=
rule
if
(
field
&&
tempTitle
)
{
let
title
=
tempTitle
if
(
parentTitle
)
{
title
=
`
${
parentTitle
}
.
${
tempTitle
}
`
}
fieldsPermission
.
push
({
field
,
title
,
permission
:
defaultPermission
})
// TODO 子表单 需要处理子表单字段
// if (type === 'group' && rule.props?.rule && Array.isArray(rule.props.rule)) {
// // 解析子表单的字段
// rule.props.rule.forEach((item) => {
// parseFieldsSetDefaultPermission(item, fieldsPermission, title)
// })
// }
}
if
(
children
&&
Array
.
isArray
(
children
))
{
children
.
forEach
((
rule
)
=>
{
parseFieldsSetDefaultPermission
(
rule
,
fieldsPermission
)
})
}
}
return
{
return
{
formType
,
formType
,
fieldsPermissionConfig
,
fieldsPermissionConfig
,
formFieldOptions
,
getNodeConfigFormFields
getNodeConfigFormFields
}
}
}
}
...
@@ -95,50 +130,8 @@ export function useFormFieldsPermission(defaultPermission: FieldPermissionType)
...
@@ -95,50 +130,8 @@ export function useFormFieldsPermission(defaultPermission: FieldPermissionType)
* @description 获取表单的字段
* @description 获取表单的字段
*/
*/
export
function
useFormFields
()
{
export
function
useFormFields
()
{
// 解析后的表单字段
const
formFields
=
inject
<
Ref
<
string
[]
>>
(
'formFields'
)
// 流程表单字段
const
formFields
=
inject
<
Ref
<
string
[]
>>
(
'formFields'
)
// 流程表单字段
const
parseFormFields
=
()
=>
{
return
parseFormCreateFields
(
unref
(
formFields
))
const
parsedFormFields
:
Array
<
Record
<
string
,
string
>>
=
[]
if
(
formFields
)
{
formFields
.
value
.
forEach
((
fieldStr
:
string
)
=>
{
parseField
(
JSON
.
parse
(
fieldStr
),
parsedFormFields
)
})
}
return
parsedFormFields
}
// 解析字段。
const
parseField
=
(
rule
:
Record
<
string
,
any
>
,
parsedFormFields
:
Array
<
Record
<
string
,
string
>>
,
parentTitle
:
string
=
''
)
=>
{
const
{
field
,
title
:
tempTitle
,
children
,
type
}
=
rule
if
(
field
&&
tempTitle
)
{
let
title
=
tempTitle
if
(
parentTitle
)
{
title
=
`
${
parentTitle
}
.
${
tempTitle
}
`
}
parsedFormFields
.
push
({
field
,
title
,
type
})
// TODO 子表单 需要处理子表单字段
// if (type === 'group' && rule.props?.rule && Array.isArray(rule.props.rule)) {
// // 解析子表单的字段
// rule.props.rule.forEach((item) => {
// parseFieldsSetDefaultPermission(item, fieldsPermission, title)
// })
// }
}
if
(
children
&&
Array
.
isArray
(
children
))
{
children
.
forEach
((
rule
)
=>
{
parseField
(
rule
,
parsedFormFields
)
})
}
}
return
parseFormFields
()
}
}
export
type
UserTaskFormType
=
{
export
type
UserTaskFormType
=
{
...
@@ -152,6 +145,8 @@ export type UserTaskFormType = {
...
@@ -152,6 +145,8 @@ export type UserTaskFormType = {
userGroups
?:
number
[]
// 用户组
userGroups
?:
number
[]
// 用户组
postIds
?:
number
[]
// 岗位
postIds
?:
number
[]
// 岗位
expression
?:
string
// 流程表达式
expression
?:
string
// 流程表达式
userFieldOnForm
?:
string
// 表单内用户字段
deptFieldOnForm
?:
string
// 表单内部门字段
approveRatio
?:
number
approveRatio
?:
number
rejectHandlerType
?:
RejectHandlerType
rejectHandlerType
?:
RejectHandlerType
returnNodeId
?:
string
returnNodeId
?:
string
...
@@ -174,6 +169,8 @@ export type CopyTaskFormType = {
...
@@ -174,6 +169,8 @@ export type CopyTaskFormType = {
userIds
?:
number
[]
// 用户
userIds
?:
number
[]
// 用户
userGroups
?:
number
[]
// 用户组
userGroups
?:
number
[]
// 用户组
postIds
?:
number
[]
// 岗位
postIds
?:
number
[]
// 岗位
userFieldOnForm
?:
string
// 表单内用户字段
deptFieldOnForm
?:
string
// 表单内部门字段
expression
?:
string
// 流程表达式
expression
?:
string
// 流程表达式
}
}
...
@@ -187,6 +184,7 @@ export function useNodeForm(nodeType: NodeType) {
...
@@ -187,6 +184,7 @@ export function useNodeForm(nodeType: NodeType) {
const
deptOptions
=
inject
<
Ref
<
DeptApi
.
DeptVO
[]
>>
(
'deptList'
)
// 部门列表
const
deptOptions
=
inject
<
Ref
<
DeptApi
.
DeptVO
[]
>>
(
'deptList'
)
// 部门列表
const
userGroupOptions
=
inject
<
Ref
<
UserGroupApi
.
UserGroupVO
[]
>>
(
'userGroupList'
)
// 用户组列表
const
userGroupOptions
=
inject
<
Ref
<
UserGroupApi
.
UserGroupVO
[]
>>
(
'userGroupList'
)
// 用户组列表
const
deptTreeOptions
=
inject
(
'deptTree'
)
// 部门树
const
deptTreeOptions
=
inject
(
'deptTree'
)
// 部门树
const
formFields
=
inject
<
Ref
<
string
[]
>>
(
'formFields'
)
// 流程表单字段
const
configForm
=
ref
<
UserTaskFormType
|
CopyTaskFormType
>
()
const
configForm
=
ref
<
UserTaskFormType
|
CopyTaskFormType
>
()
if
(
nodeType
===
NodeType
.
USER_TASK_NODE
)
{
if
(
nodeType
===
NodeType
.
USER_TASK_NODE
)
{
configForm
.
value
=
{
configForm
.
value
=
{
...
@@ -282,6 +280,18 @@ export function useNodeForm(nodeType: NodeType) {
...
@@ -282,6 +280,18 @@ export function useNodeForm(nodeType: NodeType) {
}
}
}
}
// 表单内用户字段
if
(
configForm
.
value
?.
candidateStrategy
===
CandidateStrategy
.
USER_FIELD_ON_FORM
)
{
const
formFieldOptions
=
parseFormCreateFields
(
unref
(
formFields
))
const
item
=
formFieldOptions
.
find
((
item
)
=>
item
.
field
===
configForm
.
value
?.
userFieldOnForm
)
showText
=
`表单用户:
${
item
?.
title
}
`
}
// 表单内部门负责人
if (configForm.value?.candidateStrategy === CandidateStrategy.DEPT_LEADER_ON_FORM) {
showText = `
表单内部门负责人
`
}
// 发起人自选
// 发起人自选
if (configForm.value?.candidateStrategy === CandidateStrategy.START_USER_SELECT) {
if (configForm.value?.candidateStrategy === CandidateStrategy.START_USER_SELECT) {
showText = `
发起人自选
`
showText = `
发起人自选
`
...
@@ -328,6 +338,9 @@ export function useNodeForm(nodeType: NodeType) {
...
@@ -328,6 +338,9 @@ export function useNodeForm(nodeType: NodeType) {
case CandidateStrategy.USER_GROUP:
case CandidateStrategy.USER_GROUP:
candidateParam = configForm.value.userGroups!.join(',')
candidateParam = configForm.value.userGroups!.join(',')
break
break
case CandidateStrategy.USER_FIELD_ON_FORM:
candidateParam = configForm.value.userFieldOnForm!
break
case CandidateStrategy.EXPRESSION:
case CandidateStrategy.EXPRESSION:
candidateParam = configForm.value.expression!
candidateParam = configForm.value.expression!
break
break
...
@@ -347,6 +360,13 @@ export function useNodeForm(nodeType: NodeType) {
...
@@ -347,6 +360,13 @@ export function useNodeForm(nodeType: NodeType) {
candidateParam = deptIds.concat('|' + configForm.value.deptLevel + '')
candidateParam = deptIds.concat('|' + configForm.value.deptLevel + '')
break
break
}
}
// 表单内部门的负责人
case CandidateStrategy.DEPT_LEADER_ON_FORM: {
// 候选人参数格式: | 分隔 。左边为表单内部门字段。 右边为部门层级
const deptFieldOnForm = configForm.value.deptFieldOnForm!
candidateParam = deptFieldOnForm.concat('|' + configForm.value.deptLevel + '')
break
}
default:
default:
break
break
}
}
...
@@ -376,6 +396,9 @@ export function useNodeForm(nodeType: NodeType) {
...
@@ -376,6 +396,9 @@ export function useNodeForm(nodeType: NodeType) {
case CandidateStrategy.USER_GROUP:
case CandidateStrategy.USER_GROUP:
configForm.value.userGroups = candidateParam.split(',').map((item) => +item)
configForm.value.userGroups = candidateParam.split(',').map((item) => +item)
break
break
case CandidateStrategy.USER_FIELD_ON_FORM:
configForm.value.userFieldOnForm = candidateParam
break
case CandidateStrategy.EXPRESSION:
case CandidateStrategy.EXPRESSION:
configForm.value.expression = candidateParam
configForm.value.expression = candidateParam
break
break
...
@@ -396,6 +419,14 @@ export function useNodeForm(nodeType: NodeType) {
...
@@ -396,6 +419,14 @@ export function useNodeForm(nodeType: NodeType) {
configForm.value.deptLevel = +paramArray[1]
configForm.value.deptLevel = +paramArray[1]
break
break
}
}
// 表单内的部门负责人
case CandidateStrategy.DEPT_LEADER_ON_FORM: {
// 候选人参数格式: | 分隔 。左边为表单内的部门字段。 右边为部门层级
const paramArray = candidateParam.split('|')
configForm.value.deptFieldOnForm = paramArray[0]
configForm.value.deptLevel = +paramArray[1]
break
}
default:
default:
break
break
}
}
...
...
src/components/SimpleProcessDesignerV2/src/nodes-config/CopyTaskNodeConfig.vue
View file @
158708c1
...
@@ -60,7 +60,8 @@
...
@@ -60,7 +60,8 @@
<el-form-item
<el-form-item
v-if=
"
v-if=
"
configForm.candidateStrategy == CandidateStrategy.DEPT_MEMBER ||
configForm.candidateStrategy == CandidateStrategy.DEPT_MEMBER ||
configForm.candidateStrategy == CandidateStrategy.DEPT_LEADER
configForm.candidateStrategy == CandidateStrategy.DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.MULTI_LEVEL_DEPT_LEADER
"
"
label=
"指定部门"
label=
"指定部门"
prop=
"deptIds"
prop=
"deptIds"
...
@@ -122,7 +123,54 @@
...
@@ -122,7 +123,54 @@
/>
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
v-if=
"configForm.candidateStrategy === CandidateStrategy.USER_FIELD_ON_FORM"
label=
"表单内用户字段"
prop=
"userFieldOnForm"
>
<el-select
v-model=
"configForm.userFieldOnForm"
clearable
style=
"width: 100%"
>
<el-option
v-for=
"(item,idx) in userFieldOnFormOptions"
:key=
"idx"
:label=
"item.title"
:value=
"item.field"
/>
</el-select>
</el-form-item>
<el-form-item
v-if=
"configForm.candidateStrategy === CandidateStrategy.DEPT_LEADER_ON_FORM"
label=
"表单内部门字段"
prop=
"deptFieldOnForm"
>
<el-select
v-model=
"configForm.deptFieldOnForm"
clearable
style=
"width: 100%"
>
<el-option
v-for=
"(item,idx) in deptFieldOnFormOptions"
:key=
"idx"
:label=
"item.title"
:value=
"item.field"
/>
</el-select>
</el-form-item>
<el-form-item
v-if=
"
configForm.candidateStrategy == CandidateStrategy.MULTI_LEVEL_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.START_USER_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.DEPT_LEADER_ON_FORM
"
:label=
"deptLevelLabel!"
prop=
"deptLevel"
span=
"24"
>
<el-select
v-model=
"configForm.deptLevel"
clearable
>
<el-option
v-for=
"(item, index) in MULTI_LEVEL_DEPT"
:key=
"index"
:label=
"item.label"
:value=
"item.value"
/>
</el-select>
</el-form-item>
<el-form-item
<el-form-item
v-if=
"configForm.candidateStrategy === CandidateStrategy.EXPRESSION"
v-if=
"configForm.candidateStrategy === CandidateStrategy.EXPRESSION"
label=
"流程表达式"
label=
"流程表达式"
...
@@ -201,7 +249,8 @@ import {
...
@@ -201,7 +249,8 @@ import {
CandidateStrategy
,
CandidateStrategy
,
NodeType
,
NodeType
,
CANDIDATE_STRATEGY
,
CANDIDATE_STRATEGY
,
FieldPermissionType
FieldPermissionType
,
MULTI_LEVEL_DEPT
}
from
'../consts'
}
from
'../consts'
import
{
import
{
useWatchNode
,
useWatchNode
,
...
@@ -221,6 +270,15 @@ const props = defineProps({
...
@@ -221,6 +270,15 @@ const props = defineProps({
required
:
true
required
:
true
}
}
})
})
const
deptLevelLabel
=
computed
(()
=>
{
let
label
=
'部门负责人来源'
if
(
configForm
.
value
.
candidateStrategy
==
CandidateStrategy
.
MULTI_LEVEL_DEPT_LEADER
)
{
label
=
label
+
'(指定部门向上)'
}
else
{
label
=
label
+
'(发起人部门向上)'
}
return
label
})
// 抽屉配置
// 抽屉配置
const
{
settingVisible
,
closeDrawer
,
openDrawer
}
=
useDrawer
()
const
{
settingVisible
,
closeDrawer
,
openDrawer
}
=
useDrawer
()
// 当前节点
// 当前节点
...
@@ -230,9 +288,21 @@ const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(NodeType.COPY_
...
@@ -230,9 +288,21 @@ const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(NodeType.COPY_
// 激活的 Tab 标签页
// 激活的 Tab 标签页
const
activeTabName
=
ref
(
'user'
)
const
activeTabName
=
ref
(
'user'
)
// 表单字段权限配置
// 表单字段权限配置
const
{
formType
,
fieldsPermissionConfig
,
getNodeConfigFormFields
}
=
useFormFieldsPermission
(
const
{
formType
,
fieldsPermissionConfig
,
formFieldOptions
,
getNodeConfigFormFields
}
=
useFormFieldsPermission
(
FieldPermissionType
.
READ
FieldPermissionType
.
READ
)
)
// 表单内用户字段选项, 必须是必填和用户选择器
const
userFieldOnFormOptions
=
computed
(()
=>
{
return
formFieldOptions
.
filter
(
(
item
)
=>
item
.
required
&&
item
.
type
===
'UserSelect'
)
})
// 表单内部门字段选项, 必须是必填和部门选择器
const
deptFieldOnFormOptions
=
computed
(()
=>
{
return
formFieldOptions
.
filter
(
(
item
)
=>
item
.
required
&&
item
.
type
===
'DeptSelect'
)
})
// 抄送人表单配置
// 抄送人表单配置
const
formRef
=
ref
()
// 表单 Ref
const
formRef
=
ref
()
// 表单 Ref
// 表单校验规则
// 表单校验规则
...
@@ -243,6 +313,8 @@ const formRules = reactive({
...
@@ -243,6 +313,8 @@ const formRules = reactive({
deptIds
:
[{
required
:
true
,
message
:
'部门不能为空'
,
trigger
:
'change'
}],
deptIds
:
[{
required
:
true
,
message
:
'部门不能为空'
,
trigger
:
'change'
}],
userGroups
:
[{
required
:
true
,
message
:
'用户组不能为空'
,
trigger
:
'change'
}],
userGroups
:
[{
required
:
true
,
message
:
'用户组不能为空'
,
trigger
:
'change'
}],
postIds
:
[{
required
:
true
,
message
:
'岗位不能为空'
,
trigger
:
'change'
}],
postIds
:
[{
required
:
true
,
message
:
'岗位不能为空'
,
trigger
:
'change'
}],
userFieldOnForm
:
[{
required
:
true
,
message
:
'表单内用户字段不能为空'
,
trigger
:
'change'
}],
deptFieldOnForm
:
[{
required
:
true
,
message
:
'表单内部门字段不能为空'
,
trigger
:
'change'
}],
expression
:
[{
required
:
true
,
message
:
'流程表达式不能为空'
,
trigger
:
'blur'
}]
expression
:
[{
required
:
true
,
message
:
'流程表达式不能为空'
,
trigger
:
'blur'
}]
})
})
...
@@ -272,6 +344,7 @@ const changeCandidateStrategy = () => {
...
@@ -272,6 +344,7 @@ const changeCandidateStrategy = () => {
configForm
.
value
.
postIds
=
[]
configForm
.
value
.
postIds
=
[]
configForm
.
value
.
userGroups
=
[]
configForm
.
value
.
userGroups
=
[]
configForm
.
value
.
deptLevel
=
1
configForm
.
value
.
deptLevel
=
1
configForm
.
value
.
userFieldOnForm
=
''
}
}
// 保存配置
// 保存配置
const
saveConfig
=
async
()
=>
{
const
saveConfig
=
async
()
=>
{
...
...
src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
View file @
158708c1
...
@@ -56,7 +56,6 @@
...
@@ -56,7 +56,6 @@
</el-radio>
</el-radio>
</el-radio-group>
</el-radio-group>
</el-form-item>
</el-form-item>
<el-form-item
<el-form-item
v-if=
"configForm.candidateStrategy == CandidateStrategy.ROLE"
v-if=
"configForm.candidateStrategy == CandidateStrategy.ROLE"
label=
"指定角色"
label=
"指定角色"
...
@@ -95,25 +94,6 @@
...
@@ -95,25 +94,6 @@
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
<el-form-item
v-if=
"
configForm.candidateStrategy == CandidateStrategy.MULTI_LEVEL_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.START_USER_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER
"
:label=
"deptLevelLabel!"
prop=
"deptLevel"
span=
"24"
>
<el-select
v-model=
"configForm.deptLevel"
clearable
>
<el-option
v-for=
"(item, index) in MULTI_LEVEL_DEPT"
:key=
"index"
:label=
"item.label"
:value=
"item.value"
/>
</el-select>
</el-form-item>
<el-form-item
v-if=
"configForm.candidateStrategy == CandidateStrategy.POST"
v-if=
"configForm.candidateStrategy == CandidateStrategy.POST"
label=
"指定岗位"
label=
"指定岗位"
prop=
"postIds"
prop=
"postIds"
...
@@ -157,6 +137,54 @@
...
@@ -157,6 +137,54 @@
/>
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
v-if=
"configForm.candidateStrategy === CandidateStrategy.USER_FIELD_ON_FORM"
label=
"表单内用户字段"
prop=
"userFieldOnForm"
>
<el-select
v-model=
"configForm.userFieldOnForm"
clearable
style=
"width: 100%"
>
<el-option
v-for=
"(item,idx) in userFieldOnFormOptions"
:key=
"idx"
:label=
"item.title"
:value=
"item.field"
/>
</el-select>
</el-form-item>
<el-form-item
v-if=
"configForm.candidateStrategy === CandidateStrategy.DEPT_LEADER_ON_FORM"
label=
"表单内部门字段"
prop=
"deptFieldOnForm"
>
<el-select
v-model=
"configForm.deptFieldOnForm"
clearable
style=
"width: 100%"
>
<el-option
v-for=
"(item,idx) in deptFieldOnFormOptions"
:key=
"idx"
:label=
"item.title"
:value=
"item.field"
/>
</el-select>
</el-form-item>
<el-form-item
v-if=
"
configForm.candidateStrategy == CandidateStrategy.MULTI_LEVEL_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.START_USER_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.START_USER_MULTI_LEVEL_DEPT_LEADER ||
configForm.candidateStrategy == CandidateStrategy.DEPT_LEADER_ON_FORM
"
:label=
"deptLevelLabel!"
prop=
"deptLevel"
span=
"24"
>
<el-select
v-model=
"configForm.deptLevel"
clearable
>
<el-option
v-for=
"(item, index) in MULTI_LEVEL_DEPT"
:key=
"index"
:label=
"item.label"
:value=
"item.value"
/>
</el-select>
</el-form-item>
<!-- TODO @jason:后续要支持选择已经存好的表达式 -->
<!-- TODO @jason:后续要支持选择已经存好的表达式 -->
<el-form-item
<el-form-item
v-if=
"configForm.candidateStrategy === CandidateStrategy.EXPRESSION"
v-if=
"configForm.candidateStrategy === CandidateStrategy.EXPRESSION"
...
@@ -468,8 +496,10 @@ const deptLevelLabel = computed(() => {
...
@@ -468,8 +496,10 @@ const deptLevelLabel = computed(() => {
let
label
=
'部门负责人来源'
let
label
=
'部门负责人来源'
if
(
configForm
.
value
.
candidateStrategy
==
CandidateStrategy
.
MULTI_LEVEL_DEPT_LEADER
)
{
if
(
configForm
.
value
.
candidateStrategy
==
CandidateStrategy
.
MULTI_LEVEL_DEPT_LEADER
)
{
label
=
label
+
'(指定部门向上)'
label
=
label
+
'(指定部门向上)'
}
else
if
(
configForm
.
value
.
candidateStrategy
==
CandidateStrategy
.
DEPT_LEADER_ON_FORM
)
{
label
=
label
+
'(表单内部门向上)'
}
else
{
}
else
{
label
=
label
+
'(发起人部门向上)'
label
=
label
+
'(发起人部门向上)'
}
}
return
label
return
label
})
})
...
@@ -482,9 +512,21 @@ const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(NodeType.USER_
...
@@ -482,9 +512,21 @@ const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(NodeType.USER_
// 激活的 Tab 标签页
// 激活的 Tab 标签页
const
activeTabName
=
ref
(
'user'
)
const
activeTabName
=
ref
(
'user'
)
// 表单字段权限设置
// 表单字段权限设置
const
{
formType
,
fieldsPermissionConfig
,
getNodeConfigFormFields
}
=
useFormFieldsPermission
(
const
{
formType
,
fieldsPermissionConfig
,
formFieldOptions
,
getNodeConfigFormFields
}
=
useFormFieldsPermission
(
FieldPermissionType
.
READ
FieldPermissionType
.
READ
)
)
// 表单内用户字段选项, 必须是必填和用户选择器
const
userFieldOnFormOptions
=
computed
(()
=>
{
return
formFieldOptions
.
filter
(
(
item
)
=>
item
.
required
&&
item
.
type
===
'UserSelect'
)
})
// 表单内部门字段选项, 必须是必填和部门选择器
const
deptFieldOnFormOptions
=
computed
(()
=>
{
return
formFieldOptions
.
filter
(
(
item
)
=>
item
.
required
&&
item
.
type
===
'DeptSelect'
)
})
// 操作按钮设置
// 操作按钮设置
const
{
buttonsSetting
,
btnDisplayNameEdit
,
changeBtnDisplayName
,
btnDisplayNameBlurEvent
}
=
const
{
buttonsSetting
,
btnDisplayNameEdit
,
changeBtnDisplayName
,
btnDisplayNameBlurEvent
}
=
useButtonsSetting
()
useButtonsSetting
()
...
@@ -498,6 +540,8 @@ const formRules = reactive({
...
@@ -498,6 +540,8 @@ const formRules = reactive({
roleIds
:
[{
required
:
true
,
message
:
'角色不能为空'
,
trigger
:
'change'
}],
roleIds
:
[{
required
:
true
,
message
:
'角色不能为空'
,
trigger
:
'change'
}],
deptIds
:
[{
required
:
true
,
message
:
'部门不能为空'
,
trigger
:
'change'
}],
deptIds
:
[{
required
:
true
,
message
:
'部门不能为空'
,
trigger
:
'change'
}],
userGroups
:
[{
required
:
true
,
message
:
'用户组不能为空'
,
trigger
:
'change'
}],
userGroups
:
[{
required
:
true
,
message
:
'用户组不能为空'
,
trigger
:
'change'
}],
userFieldOnForm
:
[{
required
:
true
,
message
:
'表单内用户字段不能为空'
,
trigger
:
'change'
}],
deptFieldOnForm
:
[{
required
:
true
,
message
:
'表单内部门字段不能为空'
,
trigger
:
'change'
}],
postIds
:
[{
required
:
true
,
message
:
'岗位不能为空'
,
trigger
:
'change'
}],
postIds
:
[{
required
:
true
,
message
:
'岗位不能为空'
,
trigger
:
'change'
}],
expression
:
[{
required
:
true
,
message
:
'流程表达式不能为空'
,
trigger
:
'blur'
}],
expression
:
[{
required
:
true
,
message
:
'流程表达式不能为空'
,
trigger
:
'blur'
}],
approveMethod
:
[{
required
:
true
,
message
:
'多人审批方式不能为空'
,
trigger
:
'change'
}],
approveMethod
:
[{
required
:
true
,
message
:
'多人审批方式不能为空'
,
trigger
:
'change'
}],
...
@@ -533,6 +577,8 @@ const changeCandidateStrategy = () => {
...
@@ -533,6 +577,8 @@ const changeCandidateStrategy = () => {
configForm
.
value
.
postIds
=
[]
configForm
.
value
.
postIds
=
[]
configForm
.
value
.
userGroups
=
[]
configForm
.
value
.
userGroups
=
[]
configForm
.
value
.
deptLevel
=
1
configForm
.
value
.
deptLevel
=
1
configForm
.
value
.
userFieldOnForm
=
''
configForm
.
value
.
deptFieldOnForm
=
''
configForm
.
value
.
approveMethod
=
ApproveMethodType
.
SEQUENTIAL_APPROVE
configForm
.
value
.
approveMethod
=
ApproveMethodType
.
SEQUENTIAL_APPROVE
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment