by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

Browse Source
This commit is contained in:
dap 2025-04-04 19:42:43 +08:00
commit 2ca39dfdbb
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/src/components/common-ui/vben-form.md
View File

@ -318,7 +318,7 @@ useVbenForm 返回的第二个参数，是一个对象，包含了一些表单
| collapsed | 是否折叠，在`showCollapseButton`为`true`时生效 | `boolean` | `false` | | collapsed | 是否折叠，在`showCollapseButton`为`true`时生效 | `boolean` | `false` |
| collapseTriggerResize | 折叠时，触发`resize`事件 | `boolean` | `false` | | collapseTriggerResize | 折叠时，触发`resize`事件 | `boolean` | `false` |
| collapsedRows | 折叠时保持的行数 | `number` | `1` | | collapsedRows | 折叠时保持的行数 | `number` | `1` |
| fieldMappingTime | 用于将表单内的数组值值映射成 2 个字段 | `[string, [string, string],Nullable<string>\|[string,string]\|((any,string)=>any)?][]` | - | | fieldMappingTime | 用于将表单内的数组值映射成 2 个字段 | `[string, [string, string],Nullable<string>\|[string,string]\|((any,string)=>any)?][]` | - |
| commonConfig | 表单项的通用配置，每个配置都会传递到每个表单项，表单项可覆盖 | `FormCommonConfig` | - | | commonConfig | 表单项的通用配置，每个配置都会传递到每个表单项，表单项可覆盖 | `FormCommonConfig` | - |
| schema | 表单项的每一项配置 | `FormSchema[]` | - | | schema | 表单项的每一项配置 | `FormSchema[]` | - |
| submitOnEnter | 按下回车健时提交表单 | `boolean` | false | | submitOnEnter | 按下回车健时提交表单 | `boolean` | false |

2
packages/effects/plugins/src/vxe-table/style.css
View File

@ -46,6 +46,8 @@
--vxe-ui-table-row-current-background-color: hsl(var(--accent)); --vxe-ui-table-row-current-background-color: hsl(var(--accent));
--vxe-ui-table-row-hover-current-background-color: hsl(var(--accent-hover)); --vxe-ui-table-row-hover-current-background-color: hsl(var(--accent-hover));
height: auto !important;
/* --vxe-ui-table-fixed-scrolling-box-shadow-color: rgb(0 0 0 / 80%); */ /* --vxe-ui-table-fixed-scrolling-box-shadow-color: rgb(0 0 0 / 80%); */
} }

15
packages/utils/src/helpers/generate-routes-backend.ts
View File

@ -56,13 +56,14 @@ function convertRoutes(
// 页面组件转换 // 页面组件转换
} else if (component) { } else if (component) {
const normalizePath = normalizeViewPath(component); const normalizePath = normalizeViewPath(component);
route.component = const pageKey = normalizePath.endsWith('.vue')
pageMap[ ? normalizePath
normalizePath.endsWith('.vue') : `${normalizePath}.vue`;
? normalizePath if (pageMap[pageKey]) {
: `${normalizePath}.vue` route.component = pageMap[pageKey];
]; } else {
if (!route.component) { // console.error(`route component is invalid: ${pageKey}`, route);
// route.component = pageMap['/_core/fallback/not-found.vue'];
console.error(`未找到对应组件: /views${component}.vue`); console.error(`未找到对应组件: /views${component}.vue`);
// 默认为404页面 // 默认为404页面
route.component = layoutMap.NotFoundComponent; route.component = layoutMap.NotFoundComponent;