From 39d0917a94296d888c6528f6b8b27eccdec4e249 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Sun, 22 Oct 2023 03:36:57 +0800
Subject: [PATCH] chore: compose

---
 src/views/workflow/task/TaskForm.vue            | 14 +++++++-------
 src/views/workflow/task/WorkflowPreviewForm.vue |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/workflow/task/TaskForm.vue b/src/views/workflow/task/TaskForm.vue
index c4f8d66..3dcd33c 100644
--- a/src/views/workflow/task/TaskForm.vue
+++ b/src/views/workflow/task/TaskForm.vue
@@ -16,13 +16,13 @@
           <!-- 动态表单:内置使用枇杷表单设计器(待更新为VUE3海豚表单设计器) -->
           <workflow-preview-form v-if="state.formType !== '2'"
                                  ref="formPreview"
-                                 :taskFormData="state.taskFormData"
+                                 :task-form-data="state.taskFormData"
           />
           <!-- 外置表单:内置使用用户自定义的vue页面,手动填写页面路径即可 -->
           <component :is="state.formPath"
                      v-if="state.formType === '2'"
                      ref="formPreview"
-                     :formReadOnly="state.formReadOnly"
+                     :form-read-only="state.formReadOnly"
                      :businessId="state.businessId"
           />
         </ATabPane>
@@ -327,11 +327,6 @@
         }
       // 初始化动态表单
       } else {
-        if (state.formKey === '/404') {
-          formPreview.value.init('');
-        } else {
-          formPreview.value.init(state.formKey);
-        }
         // 获取启动事件表单数据
         if (state.status === 'start' || state.status === 'reStart') {
           state.taskFormData = await getProcessStartEventFormData(state.processDefId);
@@ -339,6 +334,11 @@
         } else {
           state.taskId && (state.taskFormData = await getTaskFormData(state.taskId));
         }
+        if (state.formKey === '/404') {
+          formPreview.value.init('');
+        } else {
+          formPreview.value.init(state.formKey);
+        }
       }
       // 设置启动按钮配置
       if (state.status === 'start' || state.status === 'reStart') {
diff --git a/src/views/workflow/task/WorkflowPreviewForm.vue b/src/views/workflow/task/WorkflowPreviewForm.vue
index c9f9958..c26b854 100644
--- a/src/views/workflow/task/WorkflowPreviewForm.vue
+++ b/src/views/workflow/task/WorkflowPreviewForm.vue
@@ -75,6 +75,8 @@
             disableIds.push(item.id);
           }
         });
+        // todo: 待优化
+        formDesignProps.value = state.formData;
         state.formDesignApp?.unmount();
         state.formDesignApp = loadMicroApp(Object.assign({} , apps.find(item => item.name == 'form-design'), {
           container: '#formPreview',