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 @@

{:__('Layout Options')}

{:__("Simple nav tips")}

{:__("Toggle the top menu state (multiple or single)")}

-

{:__("Always show multiple tab when multiple nav is set")}

+

{:__("Always show multiple tab when multiple nav is set")}

{:__("Toggle the left sidebar's state (open or collapse)")}

{:__('Let the sidebar mini expand on hover')}

{:__('Always show sub menu')}

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(); });