diff --git a/.gitignore b/.gitignore index c750822cf..df314fd8f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ fe.element/element-ui coverage waiter.config.js build/bin/algolia-key.js +.envrc diff --git a/packages/menu/src/menu-item.vue b/packages/menu/src/menu-item.vue index 65aa16fe5..3c5506772 100644 --- a/packages/menu/src/menu-item.vue +++ b/packages/menu/src/menu-item.vue @@ -48,7 +48,7 @@ required: true }, route: { - type: Object, + type: [String, Object], required: false }, disabled: { diff --git a/packages/menu/src/menu.vue b/packages/menu/src/menu.vue index 4b78ba1e3..e2810be8f 100644 --- a/packages/menu/src/menu.vue +++ b/packages/menu/src/menu.vue @@ -207,6 +207,7 @@ let openedMenus = this.openedMenus; if (openedMenus.indexOf(index) !== -1) return; // 将不在该菜单路径下的其余菜单收起 + // GT: Will not put away the rest of the menu under the menu path if (this.uniqueOpened) { this.openedMenus = openedMenus.filter(index => { return indexPath.indexOf(index) !== -1; @@ -246,6 +247,7 @@ } }, // 初始化展开菜单 + // GT: Initialize the launch menu initOpenedMenu() { const index = this.activeIndex; const activeItem = this.items[index]; @@ -254,6 +256,7 @@ let indexPath = activeItem.indexPath; // 展开该菜单项的路径上所有子菜单 + // GT: Expand all submenus on the path of the menu item indexPath.forEach(index => { let submenu = this.submenus[index]; submenu && this.openMenu(index, submenu.indexPath);