diff --git a/src/assets/main.css b/src/assets/main.css index 77997cb..70015ca 100644 --- a/src/assets/main.css +++ b/src/assets/main.css @@ -23,7 +23,7 @@ html, body, #app, .index-container { min-height: 400px; } /** - * slide-fade 动画 + * slide-fade动画 */ .slide-fade-enter-active { transition: all 0.3s ease-out; @@ -38,3 +38,7 @@ html, body, #app, .index-container { transform: translateX(20px); opacity: 0; } + +.flex-grow { + flex-grow: 1; +} diff --git a/src/components/common-menu/index.vue b/src/components/common-menu/index.vue index 0d9ed5b..21edfea 100644 --- a/src/components/common-menu/index.vue +++ b/src/components/common-menu/index.vue @@ -13,15 +13,18 @@ const props = defineProps({ const menuItems = computed(() => { return filterMenus(props.menus) }) -const calcIcon = menuItem => { +const calcWithIf = menuItem => { if (menuItem.iconIf) { menuItem.icon = menuItem.iconIf(menuItem) } + if (menuItem.labelIf) { + menuItem.label = menuItem.labelIf(menuItem) + } return menuItem.icon } const filterMenus = menus => menus.filter(menu => !menu.disabled) .map(menu => { - menu.icon = calcIcon(menu) + calcWithIf(menu) if (menu.children && menu.children.length) { menu.children = filterMenus(menu.children) } @@ -36,10 +39,17 @@ const filterMenus = menus => menus.filter(menu => !menu.disabled) :collapse="collapse" >