From 6b1522d065359a0650db0124ff0a7568e6210b0c Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Sun, 26 Jul 2020 13:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=B7=E6=96=B0=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=20=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Navbar/components/Bell.vue     |  4 +-
 .../Navbar/components/Breadcrumb.vue          |  6 +-
 .../Navbar/components/Hamburger.vue           | 47 ++++----------
 vue/src/layout/components/Navbar/index.vue    | 24 ++++---
 vue/src/layout/components/Navbar/style.scss   | 63 ++++++++-----------
 vue/src/mixins/guide/data/navbar.js           |  4 +-
 6 files changed, 61 insertions(+), 87 deletions(-)

diff --git a/vue/src/layout/components/Navbar/components/Bell.vue b/vue/src/layout/components/Navbar/components/Bell.vue
index 72627e0..09e6efd 100644
--- a/vue/src/layout/components/Navbar/components/Bell.vue
+++ b/vue/src/layout/components/Navbar/components/Bell.vue
@@ -1,6 +1,6 @@
 <template>
-    <el-badge :hidden="hidden" class="bell-badge" is-dot>
-        <i class="el-icon-bell navbar-icon" title="消息提醒" @click="jump"/>
+    <el-badge :hidden="hidden" class="bell-badge" is-dot @click.native="jump">
+        <i class="el-icon-bell navbar-icon" title="消息提醒"/>
     </el-badge>
 </template>
 
diff --git a/vue/src/layout/components/Navbar/components/Breadcrumb.vue b/vue/src/layout/components/Navbar/components/Breadcrumb.vue
index 5227d74..b5e4833 100644
--- a/vue/src/layout/components/Navbar/components/Breadcrumb.vue
+++ b/vue/src/layout/components/Navbar/components/Breadcrumb.vue
@@ -35,9 +35,9 @@
 <style lang="scss" scoped>
     @import "~@/assets/styles/variables.scss";
 
