提交 1ef49e54 编写于 作者: V vben

fix(menu): fix menu split mode problem

上级 6b3195b4
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
- 修改 `VirtualScroll``ImportExcel`组件名为`VScroll``ImpExcel`,暂时解决含有关键字的组件在 vue 模版内使用内存溢出 - 修改 `VirtualScroll``ImportExcel`组件名为`VScroll``ImpExcel`,暂时解决含有关键字的组件在 vue 模版内使用内存溢出
- 修复 axios 大小写问题 - 修复 axios 大小写问题
- 修复按钮样式问题 - 修复按钮样式问题
- 修复菜单分割模式问题
## 2.0.0-rc.13 (2020-12-10) ## 2.0.0-rc.13 (2020-12-10)
......
...@@ -100,11 +100,10 @@ export default defineComponent({ ...@@ -100,11 +100,10 @@ export default defineComponent({
const getWrapperStyle = computed( const getWrapperStyle = computed(
(): CSSProperties => { (): CSSProperties => {
const isHorizontal = unref(getIsHorizontal); const isHorizontal = unref(getIsHorizontal) || getSplit.value;
return { return {
height: isHorizontal height: isHorizontal ? `calc(100%)` : `calc(100% - ${props.showLogo ? '48px' : '0px'})`,
? `calc(100% + 1px)`
: `calc(100% - ${props.showLogo ? '48px' : '0px'})`,
overflowY: isHorizontal ? 'hidden' : 'auto', overflowY: isHorizontal ? 'hidden' : 'auto',
}; };
} }
......
...@@ -21,7 +21,7 @@ export default defineComponent({ ...@@ -21,7 +21,7 @@ export default defineComponent({
const injectValue = useLayoutContext(); const injectValue = useLayoutContext();
const { getCalcContentWidth, getSplit } = useMenuSetting(); const { getCalcContentWidth } = useMenuSetting();
const { const {
getFixed, getFixed,
...@@ -56,8 +56,7 @@ export default defineComponent({ ...@@ -56,8 +56,7 @@ export default defineComponent({
(): CSSProperties => { (): CSSProperties => {
const style: CSSProperties = {}; const style: CSSProperties = {};
if (unref(getFixed)) { if (unref(getFixed)) {
style.width = style.width = unref(injectValue.isMobile) ? '100%' : unref(getCalcContentWidth);
unref(injectValue.isMobile) || unref(getSplit) ? '100%' : unref(getCalcContentWidth);
} }
if (unref(getShowFullHeaderRef)) { if (unref(getShowFullHeaderRef)) {
style.top = `${unref(fullHeaderHeightRef)}px`; style.top = `${unref(fullHeaderHeightRef)}px`;
......
...@@ -7,7 +7,7 @@ const dashboard: AppRouteModule = { ...@@ -7,7 +7,7 @@ const dashboard: AppRouteModule = {
path: '/dashboard', path: '/dashboard',
name: 'Dashboard', name: 'Dashboard',
component: LAYOUT, component: LAYOUT,
redirect: '/dashboard/welcome', redirect: '/dashboard/workbench',
meta: { meta: {
icon: 'bx:bx-home', icon: 'bx:bx-home',
title: t('routes.dashboard.dashboard'), title: t('routes.dashboard.dashboard'),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册