From 59a2e25de05cbab676ebd8288872623f07973d56 Mon Sep 17 00:00:00 2001
From: zouzhibing <zouzhibing@anthead.cn>
Date: Thu, 26 May 2022 11:39:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/SidebarItem.vue | 3 ++-
 src/layout/components/UHeader/index.vue       | 3 ---
 src/router/index.ts                           | 9 +++++++++
 src/router/modules/permission.ts              | 1 +
 src/views/components-demo/upload.vue          | 4 ++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 96c1fc2..c9edc8a 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,6 +1,6 @@
 <template>
   <template v-if="!item.hidden">
-    <template v-if="hasOneShowingChild(item.children,item)">
+    <template v-if="!item.alwaysShow&&hasOneShowingChild(item.children,item)">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)">
           <el-icon :size="20">
@@ -53,6 +53,7 @@ const hasOneShowingChild = (children = [], parent)=>{
       return true
     }
   })
+
   // 当只有一个子路由器时，默认情况下会显示该子路由器
   if (showingChildren.length === 1) {
     return true
diff --git a/src/layout/components/UHeader/index.vue b/src/layout/components/UHeader/index.vue
index 6c8578e..a34417a 100644
--- a/src/layout/components/UHeader/index.vue
+++ b/src/layout/components/UHeader/index.vue
@@ -100,15 +100,12 @@
     switch (key){
       case 1:
         logOut()
-
-
         break;
       case 2:
         person.value.show()
         break;
     }
   }
-
   const handleCollapse = () => {
     store.commit('app/SET_COLLAPSE', isCollapse.value)
   }
diff --git a/src/router/index.ts b/src/router/index.ts
index 3bf923b..b38ed8c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -17,6 +17,13 @@ interface extendRoute {
   hidden?:boolean
 }
 
+/**
+ * alwaysShow 如果设置为true，将始终显示根菜单，无论其子路由长度如何
+ * hidden 如果“hidden:true”不会显示在侧边栏中（默认值为false）
+ *
+ */
+
+
 export const constantRoutes: Array<RouteRecordRaw&extendRoute> = [
   {
     path: '/login',
@@ -67,8 +74,10 @@ const clipboardTable = {
 const zipRoutes = {
     path: '/zip',
     component: Layout,
+    isShow:true,
     redirect: 'noRedirect',
     name: 'zip',
+    alwaysShow:true,
     meta: {
         title: 'Zip',
         icon: 'document-copy',
diff --git a/src/router/modules/permission.ts b/src/router/modules/permission.ts
index 1895787..70de4ed 100644
--- a/src/router/modules/permission.ts
+++ b/src/router/modules/permission.ts
@@ -7,6 +7,7 @@ const permissionRouter = {
     component: Layout,
     redirect: 'noRedirect',
     name: 'permission',
+    alwaysShow: true, // 总是显示根目录
     meta: {
         title: '权限测试页',
         icon: 'trend-charts', roles:['other']
diff --git a/src/views/components-demo/upload.vue b/src/views/components-demo/upload.vue
index 2de3fdf..c812e11 100644
--- a/src/views/components-demo/upload.vue
+++ b/src/views/components-demo/upload.vue
@@ -65,7 +65,7 @@
 <script setup lang="ts">
     import UUpload from '@/components/u-upload/index.vue'
     import {ElMessage} from "element-plus";
-    import TwoPng from '@/assets/3.png'
+    import TwoPng from '@/assets/image/im1.jpeg'
     import {reactive, ref} from 'vue'
     const imgs  = ref([{
         url:TwoPng,
@@ -137,4 +137,4 @@
 
     display: inline-flex;
 }
-</style>
\ No newline at end of file
+</style>