Commit 6f830703a2607c33e5d25d6d17d0e453fc2fac2e

Authored by 周旭
Committed by GitHub
1 parent bfb5ebd7

perf(menu): Optimize the style of the bottom collapse button in the Mix menu layout (#896)

CHANGELOG.zh_CN.md
1 ### ✨ Features 1 ### ✨ Features
2 2
3 - **NoticeList** 添加分页、超长自动省略、标题点击事件、标题删除线等功能 3 - **NoticeList** 添加分页、超长自动省略、标题点击事件、标题删除线等功能
  4 +- **MixSider** 优化 Mix 菜单布局时 底部折叠按钮 的样式,与其它菜单布局时的风格保持一致
4 5
5 ### 🐛 Bug Fixes 6 ### 🐛 Bug Fixes
6 7
src/layouts/default/sider/MixSider.vue
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 > 15 >
16 <AppLogo :showTitle="false" :class="`${prefixCls}-logo`" /> 16 <AppLogo :showTitle="false" :class="`${prefixCls}-logo`" />
17 17
18 - <Trigger :class="`${prefixCls}-trigger`" /> 18 + <LayoutTrigger :class="`${prefixCls}-trigger`" />
19 19
20 <ScrollContainer> 20 <ScrollContainer>
21 <ul :class="`${prefixCls}-module`"> 21 <ul :class="`${prefixCls}-module`">
@@ -86,7 +86,6 @@ @@ -86,7 +86,6 @@
86 import { SimpleMenu, SimpleMenuTag } from '/@/components/SimpleMenu'; 86 import { SimpleMenu, SimpleMenuTag } from '/@/components/SimpleMenu';
87 import { Icon } from '/@/components/Icon'; 87 import { Icon } from '/@/components/Icon';
88 import { AppLogo } from '/@/components/Application'; 88 import { AppLogo } from '/@/components/Application';
89 - import Trigger from '../trigger/HeaderTrigger.vue';  
90 import { useMenuSetting } from '/@/hooks/setting/useMenuSetting'; 89 import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
91 import { useDragLine } from './useLayoutSider'; 90 import { useDragLine } from './useLayoutSider';
92 import { useGlobSetting } from '/@/hooks/setting'; 91 import { useGlobSetting } from '/@/hooks/setting';
@@ -97,6 +96,7 @@ @@ -97,6 +96,7 @@
97 import clickOutside from '/@/directives/clickOutside'; 96 import clickOutside from '/@/directives/clickOutside';
98 import { getChildrenMenus, getCurrentParentPath, getShallowMenus } from '/@/router/menus'; 97 import { getChildrenMenus, getCurrentParentPath, getShallowMenus } from '/@/router/menus';
99 import { listenerRouteChange } from '/@/logics/mitt/routeChange'; 98 import { listenerRouteChange } from '/@/logics/mitt/routeChange';
  99 + import LayoutTrigger from '../trigger/index.vue';
100 100
101 export default defineComponent({ 101 export default defineComponent({
102 name: 'LayoutMixSider', 102 name: 'LayoutMixSider',
@@ -105,7 +105,7 @@ @@ -105,7 +105,7 @@
105 AppLogo, 105 AppLogo,
106 SimpleMenu, 106 SimpleMenu,
107 Icon, 107 Icon,
108 - Trigger, 108 + LayoutTrigger,
109 SimpleMenuTag, 109 SimpleMenuTag,
110 }, 110 },
111 directives: { 111 directives: {
@@ -486,17 +486,19 @@ @@ -486,17 +486,19 @@
486 bottom: 0; 486 bottom: 0;
487 left: 0; 487 left: 0;
488 width: 100%; 488 width: 100%;
489 - padding: 6px;  
490 - padding-left: 12px;  
491 - font-size: 18px; 489 + font-size: 14px;
492 color: rgba(255, 255, 255, 0.65); 490 color: rgba(255, 255, 255, 0.65);
  491 + text-align: center;
493 cursor: pointer; 492 cursor: pointer;
494 - background-color: @sider-dark-bg-color; 493 + background-color: @trigger-dark-bg-color;
  494 + height: 36px;
  495 + line-height: 36px;
495 } 496 }
496 497
497 &.light &-trigger { 498 &.light &-trigger {
498 color: rgba(0, 0, 0, 0.65); 499 color: rgba(0, 0, 0, 0.65);
499 background-color: #fff; 500 background-color: #fff;
  501 + border-top: 1px solid #eee;
500 } 502 }
501 503
502 &-menu-list { 504 &-menu-list {