From cde1a8539455f1bccb0768749fbbfdf44b670209 Mon Sep 17 00:00:00 2001
From: superdl1996 <44232067+superdl1996@users.noreply.github.com>
Date: Thu, 3 Apr 2025 19:11:40 +0800
Subject: [PATCH 1/3] docs: typo (#5855)

---
 docs/src/components/common-ui/vben-form.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/components/common-ui/vben-form.md b/docs/src/components/common-ui/vben-form.md
index f9823091..616d17ce 100644
--- a/docs/src/components/common-ui/vben-form.md
+++ b/docs/src/components/common-ui/vben-form.md
@@ -318,7 +318,7 @@ useVbenForm 返回的第二个参数，是一个对象，包含了一些表单
 | collapsed | 是否折叠，在`showCollapseButton`为`true`时生效 | `boolean` | `false` |
 | collapseTriggerResize | 折叠时，触发`resize`事件 | `boolean` | `false` |
 | 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` | - |
 | schema | 表单项的每一项配置 | `FormSchema[]` | - |
 | submitOnEnter | 按下回车健时提交表单 | `boolean` | false |

From 360060301621a09c80fa3332054f88c6ea61449e Mon Sep 17 00:00:00 2001
From: Rascal-Coder <147695121+Rascal-Coder@users.noreply.github.com>
Date: Fri, 4 Apr 2025 13:16:31 +0800
Subject: [PATCH 2/3] fix: vxeGrid height fixed #5861 (#5862)

---
 packages/effects/plugins/src/vxe-table/style.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/effects/plugins/src/vxe-table/style.css b/packages/effects/plugins/src/vxe-table/style.css
index 020d2812..cd1d67c4 100644
--- a/packages/effects/plugins/src/vxe-table/style.css
+++ b/packages/effects/plugins/src/vxe-table/style.css
@@ -46,6 +46,8 @@
   --vxe-ui-table-row-current-background-color: hsl(var(--accent));
   --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%); */
 }
 

From b0ad08dbbc7e09ce8192923f4bce8adfaef73d4a Mon Sep 17 00:00:00 2001
From: Netfan <netfan@foxmail.com>
Date: Fri, 4 Apr 2025 15:21:09 +0800
Subject: [PATCH 3/3] feat: use the not-found component instead of the invalid
 route component in the backend mode (#5871)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 后端菜单模式下，使用not-found组件代替无效的路由组件
---
 packages/utils/src/helpers/generate-routes-backend.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/utils/src/helpers/generate-routes-backend.ts b/packages/utils/src/helpers/generate-routes-backend.ts
index 076840c6..c92b6d35 100644
--- a/packages/utils/src/helpers/generate-routes-backend.ts
+++ b/packages/utils/src/helpers/generate-routes-backend.ts
@@ -63,6 +63,7 @@ function convertRoutes(
         route.component = pageMap[pageKey];
       } else {
         console.error(`route component is invalid: ${pageKey}`, route);
+        route.component = pageMap['/_core/fallback/not-found.vue'];
       }
     }