From baec906d5c37e9a2e9047b20dcff81b9a4034d41 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Fri, 29 Dec 2017 18:45:11 +0800 Subject: [PATCH] add menu --- components/menu/src/Menu.vue | 2 +- components/menu/src/MenuItem.vue | 4 +- components/menu/src/MenuItemGroup.vue | 2 +- .../menu/src/{SubMenu.jsx => SubMenu.vue} | 41 +++++++++---------- .../src/{SubPopupMenu.js => SubPopupMenu.vue} | 33 +++++++-------- 5 files changed, 39 insertions(+), 43 deletions(-) rename components/menu/src/{SubMenu.jsx => SubMenu.vue} (93%) rename components/menu/src/{SubPopupMenu.js => SubPopupMenu.vue} (78%) diff --git a/components/menu/src/Menu.vue b/components/menu/src/Menu.vue index 3cb128d58..c47f86e3b 100644 --- a/components/menu/src/Menu.vue +++ b/components/menu/src/Menu.vue @@ -31,10 +31,10 @@ const Menu = { let openKeys = props.defaultOpenKeys selectedKeys = props.selectedKeys || [] openKeys = props.openKeys || [] + this.isRootMenu = true return { selectedKeys, openKeys, - isRootMenu: true, } }, watch: { diff --git a/components/menu/src/MenuItem.vue b/components/menu/src/MenuItem.vue index df8d899ec..daae53721 100644 --- a/components/menu/src/MenuItem.vue +++ b/components/menu/src/MenuItem.vue @@ -1,5 +1,5 @@ diff --git a/components/menu/src/SubPopupMenu.js b/components/menu/src/SubPopupMenu.vue similarity index 78% rename from components/menu/src/SubPopupMenu.js rename to components/menu/src/SubPopupMenu.vue index fbbd9415a..6e499b938 100644 --- a/components/menu/src/SubPopupMenu.js +++ b/components/menu/src/SubPopupMenu.vue @@ -1,12 +1,10 @@ -import PropTypes from 'vue-types' -import createReactClass from 'create-react-class' -import Animate from 'rc-animate' +