From d5e979147312688bea8b3e421e6116e1023bc576 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Wed, 26 Feb 2020 13:43:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sidebar/components/SidebarItem.vue        | 21 +++++--------------
 vue/src/layout/components/Sidebar/index.vue   |  1 -
 vue/src/router/modules/stock.js               |  2 +-
 vue/src/views/app/login.vue                   |  3 +++
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/vue/src/layout/components/Sidebar/components/SidebarItem.vue b/vue/src/layout/components/Sidebar/components/SidebarItem.vue
index 25fc747..31f38d1 100644
--- a/vue/src/layout/components/Sidebar/components/SidebarItem.vue
+++ b/vue/src/layout/components/Sidebar/components/SidebarItem.vue
@@ -1,17 +1,10 @@
 <script type="text/jsx">
-    import path from 'path'
     import SidebarItemContent from './SidebarItemContent'
 
-    function resolvePath(basePath, routePath = '') {
-        const indexOf = basePath.indexOf(routePath)
-        const samePath = basePath.length === indexOf + routePath.length
-        return indexOf && samePath ? basePath : path.resolve(basePath, routePath)
-    }
-
     function getOnlyChild(item) {
         const children = item.children || []
 
-        if (children.length === 1) return children[0]
+        if (children.length === 1) return item.alwaysShow ? null : children[0]
 
         if (children.length < 1) return {...item, path: undefined, children: undefined}
 
@@ -24,22 +17,20 @@
             item: Object,
             isNest: Boolean,
             showParent: Boolean,
-            collapse: Boolean,
-            basePath: {type: String, default: ''}
+            collapse: Boolean
         },
         render(h, context) {
-            function renderNode({item, isNest, showParent, collapse, basePath}) {
+            function renderNode({item, isNest, showParent, collapse}) {
                 let onlyOneChild = getOnlyChild(item)
 
                 const showSingle = onlyOneChild && !onlyOneChild.children
 
                 if (showSingle) {
-                    const index = resolvePath(basePath, onlyOneChild.path)
                     const icon = onlyOneChild.meta.icon || (item.meta && item.meta.icon)
                     const title = onlyOneChild.meta.title
                     return (
                         <el-menu-item
-                            index={index}
+                            index={onlyOneChild.fullPath}
                             class={{'submenu-title-noDropdown': !isNest, 'nest-menu': isNest}}
                         >
                             <SidebarItemContent icon={icon} title={title}/>
@@ -47,14 +38,12 @@
                     )
                 }
                 else {
-                    const index = resolvePath(basePath, item.path)
                     const icon = (item.meta && item.meta.icon) || (onlyOneChild.meta && onlyOneChild.meta.icon)
                     const title = item.meta.title
 
                     const children = item.children.map(child => renderNode({
                         isNest: true,
                         item: child,
-                        basePath: resolvePath(basePath, child.path),
                         showParent,
                         collapse
                     }))
@@ -72,7 +61,7 @@
                     }
 
                     return (
-                        <el-submenu class={{'nest-menu': isNest}} index={index} popper-append-to-body>
+                        <el-submenu class={{'nest-menu': isNest}} index={item.fullPath} popper-append-to-body>
                             <SidebarItemContent slot="title" icon={icon} title={title}/>
                             {children}
                         </el-submenu>
diff --git a/vue/src/layout/components/Sidebar/index.vue b/vue/src/layout/components/Sidebar/index.vue
index 4a1f465..fb341bb 100644
--- a/vue/src/layout/components/Sidebar/index.vue
+++ b/vue/src/layout/components/Sidebar/index.vue
@@ -24,7 +24,6 @@
                         :key="route.path"
                         :show-parent="sidebarShowParent"
                         :collapse="sidebarCollapse"
-                        :base-path="route.path"
                         :item="route"
                 />
             </el-menu>
diff --git a/vue/src/router/modules/stock.js b/vue/src/router/modules/stock.js
index ea23b85..509d9ea 100644
--- a/vue/src/router/modules/stock.js
+++ b/vue/src/router/modules/stock.js
@@ -5,7 +5,7 @@ const router = {
     path: '/stock',
     component: Layout,
     alwaysShow: true,
-    meta: {title: '库存管理', icon: 'stock', breadcrumb: false},
+    meta: {title: '库存管理', icon: 'stock'},
     children: [
         {
             path: 'current',
diff --git a/vue/src/views/app/login.vue b/vue/src/views/app/login.vue
index 2b5fb6a..1fc7feb 100644
--- a/vue/src/views/app/login.vue
+++ b/vue/src/views/app/login.vue
@@ -58,6 +58,7 @@
     import {loginBackgroundAnimate} from '@/config'
     import {isEmpty} from "@/utils"
     import md5 from "js-md5"
+    import {elSuccess} from "@/utils/message"
 
     export default {
         name: 'login',
@@ -97,6 +98,7 @@
                 })
             },
             success() {
+                elSuccess('登陆成功')
                 let redirect = this.$route.query.redirect || '/'
                 window.location.href = '/#' + redirect
             },
@@ -126,6 +128,7 @@
             else this.$refs.password.focus()
         },
         beforeDestroy() {
+            this.$message.closeAll()
             this.removeEvent()
             this.rain && this.rain.stop()
         }