diff --git a/web/apps/web-ele/src/main.ts b/web/apps/web-ele/src/main.ts index c3c3dbd..089aab8 100644 --- a/web/apps/web-ele/src/main.ts +++ b/web/apps/web-ele/src/main.ts @@ -132,6 +132,23 @@ async function initApplication() { finalPreferences.app = finalPreferences.app || {}; finalPreferences.app.name = overridesPreferences.app.name; finalPreferences.app.defaultHomePath = overridesPreferences.app.defaultHomePath; + finalPreferences.app.layout = overridesPreferences.app.layout; + finalPreferences.app.preferencesButtonPosition = + overridesPreferences.app.preferencesButtonPosition; + } + if (!applicationId && overridesPreferences.navigation) { + finalPreferences.navigation = merge( + {}, + overridesPreferences.navigation, + finalPreferences.navigation, + ); + } + if (!applicationId && overridesPreferences.sidebar) { + finalPreferences.sidebar = merge( + {}, + overridesPreferences.sidebar, + finalPreferences.sidebar, + ); } if (!applicationId && overridesPreferences.copyright) { finalPreferences.copyright = merge( diff --git a/web/apps/web-ele/src/preferences.ts b/web/apps/web-ele/src/preferences.ts index 2272119..0a11464 100644 --- a/web/apps/web-ele/src/preferences.ts +++ b/web/apps/web-ele/src/preferences.ts @@ -17,7 +17,7 @@ export const overridesPreferences = defineOverridesPreferences({ accessMode: 'mixed', authPageLayout: 'panel-center', defaultHomePath: '/page-render/main_home', - layout: 'header-sidebar-nav', + layout: 'sidebar-nav', preferencesButtonPosition: 'header', }, sidebar: { @@ -25,6 +25,11 @@ export const overridesPreferences = defineOverridesPreferences({ collapsedShowTitle: false, width: 224, }, + navigation: { + accordion: true, + split: false, + styleType: 'rounded', + }, shortcutKeys: { enable: true, globalLockScreen: false, diff --git a/web/packages/@core/preferences/src/preferences.ts b/web/packages/@core/preferences/src/preferences.ts index ad61da9..44a94b5 100644 --- a/web/packages/@core/preferences/src/preferences.ts +++ b/web/packages/@core/preferences/src/preferences.ts @@ -97,6 +97,27 @@ class PreferenceManager { if (overrides?.app?.enableCheckUpdates !== undefined) { mergedPreference.app.enableCheckUpdates = overrides.app.enableCheckUpdates; } + if (overrides?.app?.layout) { + mergedPreference.app.layout = overrides.app.layout; + } + if (overrides?.app?.preferencesButtonPosition) { + mergedPreference.app.preferencesButtonPosition = + overrides.app.preferencesButtonPosition; + } + if (overrides?.navigation) { + mergedPreference.navigation = merge( + {}, + overrides.navigation, + mergedPreference.navigation, + ); + } + if (overrides?.sidebar) { + mergedPreference.sidebar = merge( + {}, + overrides.sidebar, + mergedPreference.sidebar, + ); + } if (overrides?.shortcutKeys) { mergedPreference.shortcutKeys = merge( {},