@ant-design/pro-components 3.1.0-0 → 3.1.1-1

package/lib/layout/components/TopNavHeader/index.js

@@ -1,15 +1,12 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TopNavHeader = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _antd = require("antd");
-var _classnames = _interopRequireDefault(require("classnames"));
+var _clsx = require("clsx");
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
 var _AppsLogoComponents = require("../AppsLogoComponents");
@@ -18,38 +15,43 @@ var _BaseMenu = require("../SiderMenu/BaseMenu");
 var _SiderMenu = require("../SiderMenu/SiderMenu");
 var _style = require("./style");
 var _jsxRuntime = require("react/jsx-runtime");
-var TopNavHeader = exports.TopNavHeader = function TopNavHeader(props) {
-  var _token$layout12, _token$layout13, _token$layout14, _token$layout15, _token$layout16, _token$layout17, _token$layout18;
-  var ref = (0, _react.useRef)(null);
-  var onMenuHeaderClick = props.onMenuHeaderClick,
-    contentWidth = props.contentWidth,
-    propsClassName = props.className,
-    style = props.style,
-    headerContentRender = props.headerContentRender,
-    layout = props.layout,
-    actionsRender = props.actionsRender;
-  var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
-    getPrefixCls = _useContext.getPrefixCls;
-  var _useContext2 = (0, _react.useContext)(_provider.ProProvider),
-    dark = _useContext2.dark;
-  var prefixCls = "".concat(props.prefixCls || getPrefixCls('pro'), "-top-nav-header");
-  var _useStyle = (0, _style.useStyle)(prefixCls),
-    wrapSSR = _useStyle.wrapSSR,
-    hashId = _useStyle.hashId;
-  var renderKey = undefined;
+const TopNavHeader = props => {
+  const ref = (0, _react.useRef)(null);
+  const {
+    onMenuHeaderClick,
+    contentWidth,
+    className: propsClassName,
+    style,
+    headerContentRender,
+    layout,
+    actionsRender
+  } = props;
+  const {
+    getPrefixCls
+  } = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext);
+  const {
+    dark
+  } = (0, _react.useContext)(_provider.ProProvider);
+  const prefixCls = `${props.prefixCls || getPrefixCls('pro')}-top-nav-header`;
+  const {
+    wrapSSR,
+    hashId
+  } = (0, _style.useStyle)(prefixCls);
+  let renderKey = undefined;
   if (props.menuHeaderRender !== undefined) {
     renderKey = 'menuHeaderRender';
   } else if (layout === 'mix' || layout === 'top') {
     renderKey = 'headerTitleRender';
   }
-  var headerDom = (0, _SiderMenu.renderLogoAndTitle)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+  const headerDom = (0, _SiderMenu.renderLogoAndTitle)({
+    ...props,
     collapsed: false
-  }), renderKey);
-  var _useContext3 = (0, _react.useContext)(_provider.ProProvider),
-    token = _useContext3.token;
-  var contentDom = (0, _react.useMemo)(function () {
-    var _token$layout, _token$layout2, _token$layout3, _token$layout4, _token$layout5, _token$layout6, _token$layout7, _token$layout8, _token$layout9, _token$layout10, _token$layout11, _props$menuProps;
-    var defaultDom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ConfigProvider // @ts-ignore
+  }, renderKey);
+  const {
+    token
+  } = (0, _react.useContext)(_provider.ProProvider);
+  const contentDom = (0, _react.useMemo)(() => {
+    const defaultDom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ConfigProvider // @ts-ignore
     , {
       theme: {
         hashed: (0, _provider.isNeedOpenHash)(),
@@ -59,59 +61,66 @@ var TopNavHeader = exports.TopNavHeader = function TopNavHeader(props) {
             bodyBg: 'transparent'
           },
           Menu: {
-            itemBg: ((_token$layout = token.layout) === null || _token$layout === void 0 || (_token$layout = _token$layout.header) === null || _token$layout === void 0 ? void 0 : _token$layout.colorBgHeader) || 'transparent',
-            subMenuItemBg: ((_token$layout2 = token.layout) === null || _token$layout2 === void 0 || (_token$layout2 = _token$layout2.header) === null || _token$layout2 === void 0 ? void 0 : _token$layout2.colorBgHeader) || 'transparent',
+            itemBg: token.layout?.header?.colorBgHeader || 'transparent',
+            subMenuItemBg: token.layout?.header?.colorBgHeader || 'transparent',
             itemBorderRadius: token.borderRadius,
-            itemSelectedBg: ((_token$layout3 = token.layout) === null || _token$layout3 === void 0 || (_token$layout3 = _token$layout3.header) === null || _token$layout3 === void 0 ? void 0 : _token$layout3.colorBgMenuItemSelected) || (token === null || token === void 0 ? void 0 : token.colorBgTextHover),
-            horizontalItemSelectedBg: ((_token$layout4 = token.layout) === null || _token$layout4 === void 0 || (_token$layout4 = _token$layout4.header) === null || _token$layout4 === void 0 ? void 0 : _token$layout4.colorBgMenuItemSelected) || (token === null || token === void 0 ? void 0 : token.colorBgTextHover),
+            itemSelectedBg: token.layout?.header?.colorBgMenuItemSelected || token?.colorBgTextHover,
+            horizontalItemSelectedBg: token.layout?.header?.colorBgMenuItemSelected || token?.colorBgTextHover,
             activeBarWidth: 0,
             activeBarHeight: 0,
             activeBarBorderWidth: 0,
-            itemColor: ((_token$layout5 = token.layout) === null || _token$layout5 === void 0 || (_token$layout5 = _token$layout5.header) === null || _token$layout5 === void 0 ? void 0 : _token$layout5.colorTextMenu) || (token === null || token === void 0 ? void 0 : token.colorTextSecondary),
-            horizontalItemHoverColor: ((_token$layout6 = token.layout) === null || _token$layout6 === void 0 || (_token$layout6 = _token$layout6.header) === null || _token$layout6 === void 0 ? void 0 : _token$layout6.colorTextMenuActive) || (token === null || token === void 0 ? void 0 : token.colorText),
-            horizontalItemSelectedColor: ((_token$layout7 = token.layout) === null || _token$layout7 === void 0 || (_token$layout7 = _token$layout7.header) === null || _token$layout7 === void 0 ? void 0 : _token$layout7.colorTextMenuSelected) || (token === null || token === void 0 ? void 0 : token.colorTextBase),
+            itemColor: token.layout?.header?.colorTextMenu || token?.colorTextSecondary,
+            horizontalItemHoverColor: token.layout?.header?.colorTextMenuActive || token?.colorText,
+            horizontalItemSelectedColor: token.layout?.header?.colorTextMenuSelected || token?.colorTextBase,
             horizontalItemBorderRadius: 4,
-            itemHoverColor: ((_token$layout8 = token.layout) === null || _token$layout8 === void 0 || (_token$layout8 = _token$layout8.header) === null || _token$layout8 === void 0 ? void 0 : _token$layout8.colorTextMenuActive) || 'rgba(0, 0, 0, 0.85)',
-            horizontalItemHoverBg: ((_token$layout9 = token.layout) === null || _token$layout9 === void 0 || (_token$layout9 = _token$layout9.header) === null || _token$layout9 === void 0 ? void 0 : _token$layout9.colorBgMenuItemHover) || 'rgba(0, 0, 0, 0.04)',
-            itemSelectedColor: ((_token$layout10 = token.layout) === null || _token$layout10 === void 0 || (_token$layout10 = _token$layout10.header) === null || _token$layout10 === void 0 ? void 0 : _token$layout10.colorTextMenuSelected) || 'rgba(0, 0, 0, 1)',
-            popupBg: token === null || token === void 0 ? void 0 : token.colorBgElevated,
+            itemHoverColor: token.layout?.header?.colorTextMenuActive || 'rgba(0, 0, 0, 0.85)',
+            horizontalItemHoverBg: token.layout?.header?.colorBgMenuItemHover || 'rgba(0, 0, 0, 0.04)',
+            itemSelectedColor: token.layout?.header?.colorTextMenuSelected || 'rgba(0, 0, 0, 1)',
+            popupBg: token?.colorBgElevated,
             darkSubMenuItemBg: 'transparent',
-            darkPopupBg: token === null || token === void 0 ? void 0 : token.colorBgElevated
+            darkPopupBg: token?.colorBgElevated
           }
         },
         token: {
-          colorBgElevated: ((_token$layout11 = token.layout) === null || _token$layout11 === void 0 || (_token$layout11 = _token$layout11.header) === null || _token$layout11 === void 0 ? void 0 : _token$layout11.colorBgHeader) || 'transparent'
+          colorBgElevated: token.layout?.header?.colorBgHeader || 'transparent'
         }
       },
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseMenu.BaseMenu, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-        theme: dark ? 'dark' : 'light'
-      }, props), {}, {
-        className: "".concat(prefixCls, "-base-menu ").concat(hashId).trim()
-      }, props.menuProps), {}, {
-        style: (0, _objectSpread2.default)({
-          width: '100%'
-        }, (_props$menuProps = props.menuProps) === null || _props$menuProps === void 0 ? void 0 : _props$menuProps.style),
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseMenu.BaseMenu, {
+        theme: dark ? 'dark' : 'light',
+        ...props,
+        className: `${prefixCls}-base-menu ${hashId}`.trim(),
+        ...props.menuProps,
+        style: {
+          width: '100%',
+          ...props.menuProps?.style
+        },
         collapsed: false,
         menuRenderType: "header",
         mode: "horizontal"
-      }))
+      })
     });
     if (headerContentRender) {
       return headerContentRender(props, defaultDom);
     }
     return defaultDom;
