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

package/es/layout/utils/getBreadcrumbProps.js

@@ -1,33 +1,30 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { match } from 'path-to-regexp';
 import { urlToList } from "./pathTools";
 import { jsx as _jsx } from "react/jsx-runtime";
 // 渲染 Breadcrumb 子节点
 // Render the Breadcrumb child node
-var defaultItemRender = function defaultItemRender(route, _, routes) {
-  var _ref = route,
-    breadcrumbName = _ref.breadcrumbName,
-    title = _ref.title,
-    path = _ref.path;
-  var last = routes.findIndex(function (i) {
-    return (
-      // @ts-ignore
-      i.linkPath === route.path
-    );
-  }) === routes.length - 1;
+const defaultItemRender = (route, _, routes) => {
+  const {
+    breadcrumbName,
+    title,
+    path
+  } = route;
+  const last = routes.findIndex(i =>
+  // @ts-ignore
+  i.linkPath === route.path) === routes.length - 1;
   return last ? /*#__PURE__*/_jsx("span", {
     children: title || breadcrumbName
   }) : /*#__PURE__*/_jsx("span", {
-    onClick: path ? function () {
-      return location.href = path;
-    } : undefined,
+    onClick: path ? () => location.href = path : undefined,
     children: title || breadcrumbName
   });
 };
-var renderItemLocal = function renderItemLocal(item, props) {
-  var formatMessage = props.formatMessage,
-    menu = props.menu;
-  if (item.locale && formatMessage && (menu === null || menu === void 0 ? void 0 : menu.locale) !== false) {
+const renderItemLocal = (item, props) => {
+  const {
+    formatMessage,
+    menu
+  } = props;
+  if (item.locale && formatMessage && menu?.locale !== false) {
     return formatMessage({
       id: item.locale,
       defaultMessage: item.name
@@ -35,15 +32,15 @@ var renderItemLocal = function renderItemLocal(item, props) {
   }
   return item.name;
 };
-export var getBreadcrumb = function getBreadcrumb(breadcrumbMap, url) {
-  var breadcrumbItem = breadcrumbMap.get(url);
+export const getBreadcrumb = (breadcrumbMap, url) => {
+  let breadcrumbItem = breadcrumbMap.get(url);
   if (!breadcrumbItem) {
     // Find the first matching path in the order defined by route config
     // 按照 route config 定义的顺序找到第一个匹配的路径
-    var keys = Array.from(breadcrumbMap.keys()) || [];
-    var targetPath = keys.find(function (path) {
+    const keys = Array.from(breadcrumbMap.keys()) || [];
+    const targetPath = keys.find(path => {
       try {
-        if (path !== null && path !== void 0 && path.startsWith('http')) return false;
+        if (path?.startsWith('http')) return false;
         return match(path.replace('?', ''))(url);
       } catch (error) {
         return false;
@@ -57,22 +54,26 @@ export var getBreadcrumb = function getBreadcrumb(breadcrumbMap, url) {
     path: ''
   };
 };
-export var getBreadcrumbFromProps = function getBreadcrumbFromProps(props) {
-  var location = props.location,
-    breadcrumbMap = props.breadcrumbMap;
+export const getBreadcrumbFromProps = props => {
+  const {
+    location,
+    breadcrumbMap
+  } = props;
   return {
-    location: location,
-    breadcrumbMap: breadcrumbMap
+    location,
+    breadcrumbMap
   };
 };
-var conversionFromLocation = function conversionFromLocation(routerLocation, breadcrumbMap, props) {
+const conversionFromLocation = (routerLocation, breadcrumbMap, props) => {
   // Convertor the url to an array
-  var pathSnippets = urlToList(routerLocation === null || routerLocation === void 0 ? void 0 : routerLocation.pathname);
+  const pathSnippets = urlToList(routerLocation?.pathname);
   // Loop data mosaic routing
-  var extraBreadcrumbItems = pathSnippets.map(function (url) {
-    var currentBreadcrumb = getBreadcrumb(breadcrumbMap, url);
-    var name = renderItemLocal(currentBreadcrumb, props);
-    var hideInBreadcrumb = currentBreadcrumb.hideInBreadcrumb;
+  const extraBreadcrumbItems = pathSnippets.map(url => {
+    const currentBreadcrumb = getBreadcrumb(breadcrumbMap, url);
+    const name = renderItemLocal(currentBreadcrumb, props);
+    const {
+      hideInBreadcrumb
+    } = currentBreadcrumb;
     return name && !hideInBreadcrumb ? {
       linkPath: url,
       breadcrumbName: name,
@@ -83,16 +84,15 @@ var conversionFromLocation = function conversionFromLocation(routerLocation, bre
       breadcrumbName: '',
       title: ''
     };
-  }).filter(function (item) {
-    return item && item.linkPath;
-  });
+  }).filter(item => item && item.linkPath);
   return extraBreadcrumbItems;
 };
 /** 将参数转化为面包屑 Convert parameters into breadcrumbs */
-export var genBreadcrumbProps = function genBreadcrumbProps(props) {
-  var _getBreadcrumbFromPro = getBreadcrumbFromProps(props),
-    location = _getBreadcrumbFromPro.location,
-    breadcrumbMap = _getBreadcrumbFromPro.breadcrumbMap;
+export const genBreadcrumbProps = props => {
+  const {
+    location,
+    breadcrumbMap
+  } = getBreadcrumbFromProps(props);
 
   // 根据 location 生成 面包屑
   // Generate breadcrumbs based on location
@@ -103,30 +103,30 @@ export var genBreadcrumbProps = function genBreadcrumbProps(props) {
 };
 
 // 声明一个导出函数，接收两个参数：BreadcrumbProps和ProLayoutProps，返回一个BreadcrumbListReturn类型的对象
-export var getBreadcrumbProps = function getBreadcrumbProps(props, layoutPros // ProLayoutProps类型的layoutPros
-) {
+export const getBreadcrumbProps = (props, layoutPros // ProLayoutProps类型的layoutPros
+) => {
   // 解构赋值获取props中的breadcrumbRender和props中的itemRender，如果props中没有itemRender则使用默认的defaultItemRender函数
-  var breadcrumbRender = props.breadcrumbRender,
-    propsItemRender = props.itemRender;
+  const {
+    breadcrumbRender,
+    itemRender: propsItemRender
+  } = props;
   // 解构赋值获取layoutPros.breadcrumbProps.minLenght的值，如果没有设置，则默认为2
-  var _ref2 = layoutPros.breadcrumbProps || {},
-    _ref2$minLength = _ref2.minLength,
-    minLength = _ref2$minLength === void 0 ? 2 : _ref2$minLength;
+  const {
+    minLength = 2
+  } = layoutPros.breadcrumbProps || {};
   // 生成面包屑的路由数组，该数组中包含菜单项和面包屑项
-  var routesArray = genBreadcrumbProps(props);
+  const routesArray = genBreadcrumbProps(props);
   // 如果props中有itemRender，则使用props中的itemRender，否则使用默认函数defaultItemRender
-  var itemRender = function itemRender(item) {
-    var renderFunction = propsItemRender || defaultItemRender;
-    for (var _len = arguments.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      rest[_key - 1] = arguments[_key];
-    }
-    return renderFunction === null || renderFunction === void 0 ? void 0 : renderFunction.apply(void 0, [_objectSpread(_objectSpread({}, item), {}, {
+  const itemRender = (item, ...rest) => {
+    const renderFunction = propsItemRender || defaultItemRender;
+    return renderFunction?.({
+      ...item,
       // 如果item.linkPath存在，则使用item.linkPath，否则使用item.path
       // @ts-ignore
       path: item.linkPath || item.path
-    })].concat(rest));
+    }, ...rest);
   };
-  var items = routesArray;
+  let items = routesArray;
   // 如果面包屑渲染函数breadcrumbRender存在，则使用其渲染数组items
   if (breadcrumbRender) {
     items = breadcrumbRender(items || []) || undefined;
@@ -137,7 +137,7 @@ export var getBreadcrumbProps = function getBreadcrumbProps(props, layoutPros //
   }
   // 如果当前 ant design 包的版本大于等于5.3.0，则返回一个对象{items,itemRender},否则返回一个对象{routes:item,itemRender}
   return {
-    items: items,
-    itemRender: itemRender
+    items,
+    itemRender
   };
 };

package/es/layout/utils/getMenuData.js

@@ -1,25 +1,21 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { transformRoute } from '@umijs/route-utils';
 function fromEntries(iterable) {
-  return _toConsumableArray(iterable).reduce(function (obj, _ref) {
-    var _ref2 = _slicedToArray(_ref, 2),
-      key = _ref2[0],
-      val = _ref2[1];
+  return [...iterable].reduce((obj, [key, val]) => {
     // eslint-disable-next-line no-param-reassign
     obj[key] = val;
     return obj;
   }, {});
 }
-var getMenuData = function getMenuData(routes, menu, formatMessage, menuDataRender) {
-  var _transformRoute = transformRoute(routes, (menu === null || menu === void 0 ? void 0 : menu.locale) || false, formatMessage, true),
-    menuData = _transformRoute.menuData,
-    breadcrumb = _transformRoute.breadcrumb;
+const getMenuData = (routes, menu, formatMessage, menuDataRender) => {
+  const {
+    menuData,
+    breadcrumb
+  } = transformRoute(routes, menu?.locale || false, formatMessage, true);
   if (!menuDataRender) {
     return {
       breadcrumb: fromEntries(breadcrumb),
       breadcrumbMap: breadcrumb,
-      menuData: menuData
+      menuData
     };
   }
   return getMenuData(menuDataRender(menuData), menu, formatMessage, undefined);

package/es/layout/utils/pathTools.js

@@ -3,10 +3,6 @@ export function urlToList(url) {
   if (!url || url === '/') {
     return ['/'];
   }
-  var urlList = url.split('/').filter(function (i) {
-    return i;
-  });
-  return urlList.map(function (urlItem, index) {
-    return "/".concat(urlList.slice(0, index + 1).join('/'));
-  });
+  const urlList = url.split('/').filter(i => i);
+  return urlList.map((urlItem, index) => `/${urlList.slice(0, index + 1).join('/')}`);
 }

package/es/layout/utils/useCurrentMenuLayoutProps.js

@@ -1,16 +1,11 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useEffect, useState } from 'react';
 import { omitUndefined } from "../../utils";
-var useCurrentMenuLayoutProps = function useCurrentMenuLayoutProps(currentMenu) {
-  var _useState = useState({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    currentMenuLayoutProps = _useState2[0],
-    setCurrentMenuLayoutProps = _useState2[1];
-  useEffect(function () {
+const useCurrentMenuLayoutProps = currentMenu => {
+  const [currentMenuLayoutProps, setCurrentMenuLayoutProps] = useState({});
+  useEffect(() => {
     setCurrentMenuLayoutProps(omitUndefined({
       // 有时候会变成对象，是原来的方式
-      layout: _typeof(currentMenu.layout) !== 'object' ? currentMenu.layout : undefined,
+      layout: typeof currentMenu.layout !== 'object' ? currentMenu.layout : undefined,
       navTheme: currentMenu.navTheme,
       menuRender: currentMenu.menuRender,
       footerRender: currentMenu.footerRender,

package/es/layout/utils/utils.js

@@ -1,6 +1,5 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-export var getOpenKeysFromMenuData = function getOpenKeysFromMenuData(menuData) {
-  return (menuData || []).reduce(function (pre, item) {
+export const getOpenKeysFromMenuData = menuData => {
+  return (menuData || []).reduce((pre, item) => {
     // 如果是 flatMenu，跳过自己，只递归 children
     if (item.flatMenu) {
       if (item.children) {
@@ -12,13 +11,13 @@ export var getOpenKeysFromMenuData = function getOpenKeysFromMenuData(menuData)
       pre.push(item.key);
     }
     if (item.children) {
-      var newArray = pre.concat(getOpenKeysFromMenuData(item.children) || []);
+      const newArray = pre.concat(getOpenKeysFromMenuData(item.children) || []);
       return newArray;
     }
     return pre;
   }, []);
 };
-var themeConfig = {
+const themeConfig = {
   techBlue: '#1677FF',
   daybreak: '#1890ff',
   dust: '#F5222D',
@@ -38,25 +37,24 @@ export function genStringToTheme(val) {
   return val && themeConfig[val] ? themeConfig[val] : val || '';
 }
 export function clearMenuItem(menusData) {
-  return menusData.map(function (item) {
-    var children = item.children || [];
-    var finalItem = _objectSpread({}, item);
+  return menusData.map(item => {
+    const children = item.children || [];
+    const finalItem = {
+      ...item
+    };
     if (!finalItem.name || finalItem.hideInMenu) {
       return null;
     }
-    if (finalItem && finalItem !== null && finalItem !== void 0 && finalItem.children) {
-      if (!finalItem.hideChildrenInMenu && children.some(function (child) {
-        return child && child.name && !child.hideInMenu;
-      })) {
-        return _objectSpread(_objectSpread({}, item), {}, {
+    if (finalItem && finalItem?.children) {
+      if (!finalItem.hideChildrenInMenu && children.some(child => child && child.name && !child.hideInMenu)) {
+        return {
+          ...item,
           children: clearMenuItem(children)
-        });
+        };
       }
       // children 为空就直接删掉
       delete finalItem.children;
     }
     return finalItem;
-  }).filter(function (item) {
-    return item;
-  });
+  }).filter(item => item);
 }