diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json index 4ea632a01160101e1e4ffb0c3231a6a27fd59ffe..ee8e0d22e19afce3c4f073e64358ad5523fee3d5 100644 --- a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json +++ b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json @@ -1211,6 +1211,20 @@ "isAttr": true } ] + }, + { + "name": "AssignStartUserHandlerType", + "superClass": ["Element"], + "meta": { + "allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"] + }, + "properties": [ + { + "name": "value", + "type": "Integer", + "isBody": true + } + ] } ], "emumerations": [] diff --git a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue index 86a1cf7457fa152ac3d5da6bbcce181b2f8c9018..5cd7638360b231b03f01d1935d37809bbc5941a1 100644 --- a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue +++ b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue @@ -54,6 +54,10 @@ + + + + diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/ElementCustomConfig.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/ElementCustomConfig.vue new file mode 100644 index 0000000000000000000000000000000000000000..4b6cb527d2a94dc24ec47973ae74a72712a01e06 --- /dev/null +++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/ElementCustomConfig.vue @@ -0,0 +1,81 @@ + + + diff --git a/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue b/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue index 33f0bc096aa7308c77a1eaa51006d0d616cc97b9..3bb7d660749eb810759b0e65437f126990559e73 100644 --- a/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue +++ b/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue @@ -268,9 +268,9 @@ const bpmnInstances = () => (window as any)?.bpmnInstances const resetFormList = () => { bpmnELement.value = bpmnInstances().bpmnElement formKey.value = bpmnELement.value.businessObject.formKey - if (formKey.value?.length > 0) { - formKey.value = parseInt(formKey.value) - } + // if (formKey.value?.length > 0) { + // formKey.value = parseInt(formKey.value) + // } // 获取元素扩展属性 或者 创建扩展属性 elExtensionElements.value = bpmnELement.value.businessObject.get('extensionElements') || diff --git a/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue b/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue index 494b3d972ce396e703ec4d58c47dea9fdd27af54..016cdf6c6a27340ce8afbfac39bb5785eb20ce15 100644 --- a/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue +++ b/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue @@ -80,7 +80,7 @@ const resetAttributesList = () => { otherExtensionList.value = [] // 其他扩展配置 bpmnElementProperties.value = // bpmnElement.value.businessObject?.extensionElements?.filter((ex) => { - bpmnElement.value.businessObject?.extensionElements?.values.filter((ex) => { + bpmnElement.value.businessObject?.extensionElements?.values?.filter((ex) => { if (ex.$type !== `${prefix}:Properties`) { otherExtensionList.value.push(ex) } diff --git a/src/views/bpm/form/index.vue b/src/views/bpm/form/index.vue index 3d542c80d5a6752fb7382a8778581f721f08b01b..46edd8f9079f2d70cbdeb06fb0b44c0362621e62 100644 --- a/src/views/bpm/form/index.vue +++ b/src/views/bpm/form/index.vue @@ -143,8 +143,9 @@ const openForm = (id?: number) => { const toRouter: { name: string; query?: { id: number } } = { name: 'BpmFormEditor' } + console.log(typeof id) // 表单新建的时候id传的是event需要排除 - if (typeof id === 'number') { + if (typeof id === 'number' || typeof id === 'string') { toRouter.query = { id }