Merge Code.

This commit is contained in:
sunguangming
2024-08-27 03:06:21 +00:00
parent e832a02ade
commit 2f414cfbef
6 changed files with 58 additions and 27 deletions
+19
View File
@@ -111,6 +111,9 @@ class adminModel extends model
$menuKey = $this->getMenuKey();
if(empty($menuKey)) return;
$customKey = "admin-$menuKey";
$customMenu = isset($this->config->customMenu->{$customKey}) ? json_decode($this->config->customMenu->{$customKey}) : array();
$this->setSwitcher($menuKey);
if(isset($this->lang->admin->menuList->$menuKey))
{
@@ -146,6 +149,22 @@ class adminModel extends model
}
}
if($customMenu)
{
$this->lang->admin->menuList->{$menuKey}['menuOrder'] = array();
$this->lang->admin->menuList->{$menuKey}['dividerMenu'] = '';
$prev = '';
foreach($customMenu as $item)
{
$this->lang->admin->menuList->{$menuKey}['menuOrder'][$item->order] = $item->name;
if($prev == 'divider') $this->lang->admin->menuList->{$menuKey}['dividerMenu'] .= ',' . $item->name;
$prev = $item->name;
}
if($this->lang->admin->menuList->{$menuKey}['dividerMenu']) $this->lang->admin->menuList->{$menuKey}['dividerMenu'] = ',' . trim($this->lang->admin->menuList->{$menuKey}['dividerMenu']) . ',';
ksort($this->lang->admin->menuList->{$menuKey}['menuOrder']);
}
if(isset($this->lang->admin->menuList->{$menuKey}['menuOrder'])) $this->lang->admin->menuOrder = $this->lang->admin->menuList->{$menuKey}['menuOrder'];
if(isset($this->lang->admin->menuList->{$menuKey}['dividerMenu'])) $this->lang->admin->dividerMenu = $this->lang->admin->menuList->{$menuKey}['dividerMenu'];
if(isset($this->lang->admin->menuList->{$menuKey}['tabMenu'])) $this->lang->admin->tabMenu = $this->lang->admin->menuList->{$menuKey}['tabMenu'];