From f9e283b190b3090263011223aa43282fce6b253f Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 2 Feb 2023 10:37:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=97=A0=E6=B3=95=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/menu.ts         |  8 ++++++--
 src/views/demo/Search.vue | 31 ++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index 8b1d7520..c9f1c00d 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -1,4 +1,5 @@
 import { cloneDeep } from 'lodash-es'
+import NotFindPage from '@/views/404.vue'
 import { BlankLayoutPage, BasicLayoutPage } from 'components/Layout'
 const pagesComponent = import.meta.glob('../views/**/*.vue', { eager: true });
 
@@ -176,6 +177,7 @@ const findDetailRouteItem = (code: string, url: string): Partial<MenuItem> | nul
   if (detailComponent) {
     return {
       url: `${url}/Detail/:id`,
+      code: `${code}/Detail`,
       component: detailComponent,
       name: '详情信息',
       isShow: false
@@ -228,14 +230,16 @@ export function filterAsnycRouter(asyncRouterMap: any, parentCode = '', level =
       } else {
         const myComponent = resolveComponent(route.code)
         _route.component = myComponent ? myComponent : BlankLayoutPage;
-        if (myComponent) {
+        if (!!myComponent) {
           _route.component = myComponent;
           _route.children.map((r: any) => menusData.push(r))
           delete _route.children
+        } else {
+          _route.component = BlankLayoutPage
         }
       }
     } else {
-      _route.component = _route.component || resolveComponent(route.code) || BlankLayoutPage;
+      _route.component = route.component || resolveComponent(route.code) || BlankLayoutPage;
     }
     menusData.push(_route)
     silderMenus.push(silder)
diff --git a/src/views/demo/Search.vue b/src/views/demo/Search.vue
index b62d20ae..6b1fb421 100644
--- a/src/views/demo/Search.vue
+++ b/src/views/demo/Search.vue
@@ -1,22 +1,27 @@
 <template>
-  <div class='search'>
-    <Search
-      :columns='columns'
-      target='device-instance-search'
-      @search='search'
-    />
-    <Search
-      type='simple'
-      :columns='columns'
-      target='product'
-      @search='search'
-    />
-  </div>
+  <BasicLayoutPage
+
+  >
+    <div class='search'>
+      <Search
+        :columns='columns'
+        target='device-instance-search'
+        @search='search'
+      />
+      <Search
+        type='simple'
+        :columns='columns'
+        target='product'
+        @search='search'
+      />
+    </div>
+  </BasicLayoutPage>
 </template>
 
 <script setup name='demoSearch'>
 
 import { category } from '../../api/device/product'
+import BasicLayoutPage from '@/components/Layout/BasicLayoutPage.vue'
 
 const columns = [
   {