mirror of https://gitee.com/karson/fastadmin.git
parent
079f6df9dd
commit
b3e172ddce
|
|
@ -476,7 +476,7 @@ class Auth extends \fast\Auth
|
||||||
);
|
);
|
||||||
$current = in_array($item['id'], $selectParentIds);
|
$current = in_array($item['id'], $selectParentIds);
|
||||||
$url = $childList ? 'javascript:;' : $item['url'];
|
$url = $childList ? 'javascript:;' : $item['url'];
|
||||||
$addtabs = $childList || !$url ? "" : (stripos($url, "?") !== false ? "&" : "?") . "ref=addtabs";
|
$addtabs = $childList || !$url ? "" : (stripos($url, "?") !== false ? "&" : "?") . "ref=" . ($item['menutype'] ? $item['menutype'] : 'addtabs');
|
||||||
$childList = str_replace(
|
$childList = str_replace(
|
||||||
'" pid="' . $item['id'] . '"',
|
'" pid="' . $item['id'] . '"',
|
||||||
' ' . ($current ? '' : 'hidden') . '" pid="' . $item['id'] . '"',
|
' ' . ($current ? '' : 'hidden') . '" pid="' . $item['id'] . '"',
|
||||||
|
|
|
||||||
|
|
@ -182,7 +182,7 @@ class Menu
|
||||||
} else {
|
} else {
|
||||||
$pid = $parent;
|
$pid = $parent;
|
||||||
}
|
}
|
||||||
$allow = array_flip(['file', 'name', 'title', 'icon', 'condition', 'remark', 'ismenu', 'weigh']);
|
$allow = array_flip(['file', 'name', 'title', 'url', 'icon', 'condition', 'remark', 'ismenu', 'menutype', 'extend', 'weigh']);
|
||||||
foreach ($newMenu as $k => $v) {
|
foreach ($newMenu as $k => $v) {
|
||||||
$hasChild = isset($v['sublist']) && $v['sublist'] ? true : false;
|
$hasChild = isset($v['sublist']) && $v['sublist'] ? true : false;
|
||||||
$data = array_intersect_key($v, $allow);
|
$data = array_intersect_key($v, $allow);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue