diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index d430a5ac3020928baaf3789bc634815315732650..23c3bbff85c32611aa42d7565c2bf7d6d06db213 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -17,7 +17,8 @@ ### 🐛 Bug Fixes --修复表格 i18n 错误 +- 修复表格 i18n 错误 +- 修复菜单图标大小不一致 ## 2.0.0-rc.12 (2020-11-30) diff --git a/src/components/Menu/src/index.less b/src/components/Menu/src/index.less index 04b312562adb17df5130244d2edaa59d78c21fb7..3016d537dd0a10557fffcaaa5e7162ff06ff4e13 100644 --- a/src/components/Menu/src/index.less +++ b/src/components/Menu/src/index.less @@ -212,6 +212,10 @@ background: @sider-dark-bg-color; .active-menu-style(); + .menu-item-icon.app-iconify { + display: inline-block !important; + } + .ant-menu-item.ant-menu-item-selected.basic-menu-menu-item__level1, .ant-menu-submenu-selected.basic-menu-menu-item__level1 { color: @white; @@ -232,6 +236,10 @@ .basic-menu-item__level3:not(.ant-menu-item-selected) { background-color: @sider-dark-lighten-2-bg-color; + + .ant-menu-item { + background-color: @sider-dark-lighten-2-bg-color; + } } .ant-menu-submenu-title { @@ -253,6 +261,10 @@ overflow-x: hidden; border-right: none; + .menu-item-icon.app-iconify { + display: inline-block !important; + } + // .ant-menu-item-selected { // background: fade(@primary-color, 18%); // } diff --git a/src/layouts/default/header/LayoutMultipleHeader.less b/src/layouts/default/header/LayoutMultipleHeader.less index 877e42f13811bdcb21b1181bdec2fa80fde1d670..dc426e3c9d0b4e2022f01e1cc4b1c23cd5c70eab 100644 --- a/src/layouts/default/header/LayoutMultipleHeader.less +++ b/src/layouts/default/header/LayoutMultipleHeader.less @@ -1,6 +1,9 @@ .multiple-tab-header { flex: 0 0 auto; - margin-left: -1px; + + &.dark { + margin-left: -1px; + } &.fixed { position: fixed; diff --git a/src/layouts/default/header/LayoutMultipleHeader.tsx b/src/layouts/default/header/LayoutMultipleHeader.tsx index 85c0285b8368b0848f4c99d4d69725ead730d04c..231cf822a80092e7388116999d1e65a53bb74056 100644 --- a/src/layouts/default/header/LayoutMultipleHeader.tsx +++ b/src/layouts/default/header/LayoutMultipleHeader.tsx @@ -29,6 +29,7 @@ export default defineComponent({ getShowFullHeaderRef, getShowHeader, getUnFixedAndFull, + getHeaderTheme, } = useHeaderSetting(); const { getFullContent } = useFullContent(); @@ -110,7 +111,7 @@ export default defineComponent({ {unref(getIsShowPlaceholderDom) &&
}
{unref(getShowInsetHeaderRef) && } {unref(showTabsRef) && }