From f0a01f0fd1c32a3350e7243ce5432fe864d02986 Mon Sep 17 00:00:00 2001 From: Pan Date: Fri, 13 Jul 2018 13:38:43 +0800 Subject: [PATCH 1/2] [release] 3.7.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a4fdc6d6..803a6fb5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-admin", - "version": "3.7.1", + "version": "3.7.2", "description": "A magical vue admin. Typical templates for enterprise applications. Newest development stack of vue. Lots of awesome features", "author": "Pan ", "license": "MIT", From 62e1c851c829d5d91c83b68da2ceffac78ba1581 Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 16 Jul 2018 11:18:13 +0800 Subject: [PATCH 2/2] tweak --- src/router/index.js | 5 ++++- src/views/layout/components/Sidebar/SidebarItem.vue | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 1bda06f2..8df2b8bf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -202,7 +202,7 @@ export const asyncRouterMap = [ { path: '/nested', component: Layout, - redirect: '/nested/menu1', + redirect: '/nested/menu1/menu1-1', name: 'nested', meta: { title: 'nested', @@ -214,6 +214,7 @@ export const asyncRouterMap = [ component: () => import('@/views/nested/menu1/index'), // Parent router-view name: 'menu1', meta: { title: 'menu1' }, + redirect: '/nested/menu1/menu1-1', children: [ { path: 'menu1-1', @@ -225,6 +226,7 @@ export const asyncRouterMap = [ path: 'menu1-2', component: () => import('@/views/nested/menu1/menu1-2'), name: 'menu1-2', + redirect: '/nested/menu1/menu1-2/menu1-2-1', meta: { title: 'menu1-2' }, children: [ { @@ -251,6 +253,7 @@ export const asyncRouterMap = [ }, { path: 'menu2', + name: 'menu2', component: () => import('@/views/nested/menu2/index'), meta: { title: 'menu2' } } diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue index 12257eb4..6406571e 100644 --- a/src/views/layout/components/Sidebar/SidebarItem.vue +++ b/src/views/layout/components/Sidebar/SidebarItem.vue @@ -36,7 +36,8 @@ import { generateTitle } from '@/utils/i18n' export default { name: 'SidebarItem', props: { - item: { // route配置json + // route object + item: { type: Object, required: true },