[release] 3.0.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-element-admin",
-  "version": "3.1.1",
+  "version": "3.1.0",
   "description": "A Vue.js admin",
   "author": "Pan <panfree23@gmail.com>",
   "license": "MIT",

src/components/Breadcrumb/index.vue

@@ -10,8 +10,6 @@
 </template>
 
 <script>
-import { generateTitle } from '@/utils/i18n'
-
 export default {
   created() {
     this.getBreadcrumb()
@@ -27,7 +25,6 @@ export default {
     }
   },
   methods: {
-    generateTitle,
     getBreadcrumb() {
       let matched = this.$route.matched.filter(item => item.name)
       const first = matched[0]
@@ -35,6 +32,9 @@ export default {
         matched = [{ path: '/dashboard', meta: { title: 'dashboard' }}].concat(matched)
       }
       this.levelList = matched
+    },
+    generateTitle(title) {
+      return this.$t('route.' + title)
     }
   }
 }

src/utils/i18n.js

@@ -1,3 +0,0 @@
-export function generateTitle(title) {
-  return this.$t('route.' + title) // $t :this method from vue-i18n ,inject in @/lang/index.js
-}

src/views/layout/components/Sidebar/SidebarItem.vue

@@ -1,21 +1,21 @@
 <template>
   <div class="menu-wrapper">
-    <template v-for="item in routes" v-if="!item.hidden&&item.children">
+    <template v-for="item in routes">
 
-      <router-link v-if="item.children.length===1 && !item.children[0].children" :to="item.path+'/'+item.children[0].path" :key="item.children[0].name">
+      <router-link v-if="!item.hidden&&item.children&&item.children.length===1" :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'>
           <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>
       </router-link>
 
-      <el-submenu v-else :index="item.name||item.path" :key="item.name">
+      <el-submenu v-if="!item.hidden&&item.children&&item.children.length>1" :index="item.name||item.path" :key="item.name">
         <template slot="title">
           <svg-icon v-if="item.meta&&item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
           <span v-if="item.meta&&item.meta.title">{{generateTitle(item.meta.title)}}</span>
         </template>
 
-        <template v-for="child in item.children" v-if="!child.hidden">
+        <template v-if="!child.hidden" v-for="child in item.children">
           <sidebar-item 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">
@@ -32,8 +32,6 @@
 </template>
 
 <script>
-import { generateTitle } from '@/utils/i18n'
-
 export default {
   name: 'SidebarItem',
   props: {
@@ -42,7 +40,9 @@ export default {
     }
   },
   methods: {
-    generateTitle
+    generateTitle(title) {
+      return this.$t('route.' + title)
+    }
   }
 }
 </script>

src/views/layout/components/TagsView.vue

@@ -1,7 +1,7 @@
 <template>
   <scroll-pane class='tags-view-container' ref='scrollPane'>
     <router-link ref='tag' class="tags-view-item" :class="isActive(tag)?'active':''" v-for="tag in Array.from(visitedViews)" :to="tag.path":key="tag.path">
-      {{generateTitle(tag.title)}}
+      {{$t('route.'+tag.title)}}
       <span class='el-icon-close' @click='closeViewTags(tag,$event)'></span>
     </router-link>
   </scroll-pane>
@@ -9,7 +9,6 @@
 
 <script>
 import ScrollPane from '@/components/ScrollPane'
-import { generateTitle } from '@/utils/i18n'
 
 export default {
   components: { ScrollPane },
@@ -22,7 +21,6 @@ export default {
     this.addViewTags()
   },
   methods: {
-    generateTitle,
     closeViewTags(view, $event) {
       this.$store.dispatch('delVisitedViews', view).then((views) => {
         if (this.isActive(view)) {
@@ -63,6 +61,7 @@ export default {
         }
       })
     }
+
   },
   watch: {
     $route() {