Merge branch 'master' into deploy

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 <panfree23@gmail.com>",
   "license": "MIT",

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' }
       }

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
     },