diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
index 788e4d163..126838717 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
@@ -89,6 +89,7 @@ F.prototype.getPaletteEntries = function () {
create.start(event, elementFactory.createParticipantShape())
}
+
assign(actions, {
'hand-tool': {
group: 'tools',
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
index 304875ced..8a5858887 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
@@ -96,6 +96,7 @@ PaletteProvider.prototype.getPaletteEntries = function () {
create.start(event, elementFactory.createParticipantShape())
}
+
assign(actions, {
'hand-tool': {
group: 'tools',
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
index d243ec456..4407e6640 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
@@ -10,7 +10,7 @@ export default {
'Append Gateway': '追加网关',
'Append Task': '追加任务',
'Append Intermediate/Boundary Event': '追加中间抛出事件/边界事件',
-
+ TextAnnotation: '文本注释',
'Activate the global connect tool': '激活全局连接工具',
'Append {type}': '添加 {type}',
'Add Lane above': '在上面添加道',
@@ -29,10 +29,16 @@ export default {
'Create expanded SubProcess': '创建扩展子过程',
'Create IntermediateThrowEvent/BoundaryEvent': '创建中间抛出事件/边界事件',
'Create Pool/Participant': '创建池/参与者',
- 'Parallel Multi Instance': '并行多重事件',
- 'Sequential Multi Instance': '时序多重事件',
+ 'Participant Multiplicity': '参与者多重性',
+ 'Empty pool/participant (removes content)': '清空池/参与者(移除内容)',
+ 'Empty pool/participant': '收缩池/参与者',
+ 'Expanded pool/participant': '展开池/参与者',
+ 'Parallel Multi-Instance': '并行多重事件',
+ 'Sequential Multi-Instance': '时序多重事件',
DataObjectReference: '数据对象参考',
DataStoreReference: '数据存储参考',
+ 'Data object reference': '数据对象引用 ',
+ 'Data store reference': '数据存储引用 ',
Loop: '循环',
'Ad-hoc': '即席',
'Create {type}': '创建 {type}',
@@ -47,6 +53,9 @@ export default {
'Call Activity': '调用活动',
'Sub-Process (collapsed)': '子流程(折叠的)',
'Sub-Process (expanded)': '子流程(展开的)',
+ 'Ad-hoc sub-process': '即席子流程',
+ 'Ad-hoc sub-process (collapsed)': '即席子流程(折叠的)',
+ 'Ad-hoc sub-process (expanded)': '即席子流程(展开的)',
'Start Event': '开始事件',
StartEvent: '开始事件',
'Intermediate Throw Event': '中间事件',
@@ -109,10 +118,10 @@ export default {
'Parallel Gateway': '并行网关',
'Inclusive Gateway': '相容网关',
'Complex Gateway': '复杂网关',
- 'Event based Gateway': '事件网关',
+ 'Event-based Gateway': '事件网关',
Transaction: '转运',
- 'Sub Process': '子流程',
- 'Event Sub Process': '事件子流程',
+ 'sub-process': '子流程',
+ 'Event sub-process': '事件子流程',
'Collapsed Pool': '折叠池',
'Expanded Pool': '展开池',
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/HttpHeaderEditor.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/HttpHeaderEditor.vue
new file mode 100644
index 000000000..5d0a13349
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/HttpHeaderEditor.vue
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
index 2f9c535ee..c07e80b51 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
@@ -1,10 +1,11 @@
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/bpm/processListener/ProcessListenerForm.vue b/src/views/bpm/processListener/ProcessListenerForm.vue
index a9684dffb..916998ed1 100644
--- a/src/views/bpm/processListener/ProcessListenerForm.vue
+++ b/src/views/bpm/processListener/ProcessListenerForm.vue
@@ -39,8 +39,8 @@