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,