-    .app-breadcrumb.el-breadcrumb {
-        display: inline-block;
-        line-height: 50px;
+    .app-breadcrumb {
+        margin-left: 8px;
+        line-height: $nav-height;
 
         .no-redirect {
             color: $--color-gray;
diff --git a/vue/src/layout/components/Navbar/components/Hamburger.vue b/vue/src/layout/components/Navbar/components/Hamburger.vue
index 5241bec..504ce98 100644
--- a/vue/src/layout/components/Navbar/components/Hamburger.vue
+++ b/vue/src/layout/components/Navbar/components/Hamburger.vue
@@ -4,51 +4,26 @@
 
         functional: true,
 
-        props: {isActive: Boolean},
+        props: {active: Boolean},
 
         render(h, context) {
-            const {isActive} = context.props
+            const {active} = context.props
+            const className = {'navbar-icon': true, 'el-icon-s-unfold': true, 'hamburger': true, 'is-active': active}
             return (
-                <div class="hamburger-container" {...context.data}>
-                    <svg
-                        class={{'hamburger': true, 'is-active': isActive}}
-                        viewBox="0 0 1024 1024"
-                        xmlns="http://www.w3.org/2000/svg"
-                        width="64"
-                        height="64"
-                    >
-                        <path
-                            d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z"/>
-                    </svg>
+                <div {...context.data}>
+                    <i class={className}/>
                 </div>
             )
         }
     }
 </script>
 
-<style lang="scss">
-    .hamburger-container {
-        padding: 0 15px;
-        line-height: 46px;
-        height: 100%;
-        float: left;
-        cursor: pointer;
-        transition: background .3s;
-        -webkit-tap-highlight-color: transparent;
-
-        &:hover {
-            background: rgba(0, 0, 0, .025)
-        }
-
-        .hamburger {
-            display: inline-block;
-            vertical-align: middle;
-            width: 20px;
-            height: 20px;
+<style>
+    .hamburger {
+        font-size: 20px;
+    }
 
-            &.is-active {
-                transform: rotate(180deg);
-            }
-        }
+    .hamburger.is-active {
+        transform: rotate(180deg);
     }
 </style>
diff --git a/vue/src/layout/components/Navbar/index.vue b/vue/src/layout/components/Navbar/index.vue
index 7e9b195..3f759d3 100644
--- a/vue/src/layout/components/Navbar/index.vue
+++ b/vue/src/layout/components/Navbar/index.vue
@@ -1,20 +1,24 @@
 <template>
     <nav class="navbar">
-        <hamburger :is-active="!sidebarCollapse" @click="clickHamburger"/>
+        <div>
+            <hamburger class="navbar-item" :active="!sidebarCollapse" @click="sidebarCtrl"/>
 
-        <breadcrumb v-if="showBreadcrumb"/>
+            <div class="navbar-item" @click="refresh">
+                <i class="el-icon-refresh-right navbar-icon" title="刷新"/>
+            </div>
 
-        <div class="right-menu">
-            <search id="header-search" class="right-menu-item hidden-xs"/>
+            <breadcrumb v-if="showBreadcrumb"/>
+        </div>
 
-            <bell class="right-menu-item"/>
+        <div>
+            <bell class="navbar-item"/>
 
-            <div class="setting-btn right-menu-item hidden-xs" @click="settingDrawer=true">
+            <div class="setting-btn navbar-item hidden-xs" @click="settingDrawer=true">
                 <i class="el-icon-s-operation navbar-icon" title="个性设置"/>
             </div>
 
             <el-dropdown
-                    class="avatar-container right-menu-item"
+                    class="navbar-item"
                     trigger="click"
                     @visible-change="$emit('menu-show',$event)"
             >
@@ -78,10 +82,14 @@
         },
 
         methods: {
-            clickHamburger() {
+            sidebarCtrl() {
                 this.$store.commit('setting/sidebarCollapse', !this.sidebarCollapse)
             },
 
+            refresh() {
+                this.$router.replace({path: `/redirect${this.$route.fullPath}`})
+            },
+
             logout() {
                 if (this.prepare_logout) return
                 elConfirm('确认退出?')
diff --git a/vue/src/layout/components/Navbar/style.scss b/vue/src/layout/components/Navbar/style.scss
index 1a0d8ae..d356af2 100644
--- a/vue/src/layout/components/Navbar/style.scss
+++ b/vue/src/layout/components/Navbar/style.scss
@@ -1,56 +1,47 @@
 @import "~@/assets/styles/variables.scss";
 
 .navbar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-wrap: nowrap;
     height: $nav-height;
+    padding: 0 12px;
     transition: height .3s ease-in-out;
-    overflow: hidden;
     position: relative;
     z-index: 9;
-    background: #fff;
+    background-color: #fff;
     box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
 
+    > div {
+        display: flex;
+        height: 100%;
+    }
+
     .navbar-icon {
         font-size: 18px;
-        cursor: pointer;
-        vertical-align: middle;
     }
 
-    .right-menu {
-        float: right;
-        height: 100%;
-        line-height: $nav-height;
-
-        &:focus {
-            outline: none;
-        }
-
-        .right-menu-item {
-            display: inline-block;
-            position: relative;
-            padding: 0 8px;
-            height: 100%;
-            font-size: 0;
-            color: #5a5e66;
-            vertical-align: text-bottom;
-            transition: background .3s;
-            cursor: pointer;
+    .navbar-item {
+        display: flex;
+        align-items: center;
+        padding: 0 8px;
+        color: #5a5e66;
+        transition: background .3s;
+        cursor: pointer;
 
-            &:hover:not(#header-search) {
-                background: rgba(0, 0, 0, .025)
-            }
+        &:hover {
+            background: rgba(0, 0, 0, .025)
         }
+    }
 
-        .avatar-container {
-            .avatar-wrapper {
-                display: flex;
-                align-items: center;
-                height: 100%;
+    .avatar-wrapper {
+        display: flex;
+        align-items: center;
 
-                span {
-                    margin-right: 5px;
-                    font-size: 18px;
-                }
-            }
+        span {
+            margin-right: 5px;
+            font-size: 18px;
         }
     }
 }
diff --git a/vue/src/mixins/guide/data/navbar.js b/vue/src/mixins/guide/data/navbar.js
index 4129249..f5bb60b 100644
--- a/vue/src/mixins/guide/data/navbar.js
+++ b/vue/src/mixins/guide/data/navbar.js
@@ -8,11 +8,11 @@ const steps = [
         content: '这是搜索栏，可以根据关键字搜索菜单',
     },
     {
-        element: '.setting-btn.right-menu-item',
+        element: '.setting-btn.navbar-item',
         content: '这是个性设置按钮，可以根据自己喜好进行一些设置',
     },
     {
-        element: '.avatar-container.right-menu-item',
+        element: '.avatar-container.navbar-item',
         content: '这是用户中心',
     },
     {