diff --git a/apps/web-antd/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue b/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessDesigner.vue
similarity index 96%
rename from apps/web-antd/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
rename to apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessDesigner.vue
index 97d15e57..fba2a575 100644
--- a/apps/web-antd/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessDesigner.vue
@@ -9,6 +9,7 @@ import {
defineEmits,
defineOptions,
defineProps,
+ h,
onBeforeUnmount,
onMounted,
provide,
@@ -477,7 +478,7 @@ const elementsAlign = (align: string) => {
content: '自动对齐可能造成图形变形,是否继续?',
okText: '确定',
cancelText: '取消',
- icon: WarningOutlined as any,
+ icon: h(WarningOutlined) as any,
onOk() {
Align.trigger(SelectedElements, align);
},
@@ -524,7 +525,7 @@ onBeforeUnmount(() => {
@@ -544,7 +545,7 @@ onBeforeUnmount(() => {
-
+
@@ -552,14 +553,14 @@ onBeforeUnmount(() => {
-
+
@@ -568,42 +569,42 @@ onBeforeUnmount(() => {
@@ -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 370f295b..4fe85408 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 62f62f76..6944eaf6 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 });
-
+