From fa8e53548370f5ab0aa72ebdb57dc2d2127f25c6 Mon Sep 17 00:00:00 2001 From: xusd Date: Wed, 4 Sep 2024 10:35:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/enums/BpmnModelConstants.java | 2 +- imt-ui/src/api/bpm/definition.js | 2 +- .../package/penal/PropertiesPanel.vue | 9 +- .../multi-instance/ElementMultiInstance.vue | 90 +++++-- .../package/penal/task/NewElementTask.vue | 232 ++++++++++++++++++ imt-ui/src/utils/dict.js | 1 + imt-ui/src/views/bpm/definition/index.vue | 14 +- imt-ui/src/views/bpm/model/index.vue | 12 +- 8 files changed, 319 insertions(+), 43 deletions(-) create mode 100644 imt-ui/src/components/bpmnProcessDesigner/package/penal/task/NewElementTask.vue diff --git a/imt-server/imt-module-bpm/imt-module-bpm-biz/src/main/java/com/inspur/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java b/imt-server/imt-module-bpm/imt-module-bpm-biz/src/main/java/com/inspur/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java index ee8898e..fe9ebbd 100644 --- a/imt-server/imt-module-bpm/imt-module-bpm-biz/src/main/java/com/inspur/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java +++ b/imt-server/imt-module-bpm/imt-module-bpm-biz/src/main/java/com/inspur/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java @@ -12,7 +12,7 @@ public interface BpmnModelConstants { /** * BPMN 中的命名空间 */ - String NAMESPACE = "http://flowable.org/bpmn"; + String NAMESPACE = null; /** * BPMN UserTask 的扩展属性,用于标记候选人策略 diff --git a/imt-ui/src/api/bpm/definition.js b/imt-ui/src/api/bpm/definition.js index b1d9b97..fad8c7b 100644 --- a/imt-ui/src/api/bpm/definition.js +++ b/imt-ui/src/api/bpm/definition.js @@ -18,7 +18,7 @@ export function getProcessDefinitionList(query) { export function getProcessDefinitionBpmnXML(id) { return request({ - url: '/bpm/process-definition/get-bpmn-xml?id=' + id, + url: '/bpm/process-definition/get?id=' + id, method: 'get' }) } diff --git a/imt-ui/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue b/imt-ui/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue index 200b3bf..af59378 100644 --- a/imt-ui/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue +++ b/imt-ui/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue @@ -21,11 +21,12 @@ 替代,提供更好的表单设计功能 -
任务
- +
任务(审批人)
+ +
-
多实例
+
多实例(会签配置)
@@ -51,6 +52,7 @@ import ElementBaseInfo from "./base/ElementBaseInfo"; import ElementOtherConfig from "./other/ElementOtherConfig"; import ElementTask from "./task/ElementTask"; +import NewElementTask from "./task/NewElementTask"; import ElementMultiInstance from "./multi-instance/ElementMultiInstance"; import FlowCondition from "./flow-condition/FlowCondition"; import SignalAndMassage from "./signal-message/SignalAndMessage"; @@ -75,6 +77,7 @@ export default { FlowCondition, ElementMultiInstance, ElementTask, + NewElementTask, ElementOtherConfig, ElementBaseInfo }, diff --git a/imt-ui/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue b/imt-ui/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue index 0f7c5ef..0cf6738 100644 --- a/imt-ui/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue +++ b/imt-ui/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue @@ -1,30 +1,35 @@