Merge branch 'dev' into dev-new

# Conflicts:
#	apps/web-antd/src/views/infra/codegen/index.vue
#	apps/web-antd/src/views/infra/job/index.vue
This commit is contained in:
puhui999
2025-06-15 15:25:20 +08:00
15 changed files with 248 additions and 7 deletions

View File

@@ -262,6 +262,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
/** 列表的字段 */
export function useGridColumns(): VxeTableGridOptions['columns'] {
return [
{ type: 'checkbox', width: 40 },
{
field: 'id',
title: '编号',