-  }, [(_token$layout12 = token.layout) === null || _token$layout12 === void 0 || (_token$layout12 = _token$layout12.header) === null || _token$layout12 === void 0 ? void 0 : _token$layout12.colorBgHeader, (_token$layout13 = token.layout) === null || _token$layout13 === void 0 || (_token$layout13 = _token$layout13.header) === null || _token$layout13 === void 0 ? void 0 : _token$layout13.colorBgMenuItemSelected, (_token$layout14 = token.layout) === null || _token$layout14 === void 0 || (_token$layout14 = _token$layout14.header) === null || _token$layout14 === void 0 ? void 0 : _token$layout14.colorBgMenuItemHover, (_token$layout15 = token.layout) === null || _token$layout15 === void 0 || (_token$layout15 = _token$layout15.header) === null || _token$layout15 === void 0 ? void 0 : _token$layout15.colorTextMenu, (_token$layout16 = token.layout) === null || _token$layout16 === void 0 || (_token$layout16 = _token$layout16.header) === null || _token$layout16 === void 0 ? void 0 : _token$layout16.colorTextMenuActive, (_token$layout17 = token.layout) === null || _token$layout17 === void 0 || (_token$layout17 = _token$layout17.header) === null || _token$layout17 === void 0 ? void 0 : _token$layout17.colorTextMenuSelected, (_token$layout18 = token.layout) === null || _token$layout18 === void 0 || (_token$layout18 = _token$layout18.header) === null || _token$layout18 === void 0 ? void 0 : _token$layout18.colorBgMenuElevated, token.borderRadius, token === null || token === void 0 ? void 0 : token.colorBgTextHover, token === null || token === void 0 ? void 0 : token.colorTextSecondary, token === null || token === void 0 ? void 0 : token.colorText, token === null || token === void 0 ? void 0 : token.colorTextBase, token.colorBgElevated, dark, props, prefixCls, hashId, headerContentRender]);
+  }, [token.layout?.header?.colorBgHeader, token.layout?.header?.colorBgMenuItemSelected, token.layout?.header?.colorBgMenuItemHover, token.layout?.header?.colorTextMenu, token.layout?.header?.colorTextMenuActive, token.layout?.header?.colorTextMenuSelected, token.layout?.header?.colorBgMenuElevated, token.borderRadius, token?.colorBgTextHover, token?.colorTextSecondary, token?.colorText, token?.colorTextBase, token.colorBgElevated, dark, props, prefixCls, hashId, headerContentRender]);
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: (0, _classnames.default)(prefixCls, hashId, propsClassName, (0, _defineProperty2.default)({}, "".concat(prefixCls, "-light"), true)),
+    className: (0, _clsx.clsx)(prefixCls, hashId, propsClassName, {
+      [`${prefixCls}-light`]: true
+    }),
     style: style,
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       ref: ref,
-      className: (0, _classnames.default)("".concat(prefixCls, "-main"), hashId, (0, _defineProperty2.default)({}, "".concat(prefixCls, "-wide"), contentWidth === 'Fixed' && layout === 'top')),
+      className: (0, _clsx.clsx)(`${prefixCls}-main`, hashId, {
+        [`${prefixCls}-wide`]: contentWidth === 'Fixed' && layout === 'top'
+      }),
       children: [headerDom && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: (0, _classnames.default)("".concat(prefixCls, "-main-left ").concat(hashId)),
+        className: (0, _clsx.clsx)(`${prefixCls}-main-left ${hashId}`),
         onClick: onMenuHeaderClick,
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_AppsLogoComponents.AppsLogoComponents, (0, _objectSpread2.default)({}, props)), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "".concat(prefixCls, "-logo ").concat(hashId).trim(),
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_AppsLogoComponents.AppsLogoComponents, {
+          ...props
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: `${prefixCls}-logo ${hashId}`.trim(),
           id: "logo",
           children: headerDom
         }, "logo")]
