diff --git a/src/assets/svgs/bpm/async-child-process.svg b/src/assets/svgs/bpm/async-child-process.svg
deleted file mode 100644
index 2a27773d..00000000
--- a/src/assets/svgs/bpm/async-child-process.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
index 2b600c68..22d113f9 100644
--- a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
+++ b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
@@ -69,12 +69,6 @@
子流程
-
@@ -303,8 +297,8 @@ const addNode = (type: number) => {
type: NodeType.CHILD_PROCESS_NODE,
childNode: props.childNode,
childProcessSetting: {
- calledElement: '',
- calledElementName: '',
+ calledProcessDefinitionKey: '',
+ calledProcessDefinitionName: '',
async: false,
skipStartUserNode: false,
startUserSetting: {
diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index e9d0bde5..8e9328ab 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -39,15 +39,10 @@ export enum NodeType {
TRIGGER_NODE = 15,
/**
- * 触发器节点
+ * 子流程节点
*/
CHILD_PROCESS_NODE = 20,
- /**
- * 触发器节点
- */
- ASYNC_CHILD_PROCESS_NODE = 21,
-
/**
* 条件节点
*/
@@ -804,11 +799,11 @@ export const TRIGGER_TYPES: DictDataVO[] = [
* 子流程节点结构定义
*/
export type ChildProcessSetting = {
- calledElement: string
- calledElementName: string
+ calledProcessDefinitionKey: string
+ calledProcessDefinitionName: string
async: boolean,
- inVariable?: IOParameter[],
- outVariable?: IOParameter[],
+ inVariables?: IOParameter[],
+ outVariables?: IOParameter[],
skipStartUserNode: boolean,
startUserSetting: StartUserSetting,
}
@@ -823,5 +818,5 @@ export type IOParameter = {
export type StartUserSetting = {
type: number
formField?: string
- emptyHandleType?: number
+ emptyType?: number
}
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
index 26df65ef..a7d9aee6 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
@@ -27,9 +27,16 @@
-
+
+
+
+
@@ -48,11 +55,11 @@
inactive-text="不跳过"
/>
-
-
+
+
-
+
添加一行
-
+
-
+
添加一行
@@ -227,7 +234,8 @@ const activeTabName = ref('child')
const formRef = ref() // 表单 Ref
// 表单校验规则
const formRules = reactive({
- calledElement: [{ required: true, message: '子流程不能为空', trigger: 'change' }],
+ async: [{ required: true, message: '是否异步不能为空', trigger: 'change' }],
+ calledProcessDefinitionKey: [{ required: true, message: '子流程不能为空', trigger: 'change' }],
skipStartUserNode: [
{ required: true, message: '是否自动跳过子流程发起节点不能为空', trigger: 'change' }
],
@@ -238,10 +246,10 @@ const formRules = reactive({
startUserFormField: [{ required: true, message: '发起人表单不能为空', trigger: 'change' }]
})
const configForm = ref({
- calledElement: '',
+ calledProcessDefinitionKey: '',
skipStartUserNode: false,
- inVariable: [],
- outVariable: [],
+ inVariables: [],
+ outVariables: [],
startUserType: 1,
startUserEmptyType: 1,
startUserFormField: ''
@@ -257,17 +265,18 @@ const saveConfig = async () => {
const valid = await formRef.value.validate()
if (!valid) return false
const childInfo = childProcessOptions.value.find(
- (option) => option.key === configForm.value.calledElement
+ (option) => option.key === configForm.value.calledProcessDefinitionKey
)
currentNode.value.name = nodeName.value!
if (currentNode.value.childProcessSetting) {
- currentNode.value.childProcessSetting.calledElement = childInfo.key
- currentNode.value.childProcessSetting.calledElementName = childInfo.name
+ currentNode.value.childProcessSetting.async = configForm.value.async
+ currentNode.value.childProcessSetting.calledProcessDefinitionKey = childInfo.key
+ currentNode.value.childProcessSetting.calledProcessDefinitionName = childInfo.name
currentNode.value.childProcessSetting.skipStartUserNode = configForm.value.skipStartUserNode
- currentNode.value.childProcessSetting.inVariable = configForm.value.inVariable
- currentNode.value.childProcessSetting.outVariable = configForm.value.outVariable
+ currentNode.value.childProcessSetting.inVariables = configForm.value.inVariables
+ currentNode.value.childProcessSetting.outVariables = configForm.value.outVariables
currentNode.value.childProcessSetting.startUserSetting.type = configForm.value.startUserType
- currentNode.value.childProcessSetting.startUserSetting.emptyHandleType =
+ currentNode.value.childProcessSetting.startUserSetting.emptyType =
configForm.value.startUserEmptyType
currentNode.value.childProcessSetting.startUserSetting.formField =
configForm.value.startUserFormField
@@ -280,13 +289,15 @@ const saveConfig = async () => {
const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
nodeName.value = node.name
if (node.childProcessSetting) {
- configForm.value.calledElement = node.childProcessSetting.calledElement
+ configForm.value.async =
+ node.childProcessSetting.async
+ configForm.value.calledProcessDefinitionKey =
+ node.childProcessSetting.calledProcessDefinitionKey
configForm.value.skipStartUserNode = node.childProcessSetting.skipStartUserNode
- configForm.value.inVariable = node.childProcessSetting.inVariable
- configForm.value.outVariable = node.childProcessSetting.outVariable
+ configForm.value.inVariables = node.childProcessSetting.inVariables
+ configForm.value.outVariables = node.childProcessSetting.outVariables
configForm.value.startUserType = node.childProcessSetting.startUserSetting.type
- configForm.value.startUserEmptyType =
- node.childProcessSetting.startUserSetting.emptyHandleType ?? 1
+ configForm.value.startUserEmptyType = node.childProcessSetting.startUserSetting.emptyType ?? 1
configForm.value.startUserFormField = node.childProcessSetting.startUserSetting.formField ?? ''
}
loadFormInfo()
@@ -304,13 +315,13 @@ const deleteVariable = (arr, index: number) => {
arr.splice(index, 1)
}
const handleCalledElementChange = () => {
- configForm.value.inVariable = []
- configForm.value.outVariable = []
+ configForm.value.inVariables = []
+ configForm.value.outVariables = []
loadFormInfo()
}
const loadFormInfo = async () => {
const childInfo = childProcessOptions.value.find(
- (option) => option.key === configForm.value.calledElement
+ (option) => option.key === configForm.value.calledProcessDefinitionKey
)
const formInfo = await getForm(childInfo.formId)
childFormFieldOptions.value = []
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
index 540bb62c..e1d11091 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
@@ -86,8 +86,7 @@ const setSimpleModelNodeTaskStatus = (
simpleModel.type === NodeType.START_USER_NODE ||
simpleModel.type === NodeType.USER_TASK_NODE ||
simpleModel.type === NodeType.TRANSACTOR_NODE ||
- simpleModel.type === NodeType.CHILD_PROCESS_NODE ||
- simpleModel.type === NodeType.ASYNC_CHILD_PROCESS_NODE
+ simpleModel.type === NodeType.CHILD_PROCESS_NODE
) {
simpleModel.activityStatus = TaskStatusEnum.NOT_START
if (rejectedTaskActivityIds.includes(simpleModel.id)) {
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
index f93a2d9c..30afe69c 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
@@ -182,7 +182,6 @@ import parallelSvg from '@/assets/svgs/bpm/parallel.svg'
import finishSvg from '@/assets/svgs/bpm/finish.svg'
import transactorSvg from '@/assets/svgs/bpm/transactor.svg'
import childProcessSvg from '@/assets/svgs/bpm/child-process.svg'
-import asyncChildProcessSvg from '@/assets/svgs/bpm/async-child-process.svg'
defineOptions({ name: 'BpmProcessInstanceTimeline' })
withDefaults(
@@ -254,8 +253,6 @@ const nodeTypeSvgMap = {
[NodeType.PARALLEL_BRANCH_NODE]: { color: '#14bb83', svg: parallelSvg },
// 子流程节点
[NodeType.CHILD_PROCESS_NODE]: { color: '#14bb83', svg: childProcessSvg },
- // 异步子流程节点
- [NodeType.ASYNC_CHILD_PROCESS_NODE]: { color: '#14bb83', svg: asyncChildProcessSvg }
}
// 只有只有状态是 -1、0、1 才展示头像右小角状态小icon
@@ -276,7 +273,6 @@ const getApprovalNodeIcon = (taskStatus: number, nodeType: NodeType) => {
nodeType === NodeType.USER_TASK_NODE ||
nodeType === NodeType.TRANSACTOR_NODE ||
nodeType === NodeType.CHILD_PROCESS_NODE ||
- nodeType === NodeType.ASYNC_CHILD_PROCESS_NODE ||
nodeType === NodeType.END_EVENT_NODE
) {
return statusIconMap[taskStatus]?.icon