fix: layout error

This commit is contained in:
vben
2024-06-09 15:39:11 +08:00
parent 35c3dd78ec
commit 640ad6d9e7
58 changed files with 678 additions and 679 deletions

View File

@@ -36,7 +36,7 @@
"@vben-core/helpers": "workspace:*",
"@vben-core/toolkit": "workspace:*",
"@vben-core/typings": "workspace:*",
"@vueuse/core": "^10.10.0",
"@vueuse/core": "^10.10.1",
"vue": "3.4.27"
}
}

View File

@@ -12,7 +12,7 @@ const defaultPreferences: Preferences = {
'https://cdn.jsdelivr.net/npm/@vbenjs/static-source@0.1.0/source/avatar-v1.webp',
dynamicTitle: true,
isMobile: false,
layout: 'side-nav',
layout: 'sidebar-nav',
locale: 'zh-CN',
name: 'Vben Admin Pro',
semiDarkMenu: true,
@@ -47,8 +47,8 @@ const defaultPreferences: Preferences = {
},
shortcutKeys: { enable: true },
sidebar: {
collapse: false,
collapseShowTitle: true,
collapsed: false,
collapsedShowTitle: true,
enable: true,
expandOnHover: true,
extraCollapse: true,

View File

@@ -94,9 +94,9 @@ interface NavigationPreferences {
interface SidebarPreferences {
/** 侧边栏是否折叠 */
collapse: boolean;
collapsed: boolean;
/** 侧边栏折叠时是否显示title */
collapseShowTitle: boolean;
collapsedShowTitle: boolean;
/** 侧边栏是否可见 */
enable: boolean;
/** 菜单自动展开状态 */

View File

@@ -33,7 +33,7 @@ function usePreferences() {
* @zh_CN 布局方式
*/
const layout = computed(() =>
appPreferences.value.isMobile ? 'side-nav' : appPreferences.value.layout,
appPreferences.value.isMobile ? 'sidebar-nav' : appPreferences.value.layout,
);
/**
@@ -46,13 +46,15 @@ function usePreferences() {
/**
* @zh_CN 是否侧边导航模式
*/
const isSideNav = computed(() => appPreferences.value.layout === 'side-nav');
const isSideNav = computed(
() => appPreferences.value.layout === 'sidebar-nav',
);
/**
* @zh_CN 是否侧边混合模式
*/
const isSideMixedNav = computed(
() => appPreferences.value.layout === 'side-mixed-nav',
() => appPreferences.value.layout === 'sidebar-mixed-nav',
);
/**