diff --git a/src/components/SimpleMenu/src/components/menu.less b/src/components/SimpleMenu/src/components/menu.less index 2fe0b54c242..6a63ef28f39 100644 --- a/src/components/SimpleMenu/src/components/menu.less +++ b/src/components/SimpleMenu/src/components/menu.less @@ -161,9 +161,9 @@ white-space: nowrap; cursor: pointer; - &:hover { - color: @primary-color; - } + // &:hover { + // color: @primary-color; + // } .@{menu-prefix-cls}-tooltip { width: calc(100% - 0px); @@ -226,6 +226,16 @@ &-active.@{menu-prefix-cls}-submenu { color: @primary-color; } + + &:not(&-selected):hover { + background-color: rgb(0 0 0 / 6%); + } + } + + &-light&-vertical &-submenu-title { + &:not(&-selected):hover { + background-color: rgb(0 0 0 / 6%); + } } &-light&-vertical&-collapse { diff --git a/src/layouts/default/setting/SettingDrawer.tsx b/src/layouts/default/setting/SettingDrawer.tsx index 38e0f91168d..020def3fca7 100644 --- a/src/layouts/default/setting/SettingDrawer.tsx +++ b/src/layouts/default/setting/SettingDrawer.tsx @@ -3,7 +3,7 @@ import { BasicDrawer } from '/@/components/Drawer/index'; import { Divider } from 'ant-design-vue'; import { TypePicker, - // ThemeColorPicker, + ThemeColorPicker, SettingFooter, SwitchItem, SelectItem, @@ -38,6 +38,7 @@ import { // SIDE_BAR_BG_COLOR_LIST, // APP_PRESET_COLOR_LIST, // } from '/@/settings/designSetting'; +import { SIDE_BAR_BG_COLOR_LIST } from '/@/settings/designSetting'; const { t } = useI18n(); @@ -73,7 +74,7 @@ export default defineComponent({ getTopMenuAlign, getAccordion, getMenuWidth, - // getMenuBgColor, + getMenuBgColor, getIsTopMenu, getSplit, getIsMixSidebar, @@ -124,15 +125,15 @@ export default defineComponent({ // ); // } - // function renderSiderTheme() { - // return ( - // - // ); - // } + function renderSideBarTheme() { + return ( + + ); + } // function renderMainTheme() { // return ( @@ -417,9 +418,9 @@ export default defineComponent({ {/* {() => t('layout.setting.sysTheme')} {renderMainTheme()} {() => t('layout.setting.headerTheme')} - {renderHeaderTheme()} + {renderHeaderTheme()} */} {() => t('layout.setting.sidebarTheme')} - {renderSiderTheme()} */} + {renderSideBarTheme()} {() => t('layout.setting.interfaceFunction')} {renderFeatures()} {() => t('layout.setting.interfaceDisplay')} diff --git a/src/layouts/default/sider/MixSider.vue b/src/layouts/default/sider/MixSider.vue index d11e6f60e78..551aaa4df58 100644 --- a/src/layouts/default/sider/MixSider.vue +++ b/src/layouts/default/sider/MixSider.vue @@ -402,6 +402,10 @@ background-color: unset; color: @primary-color; } + + &:not(&--active):hover { + background-color: rgb(0 0 0 / 6%); + } } } .@{prefix-cls}-menu-list { @@ -424,9 +428,9 @@ &.dark { &.open { - .@{prefix-cls}-logo { - // border-bottom: 1px solid @border-color; - } + // .@{prefix-cls}-logo { + // border-bottom: 1px solid @border-color; + // } > .scrollbar { border-right: 1px solid @border-color;