From ee9ba987a6d59ce578dca5963dee136f4d55627b Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Tue, 30 Jan 2018 17:17:40 +0800
Subject: [PATCH] fix

---
 components/menu/src/Divider.vue        | 2 +-
 components/menu/src/MenuMixin.js       | 2 +-
 components/menu/src/commonPropsType.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/menu/src/Divider.vue b/components/menu/src/Divider.vue
index b115897d4..2341d7b53 100644
--- a/components/menu/src/Divider.vue
+++ b/components/menu/src/Divider.vue
@@ -1,6 +1,6 @@
 <script>
 export default {
-  name: 'Divider',
+  name: 'MenuDivider',
   props: {
     disabled: {
       type: Boolean,
diff --git a/components/menu/src/MenuMixin.js b/components/menu/src/MenuMixin.js
index 12a35b25a..757b0f2e4 100644
--- a/components/menu/src/MenuMixin.js
+++ b/components/menu/src/MenuMixin.js
@@ -135,7 +135,7 @@ export default {
 
     renderCommonMenuItem (child, i, subIndex, extraProps) {
       if (child.tag === undefined) { return child }
-      warning(['MenuItem', 'MenuItemGroup', 'SubMenu'].includes(getComponentName(child.componentOptions)),
+      warning(['MenuItem', 'MenuItemGroup', 'SubMenu', 'MenuDivider'].includes(getComponentName(child.componentOptions)),
         `Menu children not support ${getComponentName(child.componentOptions)}`,
       )
       const state = this.$data
diff --git a/components/menu/src/commonPropsType.js b/components/menu/src/commonPropsType.js
index e5e29f2db..2273872e3 100644
--- a/components/menu/src/commonPropsType.js
+++ b/components/menu/src/commonPropsType.js
@@ -22,5 +22,5 @@ export default {
   openTransitionName: PropTypes.string,
   forceSubMenuRender: PropTypes.bool,
   selectable: PropTypes.bool,
-  isRootMenu: PropTypes.bool,
+  isRootMenu: PropTypes.bool.def(true),
 }