diff --git a/src/components/menu/menu.vue b/src/components/menu/menu.vue index a725867a..fcc80f5b 100644 --- a/src/components/menu/menu.vue +++ b/src/components/menu/menu.vue @@ -78,7 +78,7 @@ groupItem.active = false; } }) - } else { + } else if (subitem.$options.name === 'MenuItem') { if (subitem.key === this.activeKey) { subitem.active = true; subitem.$parent.active = true; @@ -91,7 +91,7 @@ item.$children.forEach(groupItem => { groupItem.active = groupItem.key === this.activeKey; }) - } else { + } else if (item.$options.name === 'MenuItem') { item.active = item.key === this.activeKey; } }) diff --git a/src/styles/components/menu.less b/src/styles/components/menu.less index 3bd9a8de..bccc2219 100644 --- a/src/styles/components/menu.less +++ b/src/styles/components/menu.less @@ -121,11 +121,11 @@ &-item-group{ line-height: normal; &-title { + height: 30px; + line-height: 30px; padding-left: 8px; font-size: @font-size-small; color: @legend-color; - height: 48px; - line-height: 48px; } & > ul{ @@ -166,6 +166,8 @@ } &-vertical &-item-group{ &-title{ + height: 48px; + line-height: 48px; font-size: @font-size-base; padding-left: 28px; } @@ -223,4 +225,9 @@ } } } -.select-item(@menu-prefix-cls, @menu-dropdown-item-prefix-cls); \ No newline at end of file +.select-item(@menu-prefix-cls, @menu-dropdown-item-prefix-cls); + +.@{menu-dropdown-item-prefix-cls} { + padding: 7px 16px 8px; + font-size: @font-size-base !important; +} \ No newline at end of file diff --git a/test/routers/menu.vue b/test/routers/menu.vue index d01e69a0..68ed9222 100644 --- a/test/routers/menu.vue +++ b/test/routers/menu.vue @@ -1,55 +1,47 @@