|
@@ -150,7 +150,6 @@ class Menu
|
|
|
if (layadmin()) {
|
|
|
$console = true;
|
|
|
}
|
|
|
- $group = false;
|
|
|
foreach ($menu as $k => $v) {
|
|
|
|
|
|
if (!$console && $k == 'console') {
|
|
@@ -168,19 +167,11 @@ class Menu
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- $menu[$k]['checked'] = false;
|
|
|
- if ($group && $group == $menu[$k]['group_id']) {
|
|
|
- $menu[$k]['checked'] = true;
|
|
|
- } elseif (!$group) {
|
|
|
- $group = $menu[$k]['group_id'];
|
|
|
- $menu[$k]['checked'] = true;
|
|
|
- }
|
|
|
-
|
|
|
$menu[$k] = $this->getChild($menu[$k], $child, $v, $auth);
|
|
|
if (!isset($menu[$k]['child'])) {
|
|
|
unset($menu[$k]);
|
|
|
} else {
|
|
|
- $this->group[$menu[$k]['group_id']] = array($menu[$k]['group_id'], $menu[$k]['checked']);
|
|
|
+ $this->group[$menu[$k]['group_id']] = $menu[$k]['group_id'];
|
|
|
}
|
|
|
}
|
|
|
} elseif (!$ms && $state == 2) {
|
|
@@ -533,8 +524,6 @@ class Menu
|
|
|
foreach ($group as $k => $v) {
|
|
|
if (!isset($this->group[$k])) {
|
|
|
unset($group[$k]);
|
|
|
- } else {
|
|
|
- $group[$k]['checked'] = $this->group[$k][1];
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -570,9 +559,10 @@ class Menu
|
|
|
</a>
|
|
|
</li>';
|
|
|
if (layadmin() && count($data) > 1) {
|
|
|
+ $i = 0;
|
|
|
foreach ($data as $k => $v) {
|
|
|
$v['icon'] = $v['icon'] ? "layui-icon " . $v['icon'] : "layui-icon layui-icon-home";
|
|
|
- if ($v['checked']) {
|
|
|
+ if ($i == 0) {
|
|
|
$cur = 'layui-this';
|
|
|
} else {
|
|
|
$cur = '';
|
|
@@ -581,10 +571,15 @@ class Menu
|
|
|
|
|
|
|
|
|
$link = 'href="javascript:;" onclick="menuGroup('.$v['id'].', $(this))"';
|
|
|
- $html .= '<a '.$link.' lay-tips="'.$v['name'].'">';
|
|
|
+ $html .= '<a '.$link.' lay-tips="'.$v['name'].'" id="menu_group_'.$v['id'].'">';
|
|
|
$html .= '<i class="'.$v['icon'].'"></i><cite style="margin-left:5px;">'.$v['name'].'</cite></a>';
|
|
|
|
|
|
+ if ($i == 0) {
|
|
|
+ $html .= '<script>$(document).ready(function(){$("#menu_group_'.$v['id'].'").click()});</script>';
|
|
|
+ }
|
|
|
+
|
|
|
$html .= '</li>';
|
|
|
+ $i++;
|
|
|
}
|
|
|
$html .= '';
|
|
|
}
|
|
@@ -605,12 +600,7 @@ class Menu
|
|
|
if (layadmin()) {
|
|
|
foreach ($data as $k => $v) {
|
|
|
$v['icon'] = $v['icon'] ? "layui-icon " . $v['icon'] : "layui-icon layui-icon-home";
|
|
|
- $style = '';
|
|
|
- if ($v['checked'] == 1) {
|
|
|
- $style = '';
|
|
|
- } else {
|
|
|
- $style = 'style="display:none;"';
|
|
|
- }
|
|
|
+ $style = 'style="display:none;"';
|
|
|
$html .= '<li data-name="'.$v['key'].'" class="layui-nav-item menu_group menu_group_'.$v['group_id'].'" '.$style.'>';
|
|
|
|
|
|
if (isset($v['child']) && $v['child']) {
|