From 6693f9fd0a1e49a1c375c49378685cad872ba902 Mon Sep 17 00:00:00 2001
From: GAOANG <1140589958@qq.com>
Date: Tue, 2 Apr 2024 16:03:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=99=A8=E5=8F=8C=E5=87=BB=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0emit=E4=BC=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/helper/generatorHelper.ts | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts
index b4f4f5b..6a8f75c 100644
--- a/src/utils/helper/generatorHelper.ts
+++ b/src/utils/helper/generatorHelper.ts
@@ -989,23 +989,7 @@ ${hasTemplatePrint ? ' reactive ' : ''}
   });
   
   function dbClickRow(record) {
-    if (!record.workflowData.schemaId && !record.workflowData.taskIds) {
-      ${
-        formType === 'modal'
-          ? `
-      router.push({
-        path: '/form/${lowerClassName}/' + record.id + '/viewForm',
-        query: {
-            formPath: '${model.outputConfig.outputValue}/${lowerClassName}'
-        }
-      });`
-          : ` 
-    openDrawer(true, {
-      isView: true,
-      id: record.${camelCaseString(mainTable.pkField)},
-    });`
-      }
-    } else if (record.workflowData.taskIds && record.workflowData.taskIds.length) {
+    if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
       const { processId, taskIds, schemaId } = record.workflowData;
       router.push({
         path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
@@ -1013,7 +997,7 @@ ${hasTemplatePrint ? ' reactive ' : ''}
           taskId: taskIds[0]
         }
       });
-    } else {
+    } else if (record.workflowData?.schemaId && !record.workflowData.taskIds) {
       const { processId, schemaId } = record.workflowData;
       router.push({
         path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
@@ -1022,6 +1006,13 @@ ${hasTemplatePrint ? ' reactive ' : ''}
           taskId: ''
         }
       });
+    } else {
+      router.push({
+        path: '/form/${lowerClassName}/' + record.id + '/viewForm',
+        query: {
+            formPath: '${model.outputConfig.outputValue}/${lowerClassName}'
+        }
+      });
     }
   }
 
@@ -1679,7 +1670,7 @@ export function buildSimpleFormCode(model: GeneratorConfig, _tableInfo: TableInf
   const { filterFormSchemaAuth } = usePermission();
 
   const RowKey = '${mainTable.pkField ? camelCase(mainTable.pkField) : 'id'}';
-  const emits = defineEmits(['changeUploadComponentIds','loadingCompleted']);
+  const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'form-mounted']);
   const props = defineProps({
     fromPage: {
       type: Number,