diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json index 31fb7d85..a5e122ea 100644 --- a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json +++ b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json @@ -1357,6 +1357,62 @@ "isBody": true } ] + }, + { + "name": "ApproveType", + "superClass": ["Element"], + "meta": { + "allowedIn": ["bpmn:UserTask"] + }, + "properties": [ + { + "name": "value", + "type": "Integer", + "isBody": true + } + ] + }, + { + "name": "ApproveMethod", + "superClass": ["Element"], + "meta": { + "allowedIn": ["bpmn:UserTask"] + }, + "properties": [ + { + "name": "value", + "type": "Integer", + "isBody": true + } + ] + }, + { + "name": "CandidateStrategy", + "superClass": ["Element"], + "meta": { + "allowedIn": ["bpmn:UserTask"] + }, + "properties": [ + { + "name": "value", + "type": "Integer", + "isBody": true + } + ] + }, + { + "name": "CandidateParam", + "superClass": ["Element"], + "meta": { + "allowedIn": ["bpmn:UserTask"] + }, + "properties": [ + { + "name": "value", + "type": "String", + "isBody": true + } + ] } ], "emumerations": [] diff --git a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue index c32c7620..cf836952 100644 --- a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue +++ b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue @@ -36,7 +36,7 @@ key="multiInstance" > 多实例(会签配置) - + 执行监听器 diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue index c592ed5f..4e1e3f14 100644 --- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue +++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue @@ -193,7 +193,7 @@ const { buttonsSetting, btnDisplayNameEdit, changeBtnDisplayName, btnDisplayName useButtonsSetting() // 字段权限 -const fieldsPermissionEl = ref() +const fieldsPermissionEl = ref([]) const { formType, fieldsPermissionConfig, getNodeConfigFormFields } = useFormFieldsPermission( FieldPermissionType.READ ) @@ -246,7 +246,7 @@ const resetCustomConfigList = () => { elExtensionElements.value.values?.filter( (ex) => ex.$type === `${prefix}:AssignEmptyUserIds` )?.[0] || bpmnInstances().moddle.create(`${prefix}:AssignEmptyUserIds`, { value: '' }) - assignEmptyUserIds.value = assignEmptyUserIdsEl.value.value.split(',').map((item) => { + assignEmptyUserIds.value = assignEmptyUserIdsEl.value.value?.split(',').map((item) => { // 如果数字超出了最大安全整数范围,则将其作为字符串处理 let num = Number(item) return num > Number.MAX_SAFE_INTEGER || num < -Number.MAX_SAFE_INTEGER ? item : num @@ -270,17 +270,18 @@ const resetCustomConfigList = () => { // 字段权限 if (formType.value === 10) { - fieldsPermissionEl.value = elExtensionElements.value.values?.filter( + const fieldsPermissionList = elExtensionElements.value.values?.filter( (ex) => ex.$type === `${prefix}:FieldsPermission` ) - if (fieldsPermissionEl.value.length === 0) { - getNodeConfigFormFields() - fieldsPermissionConfig.value.forEach((el) => { - fieldsPermissionEl.value.push( - bpmnInstances().moddle.create(`${prefix}:FieldsPermission`, el) - ) - }) - } + fieldsPermissionEl.value = [] + getNodeConfigFormFields() + fieldsPermissionConfig.value.forEach((element) => { + element.permission = + fieldsPermissionList?.find((obj) => obj.field === element.field)?.permission ?? '1' + fieldsPermissionEl.value.push( + bpmnInstances().moddle.create(`${prefix}:FieldsPermission`, element) + ) + }) } // 保留剩余扩展元素,便于后面更新该元素对应属性 diff --git a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue index 7cd16f77..1ee68e86 100644 --- a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue +++ b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue @@ -1,6 +1,30 @@ - + + + + + {{ item.label }} + + + + + + + + + 依次审批 会签 @@ -76,11 +100,14 @@