bichangxiong/ruoyi-plus-vben5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: refacotr preference

Browse Source
This commit is contained in:
vben
2024-06-01 23:15:29 +08:00
parent f7b97e8a83
commit fed47f5e05
139 changed files with 2205 additions and 1450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/business/layouts/src/basic/menu/mixed-menu.vue
View File

@@ -3,8 +3,8 @@ import type { NormalMenuProps } from '@vben-core/menu-ui';
import type { MenuRecordRaw } from '@vben-core/typings';
import { NormalMenu } from '@vben-core/menu-ui';
import { useAccessStore } from '@vben-core/stores';
import { useAccessStore } from '@vben/stores';
import { computed, onBeforeMount } from 'vue';
import { useRoute } from 'vue-router';

11
packages/business/layouts/src/basic/menu/use-extra-menu.ts
View File

@@ -1,7 +1,8 @@
import type { MenuRecordRaw } from '@vben-core/typings';
import { preference } from '@vben/preference';
import { useAccessStore } from '@vben/stores';
import { preferences } from '@vben-core/preferences';
import { useAccessStore } from '@vben-core/stores';
import { computed, ref } from 'vue';
import { useRoute } from 'vue-router';
@@ -46,7 +47,7 @@ function useExtraMenu() {
extraMenus.value = rootMenu?.children ?? [];
extraActiveMenu.value = menu.parents?.[0] ?? menu.path;
if (preference.sideExpandOnHover) {
if (preferences.sidebar.expandOnHover) {
extraVisible.value = extraMenus.value.length > 0;
}
};
@@ -55,7 +56,7 @@ function useExtraMenu() {
* 侧边菜单鼠标移出事件
*/
const handleSideMouseLeave = () => {
if (preference.sideExpandOnHover) {
if (preferences.sidebar.expandOnHover) {
return;
}
extraVisible.value = false;
@@ -69,7 +70,7 @@ function useExtraMenu() {
};
const handleMenuMouseEnter = (menu: MenuRecordRaw) => {
if (!preference.sideExpandOnHover) {
if (!preferences.sidebar.expandOnHover) {
const { findMenu } = findRootMenuByPath(menus.value, menu.path);
extraMenus.value = findMenu?.children ?? [];
extraActiveMenu.value = menu.parents?.[0] ?? menu.path;

14
packages/business/layouts/src/basic/menu/use-mixed-menu.ts
View File

@@ -1,7 +1,8 @@
import type { MenuRecordRaw } from '@vben-core/typings';
import { preference, usePreference } from '@vben/preference';
import { useAccessStore } from '@vben/stores';
import { preferences, usePreferences } from '@vben-core/preferences';
import { useAccessStore } from '@vben-core/stores';
import { computed, onBeforeMount, ref } from 'vue';
import { useRoute } from 'vue-router';
@@ -15,17 +16,18 @@ function useMixedMenu() {
const splitSideMenus = ref<MenuRecordRaw[]>([]);
const rootMenuPath = ref<string>('');
const { isMixedNav } = usePreference();
const { isMixedNav } = usePreferences();
const needSplit = computed(
() => preference.navigationSplit && isMixedNav.value,
() => preferences.navigation.split && isMixedNav.value,
);
const sideVisible = computed(() => {
const enableSidebar = preferences.sidebar.enable;
if (needSplit.value) {
return preference.sideVisible && splitSideMenus.value.length > 0;
return enableSidebar && splitSideMenus.value.length > 0;
}
return preference.sideVisible;
return enableSidebar;
});
const menus = computed(() => accessStore.getAccessMenus);