geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://fcd.gdyditc.com/itc-framework/ma/2024/front into dev

Browse Source
This commit is contained in:
gaoyunqi
2024-04-02 16:57:03 +08:00
parent a23b8970de 6693f9fd0a
commit b595971a5b
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/utils/helper/generatorHelper.ts
View File

@ -989,23 +989,7 @@ ${hasTemplatePrint ? ' reactive ' : ''}
}); });
function dbClickRow(record) { function dbClickRow(record) {
if (!record.workflowData.schemaId && !record.workflowData.taskIds) { if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
${
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) {
const { processId, taskIds, schemaId } = record.workflowData; const { processId, taskIds, schemaId } = record.workflowData;
router.push({ router.push({
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow', path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
@ -1013,7 +997,7 @@ ${hasTemplatePrint ? ' reactive ' : ''}
taskId: taskIds[0] taskId: taskIds[0]
} }
}); });
} else { } else if (record.workflowData?.schemaId && !record.workflowData.taskIds) {
const { processId, schemaId } = record.workflowData; const { processId, schemaId } = record.workflowData;
router.push({ router.push({
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow', path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
@ -1022,6 +1006,13 @@ ${hasTemplatePrint ? ' reactive ' : ''}
taskId: '' 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 { filterFormSchemaAuth } = usePermission();
const RowKey = '${mainTable.pkField ? camelCase(mainTable.pkField) : 'id'}'; const RowKey = '${mainTable.pkField ? camelCase(mainTable.pkField) : 'id'}';
const emits = defineEmits(['changeUploadComponentIds','loadingCompleted']); const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'form-mounted']);
const props = defineProps({ const props = defineProps({
fromPage: { fromPage: {
type: Number, type: Number,