From 63d47b0fae7078f41d6e9cd0966d6f5cd0195b44 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Thu, 27 Aug 2020 19:50:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=90=AF=E7=94=A8=E4=BA=86'=E4=BE=A7?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E8=87=AA=E5=8A=A8=E9=9A=90=E8=97=8F'?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=B8=B2=E6=9F=93=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F=E6=8A=98=E5=8F=A0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/component/Navbar/component/Hamburger.vue    |  5 +++--
 vue/src/layout/component/Navbar/index.vue              | 10 ++++++++--
 vue/src/layout/component/Sidebar/index.vue             |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/vue/src/layout/component/Navbar/component/Hamburger.vue b/vue/src/layout/component/Navbar/component/Hamburger.vue
index fc879ba..e43d35f 100644
--- a/vue/src/layout/component/Navbar/component/Hamburger.vue
+++ b/vue/src/layout/component/Navbar/component/Hamburger.vue
@@ -4,10 +4,11 @@ export default {
 
     functional: true,
 
-    props: {active: Boolean},
+    props: {render: Boolean, active: Boolean},
 
     render(h, context) {
-        const {active} = context.props
+        const {render, active} = context.props
+        if (!render) return
         const className = `navbar-icon el-icon-s-unfold hamburger ${active ? 'is-active' : ''}`
         return (
             <div {...context.data} title={`${active ? '折叠' : '展开'}侧边栏`}>
diff --git a/vue/src/layout/component/Navbar/index.vue b/vue/src/layout/component/Navbar/index.vue
index 7382360..af38833 100644
--- a/vue/src/layout/component/Navbar/index.vue
+++ b/vue/src/layout/component/Navbar/index.vue
@@ -1,7 +1,7 @@
 <template>
     <nav class="navbar">
         <div style="width: 30%">
-            <hamburger class="navbar-item" :active="!sidebarCollapse" @click="sidebarCtrl"/>
+            <hamburger class="navbar-item" :render="renderHamburger" :active="!sidebarCollapse" @click="sidebarCtrl"/>
 
             <breadcrumb v-if="showBreadcrumb"/>
 
@@ -67,11 +67,17 @@ export default {
     data: () => ({settingDrawer: false}),
 
     computed: {
+        ...mapState('app', ['device']),
+
         ...mapState('resource', ['activeRootMenu', 'menus']),
 
         ...mapState('user', ['avatar', 'name', 'prepareLogout']),
 
-        ...mapState('setting', ['sidebarCollapse', 'showBreadcrumb'])
+        ...mapState('setting', ['sidebarAutoHidden', 'sidebarCollapse', 'showBreadcrumb']),
+
+        renderHamburger() {
+            return !(this.device === 'pc' && this.sidebarAutoHidden)
+        }
     },
 
     methods: {
diff --git a/vue/src/layout/component/Sidebar/index.vue b/vue/src/layout/component/Sidebar/index.vue
index 97c52b1..323f5d5 100644
--- a/vue/src/layout/component/Sidebar/index.vue
+++ b/vue/src/layout/component/Sidebar/index.vue
@@ -35,10 +35,10 @@ export default {
         },
 
         //是否隐藏侧边栏
-        //①设置了侧边栏自动隐藏且鼠标不再侧边栏内
+        //①设置了侧边栏自动隐藏且鼠标不再侧边栏内且是pc端
         //②侧边栏处于折叠状态且是移动端
         hideSidebar() {
-            return this.sidebarAutoHidden && this.mouseOutside
+            return this.sidebarAutoHidden && this.mouseOutside && this.device === 'pc'
                 || this.sidebarCollapse && this.device === 'mobile'
         },