Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

packages/@core/preferences/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vben-core/preferences",
-  "version": "5.1.2",
+  "version": "5.2.0",
   "homepage": "https://github.com/vbenjs/vue-vben-admin",
   "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
   "repository": {

packages/@core/preferences/src/use-preferences.ts

@@ -43,6 +43,13 @@ function usePreferences() {
     isMobile.value ? 'sidebar-nav' : appPreferences.value.layout,
   );
 
+  /**
+   * @zh_CN 是否显示顶栏
+   */
+  const isShowHeaderNav = computed(() => {
+    return preferences.header.enable;
+  });
+
   /**
    * @zh_CN 是否全屏显示content，不需要侧边、底部、顶部、tab区域
    */
@@ -180,7 +187,11 @@ function usePreferences() {
     }
 
     // 如果是全屏模式或者没有固定在顶部，
-    const fixed = contentIsMaximize || isFullContent.value || isMobile.value;
+    const fixed =
+      contentIsMaximize ||
+      isFullContent.value ||
+      isMobile.value ||
+      !isShowHeaderNav.value;
 
     return {
       fixed,