@umijs/plugins 4.0.0-canary.20220628.1 → 4.0.0-canary.20220628.2

package/dist/layout.js

@@ -91,6 +91,7 @@ exports.default = (api) => {
             path: 'Layout.tsx',
             content: `
 import { Link, useLocation, useNavigate, Outlet, useAppData, useRouteData, matchRoutes } from 'umi';
+import type { IRoute } from 'umi';
 import React, { useMemo } from 'react';
 import {
   ProLayout,
@@ -113,6 +114,28 @@ import { useIntl } from '@@/plugin-locale';
     `.trim()
                 : ''}
 
+// 过滤出需要显示的路由, 这里的filterFn 指 不希望显示的层级
+const filterRoutes = (routes: IRoute[], filterFn: (route: IRoute) => boolean) => {
+  if (routes.length === 0) {
+    return []
+  }
+
+  let newRoutes = []
+  for (const route of routes) {
+    if (filterFn(route)) {
+      if (Array.isArray(route.routes)) {
+        newRoutes.push(...filterRoutes(route.routes, filterFn))
+      }
+    } else {
+      newRoutes.push(route);
+      if (Array.isArray(route.routes)) {
+        route.routes = filterRoutes(route.routes, filterFn);
+      }
+    }
+  }
+
+  return newRoutes;
+}
 
 export default (props: any) => {
   const location = useLocation();
@@ -137,8 +160,13 @@ const { formatMessage } = useIntl();
       ...initialInfo
     },
   });
+
   const matchedRoute = useMemo(() => matchRoutes(clientRoutes, location.pathname).pop()?.route, [location.pathname]);
-  const [route] = useAccessMarkedRoutes(clientRoutes.filter(({ id }) => id === 'ant-design-pro-layout'));
+  const newRoutes = filterRoutes(clientRoutes.filter(route => route.id === 'ant-design-pro-layout'), (route) => {
+    return !!route.isLayout && route.id !== 'ant-design-pro-layout';
+  })
+  const [route] = useAccessMarkedRoutes(newRoutes);
+
   return (
     <ProLayout
       route={route}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220628.1",
+  "version": "4.0.0-canary.20220628.2",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -25,7 +25,7 @@
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^7.0.1-beta.20",
-    "@umijs/bundler-utils": "4.0.0-canary.20220628.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20220628.2",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.5",
@@ -44,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-canary.20220628.1"
+    "umi": "4.0.0-canary.20220628.2"
   },
   "publishConfig": {
     "access": "public"