fix: stabilize admin sidebar layout
This commit is contained in:
@@ -132,6 +132,23 @@ async function initApplication() {
|
|||||||
finalPreferences.app = finalPreferences.app || {};
|
finalPreferences.app = finalPreferences.app || {};
|
||||||
finalPreferences.app.name = overridesPreferences.app.name;
|
finalPreferences.app.name = overridesPreferences.app.name;
|
||||||
finalPreferences.app.defaultHomePath = overridesPreferences.app.defaultHomePath;
|
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) {
|
if (!applicationId && overridesPreferences.copyright) {
|
||||||
finalPreferences.copyright = merge(
|
finalPreferences.copyright = merge(
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ export const overridesPreferences = defineOverridesPreferences({
|
|||||||
accessMode: 'mixed',
|
accessMode: 'mixed',
|
||||||
authPageLayout: 'panel-center',
|
authPageLayout: 'panel-center',
|
||||||
defaultHomePath: '/page-render/main_home',
|
defaultHomePath: '/page-render/main_home',
|
||||||
layout: 'header-sidebar-nav',
|
layout: 'sidebar-nav',
|
||||||
preferencesButtonPosition: 'header',
|
preferencesButtonPosition: 'header',
|
||||||
},
|
},
|
||||||
sidebar: {
|
sidebar: {
|
||||||
@@ -25,6 +25,11 @@ export const overridesPreferences = defineOverridesPreferences({
|
|||||||
collapsedShowTitle: false,
|
collapsedShowTitle: false,
|
||||||
width: 224,
|
width: 224,
|
||||||
},
|
},
|
||||||
|
navigation: {
|
||||||
|
accordion: true,
|
||||||
|
split: false,
|
||||||
|
styleType: 'rounded',
|
||||||
|
},
|
||||||
shortcutKeys: {
|
shortcutKeys: {
|
||||||
enable: true,
|
enable: true,
|
||||||
globalLockScreen: false,
|
globalLockScreen: false,
|
||||||
|
|||||||
@@ -97,6 +97,27 @@ class PreferenceManager {
|
|||||||
if (overrides?.app?.enableCheckUpdates !== undefined) {
|
if (overrides?.app?.enableCheckUpdates !== undefined) {
|
||||||
mergedPreference.app.enableCheckUpdates = overrides.app.enableCheckUpdates;
|
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) {
|
if (overrides?.shortcutKeys) {
|
||||||
mergedPreference.shortcutKeys = merge(
|
mergedPreference.shortcutKeys = merge(
|
||||||
{},
|
{},
|
||||||
|
|||||||
Reference in New Issue
Block a user