Browse Source

fix(menu): fix menu split mode problem

pull/126/head
vben 6 years ago
parent
commit
1ef49e542d
  1. 1
      CHANGELOG.zh_CN.md
  2. 7
      src/components/Menu/src/BasicMenu.tsx
  3. 5
      src/layouts/default/header/LayoutMultipleHeader.tsx
  4. 2
      src/router/routes/modules/dashboard.ts

1
CHANGELOG.zh_CN.md

@ -21,6 +21,7 @@
- 修改 `VirtualScroll`和`ImportExcel`组件名为`VScroll`与`ImpExcel`,暂时解决含有关键字的组件在 vue 模版内使用内存溢出
- 修复 axios 大小写问题
- 修复按钮样式问题
- 修复菜单分割模式问题
## 2.0.0-rc.13 (2020-12-10)

7
src/components/Menu/src/BasicMenu.tsx

@ -100,11 +100,10 @@ export default defineComponent({
const getWrapperStyle = computed(
(): CSSProperties => {
const isHorizontal = unref(getIsHorizontal);
const isHorizontal = unref(getIsHorizontal) || getSplit.value;
return {
height: isHorizontal
? `calc(100% + 1px)`
: `calc(100% - ${props.showLogo ? '48px' : '0px'})`,
height: isHorizontal ? `calc(100%)` : `calc(100% - ${props.showLogo ? '48px' : '0px'})`,
overflowY: isHorizontal ? 'hidden' : 'auto',
};
}

5
src/layouts/default/header/LayoutMultipleHeader.tsx

@ -21,7 +21,7 @@ export default defineComponent({
const injectValue = useLayoutContext();
const { getCalcContentWidth, getSplit } = useMenuSetting();
const { getCalcContentWidth } = useMenuSetting();
const {
getFixed,
@ -56,8 +56,7 @@ export default defineComponent({
(): CSSProperties => {
const style: CSSProperties = {};
if (unref(getFixed)) {
style.width =
unref(injectValue.isMobile) || unref(getSplit) ? '100%' : unref(getCalcContentWidth);
style.width = unref(injectValue.isMobile) ? '100%' : unref(getCalcContentWidth);
}
if (unref(getShowFullHeaderRef)) {
style.top = `${unref(fullHeaderHeightRef)}px`;

2
src/router/routes/modules/dashboard.ts

@ -7,7 +7,7 @@ const dashboard: AppRouteModule = {
path: '/dashboard',
name: 'Dashboard',
component: LAYOUT,
redirect: '/dashboard/welcome',
redirect: '/dashboard/workbench',
meta: {
icon: 'bx:bx-home',
title: t('routes.dashboard.dashboard'),

Loading…
Cancel
Save