@@ -612,7 +613,7 @@ onBeforeUnmount(() => {
@@ -620,32 +621,32 @@ onBeforeUnmount(() => {
-
+
-
+
diff --git a/apps/web-antd/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue b/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue
similarity index 97%
rename from apps/web-antd/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
rename to apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue
index 370f295bbbe263d3694e2fa81fc00117cb8353a9..4fe8540807494477bfd6f6535af92213af6149e5 100644
--- a/apps/web-antd/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue
@@ -1,7 +1,7 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/web-antd/src/views/bpm/model/form/modules/process-design.vue b/apps/web-antd/src/views/bpm/model/form/modules/process-design.vue
index 62f62f761bcb63e96dc1da80869beca185749df9..6944eaf6de82712124c5d212e9fe2bafc6a0db91 100644
--- a/apps/web-antd/src/views/bpm/model/form/modules/process-design.vue
+++ b/apps/web-antd/src/views/bpm/model/form/modules/process-design.vue
@@ -5,7 +5,7 @@ import { computed, inject, nextTick, ref } from 'vue';
import { BpmModelType } from '@vben/constants';
-// TODO BPM 流程模型设计器 BpmModelEditor 待整合
+import BpmModelEditor from './bpm-model-editor.vue';
import SimpleModelDesign from './simple-model-design.vue';
// 创建本地数据副本
@@ -56,7 +56,13 @@ defineExpose({ validate });
-
+
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6db4805bc9edaf4338bca0df270ff64dd32b377a..9ae95d06c5f018805d1256af7d27ee942cc5ee94 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -198,9 +198,21 @@ catalogs:
axios-mock-adapter:
specifier: ^2.1.0
version: 2.1.0
+ bpmn-js:
+ specifier: ^17.11.1
+ version: 17.11.1
+ bpmn-js-properties-panel:
+ specifier: 5.23.0
+ version: 5.23.0
+ bpmn-js-token-simulation:
+ specifier: ^0.36.3
+ version: 0.36.3
cac:
specifier: ^6.7.14
version: 6.7.14
+ camunda-bpmn-moddle:
+ specifier: ^7.0.1
+ version: 7.0.1
chalk:
specifier: ^5.4.1
version: 5.6.0
@@ -249,6 +261,9 @@ catalogs:
depcheck:
specifier: ^1.4.7
version: 1.4.7
+ diagram-js:
+ specifier: ^12.8.1
+ version: 12.8.1
dotenv:
specifier: ^16.6.1
version: 16.6.1
@@ -309,6 +324,9 @@ catalogs:
execa:
specifier: ^9.6.0
version: 9.6.0
+ fast-xml-parser:
+ specifier: ^4.5.3
+ version: 4.5.3
find-up:
specifier: ^7.0.0
version: 7.0.0
@@ -381,6 +399,9 @@ catalogs:
medium-zoom:
specifier: ^1.1.0
version: 1.1.0
+ min-dash:
+ specifier: ^4.2.3
+ version: 4.2.3
naive-ui:
specifier: ^2.42.0
version: 2.42.0
@@ -459,6 +480,9 @@ catalogs:
sortablejs:
specifier: ^1.15.6
version: 1.15.6
+ steady-xml:
+ specifier: ^0.1.0
+ version: 0.1.0
stylelint:
specifier: ^16.21.0
version: 16.24.0
@@ -783,16 +807,16 @@ importers:
specifier: 'catalog:'
version: 4.2.6(vue@3.5.21(typescript@5.9.2))
bpmn-js:
- specifier: ^17.11.1
+ specifier: 'catalog:'
version: 17.11.1
bpmn-js-properties-panel:
- specifier: 5.23.0
+ specifier: 'catalog:'
version: 5.23.0(@bpmn-io/properties-panel@3.33.0)(bpmn-js@17.11.1)(camunda-bpmn-js-behaviors@1.11.1(bpmn-js@17.11.1)(camunda-bpmn-moddle@7.0.1)(zeebe-bpmn-moddle@1.11.0))(diagram-js@12.8.1)
bpmn-js-token-simulation:
- specifier: ^0.36.3
+ specifier: 'catalog:'
version: 0.36.3
camunda-bpmn-moddle:
- specifier: ^7.0.1
+ specifier: 'catalog:'
version: 7.0.1
cropperjs:
specifier: 'catalog:'
@@ -801,22 +825,22 @@ importers:
specifier: 'catalog:'
version: 1.11.18
diagram-js:
- specifier: ^12.8.1
+ specifier: 'catalog:'
version: 12.8.1
fast-xml-parser:
- specifier: ^4.5.3
+ specifier: 'catalog:'
version: 4.5.3
highlight.js:
specifier: 'catalog:'
version: 11.11.1
min-dash:
- specifier: ^4.2.3
+ specifier: 'catalog:'
version: 4.2.3
pinia:
specifier: ^3.0.3
version: 3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
steady-xml:
- specifier: ^0.1.0
+ specifier: 'catalog:'
version: 0.1.0
tinymce:
specifier: 'catalog:'