chore: fix layout style

This commit is contained in:
vben
2020-12-22 23:18:50 +08:00
parent bd7b53f14a
commit f69aaeab5e
14 changed files with 123 additions and 10 deletions

View File

@@ -2,7 +2,11 @@
<Layout :class="prefixCls">
<LayoutFeatures />
<LayoutHeader fixed v-if="getShowFullHeaderRef" />
<Layout class="ant-layout-has-sider">
<Layout
:class="{
'ant-layout-has-sider': getIsMixSidebar,
}"
>
<LayoutSideBar v-if="getShowSidebar || getIsMobile" />
<Layout :class="`${prefixCls}__main`">
<LayoutMultipleHeader />

View File

@@ -45,6 +45,7 @@ export default defineComponent({
getMenuType,
getMenuTheme,
getCollapsed,
getCollapsedShowTitle,
getAccordion,
getIsHorizontal,
getIsSidebarType,
@@ -130,6 +131,8 @@ export default defineComponent({
beforeClickFn={beforeMenuClickFn}
isHorizontal={props.isHorizontal}
type={unref(getMenuType)}
collapsedShowTitle={unref(getCollapsedShowTitle)}
showLogo={unref(getIsShowLogo)}
mode={unref(getComputedMenuMode)}
theme={unref(getComputedMenuTheme)}
items={unref(menusRef)}

View File

@@ -61,6 +61,7 @@ export default defineComponent({
getShowMenu,
getMenuType,
getTrigger,
getCollapsedShowTitle,
getMenuFixed,
getCollapsed,
getCanDrag,
@@ -176,6 +177,12 @@ export default defineComponent({
def={unref(getCollapsed)}
disabled={!unref(getShowMenuRef) || unref(getIsMixSidebar)}
/>
<SwitchItem
title={t('layout.setting.collapseMenuDisplayName')}
event={HandlerEnum.MENU_COLLAPSED_SHOW_TITLE}
def={unref(getCollapsedShowTitle)}
disabled={!unref(getShowMenuRef) || !unref(getCollapsed)}
/>
<SwitchItem
title={t('layout.setting.fixedHeader')}

View File

@@ -51,12 +51,16 @@ export function handler(event: HandlerEnum, value: any): DeepPartial<ProjectConf
case HandlerEnum.MENU_SHOW_SIDEBAR:
return { menuSetting: { show: value } };
case HandlerEnum.MENU_COLLAPSED_SHOW_TITLE:
return { menuSetting: { collapsedShowTitle: value } };
case HandlerEnum.MENU_THEME:
updateSidebarBgColor(value);
return { menuSetting: { bgColor: value } };
case HandlerEnum.MENU_SPLIT:
return { menuSetting: { split: value } };
return { menuSetting: { split: value, collapsedShowTitle: true } };
case HandlerEnum.MENU_CLOSE_MIX_SIDEBAR_ON_CHANGE:
return { menuSetting: { closeMixSidebarOnChange: value } };

View File

@@ -267,15 +267,16 @@
}
}
}
@border-color: @sider-dark-lighten-1-bg-color;
&.dark {
&.open {
.@{prefix-cls}-logo {
border-bottom: 1px solid rgb(114 114 114);
border-bottom: 1px solid @border-color;
}
> .scroll-container {
border-right: 1px solid rgb(114 114 114);
border-right: 1px solid @border-color;
}
}
.@{prefix-cls}-menu-list {
@@ -284,7 +285,7 @@
&__title {
color: @white;
border-bottom: none;
border-bottom: 1px solid rgb(114 114 114);
border-bottom: 1px solid @border-color;
}
}
}