diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json index a5e122eaa0a38cf90efa412c4d9bbde9aa2db1a8..7fe1fa795b1301895d4a06919d7158ee6a7fe0d5 100644 --- a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json +++ b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json @@ -406,6 +406,31 @@ "name": "variableMappingDelegateExpression", "isAttr": true, "type": "String" + }, + { + "name": "calledElementType", + "isAttr": true, + "type": "String" + }, + { + "name": "processInstanceName", + "isAttr": true, + "type": "String" + }, + { + "name": "inheritBusinessKey", + "isAttr": true, + "type": "Boolean" + }, + { + "name": "businessKey", + "isAttr": true, + "type": "String" + }, + { + "name": "inheritVariables", + "isAttr": true, + "type": "Boolean" } ] }, diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js index c1f40c1b795554c320746bb6633cc722ef947874..788e4d163f9204814f2e8c4713e4fd4e4aba4f8c 100644 --- a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js +++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js @@ -165,6 +165,12 @@ F.prototype.getPaletteEntries = function () { 'bpmn-icon-user-task', translate('Create User Task') ), + 'create.call-activity': createAction( + 'bpmn:CallActivity', + 'activity', + 'bpmn-icon-call-activity', + translate('Create Call Activity') + ), 'create.service-task': createAction( 'bpmn:ServiceTask', 'activity', diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js index 7e5aa8c60d306da52134599f4c1f131cc3430882..cb920413b8dc81d84298bc8bb9d26a271e553cba 100644 --- a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js +++ b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js @@ -56,6 +56,7 @@ export default { 'Create EndEvent': '创建结束事件', 'Create Task': '创建任务', 'Create User Task': '创建用户任务', + 'Create Call Activity': '创建调用活动', 'Create Service Task': '创建服务任务', 'Create Gateway': '创建网关', 'Create DataObjectReference': '创建数据对象', diff --git a/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue index c1f7c558b627ebffb455b9eeabb958d6ec06b67c..3a71b4c77415eca0d27359db1b5e70d84626093f 100644 --- a/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue +++ b/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue @@ -70,7 +70,7 @@ watch( () => props.type, () => { if (props.type) { - witchTaskComponent.value = installedComponent[props.type].componet + witchTaskComponent.value = installedComponent[props.type].component } }, { immediate: true } diff --git a/src/components/bpmnProcessDesigner/package/penal/task/data.ts b/src/components/bpmnProcessDesigner/package/penal/task/data.ts index d33fbebd1bfd57eaad87c47652586070cb85e8d1..805c9ac5638656cdc856639787a144cdb040b469 100644 --- a/src/components/bpmnProcessDesigner/package/penal/task/data.ts +++ b/src/components/bpmnProcessDesigner/package/penal/task/data.ts @@ -2,23 +2,28 @@ import UserTask from './task-components/UserTask.vue' import ServiceTask from './task-components/ServiceTask.vue' import ScriptTask from './task-components/ScriptTask.vue' import ReceiveTask from './task-components/ReceiveTask.vue' +import CallActivity from './task-components/CallActivity.vue' export const installedComponent = { UserTask: { name: '用户任务', - componet: UserTask + component: UserTask }, ServiceTask: { name: '服务任务', - componet: ServiceTask + component: ServiceTask }, ScriptTask: { name: '脚本任务', - componet: ScriptTask + component: ScriptTask }, ReceiveTask: { name: '接收任务', - componet: ReceiveTask + component: ReceiveTask + }, + CallActivity: { + name: '调用活动', + component: CallActivity } } diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/CallActivity.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/CallActivity.vue new file mode 100644 index 0000000000000000000000000000000000000000..6d8268b58c242231ba7e035113fa386fb5b3b783 --- /dev/null +++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/CallActivity.vue @@ -0,0 +1,280 @@ + + + + +