zmdms-webui 3.2.9 → 3.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -42,6 +42,7 @@ var SubMenu = function (props, ref) {
|
|
|
42
42
|
getNewPath: getNewPath,
|
|
43
43
|
userMenus: userMenus,
|
|
44
44
|
}), subMenuOpenKeys = _c.subMenuOpenKeys, onSubMenuOpenChange = _c.onSubMenuOpenChange;
|
|
45
|
+
console.log(subMenuOpenKeys);
|
|
45
46
|
// 如果是搜索或者收藏 把二级菜单都展开
|
|
46
47
|
useEffect(function () {
|
|
47
48
|
if (mainMenuSelectedKeys && mainMenuSelectedKeys.length > 0) {
|
|
@@ -150,11 +151,18 @@ var SubMenu = function (props, ref) {
|
|
|
150
151
|
// 这里为什么要用newPath 而不是menuItem.id
|
|
151
152
|
// 因为如果要选到叶子节点，是直接拿路由去做匹配
|
|
152
153
|
// 如果这个菜单有子元素，那么这个菜单是不需要跳转的，他的key应该取menuItem.id
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
154
|
+
// 20260529 这里做一个调整 如果有子元素，那么他的key应该取menuItem.id
|
|
155
|
+
key: ((_a = menuItem.children) === null || _a === void 0 ? void 0 : _a.length) > 0
|
|
156
|
+
? menuItem.id
|
|
157
|
+
: newPath !== "/"
|
|
158
|
+
? newPath
|
|
159
|
+
: menuItem.id,
|
|
160
|
+
// key:
|
|
161
|
+
// newPath !== "/"
|
|
162
|
+
// ? newPath
|
|
163
|
+
// : menuItem.children?.length > 0
|
|
164
|
+
// ? menuItem.id
|
|
165
|
+
// : newPath,
|
|
158
166
|
// newPath === "/" || menuItem.children?.length > 0
|
|
159
167
|
// ? menuItem.id
|
|
160
168
|
// : newPath,
|