From fa8e2ac251962994cc10d963ea6d973247879d1d Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@chandao.com>
Date: Tue, 4 Nov 2025 07:46:25 +0000
Subject: [PATCH 1/2]  * [task#151825] DropMenu supports alias.

---
 lib/zin/wg/navbar/v1.php | 7 +++++--
 module/common/model.php  | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/zin/wg/navbar/v1.php b/lib/zin/wg/navbar/v1.php
index c742c1a268..a35ce3af85 100644
--- a/lib/zin/wg/navbar/v1.php
+++ b/lib/zin/wg/navbar/v1.php
@@ -288,8 +288,11 @@ class navbar extends wg
                         }
                         else
                         {
-                            $subModule = isset($dropMenuItem['subModule']) ? explode(',', $dropMenuItem['subModule']) : array();
-                            if($subModule and in_array($currentModule, $subModule) and !str_contains(",$exclude,", ",$currentModule-$currentMethod,")) $activeMainMenu = true;
+                            $subModule  = isset($dropMenuItem['subModule']) ? explode(',', $dropMenuItem['subModule']) : array();
+                            $subExclude = zget($dropMenuItem, 'exclude', '');
+                            $subAlias   = zget($dropMenuItem, 'alias', '');
+                            if($subModule and in_array($currentModule, $subModule) and !str_contains(",$subExclude,", ",$currentModule-$currentMethod,")) $activeMainMenu = true;
+                            if($module == $currentModule && ($method == $currentMethod || str_contains(",$subAlias,", ",$currentMethod,")) && !str_contains(",$subExclude,", ",$currentModule-$currentMethod,")) $activeMainMenu = true;
                         }
 
                         if($activeMenuID) $activeMainMenu = $dropMenuName == $activeMenuID;
diff --git a/module/common/model.php b/module/common/model.php
index b0927d3bc7..f0b50c7186 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -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($module == $currentModule && ($method == $currentMethod || strpos(",$subAlias,", ",$currentMethod,") !== false) && strpos(",$subExclude,", ",$currentModule-$currentMethod,") === false) $activeMainMenu = true;
                         }
 
                         if($activeMainMenu) $activeMenu = $dropMenuName;

From 16edb43daded0973805594b97ec1434e2ff2edc3 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@chandao.com>
Date: Wed, 5 Nov 2025 00:34:30 +0000
Subject: [PATCH 2/2]  * [task#151825] Dropmenu supports alias.

---
 lib/zin/wg/navbar/v1.php | 9 ++++-----
 module/common/model.php  | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/zin/wg/navbar/v1.php b/lib/zin/wg/navbar/v1.php
index a35ce3af85..b507441bc6 100644
--- a/lib/zin/wg/navbar/v1.php
+++ b/lib/zin/wg/navbar/v1.php
@@ -288,11 +288,10 @@ class navbar extends wg
                         }
                         else
                         {
-                            $subModule  = isset($dropMenuItem['subModule']) ? explode(',', $dropMenuItem['subModule']) : array();
-                            $subExclude = zget($dropMenuItem, 'exclude', '');
-                            $subAlias   = zget($dropMenuItem, 'alias', '');
-                            if($subModule and in_array($currentModule, $subModule) and !str_contains(",$subExclude,", ",$currentModule-$currentMethod,")) $activeMainMenu = true;
-                            if($module == $currentModule && ($method == $currentMethod || str_contains(",$subAlias,", ",$currentMethod,")) && !str_contains(",$subExclude,", ",$currentModule-$currentMethod,")) $activeMainMenu = true;
+                            $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;
diff --git a/module/common/model.php b/module/common/model.php
index f0b50c7186..90ff1c2fdd 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -824,7 +824,7 @@ class commonModel extends model
                             $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($module == $currentModule && ($method == $currentMethod || strpos(",$subAlias,", ",$currentMethod,") !== false) && strpos(",$subExclude,", ",$currentModule-$currentMethod,") === false) $activeMainMenu = true;
+                            if(strpos(",$subAlias,", ",$currentModule-$currentMethod,") !== false) $activeMainMenu = true;
                         }
 
                         if($activeMainMenu) $activeMenu = $dropMenuName;