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

package/dist/access.js

@@ -114,7 +114,7 @@ export const useAccessMarkedRoutes = (routes: IRoute[]) => {
     }
 
     return routes.map(route => process(route));
-  }, [routes.length]);
+  }, [routes.length, access]);
 
   return markdedRoutes;
 }

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,48 @@ 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;
+}
+
+// 格式化路由 处理因 wrapper 导致的 菜单 path 不一致
+const mapRoutes = (routes: IRoute[]) => {
+  if (routes.length === 0) {
+    return []
+  }
+  return routes.map(route => {
+    // 需要 copy 一份, 否则会污染原始数据
+    const newRoute = {...route}
+    if (route.originPath) {
+      newRoute.path = route.originPath
+    }
+
+    if (Array.isArray(route.routes)) {
+      newRoute.routes = mapRoutes(route.routes);
+    }
+
+    return newRoute
+  })
+}
 
 export default (props: any) => {
   const location = useLocation();
@@ -137,8 +180,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') || !!route.isWrapper;
+  })
+  const [route] = useAccessMarkedRoutes(mapRoutes(newRoutes));
+
   return (
     <ProLayout
       route={route}

package/dist/locale.js

@@ -182,7 +182,7 @@ exports.default = (api) => {
         api.writeTmpFile({
             path: 'index.ts',
             content: `
-export { setLocale, getLocale, getIntl, useIntl, injectIntl, formatMessage, FormattedMessage } from './localeExports.ts';
+export { addLocale, setLocale, getLocale, getIntl, useIntl, injectIntl, formatMessage, FormattedMessage, getAllLocales } from './localeExports.ts';
 export { SelectLang } from './SelectLang.tsx';
 `,
         });

package/dist/request.js

@@ -23,6 +23,7 @@ import axios, {
   type AxiosInstance,
   type AxiosRequestConfig,
   type AxiosResponse,
+  type AxiosError,
 } from '{{{axiosPath}}}';
 import useUmiRequest, { UseRequestProvider } from '{{{umiRequestPath}}}';
 import { ApplyPluginsType } from 'umi';
@@ -123,6 +124,8 @@ interface IRequest{
    <T = any>(url: string): Promise<T>;  // 不提供 opts 时，默认使用 'GET' method，并且默认返回 data
 }
 
+type RequestError = AxiosError | Error
+
 interface IErrorHandler {
   (error: RequestError, opts: IRequestOptions): void;
 }
@@ -134,10 +137,10 @@ type IResponseInterceptor = <T = any>(response : AxiosResponse<T>) => AxiosRespo
 type IRequestInterceptorTuple = [IRequestInterceptor , IErrorInterceptor] | [ IRequestInterceptor ] | IRequestInterceptor
 type IResponseInterceptorTuple = [IResponseInterceptor, IErrorInterceptor] | [IResponseInterceptor] | IResponseInterceptor
 
-export interface RequestConfig extends AxiosRequestConfig {
+export interface RequestConfig<T = any> extends AxiosRequestConfig {
   errorConfig?: {
     errorHandler?: IErrorHandler;
-    errorThrower?: <T = any>( res: T ) => void
+    errorThrower?: ( res: T ) => void
   };
   requestInterceptors?: IRequestInterceptorTuple[];
   responseInterceptors?: IResponseInterceptorTuple[];
@@ -302,6 +305,8 @@ export type {
   AxiosInstance,
   AxiosRequestConfig,
   AxiosResponse, 
+  AxiosError,
+  RequestError,
   ResponseInterceptor } from './request';
 `,
         });

package/dist/utils/modelUtils.js

@@ -128,7 +128,7 @@ class ModelUtils {
         // check duplicate
         const namespaces = models.map((model) => model.namespace);
         if (new Set(namespaces).size !== namespaces.length) {
-            throw new Error(`Duplicate namespace in models: ${namespaces.join(', ')}`);
+            throw new Error(`Duplicate namespace in models: ${namespaces.sort().join(', ')}`);
         }
         // sort models by deps
         if (opts.sort) {

package/libs/locale/SelectLang.tpl

@@ -228,7 +228,7 @@ const defaultLangUConfigMap = {
     title: 'Ziman'
   },
   'kn-IN': {
-    lang: 'zh-TW',
+    lang: 'kn-IN',
     label: 'ಕನ್ನಡ',
     icon: '🇮🇳',
     title: 'ಭಾಷೆ'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220628.1",
+  "version": "4.0.0-canary.20220713.1",
   "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.20220713.1",
     "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.20220713.1"
   },
   "publishConfig": {
     "access": "public"