From 82ee62cb14a8db8399a50a0b28cab2612f43d1a3 Mon Sep 17 00:00:00 2001 From: Lesan <1960681385@qq.com> Date: Sun, 19 Jan 2025 10:28:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../descriptor/flowableDescriptor.json | 14 +++++++++ .../components/UserTaskCustomConfig.vue | 30 ++++++++++++++----- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json index 9f3ae16c..130b5941 100644 --- a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json +++ b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json @@ -1463,6 +1463,20 @@ "type": "String" } ] + }, + { + "name": "ReasonRequire", + "superClass": ["Element"], + "meta": { + "allowedIn": ["bpmn:UserTask"] + }, + "properties": [ + { + "name": "value", + "type": "Boolean", + "isBody": true + } + ] } ], "emumerations": [] diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue index 206c3889..aab130d0 100644 --- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue +++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue @@ -167,6 +167,11 @@ + + 审批意见 + + + @@ -227,6 +232,9 @@ const approveType = ref({ value: ApproveType.USER }) // 是否需要签名 const signEnable = ref({ value: false }) +// 审批意见 +const reasonRequire = ref({ value: false }) + const elExtensionElements = ref() const otherExtensions = ref() const bpmnElement = ref() @@ -320,6 +328,16 @@ const resetCustomConfigList = () => { }) } + // 是否需要签名 + signEnable.value = + elExtensionElements.value.values?.filter((ex) => ex.$type === `${prefix}:SignEnable`)?.[0] || + bpmnInstances().moddle.create(`${prefix}:SignEnable`, { value: false }) + + // 审批意见 + reasonRequire.value = + elExtensionElements.value.values?.filter((ex) => ex.$type === `${prefix}:ReasonRequire`)?.[0] || + bpmnInstances().moddle.create(`${prefix}:ReasonRequire`, { value: false }) + // 保留剩余扩展元素,便于后面更新该元素对应属性 otherExtensions.value = elExtensionElements.value.values?.filter( @@ -331,14 +349,11 @@ const resetCustomConfigList = () => { ex.$type !== `${prefix}:AssignEmptyUserIds` && ex.$type !== `${prefix}:ButtonsSetting` && ex.$type !== `${prefix}:FieldsPermission` && - ex.$type !== `${prefix}:ApproveType` + ex.$type !== `${prefix}:ApproveType` && + ex.$type !== `${prefix}:SignEnable` && + ex.$type !== `${prefix}:ReasonRequire` ) ?? [] - // 是否需要签名 - signEnable.value = - elExtensionElements.value.values?.filter((ex) => ex.$type === `${prefix}:SignEnable`)?.[0] || - bpmnInstances().moddle.create(`${prefix}:SignEnable`, { value: false }) - // 更新元素扩展属性,避免后续报错 updateElementExtensions() } @@ -388,7 +403,8 @@ const updateElementExtensions = () => { approveType.value, ...buttonsSettingEl.value, ...fieldsPermissionEl.value, - signEnable.value + signEnable.value, + reasonRequire.value ] }) bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {