From 7474c6b83be9e69e60f1731abd82177919f61e5d Mon Sep 17 00:00:00 2001 From: LesanOuO <1960681385@qq.com> Date: Sat, 7 Dec 2024 10:45:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20unplugin-vue-components=E6=8A=A5?= =?UTF-8?q?=E9=94=99=EF=BC=8C=E5=90=8C=E5=90=8DUserTask?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/{UserTask.vue => UserTaskCustomConfig.vue} | 0 .../bpmnProcessDesigner/package/penal/custom-config/data.ts | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/components/bpmnProcessDesigner/package/penal/custom-config/components/{UserTask.vue => UserTaskCustomConfig.vue} (100%) diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue similarity index 100% rename from src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue rename to src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/data.ts b/src/components/bpmnProcessDesigner/package/penal/custom-config/data.ts index 8870f021..a45355e2 100644 --- a/src/components/bpmnProcessDesigner/package/penal/custom-config/data.ts +++ b/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: '定时边界事件(非中断)', From e52049876e90ef103469965d37f0416e289b7524 Mon Sep 17 00:00:00 2001 From: LesanOuO <1960681385@qq.com> Date: Sat, 7 Dec 2024 11:19:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=96=B0=E5=88=9B=E5=BB=BA=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=97=B6=E6=97=A0values=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package/penal/multi-instance/ElementMultiInstance.vue | 2 +- .../package/penal/task/task-components/UserTask.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue index 1ee68e86..331ffa2b 100644 --- a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue +++ b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue @@ -301,7 +301,7 @@ 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 diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue index ecd6fbf4..07bb3ed7 100644 --- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue +++ b/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 From 5785d741bb98e587cac3c9936d5c7b2a4bcc3049 Mon Sep 17 00:00:00 2001 From: LesanOuO <1960681385@qq.com> Date: Sat, 7 Dec 2024 11:22:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=A4=9A=E5=AE=9E=E4=BE=8B=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=ADSEQUENTIAL=5FAPPROVE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../penal/multi-instance/ElementMultiInstance.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue index 331ffa2b..de2fb0d7 100644 --- a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue +++ b/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 ?? bpmnInstances().moddle.create('bpmn:ExtensionElements', { values: [] }) + 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