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

Merge branch feature/workflowgroup of zentao/zentaopms (#12177)

Browse Source
This commit is contained in:
刘刚
2025-11-05 09:35:16 +08:00
committed by Gitfox
parent 1fb227eb61 16edb43dad
commit aac4e67e1d
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/wg/navbar/v1.php
+2
View File
@@ -289,7 +289,9 @@ class navbar extends wg
else
{
$subModule = isset($dropMenuItem['subModule']) ? explode(',', $dropMenuItem['subModule']) : array();
$subAlias = zget($dropMenuItem, 'alias', '');
if($subModule and in_array($currentModule, $subModule) and !str_contains(",$exclude,", ",$currentModule-$currentMethod,")) $activeMainMenu = true;
if(str_contains(",$subAlias,", ",$currentModule-$currentMethod,")) $activeMainMenu = true;
}
if($activeMenuID) $activeMainMenu = $dropMenuName == $activeMenuID;
module/common/model.php
+2
View File
@@ -822,7 +822,9 @@ class commonModel extends model
{
$subModule = isset($dropMenuItem['subModule']) ? explode(',', $dropMenuItem['subModule']) : array();
$subExclude = isset($dropMenuItem['exclude']) ? $dropMenuItem['exclude'] : $exclude;
$subAlias = zget($dropMenuItem, 'alias', '');
if($subModule and in_array($currentModule, $subModule) and strpos(",$subExclude,", ",$currentModule-$currentMethod,") === false) $activeMainMenu = true;
if(strpos(",$subAlias,", ",$currentModule-$currentMethod,") !== false) $activeMainMenu = true;
}
if($activeMainMenu) $activeMenu = $dropMenuName;