|
@@ -12,6 +12,8 @@ class Menu
|
|
*/
|
|
*/
|
|
private $fast = array();
|
|
private $fast = array();
|
|
|
|
|
|
|
|
+ private $group = array();
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* data
|
|
* data
|
|
*
|
|
*
|
|
@@ -148,6 +150,8 @@ class Menu
|
|
if (layadmin()) {
|
|
if (layadmin()) {
|
|
$console = true;
|
|
$console = true;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ $this->getGroup();
|
|
|
|
|
|
foreach ($menu as $k => $v) {
|
|
foreach ($menu as $k => $v) {
|
|
|
|
|
|
@@ -169,6 +173,9 @@ class Menu
|
|
$menu[$k] = $this->getChild($menu[$k], $child, $v, $auth);
|
|
$menu[$k] = $this->getChild($menu[$k], $child, $v, $auth);
|
|
|
|
|
|
if (!isset($menu[$k]['child'])) {
|
|
if (!isset($menu[$k]['child'])) {
|
|
|
|
+ if (isset($this->group[$menu[$k]['group_id']])) {
|
|
|
|
+ unset($this->group[$menu[$k]['group_id']]);
|
|
|
|
+ }
|
|
unset($menu[$k]);
|
|
unset($menu[$k]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -515,6 +522,15 @@ class Menu
|
|
return $info['id'];
|
|
return $info['id'];
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private function getGroup()
|
|
|
|
+ {
|
|
|
|
+ if (!$this->group) {
|
|
|
|
+ $this->group = Dever::db('manage/menu_group')->state();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return $this->group;
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* menu 生成顶部菜单
|
|
* menu 生成顶部菜单
|
|
*
|
|
*
|
|
@@ -522,7 +538,8 @@ class Menu
|
|
*/
|
|
*/
|
|
public function getTop()
|
|
public function getTop()
|
|
{
|
|
{
|
|
- $data = Dever::db('manage/menu_group')->state();
|
|
|
|
|
|
+ Dever::load('manage/menu.getHtml');
|
|
|
|
+ $data = $this->getGroup();
|
|
|
|
|
|
$html = '<li class="layui-nav-item layadmin-flexible" lay-unselect>
|
|
$html = '<li class="layui-nav-item layadmin-flexible" lay-unselect>
|
|
<a href="javascript:;" layadmin-event="flexible" title="侧边伸缩">
|
|
<a href="javascript:;" layadmin-event="flexible" title="侧边伸缩">
|