Browse Source

perf: 同步完整版分支代码

i18n
xiaoxian521 3 years ago
parent
commit
1b93ce989c
  1. 19
      src/layout/components/sidebar/sidebarItem.vue
  2. 14
      src/style/sidebar.scss

19
src/layout/components/sidebar/sidebarItem.vue

@ -31,6 +31,19 @@ const props = defineProps({
} }
}); });
const getExtraIconStyle = computed((): CSSProperties => {
if (useAppStoreHook().getSidebarStatus) {
return {
position: "absolute",
right: "10px"
};
} else {
return {
position: "static"
};
}
});
const getNoDropdownStyle = computed((): CSSProperties => { const getNoDropdownStyle = computed((): CSSProperties => {
return { return {
display: "flex", display: "flex",
@ -177,6 +190,9 @@ function resolvePath(routePath) {
</el-tooltip> </el-tooltip>
<FontIcon <FontIcon
v-if="onlyOneChild.meta.extraIcon" v-if="onlyOneChild.meta.extraIcon"
width="30px"
height="30px"
:style="getExtraIconStyle"
:icon="onlyOneChild.meta.extraIcon.name" :icon="onlyOneChild.meta.extraIcon.name"
:svg="onlyOneChild.meta.extraIcon.svg ? true : false" :svg="onlyOneChild.meta.extraIcon.svg ? true : false"
></FontIcon> ></FontIcon>
@ -221,6 +237,9 @@ function resolvePath(routePath) {
</el-tooltip> </el-tooltip>
<FontIcon <FontIcon
v-if="props.item.meta.extraIcon" v-if="props.item.meta.extraIcon"
width="30px"
height="30px"
style="position: absolute; right: 10px"
:icon="props.item.meta.extraIcon.name" :icon="props.item.meta.extraIcon.name"
:svg="props.item.meta.extraIcon.svg ? true : false" :svg="props.item.meta.extraIcon.svg ? true : false"
></FontIcon> ></FontIcon>

14
src/style/sidebar.scss

@ -306,6 +306,10 @@
height: 48px; height: 48px;
line-height: 48px; line-height: 48px;
background: $menuBg; background: $menuBg;
svg {
position: static !important;
}
} }
.is-active > .el-sub-menu__title, .is-active > .el-sub-menu__title,
@ -600,16 +604,6 @@ body[layout="vertical"] {
} }
} }
.el-sub-menu {
overflow: hidden;
& > .el-sub-menu__title {
.el-sub-menu__icon-arrow {
display: none;
}
}
}
/* 菜单折叠 */ /* 菜单折叠 */
.el-menu--collapse { .el-menu--collapse {
.el-sub-menu { .el-sub-menu {

Loading…
Cancel
Save