From 02cc257fafd27c76a7abf961251b654093c943ee Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Thu, 20 Jan 2022 17:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=B1=95=E7=A4=BA=E5=AD=90=E8=8F=9C=E5=8D=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Index.php  | 2 +-
 application/admin/library/Auth.php      | 2 +-
 application/admin/view/common/menu.html | 2 +-
 application/config.php                  | 2 ++
 extend/fast/Tree.php                    | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index df8d3466..862c2243 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -32,7 +32,7 @@ class Index extends Backend
      */
     public function index()
     {
-        $cookieArr = ['adminskin' => "/^skin\-([a-z\-]+)\$/i", 'multiplenav' => "/^(0|1)\$/", 'multipletab' => "/^(0|1)\$/"];
+        $cookieArr = ['adminskin' => "/^skin\-([a-z\-]+)\$/i", 'multiplenav' => "/^(0|1)\$/", 'multipletab' => "/^(0|1)\$/", 'show_submenu' => "/^(0|1)\$/"];
         foreach ($cookieArr as $key => $regex) {
             $cookieValue = $this->request->cookie($key);
             if (!is_null($cookieValue) && preg_match($regex, $cookieValue)) {
diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php
index ea9e823d..4bd10a5c 100644
--- a/application/admin/library/Auth.php
+++ b/application/admin/library/Auth.php
@@ -451,7 +451,7 @@ class Auth extends \fast\Auth
 
         $select_id = $referer ? $referer['id'] : ($selected ? $selected['id'] : 0);
         $menu = $nav = '';
-        $showSubmenu = (int)cookie('show_submenu');
+        $showSubmenu = config('fastadmin.show_submenu');
         if (Config::get('fastadmin.multiplenav')) {
             $topList = [];
             foreach ($ruleList as $index => $item) {
diff --git a/application/admin/view/common/menu.html b/application/admin/view/common/menu.html
index 9727d028..1e42c013 100644
--- a/application/admin/view/common/menu.html
+++ b/application/admin/view/common/menu.html
@@ -30,7 +30,7 @@
     </div>
 
     <!-- 左侧菜单栏 -->
-    <ul class="sidebar-menu {if $Think.cookie.show_submenu}show-submenu{/if}">
+    <ul class="sidebar-menu {if $Think.config.fastadmin.show_submenu}show-submenu{/if}">
 
         <!-- 菜单可以在 后台管理->权限管理->菜单规则 中进行增删改排序 -->
         {$menulist}
diff --git a/application/config.php b/application/config.php
index 877a5ca2..08e78c40 100755
--- a/application/config.php
+++ b/application/config.php
@@ -277,6 +277,8 @@ return [
         'multiplenav'           => false,
         //是否开启多选项卡(仅在开启多级菜单时起作用)
         'multipletab'           => true,
+        //是否默认展示子菜单
+        'show_submenu'          => false,
         //后台皮肤,为空时表示使用skin-black-blue
         'adminskin'             => '',
         //后台是否启用面包屑
diff --git a/extend/fast/Tree.php b/extend/fast/Tree.php
index 8a6b2985..2c1997c2 100644
--- a/extend/fast/Tree.php
+++ b/extend/fast/Tree.php
@@ -326,7 +326,7 @@ class Tree
                     '@addtabs'   => $childdata || !isset($value['@url']) ? "" : (stripos($value['@url'], "?") !== false ? "&" : "?") . "ref=addtabs",
                     '@caret'     => ($childdata && (!isset($value['@badge']) || !$value['@badge']) ? '<i class="fa fa-angle-left"></i>' : ''),
                     '@badge'     => isset($value['@badge']) ? $value['@badge'] : '',
-                    '@class'     => ($selected ? ' active' : '') . ($disabled ? ' disabled' : '') . ($childdata ? ' treeview' . (cookie('show_submenu') ? ' treeview-open' : '') : ''),
+                    '@class'     => ($selected ? ' active' : '') . ($disabled ? ' disabled' : '') . ($childdata ? ' treeview' . (config('fastadmin.show_submenu') ? ' treeview-open' : '') : ''),
                 );
                 $str .= strtr($nstr, $value);
             }