From a303950eee49622a45d1449c7fb2f4719b1c4e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com>
Date: Mon, 27 Jun 2022 22:43:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E5=90=8C=E5=90=8D=20=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms | 6 +++---
 magic-boot-ui/src/layout/empty.vue                   | 3 +++
 magic-boot-ui/src/layout/tabs.vue                    | 6 +++---
 magic-boot-ui/src/scripts/routerPermission.js        | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 magic-boot-ui/src/layout/empty.vue

diff --git a/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms b/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms
index a5ee50b..ade434b 100644
--- a/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms
+++ b/data/magic-api/api/系统管理/菜单管理/当前用户菜单.ms
@@ -5,7 +5,7 @@
   "groupId" : "67b2ce258e24491194b74992958c74aa",
   "name" : "当前用户菜单",
   "createTime" : null,
-  "updateTime" : 1649558286068,
+  "updateTime" : 1656340766427,
   "lock" : "0",
   "createBy" : null,
   "updateBy" : null,
@@ -557,7 +557,7 @@ var userId = StpUtil.getLoginId()
 var menus = db.select("""
     select
         sm.id,
-        sm.name,
+        sm.name title,
         sm.pid,
         sm.is_show,
         sm.url,
@@ -579,7 +579,7 @@ for(menu in menus){
     menu.component = (menu.url || "Layout");
     menu.path = (menu.component == 'Layout' ? "/" : menu.component);
     menu.meta = {}
-    menu.meta.title = menu.name
+    menu.meta.title = menu.title
     menu.meta.icon = menu.icon
     menu.meta.keepAlive = (menu.keepAlive == '1' ? true : false)
 }
diff --git a/magic-boot-ui/src/layout/empty.vue b/magic-boot-ui/src/layout/empty.vue
new file mode 100644
index 0000000..36da3c3
--- /dev/null
+++ b/magic-boot-ui/src/layout/empty.vue
@@ -0,0 +1,3 @@
+<template>
+  空页面
+</template>
diff --git a/magic-boot-ui/src/layout/tabs.vue b/magic-boot-ui/src/layout/tabs.vue
index 7a73cff..851e013 100644
--- a/magic-boot-ui/src/layout/tabs.vue
+++ b/magic-boot-ui/src/layout/tabs.vue
@@ -8,17 +8,17 @@
   >
     <el-tab-pane
       v-for="(view, key) in global.visitedViews" :key="key"
-      :label="view.name"
+      :label="view.meta.title"
       :name="view.path"
       :closable="!(view.path == '/home')"
     >
       <template #label>
         <el-dropdown trigger="contextmenu">
           <div class="el-tabs__item is-top is-closable is-focus" style="padding: 0px;" v-if="$route.path != view.path">
-            {{ view.name }}
+            {{ view.meta.title }}
           </div>
           <div class="el-tabs__item is-top is-active is-closable is-focus" style="padding: 0px;" v-else>
-            {{ view.name }}
+            {{ view.meta.title }}
           </div>
           <template #dropdown>
             <el-dropdown-menu>
diff --git a/magic-boot-ui/src/scripts/routerPermission.js b/magic-boot-ui/src/scripts/routerPermission.js
index b4b989f..e7f5098 100644
--- a/magic-boot-ui/src/scripts/routerPermission.js
+++ b/magic-boot-ui/src/scripts/routerPermission.js
@@ -17,8 +17,8 @@ export const filterAsyncRouter = (routers, level) => {
           router.path = "/" + common.uuid()
           router.component = level > 0 ? layoutModules[`../layout/none.vue`] : loadLayoutView(component)
         } else {
-          router.path = router.path = router.path.startsWith('/') ? router.path : '/' + router.path
-          router.component = loadView(component)
+          router.path = router.path.startsWith('/') ? router.path : '/' + router.path
+          router.component = loadView(component) || layoutModules[`../layout/empty.vue`]
         }
       }
       if (router.children && router.children.length) {