From 66d8cf1233504e4a865264a47a368e8f68354df7 Mon Sep 17 00:00:00 2001
From: zws <447643445@qq.com>
Date: Thu, 16 Jan 2025 10:10:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3bpmn=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=20=E5=88=9D=E6=AC=A1=E5=88=9B=E5=BB=BA=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8Bkey=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/base/ElementBaseInfo.vue                  | 3 +++
 src/views/bpm/model/editor/index.vue                        | 6 ++++++
 src/views/bpm/model/form/index.vue                          | 1 +
 3 files changed, 10 insertions(+)

diff --git a/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue b/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
index 70ad4f8b..3172338d 100644
--- a/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
@@ -152,6 +152,9 @@ watch(
       handleKeyUpdate(props.model.key)
       handleNameUpdate(props.model.name)
     }
+  },
+  {
+    immediate: true
   }
 )
 
diff --git a/src/views/bpm/model/editor/index.vue b/src/views/bpm/model/editor/index.vue
index b91c250e..1076cf56 100644
--- a/src/views/bpm/model/editor/index.vue
+++ b/src/views/bpm/model/editor/index.vue
@@ -12,6 +12,8 @@
       :additionalModel="controlForm.additionalModel"
       :model="model"
       @save="save"
+      :process-id="modelKey"
+      :process-name="modelName"
     />
     <!-- 流程属性器，负责编辑每个流程节点的属性 -->
     <MyProcessPenal
@@ -53,6 +55,8 @@ provide('formType', formType)
 
 // 注入流程数据
 const xmlString = inject('processData') as Ref
+// 注入模型数据
+const modelData = inject('modelData') as Ref
 
 const modeler = shallowRef() // BPMN Modeler
 const processDesigner = ref()
@@ -69,6 +73,8 @@ const model = ref<ModelApi.ModelVO>() // 流程模型的信息
 /** 初始化 modeler */
 // TODO @zws：需要初始化，不然首次创建后，无法发布！相当于说，key、name 要去赋值下
 const initModeler = async (item) => {
+  //先初始化模型数据
+  model.value = modelData.value
   modeler.value = item
 }
 
diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index 37fa6bf0..43e5c0a7 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -145,6 +145,7 @@ const formData: any = ref({
 const processData = ref<any>()
 
 provide('processData', processData)
+provide('modelData', formData)
 
 // 数据列表
 const formList = ref([])