rabin 2 years ago
parent
commit
8ea239a96b
3 changed files with 22 additions and 11 deletions
  1. 1 1
      assets/layadmin/html/home.html
  2. 1 1
      assets/layadmin/html/inc/script.html
  3. 20 9
      src/Menu.php

+ 1 - 1
assets/layadmin/html/home.html

@@ -57,7 +57,7 @@
   <script>
     layui.config({
         base: '../script/lib/layui/admin/' //静态资源所在路径
-        ,version:false
+        ,version:true
     }).extend({
         index: 'lib/index' //主入口模块
     }).use('index');

+ 1 - 1
assets/layadmin/html/inc/script.html

@@ -39,4 +39,4 @@
 <script type="text/javascript" src="../script/lib/excel/excel.js?v16"></script>
 
 <!-- 加载主要js,很乱,后续优化 -->
-<script type="text/javascript" src="../script/lib/manage/main.js?v306"></script>
+<script type="text/javascript" src="../script/lib/manage/main.js?v308"></script>

+ 20 - 9
src/Menu.php

@@ -684,15 +684,18 @@ class Menu
     </a>
   </li></ul><ul class="layui-nav nav layui-layout-left" style="margin-left: 161px;">';
 
-        $cur_group = Dever::input('group', 1) - 1;
+        $cur_group = Dever::input('group');
         if (layadmin()) {
             $i = 0;
             foreach ($data as $k => $v) {
                 $v['icon'] = $v['icon'] ? "layui-icon " . $v['icon'] : "layui-icon layui-icon-home";
-                if ($i == $cur_group) {
+                $cur = '';
+                if ($cur_group) {
+                    if ($v['id'] == $cur_group) {
+                        $cur = 'layui-this';
+                    }
+                } elseif ($i == 0) {
                     $cur = 'layui-this';
-                } else {
-                    $cur = '';
                 }
                 $html .= '<li class="layui-nav-item '.$cur.'">';
 
@@ -701,7 +704,7 @@ class Menu
                 $html .= '<a '.$link.' lay-tipss="'.$v['name'].'" id="menu_group_'.$v['id'].'">';
                 $html .= '<i class="'.$v['icon'].'"></i><cite style="margin-left:5px;">'.$v['name'].'</cite></a>';
 
-                if ($i == $cur_group) {
+                if ($cur) {
                     $html .= '<script>$(document).ready(function(){$("#menu_group_'.$v['id'].'").click()});</script>';
                 }
 
@@ -724,11 +727,17 @@ class Menu
         $data = $this->all();
 
         $html = '';
+        $menu = Dever::input('menu');
         if (layadmin()) {
             foreach ($data as $k => $v) {
                 $v['icon'] = $v['icon'] ? "layui-icon " . $v['icon'] : "layui-icon layui-icon-home";
                 $style = 'style="display:none;"';
-                $html .= '<li data-name="'.$v['key'].'" class="layui-nav-item menu_group menu_group_'.$v['group_id'].'" '.$style.'>';
+                $nav = '';
+                if ($menu && strstr($menu, $v['key'])) {
+                    $style = '';
+                    $nav = 'layui-nav-itemed';
+                }
+                $html .= '<li data-name="'.$v['key'].'" class="layui-nav-item menu_group menu_group_'.$v['group_id'].' '.$nav.'" '.$style.'>';
 
                 if (isset($v['child']) && $v['child']) {
                     $link = 'href="javascript:;"';
@@ -738,7 +747,7 @@ class Menu
                 $html .= '<a '.$link.' lay-tips="'.$v['name'].'" lay-direction="2">';
                 $html .= '<i class="'.$v['icon'].'"></i><cite>'.$v['name'].'</cite></a>';
 
-                $html .= $this->getHtmlChild($v);
+                $html .= $this->getHtmlChild($v, $menu);
 
                 $html .= '</li>';
             }
@@ -748,7 +757,7 @@ class Menu
         return $html;
     }
 
-    public function getHtmlChild($v)
+    public function getHtmlChild($v, $menu = '')
     {
         $html = '';
 
@@ -756,7 +765,9 @@ class Menu
             $html .= '<dl class="layui-nav-child">';
             foreach ($v['child'] as $k1 => $v1) {
                 $active = '';
-                if ($v1['key'] == 'console.index') {
+                if ($menu && strstr($menu, $v1['key'])) {
+                    $active = 'layui-this';
+                } elseif ($v1['key'] == 'console.index') {
                     $active = 'layui-this';
                 }
                 $html .= '<dd data-name="'.$v1['key'].'" class="'.$active.'">';