From 9ba2648689d6b9ce78550667ea200cdeb387d2cb Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 3 Jan 2018 13:40:22 +0800
Subject: [PATCH 1/3] fix[sidebar]: fixed nest menu and noDropdown item bug

---
 src/views/layout/components/Sidebar/SidebarItem.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
index c948748d..5cb12818 100644
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ b/src/views/layout/components/Sidebar/SidebarItem.vue
@@ -3,7 +3,7 @@
     <template v-for="item in routes" v-if="!item.hidden&&item.children">
 
       <router-link v-if="item.children.length===1 && !item.children[0].children" :to="item.path+'/'+item.children[0].path" :key="item.children[0].name">
-        <el-menu-item :index="item.path+'/'+item.children[0].path" class='submenu-title-noDropdown'>
+        <el-menu-item :index="item.path+'/'+item.children[0].path" :class="{'submenu-title-noDropdown':!isNest}">
           <svg-icon v-if="item.children[0].meta&&item.children[0].meta.icon" :icon-class="item.children[0].meta.icon"></svg-icon>
           <span v-if="item.children[0].meta&&item.children[0].meta.title">{{generateTitle(item.children[0].meta.title)}}</span>
         </el-menu-item>
@@ -16,7 +16,7 @@
         </template>
 
         <template v-for="child in item.children" v-if="!child.hidden">
-          <sidebar-item class="nest-menu" v-if="child.children&&child.children.length>0" :routes="[child]" :key="child.path"></sidebar-item>
+          <sidebar-item :is-nest="true" class="nest-menu" v-if="child.children&&child.children.length>0" :routes="[child]" :key="child.path"></sidebar-item>
 
           <router-link v-else :to="item.path+'/'+child.path" :key="child.name">
             <el-menu-item :index="item.path+'/'+child.path">
@@ -39,6 +39,10 @@ export default {
   props: {
     routes: {
       type: Array
+    },
+    isNest: {
+      type: Boolean,
+      default: false
     }
   },
   methods: {

From d18902dfeee1c58caf218983aa72b18f399cf96f Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Thu, 4 Jan 2018 10:03:33 +0800
Subject: [PATCH 2/3] perf[style]: refine css

---
 src/components/LangSelect/index.vue           | 2 +-
 src/views/layout/components/Sidebar/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue
index 608b126a..e8afa59e 100644
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -34,7 +34,7 @@ export default {
 .international-icon {
   font-size: 20px;
   cursor: pointer;
-  vertical-align: -5px;
+  vertical-align: -5px!important;
 }
 </style>
 
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 57dc4f04..6a6f1427 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -1,6 +1,6 @@
 <template>
   <scroll-bar>
-    <el-menu mode="vertical" :default-active="$route.path" :collapse="isCollapse" background-color="#304156" text-color="#fff" active-text-color="#409EFF">
+    <el-menu mode="vertical" :default-active="$route.path" :collapse="isCollapse" background-color="#304156" text-color="#bfcbd9" active-text-color="#409EFF">
       <sidebar-item :routes="permission_routers"></sidebar-item>
     </el-menu>
   </scroll-bar>

From 2472107768b6639ed56ab5068e181a3bf58ce606 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Thu, 4 Jan 2018 10:04:14 +0800
Subject: [PATCH 3/3] perf[i18n]: refine generateTitle function

---
 src/utils/i18n.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/utils/i18n.js b/src/utils/i18n.js
index faa52062..0cb5e253 100644
--- a/src/utils/i18n.js
+++ b/src/utils/i18n.js
@@ -1,4 +1,10 @@
 // translate router.meta.title, be used in breadcrumb sidebar tagsview
 export function generateTitle(title) {
-  return this.$t('route.' + title) // $t :this method from vue-i18n, inject in @/lang/index.js
+  const hasKey = this.$te('route.' + title)
+  const translatedTitle = this.$t('route.' + title) // $t :this method from vue-i18n, inject in @/lang/index.js
+
+  if (hasKey) {
+    return translatedTitle
+  }
+  return title
 }