Skip to content

Commit 46985c6

Browse files
YunaiVgitee-org
authored andcommitted
!612 bpm设计器优化
Merge pull request !612 from Lesan/feature/bpm
2 parents 7697054 + 5785d74 commit 46985c6

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

src/components/bpmnProcessDesigner/package/penal/custom-config/data.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import UserTask from './components/UserTask.vue'
1+
import UserTaskCustomConfig from './components/UserTaskCustomConfig.vue'
22
import BoundaryEventTimer from './components/BoundaryEventTimer.vue'
33

44
export const CustomConfigMap = {
55
UserTask: {
66
name: '用户任务',
7-
componet: UserTask
7+
componet: UserTaskCustomConfig
88
},
99
BoundaryEventTimerEventDefinition: {
1010
name: '定时边界事件(非中断)',

src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,13 +301,20 @@ const approveMethod = ref()
301301
const approveRatio = ref(100)
302302
const otherExtensions = ref()
303303
const getElementLoopNew = () => {
304-
const extensionElements = bpmnElement.value.businessObject?.extensionElements ?? []
304+
const extensionElements =
305+
bpmnElement.value.businessObject?.extensionElements ??
306+
bpmnInstances().moddle.create('bpmn:ExtensionElements', { values: [] })
305307
approveMethod.value = extensionElements.values.filter(
306308
(ex) => ex.$type === `${prefix}:ApproveMethod`
307309
)?.[0]?.value
308310
309311
otherExtensions.value =
310312
extensionElements.values.filter((ex) => ex.$type !== `${prefix}:ApproveMethod`) ?? []
313+
314+
if (!approveMethod.value) {
315+
approveMethod.value = ApproveMethodType.SEQUENTIAL_APPROVE
316+
updateLoopCharacteristics()
317+
}
311318
}
312319
const onApproveMethodChange = () => {
313320
approveRatio.value = 100

src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ const resetTaskForm = () => {
163163
return
164164
}
165165
166-
const extensionElements = businessObject?.extensionElements ?? []
166+
const extensionElements = businessObject?.extensionElements ?? bpmnInstances().moddle.create('bpmn:ExtensionElements', { values: [] })
167167
userTaskForm.value.candidateStrategy = extensionElements.values?.filter(
168168
(ex) => ex.$type === `${prefix}:CandidateStrategy`
169169
)?.[0]?.value

0 commit comments

Comments
 (0)