From 91dea04a8627ba6d272b8db24b8c22fc4fe37b41 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Wed, 4 Jun 2025 14:47:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=80=E6=B4=81=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=92=8C=E5=A4=9A=E7=BA=A7=E8=8F=9C=E5=8D=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Index.php     | 4 ++++
 application/admin/view/common/control.html | 2 +-
 public/assets/js/backend/index.js          | 8 +++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index 6f1241a1..4f3c49c3 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -39,6 +39,10 @@ class Index extends Backend
                 config('fastadmin.' . $key, $cookieValue);
             }
         }
+        //如同时启用简洁和多级菜单，简洁菜单将失效
+        if (config('fastadmin.simplenav') && config('fastadmin.multiplenav')) {
+            config('fastadmin.simplenav', false);
+        }
         //左侧菜单
         list($menulist, $navlist, $fixedmenu, $referermenu) = $this->auth->getSidebar([
             'dashboard' => 'hot',
diff --git a/application/admin/view/common/control.html b/application/admin/view/common/control.html
index 89ef67b4..af03d203 100644
--- a/application/admin/view/common/control.html
+++ b/application/admin/view/common/control.html
@@ -32,7 +32,7 @@
             <h4 class="control-sidebar-heading">{:__('Layout Options')}</h4>
             <div class="form-group"><label class="control-sidebar-subheading"><input type="checkbox" data-config="simplenav" {if $Think.config.fastadmin.simplenav}checked{/if} class="pull-right"> {:__('Simple Nav')}</label><p>{:__("Simple nav tips")}</p></div>
             <div class="form-group"><label class="control-sidebar-subheading"><input type="checkbox" data-config="multiplenav" {if $Think.config.fastadmin.multiplenav}checked{/if} class="pull-right"> {:__('Multiple Nav')}</label><p>{:__("Toggle the top menu state (multiple or single)")}</p></div>
-            <div class="form-group"><label class="control-sidebar-subheading"><input type="checkbox" data-config="multipletab" {if $Think.config.fastadmin.multipletab}checked{/if} class="pull-right"> {:__('Multiple Tab')}</label><p>{:__("Always show multiple tab when multiple nav is set")}</p></div>
+            <div class="form-group"><label class="control-sidebar-subheading"><input type="checkbox" data-config="multipletab" {if !$Think.config.fastadmin.multiplenav}disabled{/if} {if $Think.config.fastadmin.multipletab}checked{/if} class="pull-right"> {:__('Multiple Tab')}</label><p>{:__("Always show multiple tab when multiple nav is set")}</p></div>
             <div class="form-group"><label class="control-sidebar-subheading"><input type="checkbox" data-layout="sidebar-collapse" class="pull-right"> {:__('Toggle Sidebar')}</label><p>{:__("Toggle the left sidebar's state (open or collapse)")}</p></div>
             <div class="form-group"><label class="control-sidebar-subheading"><input type="checkbox" data-enable="expandOnHover" class="pull-right"> {:__('Sidebar Expand on Hover')}</label><p>{:__('Let the sidebar mini expand on hover')}</p></div>
             <div class="form-group"><label class="control-sidebar-subheading"><input type="checkbox" data-menu="show-submenu" class="pull-right"> {:__('Show sub menu')}</label><p>{:__('Always show sub menu')}</p></div>
diff --git a/public/assets/js/backend/index.js b/public/assets/js/backend/index.js
index 2efbc99b..7b389a5e 100755
--- a/public/assets/js/backend/index.js
+++ b/public/assets/js/backend/index.js
@@ -335,10 +335,13 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi
                 }, 0);
             });
 
-            // 切换简洁模式菜单
+            // 切换简洁菜单
             $(document).on("click", "[data-config='simplenav']", function () {
                 var value = $(this).prop("checked") ? 1 : 0;
                 createCookie('simplenav', value);
+                if ($("[data-config='multiplenav']").prop("checked")) {
+                    createCookie('multiplenav', 0);
+                }
                 location.reload();
             });
 
@@ -346,6 +349,9 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi
             $(document).on("click", "[data-config='multiplenav']", function () {
                 var value = $(this).prop("checked") ? 1 : 0;
                 createCookie('multiplenav', value);
+                if ($("[data-config='simplenav']").prop("checked")) {
+                    createCookie('simplenav', 0);
+                }
                 location.reload();
             });