样式调整

信息体组件自动带部门
tab标题显示业务功能名称
修改流程默认节点名称、修改流程线名称可为空
表单流程验证跳过
This commit is contained in:
yaoyn
2024-05-29 09:28:48 +08:00
parent 5e85ad2c2f
commit f6209b9476
16 changed files with 113 additions and 78 deletions

View File

@ -534,11 +534,11 @@ export function buildListCode(model: GeneratorConfig): string {
}
<template #toolbar>
<template v-for="button in tableButtonConfig" :key="button.code">
<a-button v-if="button.isDefault" type="primary" @click="buttonClick(button.code)">
<a-button v-if="button.isDefault" :type="button.type" @click="buttonClick(button.code)">
<template #icon><Icon :icon="button.icon" /></template>
{{ button.name }}
</a-button>
<a-button v-else type="primary">
<a-button v-else :type="button.type">
<template #icon><Icon :icon="button.icon" /></template>
{{ button.name }}
</a-button>
@ -908,10 +908,11 @@ ${hasTemplatePrint ? ' reactive ' : ''}
`
: ''
}
const formName='${model.outputConfig?.comment || pascalClassName}';
const [registerTable, { reload, ${hasFilterButton ? 'setColumns,' : ''} ${
hasPrintButton ? 'getRawDataSource,' : ''
} }] = useTable({
title: '${model.listConfig?.listTitle || pascalClassName + '列表'}',
title: '${model.listConfig?.listTitle||''}' || (formName + '列表'),
api: get${pascalMainTableName}Page,
rowKey: '${camelCaseString(mainTable.pkField)}',
columns: filterColumns,
@ -1003,7 +1004,8 @@ ${hasTemplatePrint ? ' reactive ' : ''}
router.push({
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
query: {
taskId: taskIds[0]
taskId: taskIds[0],
formName: formName
}
});
} else if (record.workflowData?.schemaId && !record.workflowData.taskIds) {
@ -1012,14 +1014,16 @@ ${hasTemplatePrint ? ' reactive ' : ''}
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
query: {
readonly: 1,
taskId: ''
taskId: '',
formName: formName
}
});
} else {
router.push({
path: '/form/${lowerClassName}/' + record.id + '/viewForm',
query: {
formPath: '${model.outputConfig.outputValue}/${lowerClassName}'
formPath: '${model.outputConfig.outputValue}/${lowerClassName}',
formName: formName
}
});
}
@ -1047,7 +1051,8 @@ ${hasTemplatePrint ? ' reactive ' : ''}
router.push({
path: '/form/${lowerClassName}/0/createForm',
query: {
formPath: '${model.outputConfig.outputValue}/${lowerClassName}'
formPath: '${model.outputConfig.outputValue}/${lowerClassName}',
formName: formName
}
});
}
@ -1064,7 +1069,8 @@ ${hasTemplatePrint ? ' reactive ' : ''}
router.push({
path: '/form/${lowerClassName}/' + record.id + '/updateForm',
query: {
formPath: '${model.outputConfig.outputValue}/${lowerClassName}'
formPath: '${model.outputConfig.outputValue}/${lowerClassName}',
formName: formName
}
});`
: `
@ -1348,7 +1354,8 @@ ${hasTemplatePrint ? ' reactive ' : ''}
router.push({
path: '/form/${lowerClassName}/' + record.id + '/viewForm',
query: {
formPath: '${model.outputConfig.outputValue}/${lowerClassName}'
formPath: '${model.outputConfig.outputValue}/${lowerClassName}',
formName: formName
}
});`
: `
@ -1491,7 +1498,7 @@ ${hasTemplatePrint ? ' reactive ' : ''}
}
${hasFlowRecordButton ? `if (button.code === 'flowRecord') hasFlowRecord = true;` : ''}
});
if (record.workflowData.enabled) {
if (record.workflowData?.enabled) {
//与工作流有关联的表单
if (record.workflowData.status) {
//如果是本人需要审批的数据 就会有taskIds 所以需要修改绑定事件
@ -1529,7 +1536,7 @@ ${hasTemplatePrint ? ' reactive ' : ''}
actionsList = actionsList.concat(editAndDelBtn);
}
} else {
if (!record.workflowData.processId) {
if (!record.workflowData?.processId) {
//与工作流没有关联的表单并且在当前页面新增的数据 如选择编辑、删除按钮则加上
actionsList = actionsList.concat(editAndDelBtn);
}
@ -1570,7 +1577,8 @@ ${hasTemplatePrint ? ' reactive ' : ''}
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
query: {
readonly: 1,
taskId: ''
taskId: '',
formName: formName
}
});
}
@ -1614,7 +1622,8 @@ ${hasTemplatePrint ? ' reactive ' : ''}
router.push({
path: '/flow/' + schemaId + '/' + processId + '/approveFlow',
query: {
taskId: taskIds[0]
taskId: taskIds[0],
formName: formName
}
});
}