浏览代码

!612 bpm设计器优化
Merge pull request !612 from Lesan/feature/bpm

芋道源码 8 月之前
父节点
当前提交
46985c6e1b

+ 0 - 0
src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue → src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue


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

@@ -1,10 +1,10 @@
-import UserTask from './components/UserTask.vue'
+import UserTaskCustomConfig from './components/UserTaskCustomConfig.vue'
 import BoundaryEventTimer from './components/BoundaryEventTimer.vue'
 
 export const CustomConfigMap = {
   UserTask: {
     name: '用户任务',
-    componet: UserTask
+    componet: UserTaskCustomConfig
   },
   BoundaryEventTimerEventDefinition: {
     name: '定时边界事件(非中断)',

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

@@ -301,13 +301,20 @@ const approveMethod = ref()
 const approveRatio = ref(100)
 const otherExtensions = ref()
 const getElementLoopNew = () => {
-  const extensionElements = bpmnElement.value.businessObject?.extensionElements ?? []
+  const extensionElements =
+    bpmnElement.value.businessObject?.extensionElements ??
+    bpmnInstances().moddle.create('bpmn:ExtensionElements', { values: [] })
   approveMethod.value = extensionElements.values.filter(
     (ex) => ex.$type === `${prefix}:ApproveMethod`
   )?.[0]?.value
 
   otherExtensions.value =
     extensionElements.values.filter((ex) => ex.$type !== `${prefix}:ApproveMethod`) ?? []
+
+  if (!approveMethod.value) {
+    approveMethod.value = ApproveMethodType.SEQUENTIAL_APPROVE
+    updateLoopCharacteristics()
+  }
 }
 const onApproveMethodChange = () => {
   approveRatio.value = 100

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

@@ -163,7 +163,7 @@ const resetTaskForm = () => {
     return
   }
 
-  const extensionElements = businessObject?.extensionElements ?? []
+  const extensionElements = businessObject?.extensionElements ?? bpmnInstances().moddle.create('bpmn:ExtensionElements', { values: [] })
   userTaskForm.value.candidateStrategy = extensionElements.values?.filter(
     (ex) => ex.$type === `${prefix}:CandidateStrategy`
   )?.[0]?.value