diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue b/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue
index 370f295b..f7517032 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { defineProps, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
-import { BpmProcessInstanceStatus } from '@vben/constants';
+import { BpmProcessInstanceStatus, DICT_TYPE } from '@vben/constants';
 import { UndoOutlined, ZoomInOutlined, ZoomOutOutlined } from '@vben/icons';
 import { dateFormatter, formatPast2 } from '@vben/utils';
 
@@ -10,7 +10,6 @@ import BpmnViewer from 'bpmn-js/lib/Viewer';
 import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas';
 
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE } from '#/utils/dict';
 
 import '../theme/index.scss';
 
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ProcessListenerDialog.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ProcessListenerDialog.vue
index 0f620aad..5bdb51c9 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ProcessListenerDialog.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ProcessListenerDialog.vue
@@ -4,14 +4,13 @@ import type { BpmProcessListenerApi } from '#/api/bpm/processListener';
 
 import { reactive, ref } from 'vue';
 
-import { CommonStatusEnum } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 
 import { Button, Modal, Pagination, Table } from 'ant-design-vue';
 
 import { getProcessListenerPage } from '#/api/bpm/processListener';
 import { ContentWrap } from '#/components/content-wrap';
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE } from '#/utils/dict';
 
 /** BPM 流程 表单 */
 defineOptions({ name: 'ProcessListenerDialog' });
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/ReceiveTask.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/ReceiveTask.vue
index 26d84ecc..16b93789 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/ReceiveTask.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/ReceiveTask.vue
@@ -57,7 +57,9 @@ const createNewMessage = () => {
   bpmnRootElements.value.push(newMessage);
   messageMap.value[newMessageForm.value.id] = newMessageForm.value.name;
   // @ts-ignore
-  bpmnMessageRefsMap.value?.[newMessageForm.value.id] = newMessage;
+  if (bpmnMessageRefsMap.value) {
+    bpmnMessageRefsMap.value[newMessageForm.value.id] = newMessage;
+  }
   messageModelVisible.value = false;
 };
 const updateTaskMessage = (messageId: string) => {
@@ -80,7 +82,9 @@ onMounted(() => {
     .filter((el: any) => el.$type === 'bpmn:Message')
     .forEach((m: any) => {
       // @ts-ignore
-      bpmnMessageRefsMap.value?.[m.id] = m;
+      if (bpmnMessageRefsMap.value) {
+        bpmnMessageRefsMap.value[m.id] = m;
+      }
       messageMap.value[m.id] = m.name;
     });
   messageMap.value['-1'] = '无';
diff --git a/apps/web-antd/src/views/bpm/model/form/modules/bpm-model-editor.vue b/apps/web-antd/src/views/bpm/model/form/modules/bpm-model-editor.vue
new file mode 100644
index 00000000..fef66c4b
--- /dev/null
+++ b/apps/web-antd/src/views/bpm/model/form/modules/bpm-model-editor.vue
@@ -0,0 +1,135 @@
+<script lang="ts" setup>
+import type { Ref } from 'vue';
+
+import type { BpmModelApi } from '#/api/bpm/model';
+
+import { inject, onBeforeUnmount, provide, ref, shallowRef, watch } from 'vue';
+
+import { BpmModelFormType } from '@vben/constants';
+
+import { message } from 'ant-design-vue';
+
+import { getFormDetail } from '#/api/bpm/form';
+import {
+  MyProcessDesigner,
+  MyProcessPenal,
+} from '#/components/bpmn-process-designer/package';
+// 自定义元素选中时的弹出菜单（修改 默认任务 为 用户任务）
+import CustomContentPadProvider from '#/components/bpmn-process-designer/package/designer/plugins/content-pad';
+// 自定义左侧菜单（修改 默认任务 为 用户任务）
+import CustomPaletteProvider from '#/components/bpmn-process-designer/package/designer/plugins/palette';
+import { ContentWrap } from '#/components/content-wrap';
+
+defineOptions({ name: 'BpmModelEditor' });
+
+defineProps<{
+  modelId?: string;
+  modelKey: string;
+  modelName: string;
+  value?: string;
+}>();
+
+const emit = defineEmits(['success', 'init-finished']);
+
+// 表单信息
+const formFields = ref<string[]>([]);
+// 表单类型，暂仅限流程表单
+const formType = ref(BpmModelFormType.NORMAL);
+provide('formFields', formFields);
+provide('formType', formType);
+
+// 注入流程数据
+const xmlString = inject('processData') as Ref;
+// 注入模型数据
+const modelData = inject('modelData') as Ref;
+
+const modeler = shallowRef(); // BPMN Modeler
+const processDesigner = ref();
+const controlForm = ref({
+  simulation: true,
+  labelEditing: false,
+  labelVisible: false,
+  prefix: 'flowable',
+  headerButtonSize: 'mini',
+  additionalModel: [CustomContentPadProvider, CustomPaletteProvider],
+});
+const model = ref<BpmModelApi.Model>(); // 流程模型的信息
+
+/** 初始化 modeler */
+const initModeler = async (item: any) => {
+  // 先初始化模型数据
+  model.value = modelData.value;
+  modeler.value = item;
+};
+
+/** 添加/修改模型 */
+const save = async (bpmnXml: string) => {
+  try {
+    xmlString.value = bpmnXml;
+    emit('success', bpmnXml);
+  } catch (error) {
+    console.error('保存失败:', error);
+    message.error('保存失败');
+  }
+};
+
+/** 监听表单 ID 变化，加载表单数据 */
+watch(
+  () => modelData.value.formId,
+  async (newFormId) => {
+    if (newFormId && modelData.value.formType === BpmModelFormType.NORMAL) {
+      const data = await getFormDetail(newFormId);
+      formFields.value = data.fields;
+    } else {
+      formFields.value = [];
+    }
+  },
+  { immediate: true },
+);
+
+// 在组件卸载时清理
+onBeforeUnmount(() => {
+  modeler.value = null;
+  // 清理全局实例
+  const w = window as any;
+  if (w.bpmnInstances) {
+    w.bpmnInstances = null;
+  }
+});
+</script>
+
+<template>
+  <ContentWrap>
+    <!-- 流程设计器，负责绘制流程等 -->
+    <MyProcessDesigner
+      key="designer"
+      v-model="xmlString"
+      :value="xmlString"
+      v-bind="controlForm"
+      keyboard
+      ref="processDesigner"
+      @init-finished="initModeler"
+      :additional-model="controlForm.additionalModel"
+      :model="model"
+      @save="save"
+      :process-id="modelKey"
+      :process-name="modelName"
+    />
+    <!-- 流程属性器，负责编辑每个流程节点的属性 -->
+    <MyProcessPenal
+      v-if="modeler"
+      key="penal"
+      :bpmn-modeler="modeler"
+      :prefix="controlForm.prefix"
+      class="process-panel"
+      :model="model"
+    />
+  </ContentWrap>
+</template>
+<style lang="scss">
+.process-panel__container {
+  position: absolute;
+  top: 172px;
+  right: 70px;
+}
+</style>
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 });
   <div class="h-full">
     <!-- BPMN设计器 -->
     <template v-if="modelData.type === BpmModelType.BPMN">
-      <!-- TODO BPMN 流程设计器 -->
+      <BpmModelEditor
+        v-if="showDesigner"
+        :model-id="modelData.id"
+        :model-key="modelData.key"
+        :model-name="modelData.name"
+        @success="handleDesignSuccess"
+      />
     </template>
     <!-- Simple设计器 -->
     <template v-else>