Compare commits

..

No commits in common. "de36c33d3c1a5d4cac5161df38511c7ac2dad1a0" and "41daa6a5db3bb1d333d5d21b2071002f23dd5549" have entirely different histories.

2 changed files with 10 additions and 22 deletions

View File

@ -61,21 +61,6 @@ const getSubMenuIconStyle = computed((): CSSProperties => {
};
});
const textClass = computed(() => {
const item = props.item;
const baseClass = "w-full! text-inherit!";
if (
layout.value !== "horizontal" &&
isCollapse.value &&
!toRaw(item.meta.icon) &&
((layout.value === "vertical" && item.parentId === null) ||
(layout.value === "mix" && item.parentId !== 0))
) {
return `${baseClass} min-w-[54px]! text-center! px-3!`;
}
return baseClass;
});
const expandCloseIcon = computed(() => {
if (!getConfig()?.MenuArrowIconNoTransition) return "";
return {
@ -159,7 +144,7 @@ function resolvePath(routePath) {
item?.pathList?.length === 2)
"
truncated
class="w-full! px-3! min-w-[54px]! text-center! text-inherit!"
class="w-full! pl-4! text-inherit!"
>
{{ transformI18n(onlyOneChild.meta.title) }}
</el-text>
@ -210,7 +195,15 @@ function resolvePath(routePath) {
offset: [0, -10],
theme: tooltipEffect
}"
:class="textClass"
:class="{
'w-full!': true,
'text-inherit!': true,
'pl-4!':
layout !== 'horizontal' &&
isCollapse &&
!toRaw(item.meta.icon) &&
item.parentId === null
}"
>
{{ transformI18n(item.meta.title) }}
</ReText>

View File

@ -667,10 +667,6 @@ body[layout="horizontal"] {
@include merge-style($sideBarWidth);
.el-menu {
--el-menu-hover-text-color: var(--pure-theme-menu-text) !important;
}
.fixed-header,
.main-container {
transition: none !important;
@ -692,7 +688,6 @@ body[layout="mix"] {
.el-menu {
--el-menu-hover-bg-color: transparent !important;
--el-menu-hover-text-color: var(--pure-theme-menu-text) !important;
}
.hideSidebar {