@@ -119,11 +128,13 @@ var TopNavHeader = exports.TopNavHeader = function TopNavHeader(props) {
         style: {
           flex: 1
         },
-        className: "".concat(prefixCls, "-menu ").concat(hashId).trim(),
+        className: `${prefixCls}-menu ${hashId}`.trim(),
         children: contentDom
-      }), (actionsRender || props.avatarProps) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ActionsContent.ActionsContent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+      }), (actionsRender || props.avatarProps) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ActionsContent.ActionsContent, {
+        ...props,
         prefixCls: prefixCls
-      }))]
+      })]
     })
   }));
-};
+};
+exports.TopNavHeader = TopNavHeader;

package/lib/layout/components/TopNavHeader/style.js

@@ -1,83 +1,83 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useStyle = useStyle;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _provider = require("../../../provider");
-var genTopNavHeaderStyle = function genTopNavHeaderStyle(token) {
-  var _token$layout, _token$layout2;
-  return (0, _defineProperty2.default)({}, token.componentCls, {
-    position: 'relative',
-    width: '100%',
-    height: '100%',
-    backgroundColor: 'transparent',
-    '.anticon': {
-      color: 'inherit'
-    },
-    '&-main': {
-      display: 'flex',
-      height: '100%',
-      paddingInlineStart: '16px',
-      '&-left': (0, _defineProperty2.default)({
-        display: 'flex',
-        alignItems: 'center'
-      }, "".concat(token.proComponentsCls, "-layout-apps-icon"), {
-        marginInlineEnd: 16,
-        marginInlineStart: -8
-      })
-    },
-    '&-wide': {
-      maxWidth: 1152,
-      margin: '0 auto'
-    },
-    '&-logo': {
+const genTopNavHeaderStyle = token => {
+  return {
+    [token.componentCls]: {
       position: 'relative',
-      display: 'flex',
+      width: '100%',
       height: '100%',
-      alignItems: 'center',
-      overflow: 'hidden',
-      '> *:first-child': {
+      backgroundColor: 'transparent',
+      '.anticon': {
+        color: 'inherit'
+      },
+      '&-main': {
         display: 'flex',
-        alignItems: 'center',
-        minHeight: '22px',
-        fontSize: '22px'
+        height: '100%',
+        paddingInlineStart: '16px',
+        '&-left': {
+          display: 'flex',
+          alignItems: 'center',
+          [`${token.proComponentsCls}-layout-apps-icon`]: {
+            marginInlineEnd: 16,
+            marginInlineStart: -8
+          }
+        }
+      },
+      '&-wide': {
+        maxWidth: 1152,
+        margin: '0 auto'
       },
-      '> *:first-child > img': {
-        display: 'inline-block',
-        height: '32px',
-        verticalAlign: 'middle'
+      '&-logo': {
+        position: 'relative',
+        display: 'flex',
+        height: '100%',
+        alignItems: 'center',
+        overflow: 'hidden',
+        '> *:first-child': {
+          display: 'flex',
+          alignItems: 'center',
+          minHeight: '22px',
+          fontSize: '22px'
+        },
+        '> *:first-child > img': {
+          display: 'inline-block',
+          height: '32px',
+          verticalAlign: 'middle'
+        },
+        '> *:first-child > h1': {
+          display: 'inline-block',
+          marginBlock: 0,
+          marginInline: 0,
+          lineHeight: '24px',
+          marginInlineStart: 6,
+          fontWeight: '600',
+          fontSize: '16px',
+          color: token.layout?.header?.colorHeaderTitle,
+          verticalAlign: 'top'
+        }
       },
-      '> *:first-child > h1': {
-        display: 'inline-block',
-        marginBlock: 0,
-        marginInline: 0,
-        lineHeight: '24px',
-        marginInlineStart: 6,
-        fontWeight: '600',
-        fontSize: '16px',
-        color: (_token$layout = token.layout) === null || _token$layout === void 0 || (_token$layout = _token$layout.header) === null || _token$layout === void 0 ? void 0 : _token$layout.colorHeaderTitle,
-        verticalAlign: 'top'
+      '&-menu': {
+        minWidth: 0,
+        display: 'flex',
+        alignItems: 'center',
+        paddingInline: 6,
+        paddingBlock: 6,
+        lineHeight: `${Math.max((token.layout?.header?.heightLayoutHeader || 56) - 12, 40)}px`
       }
-    },
-    '&-menu': {
-      minWidth: 0,
-      display: 'flex',
-      alignItems: 'center',
-      paddingInline: 6,
-      paddingBlock: 6,
-      lineHeight: "".concat(Math.max((((_token$layout2 = token.layout) === null || _token$layout2 === void 0 || (_token$layout2 = _token$layout2.header) === null || _token$layout2 === void 0 ? void 0 : _token$layout2.heightLayoutHeader) || 56) - 12, 40), "px")
     }
-  });
+  };
 };
 function useStyle(prefixCls) {
-  return (0, _provider.useStyle)('ProLayoutTopNavHeader', function (token) {
-    var topNavHeaderToken = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, token), {}, {
-      componentCls: ".".concat(prefixCls)
-    });
+  return (0, _provider.useStyle)('ProLayoutTopNavHeader', token => {
+    const topNavHeaderToken = {
+      ...token,
+      componentCls: `.${prefixCls}`
+    };
     return [genTopNavHeaderStyle(topNavHeaderToken)];
   });
 }

package/lib/layout/context/RouteContext.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RouteContext = void 0;
 var _react = require("react");
-var RouteContext = exports.RouteContext = /*#__PURE__*/(0, _react.createContext)({});
+const RouteContext = exports.RouteContext = /*#__PURE__*/(0, _react.createContext)({});

package/lib/layout/defaultSettings.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defaultSettings = void 0;
-var defaultSettings = exports.defaultSettings = {
+const defaultSettings = exports.defaultSettings = {
   navTheme: 'light',
   layout: 'side',
   contentWidth: 'Fluid',

package/lib/layout/getPageTitle.js

@@ -1,17 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.matchParamsPath = exports.getPageTitleInfo = exports.getPageTitle = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _pathToRegexp = require("path-to-regexp");
-var matchParamsPath = exports.matchParamsPath = function matchParamsPath(pathname, breadcrumb, breadcrumbMap) {
+const matchParamsPath = (pathname, breadcrumb, breadcrumbMap) => {
   // Internal logic use breadcrumbMap to ensure the order
   // 内部逻辑使用 breadcrumbMap 来确保查询顺序
   if (breadcrumbMap) {
-    var pathKey = (0, _toConsumableArray2.default)(breadcrumbMap.keys()).find(function (key) {
+    const pathKey = [...breadcrumbMap.keys()].find(key => {
       try {
         if (key.startsWith('http')) {
           return false;
@@ -30,9 +28,9 @@ var matchParamsPath = exports.matchParamsPath = function matchParamsPath(pathnam
   // External uses use breadcrumb
   // 外部用户使用 breadcrumb 参数
   if (breadcrumb) {
-    var _pathKey = Object.keys(breadcrumb).find(function (key) {
+    const pathKey = Object.keys(breadcrumb).find(key => {
       try {
-        if (key !== null && key !== void 0 && key.startsWith('http')) {
+        if (key?.startsWith('http')) {
           return false;
         }
         return (0, _pathToRegexp.match)(key)(pathname);
@@ -41,33 +39,34 @@ var matchParamsPath = exports.matchParamsPath = function matchParamsPath(pathnam
         return false;
       }
     });
-    if (_pathKey) {
-      return breadcrumb[_pathKey];
+    if (pathKey) {
+      return breadcrumb[pathKey];
     }
   }
   return {
     path: ''
   };
 };
+exports.matchParamsPath = matchParamsPath;
 /**
  * 获取关于 pageTitle 的所有信息方便包装
  *
  * @param props
  * @param ignoreTitle
  */
-var getPageTitleInfo = exports.getPageTitleInfo = function getPageTitleInfo(props, ignoreTitle) {
-  var _props$pathname = props.pathname,
-    pathname = _props$pathname === void 0 ? '/' : _props$pathname,
-    breadcrumb = props.breadcrumb,
-    breadcrumbMap = props.breadcrumbMap,
-    formatMessage = props.formatMessage,
-    title = props.title,
-    _props$menu = props.menu,
-    menu = _props$menu === void 0 ? {
+const getPageTitleInfo = (props, ignoreTitle) => {
+  const {
+    pathname = '/',
+    breadcrumb,
+    breadcrumbMap,
+    formatMessage,
+    title,
+    menu = {
       locale: false
-    } : _props$menu;
-  var pageTitle = ignoreTitle ? '' : title || '';
-  var currRouterData = matchParamsPath(pathname, breadcrumb, breadcrumbMap);
+    }
+  } = props;
+  const pageTitle = ignoreTitle ? '' : title || '';
+  const currRouterData = matchParamsPath(pathname, breadcrumb, breadcrumbMap);
   if (!currRouterData) {
     return {
       title: pageTitle,
@@ -75,7 +74,7 @@ var getPageTitleInfo = exports.getPageTitleInfo = function getPageTitleInfo(prop
       pageName: pageTitle
     };
   }
-  var pageName = currRouterData.name;
+  let pageName = currRouterData.name;
   if (menu.locale !== false && currRouterData.locale && formatMessage) {
     pageName = formatMessage({
       id: currRouterData.locale || '',
@@ -93,15 +92,17 @@ var getPageTitleInfo = exports.getPageTitleInfo = function getPageTitleInfo(prop
     return {
       title: pageName,
       id: currRouterData.locale || '',
-      pageName: pageName
+      pageName
     };
   }
   return {
-    title: "".concat(pageName, " - ").concat(title),
+    title: `${pageName} - ${title}`,
     id: currRouterData.locale || '',
-    pageName: pageName
+    pageName
   };
 };
-var getPageTitle = exports.getPageTitle = function getPageTitle(props, ignoreTitle) {
+exports.getPageTitleInfo = getPageTitleInfo;
+const getPageTitle = (props, ignoreTitle) => {
   return getPageTitleInfo(props, ignoreTitle).title;
-};
+};
+exports.getPageTitle = getPageTitle;

package/lib/layout/index.js

@@ -22,92 +22,92 @@ var _exportNames = {
 };
 Object.defineProperty(exports, "DefaultFooter", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _Footer.DefaultFooter;
   }
 });
 Object.defineProperty(exports, "DefaultHeader", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _Header.DefaultHeader;
   }
 });
 Object.defineProperty(exports, "FooterToolbar", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _FooterToolbar.FooterToolbar;
   }
 });
 Object.defineProperty(exports, "GridContent", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _GridContent.GridContent;
   }
 });
 Object.defineProperty(exports, "PageContainer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _PageContainer.PageContainer;
   }
 });
 Object.defineProperty(exports, "PageHeader", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _PageHeader.PageHeader;
   }
 });
 Object.defineProperty(exports, "PageLoading", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _PageLoading.PageLoading;
   }
 });
 Object.defineProperty(exports, "ProBreadcrumb", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _PageContainer.ProBreadcrumb;
   }
 });
 Object.defineProperty(exports, "ProLayout", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _ProLayout.ProLayout;
   }
 });
 Object.defineProperty(exports, "ProPageHeader", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _PageContainer.ProPageHeader;
   }
 });
 Object.defineProperty(exports, "RouteContext", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _RouteContext.RouteContext;
   }
 });
 Object.defineProperty(exports, "SettingDrawer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _SettingDrawer.SettingDrawer;
   }
 });
 Object.defineProperty(exports, "TopNavHeader", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _TopNavHeader.TopNavHeader;
   }
 });
 exports.default = void 0;
 Object.defineProperty(exports, "getMenuData", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _getMenuData.getMenuData;
   }
 });
 Object.defineProperty(exports, "getPageTitle", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _getPageTitle.getPageTitle;
   }
 });
