Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [story#72666] support icons for secondary menus.

Browse Source
This commit is contained in:
wangzemei
2025-03-24 15:33:11 +08:00
committed by 綦新志
parent 466dcf160c
commit 5280386d51
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/wg/navbar/v1.php
+3 -1
View File
@@ -187,6 +187,7 @@ class navbar extends wg
'text' => $menuItem->text,
'type' => 'text',
'tagName' => 'span',
'icon' => isset($menuItem->icon) ? $menuItem->icon : '',
);
continue;
@@ -326,6 +327,7 @@ class navbar extends wg
{
$items[] = array(
'class' => $class,
'icon' => isset($menuItem->icon) ? $menuItem->icon : '',
'text' => $label,
'url' => commonModel::createMenuLink($menuItem, $tab),
'active' => $isActive,
@@ -338,7 +340,7 @@ class navbar extends wg
}
else
{
$items[] = array('class' => $class, 'text' => $menuItem->text, 'active' => $isActive);
$items[] = array('class' => $class, 'icon' => isset($menuItem->icon) ? $menuItem->icon : '', 'text' => $menuItem->text, 'active' => $isActive);
}
}
module/custom/model.php
+3 -1
View File
@@ -188,10 +188,11 @@ class customModel extends model
list($customMenuMap, $order) = static::buildCustomMenuMap($allMenu, $customMenu, $module);
/* Merge fileMenu && customMenu. */
foreach($customMenuMap as $name => $item)
foreach($customMenuMap as $name => &$item)
{
if(is_object($allMenu) && !isset($allMenu->{$name})) $allMenu->{$name} = $item;
if(is_array($allMenu) && !isset($allMenu[$name])) $allMenu[$name] = $item;
if(is_object($allMenu) && isset($allMenu->{$name}) && isset($allMenu->{$name}['icon'])) $item->icon = $allMenu->{$name}['icon'];
}
$menu = static::buildMenuItems($allMenu, $customMenuMap, $module, $order);
@@ -419,6 +420,7 @@ class customModel extends model
$menuItem->link = $itemLink;
$menuItem->text = $label;
if($isTutorialMode) $menuItem->tutorial = true;
if(isset($customMenuMap[$name]) && isset($customMenuMap[$name]->icon)) $menuItem->icon = $customMenuMap[$name]->icon;
$attrList = array('class', 'subModule', 'dropMenu', 'alias', 'exclude', 'divider');
$hidden = strpos($name, 'QUERY') === 0 && !isset($customMenuMap[$name]) ? false : isset($customMenuMap[$name]) && isset($customMenuMap[$name]->hidden) && $customMenuMap[$name]->hidden;