fix:sort pro_layout_parentKeys

umijs · Apr 24, 2022 · 3feb2fb · 3feb2fb
1 parent 6743cc4
commit 3feb2fb
Show file tree

Hide file tree

Showing 3 changed files with 169 additions and 108 deletions.
diff --git a/src/transformRoute/transformRoute.ts b/src/transformRoute/transformRoute.ts
@@ -215,20 +215,25 @@ function formatter(
         ...restParent
       } = parent;
 
+      const item_pro_layout_parentKeys = new Set([
+        ...pro_layout_parentKeys,
+        ...(item.parentKeys || []),
+      ]);
+
+      if (parent.key) {
+        item_pro_layout_parentKeys.add(parent.key);
+      }
+
       const finallyItem: MenuDataItem = {
         ...restParent,
         menu: undefined,
         ...item,
         path,
         locale,
         key: item.key || getKeyByPath({ ...item, path }),
-        pro_layout_parentKeys: Array.from(
-          new Set([
-            ...(item.parentKeys || []),
-            ...pro_layout_parentKeys,
-            `/${parent.key || ''}`.replace(/\/\//g, '/').replace(/\/\//g, '/'),
-          ]),
-        ).filter((key) => key && key !== '/'),
+        pro_layout_parentKeys: Array.from(item_pro_layout_parentKeys).filter(
+          (key) => key && key !== '/',
+        ),
       };
 
       if (localeName) {