@@ -131,7 +131,7 @@ Object.keys(_Help).forEach(function (key) {
   if (key in exports && exports[key] === _Help[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function get() {
+    get: function () {
       return _Help[key];
     }
   });

package/lib/layout/locales/en-US.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _settingDrawer = _interopRequireDefault(require("./en-US/settingDrawer"));
-var _default = exports.default = (0, _objectSpread2.default)({}, _settingDrawer.default);
+var _default = exports.default = {
+  ..._settingDrawer.default
+};

package/lib/layout/locales/index.js

@@ -11,20 +11,22 @@ var _itIT = _interopRequireDefault(require("./it-IT"));
 var _koKR = _interopRequireDefault(require("./ko-KR"));
 var _zhCN = _interopRequireDefault(require("./zh-CN"));
 var _zhTW = _interopRequireDefault(require("./zh-TW"));
-var locales = {
+const locales = {
   'zh-CN': _zhCN.default,
   'zh-TW': _zhTW.default,
   'en-US': _enUS.default,
   'it-IT': _itIT.default,
   'ko-KR': _koKR.default
 };
-var getLanguage = exports.getLanguage = function getLanguage() {
+const getLanguage = () => {
   // support ssr
   if (!(0, _utils.isBrowser)()) return 'zh-CN';
-  var lang = window.localStorage.getItem('umi_locale');
+  const lang = window.localStorage.getItem('umi_locale');
   return lang || window.g_locale || navigator.language;
 };
-var gLocaleObject = exports.gLocaleObject = function gLocaleObject() {
-  var gLocale = getLanguage();
+exports.getLanguage = getLanguage;
+const gLocaleObject = () => {
+  const gLocale = getLanguage();
   return locales[gLocale] || locales['zh-CN'];
-};
+};
+exports.gLocaleObject = gLocaleObject;

package/lib/layout/locales/it-IT.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _settingDrawer = _interopRequireDefault(require("./it-IT/settingDrawer"));
-var _default = exports.default = (0, _objectSpread2.default)({}, _settingDrawer.default);
+var _default = exports.default = {
+  ..._settingDrawer.default
+};