From 56052135c0380ae4f8dea2d9c45989e1ddee3482 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 31 Oct 2023 10:22:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/menu.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index 1d11aabd..eadfbb02 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -179,13 +179,13 @@ const handleMeta = (item: MenuItem, isApp: boolean) => {
   }
 }
 
-const findComponents = (code: string, level: number, isApp: boolean, components: any) => {
+const findComponents = (code: string, level: number, isApp: boolean, components: any, mate: any, hasChildren: boolean) => {
   const myComponents = components[code]
   if (level === 1) { // BasicLayoutPage
-    if (myComponents) {
-      return h(BasicLayoutPage, {}, () => [h(defineAsyncComponent(() => myComponents()), {})])
+    if (myComponents && !hasChildren) {
+      return mate?.hasLayout === false ? () => myComponents() : h(BasicLayoutPage, {}, () => [h(defineAsyncComponent(() => myComponents()), {})])
     }
-    if (isApp) {
+    if (isApp && !hasChildren) {
       return h(BasicLayoutPage, {}, () => [h(Iframe, {})])
     }
     return myComponents ? () => myComponents() : BasicLayoutPage
@@ -266,7 +266,7 @@ export const handleMenus = (menuData: any[], components: any, level: number = 1)
         children: item.children
       }
 
-      route.component = findComponents(item.code, level, isApp, components)
+      route.component = findComponents(item.code, level, isApp, components, item.meta, !!item.chidlren?.length)
       const extraRoute = hasExtraChildren(item, extraRouteObj)
       const detail_components = findDetailRouteItem(item, components)