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

package/lib/table/utils/index.js

@@ -1,28 +1,19 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isMergeCell = exports.isLocaleSorter = exports.isLocaleFilter = exports.isBordered = exports.getServerSorterResult = exports.getServerFilterResult = exports.genColumnKey = exports.flattenColumns = exports.checkUndefinedOrNull = void 0;
+exports.isMergeCell = exports.isLocaleSorter = exports.isLocaleFilter = exports.isLocalSorter = exports.isLocalFilter = exports.isBordered = exports.getServerSorterResult = exports.getServerFilterResult = exports.genColumnKey = exports.flattenColumns = exports.checkUndefinedOrNull = void 0;
 exports.mergePagination = mergePagination;
 exports.parseServerDefaultColumnConfig = exports.parseProSortOrder = exports.parseProFilteredValue = exports.parseDataIndex = void 0;
 exports.postDataPipeline = postDataPipeline;
 exports.useActionType = useActionType;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 /**
  * 检查值是否存在 为了 避开 0 和 false
  *
  * @param value
  */
-var checkUndefinedOrNull = exports.checkUndefinedOrNull = function checkUndefinedOrNull(value) {
-  return value !== undefined && value !== null;
-};
+const checkUndefinedOrNull = value => value !== undefined && value !== null;
 
 /**
  * 合并用户 props 和 预设的 props
@@ -31,28 +22,29 @@ var checkUndefinedOrNull = exports.checkUndefinedOrNull = function checkUndefine
  * @param action
  * @param intl
  */
+exports.checkUndefinedOrNull = checkUndefinedOrNull;
 function mergePagination(pagination, pageInfo, intl) {
-  var _pagination$current, _pagination$pageSize;
   if (pagination === false) {
     return false;
   }
-  var total = pageInfo.total,
-    current = pageInfo.current,
-    pageSize = pageInfo.pageSize,
-    setPageInfo = pageInfo.setPageInfo;
-  var defaultPagination = (0, _typeof2.default)(pagination) === 'object' ? pagination : {};
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    showTotal: function showTotal(all, range) {
-      return "".concat(intl.getMessage('pagination.total.range', '第'), " ").concat(range[0], "-").concat(range[1], " ").concat(intl.getMessage('pagination.total.total', '条/总共'), " ").concat(all, " ").concat(intl.getMessage('pagination.total.item', '条'));
-    },
-    total: total
-  }, defaultPagination), {}, {
-    current: pagination !== true && pagination ? (_pagination$current = pagination.current) !== null && _pagination$current !== void 0 ? _pagination$current : current : current,
-    pageSize: pagination !== true && pagination ? (_pagination$pageSize = pagination.pageSize) !== null && _pagination$pageSize !== void 0 ? _pagination$pageSize : pageSize : pageSize,
-    onChange: function onChange(page, newPageSize) {
-      var _ref = pagination,
-        onChange = _ref.onChange;
-      onChange === null || onChange === void 0 || onChange(page, newPageSize || 20);
+  const {
+    total,
+    current,
+    pageSize,
+    setPageInfo
+  } = pageInfo;
+  const defaultPagination = typeof pagination === 'object' ? pagination : {};
+  return {
+    showTotal: (all, range) => `${intl.getMessage('pagination.total.range', '第')} ${range[0]}-${range[1]} ${intl.getMessage('pagination.total.total', '条/总共')} ${all} ${intl.getMessage('pagination.total.item', '条')}`,
+    total,
+    ...defaultPagination,
+    current: pagination !== true && pagination ? pagination.current ?? current : current,
+    pageSize: pagination !== true && pagination ? pagination.pageSize ?? pageSize : pageSize,
+    onChange: (page, newPageSize) => {
+      const {
+        onChange
+      } = pagination;
+      onChange?.(page, newPageSize || 20);
       // pageSize 改变之后就没必要切换页码
       if (newPageSize !== pageSize || current !== page) {
         setPageInfo({
@@ -61,7 +53,7 @@ function mergePagination(pagination, pageInfo, intl) {
         });
       }
     }
-  });
+  };
 }
 
 /**
@@ -73,99 +65,39 @@ function mergePagination(pagination, pageInfo, intl) {
  */
 function useActionType(ref, action, props) {
   /** 这里生成action的映射，保证 action 总是使用的最新 只需要渲染一次即可 */
-  var userAction = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.editableUtils), {}, {
+  const userAction = {
+    ...props.editableUtils,
     pageInfo: action.pageInfo,
     nativeElement: props.nativeElement,
     focus: props.focus,
-    reload: function () {
-      var _reload = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(resetPageIndex) {
-        return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              if (!resetPageIndex) {
-                _context.next = 3;
-                break;
-              }
-              _context.next = 3;
-              return action.setPageInfo({
-                current: 1
-              });
-            case 3:
-              _context.next = 5;
-              return action === null || action === void 0 ? void 0 : action.reload();
-            case 5:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      function reload(_x) {
-        return _reload.apply(this, arguments);
-      }
-      return reload;
-    }(),
-    reloadAndRest: function () {
-      var _reloadAndRest = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
-        return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              // reload 之后大概率会切换数据，清空一下选择。
-              props.onCleanSelected();
-              _context2.next = 3;
-              return action.setPageInfo({
-                current: 1
-              });
-            case 3:
-              _context2.next = 5;
-              return action === null || action === void 0 ? void 0 : action.reload();
-            case 5:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      function reloadAndRest() {
-        return _reloadAndRest.apply(this, arguments);
-      }
-      return reloadAndRest;
-    }(),
-    reset: function () {
-      var _reset = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
-        var _action$reset;
-        return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 2;
-              return props.resetAll();
-            case 2:
-              _context3.next = 4;
-              return action === null || action === void 0 || (_action$reset = action.reset) === null || _action$reset === void 0 ? void 0 : _action$reset.call(action);
-            case 4:
-              _context3.next = 6;
-              return action === null || action === void 0 ? void 0 : action.reload();
-            case 6:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3);
-      }));
-      function reset() {
-        return _reset.apply(this, arguments);
+    reload: async resetPageIndex => {
+      // 如果为 true，回到第一页
+      if (resetPageIndex) {
+        await action.setPageInfo({
+          current: 1
+        });
       }
-      return reset;
-    }(),
-    fullScreen: function fullScreen() {
-      return props.fullScreen();
+      await action?.reload();
     },
-    clearSelected: function clearSelected() {
-      return props.onCleanSelected();
+    reloadAndRest: async () => {
+      // reload 之后大概率会切换数据，清空一下选择。
+      props.onCleanSelected();
+      await action.setPageInfo({
+        current: 1
+      });
+      await action?.reload();
     },
-    setPageInfo: function setPageInfo(rest) {
-      return action.setPageInfo(rest);
+    reset: async () => {
+      await props.resetAll();
+      await action?.reset?.();
+      await action?.reload();
     },
+    fullScreen: () => props.fullScreen(),
+    clearSelected: () => props.onCleanSelected(),
+    setPageInfo: rest => action.setPageInfo(rest),
     // 透出 scrollTo（如上层提供）
     scrollTo: props.scrollTo
-  });
+  };
   // eslint-disable-next-line no-param-reassign
   ref.current = userAction;
 }
@@ -176,16 +108,14 @@ function useActionType(ref, action, props) {
  * @param pipeline
  */
 function postDataPipeline(data, pipeline) {
-  if (pipeline.filter(function (item) {
-    return item;
-  }).length < 1) {
+  if (pipeline.filter(item => item).length < 1) {
     return data;
   }
-  return pipeline.reduce(function (pre, postData) {
+  return pipeline.reduce((pre, postData) => {
     return postData(pre);
   }, data);
 }
-var isBordered = exports.isBordered = function isBordered(borderType, border) {
+const isBordered = (borderType, border) => {
   if (border === undefined) {
     return false;
   }
@@ -194,11 +124,9 @@ var isBordered = exports.isBordered = function isBordered(borderType, border) {
   }
   return border[borderType];
 };
-var isMergeCell = exports.isMergeCell = function isMergeCell(dom // 如果是合并单元格的，直接返回对象
-) {
-  var _dom$props;
-  return dom && (0, _typeof2.default)(dom) === 'object' && (dom === null || dom === void 0 || (_dom$props = dom.props) === null || _dom$props === void 0 ? void 0 : _dom$props.colSpan);
-};
+exports.isBordered = isBordered;
+const isMergeCell = (dom // 如果是合并单元格的，直接返回对象
+) => dom && typeof dom === 'object' && dom?.props?.colSpan;
 
 /**
  * 根据 key 和 dataIndex 生成唯一 id
@@ -207,11 +135,12 @@ var isMergeCell = exports.isMergeCell = function isMergeCell(dom // 如果是合
  * @param dataIndex 在对象中的数据
  * @param index 序列号，理论上唯一
  */
-var genColumnKey = exports.genColumnKey = function genColumnKey(key, index) {
+exports.isMergeCell = isMergeCell;
+const genColumnKey = (key, index) => {
   if (key) {
     return Array.isArray(key) ? key.join('-') : key.toString();
   }
-  return "".concat(index);
+  return `${index}`;
 };
 
 /**
@@ -219,11 +148,12 @@ var genColumnKey = exports.genColumnKey = function genColumnKey(key, index) {
  *
  * @param dataIndex Column 中的 dataIndex
  */
-var parseDataIndex = exports.parseDataIndex = function parseDataIndex(dataIndex) {
+exports.genColumnKey = genColumnKey;
+const parseDataIndex = dataIndex => {
   if (Array.isArray(dataIndex)) {
     return dataIndex.join(',');
   }
-  return dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString();
+  return dataIndex?.toString();
 };
 
 /**
@@ -231,12 +161,13 @@ var parseDataIndex = exports.parseDataIndex = function parseDataIndex(dataIndex)
  * @param data 列配置
  * @returns 平铺后的列配置
  */
-var flattenColumns = exports.flattenColumns = function flattenColumns(data) {
-  var _columns = [];
-  for (var i = 0; i < data.length; i++) {
-    var _curItem = data[i];
+exports.parseDataIndex = parseDataIndex;
+const flattenColumns = data => {
+  const _columns = [];
+  for (let i = 0; i < data.length; i++) {
+    const _curItem = data[i];
     if (_curItem.children) {
-      _columns.push.apply(_columns, (0, _toConsumableArray2.default)(flattenColumns(_curItem.children)));
+      _columns.push(...flattenColumns(_curItem.children));
     } else {
       _columns.push(_curItem);
     }
@@ -250,35 +181,45 @@ var flattenColumns = exports.flattenColumns = function flattenColumns(data) {
  * @param onFilter 筛选函数
  * @returns 是否为本地筛选
  */
-var isLocaleFilter = exports.isLocaleFilter = function isLocaleFilter(filters, onFilter) {
+exports.flattenColumns = flattenColumns;
+const isLocalFilter = (filters, onFilter) => {
   return !!filters && !!onFilter;
 };
 
+/**
+ * @deprecated typo kept for backward compatibility
+ * use `isLocalFilter` instead
+ */
+exports.isLocalFilter = isLocalFilter;
+const isLocaleFilter = exports.isLocaleFilter = isLocalFilter;
+
 /**
  * 判断是否为本地排序
  * @param sorter 排序配置
  * @returns 是否为本地排序
  */
-var isLocaleSorter = exports.isLocaleSorter = function isLocaleSorter(sorter) {
-  return typeof sorter === 'function' || (0, _typeof2.default)(sorter) === 'object' && typeof sorter.compare === 'function';
+const isLocalSorter = sorter => {
+  return typeof sorter === 'function' || typeof sorter === 'object' && typeof sorter.compare === 'function';
 };
 
+/**
+ * @deprecated typo kept for backward compatibility
+ * use `isLocalSorter` instead
+ */
+exports.isLocalSorter = isLocalSorter;
+const isLocaleSorter = exports.isLocaleSorter = isLocalSorter;
+
 /**
  * 获取服务端筛选数据
  * @param filters 筛选数据
  * @param columns 列配置
  * @returns 服务端筛选数据
  */
-var getServerFilterResult = exports.getServerFilterResult = function getServerFilterResult(filters, columns) {
+const getServerFilterResult = (filters, columns) => {
   // 过滤掉本地筛选的列
-  return Object.entries(filters).reduce(function (acc, _ref2) {
-    var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-      key = _ref3[0],
-      value = _ref3[1];
-    var column = columns.find(function (column) {
-      return parseDataIndex(column.dataIndex) === key;
-    });
-    if (column != null && !isLocaleFilter(column.filters, column.onFilter)) acc[key] = value;
+  return Object.entries(filters).reduce((acc, [key, value]) => {
+    const column = columns.find(column => parseDataIndex(column.dataIndex) === key);
+    if (column != null && !isLocalFilter(column.filters, column.onFilter)) acc[key] = value;
     return acc;
   }, {});
 };
@@ -288,13 +229,13 @@ var getServerFilterResult = exports.getServerFilterResult = function getServerFi
  * @param sorterResult 排序数据
  * @returns 服务端排序数据
  */
-var getServerSorterResult = exports.getServerSorterResult = function getServerSorterResult(sorterResult) {
-  var result = Array.isArray(sorterResult) ? sorterResult : [sorterResult];
-  var serverSorter = result.reduce(function (acc, item) {
-    var _item$column, _item$column2;
-    var sorter = (_item$column = item.column) === null || _item$column === void 0 ? void 0 : _item$column.sorter;
-    if (sorter != null && isLocaleSorter(sorter)) return acc;
-    var sortKey = typeof sorter === 'string' ? sorter : parseDataIndex((_item$column2 = item.column) === null || _item$column2 === void 0 ? void 0 : _item$column2.dataIndex);
+exports.getServerFilterResult = getServerFilterResult;
+const getServerSorterResult = sorterResult => {
+  const result = Array.isArray(sorterResult) ? sorterResult : [sorterResult];
+  const serverSorter = result.reduce((acc, item) => {
+    const sorter = item.column?.sorter;
+    if (sorter != null && isLocalSorter(sorter)) return acc;
+    const sortKey = typeof sorter === 'string' ? sorter : parseDataIndex(item.column?.dataIndex);
     if (sortKey != null) acc[sortKey] = item.order;
     return acc;
   }, {});
@@ -305,34 +246,32 @@ var getServerSorterResult = exports.getServerSorterResult = function getServerSo
  * 从 ProColumns 数组中取出默认的服务端排序和筛选数据
  * @param columns ProColumns
  */
-var parseServerDefaultColumnConfig = exports.parseServerDefaultColumnConfig = function parseServerDefaultColumnConfig(columns) {
-  var filter = {};
-  var sort = {};
-  columns.forEach(function (column) {
+exports.getServerSorterResult = getServerSorterResult;
+const parseServerDefaultColumnConfig = columns => {
+  const filter = {};
+  const sort = {};
+  columns.forEach(column => {
     // 转换 dataIndex
-    var dataIndex = parseDataIndex(column.dataIndex);
+    const dataIndex = parseDataIndex(column.dataIndex);
     if (!dataIndex) return; // 没有 dataIndex 的列不参与服务端排序/筛选
 
     // 当 column 启用服务端 filters 功能时，取出默认的筛选值
-    if (column.filters && !isLocaleFilter(column.filters, column.onFilter)) {
-      var _ref4;
-      filter[dataIndex] = (_ref4 = column.defaultFilteredValue) !== null && _ref4 !== void 0 ? _ref4 : null;
+    if (column.filters && !isLocalFilter(column.filters, column.onFilter)) {
+      filter[dataIndex] = column.defaultFilteredValue ?? null;
     }
 
     // 当 column 启用服务端 sorter 功能时，取出默认的排序值
-    if (column.sorter && !isLocaleSorter(column.sorter)) {
+    if (column.sorter && !isLocalSorter(column.sorter)) {
       if (typeof column.sorter === 'string') {
-        var _column$defaultSortOr;
-        sort[column.sorter] = (_column$defaultSortOr = column.defaultSortOrder) !== null && _column$defaultSortOr !== void 0 ? _column$defaultSortOr : null;
+        sort[column.sorter] = column.defaultSortOrder ?? null;
       } else {
-        var _column$defaultSortOr2;
-        sort[dataIndex] = (_column$defaultSortOr2 = column.defaultSortOrder) !== null && _column$defaultSortOr2 !== void 0 ? _column$defaultSortOr2 : null;
+        sort[dataIndex] = column.defaultSortOrder ?? null;
       }
     }
   });
   return {
-    sort: sort,
-    filter: filter
+    sort,
+    filter
   };
 };
 
@@ -342,10 +281,13 @@ var parseServerDefaultColumnConfig = exports.parseServerDefaultColumnConfig = fu
  * @param columnProps 列配置
  * @returns 排序值
  */
-var parseProSortOrder = exports.parseProSortOrder = function parseProSortOrder(proSort, columnProps) {
-  var sorter = columnProps.sorter,
-    columnSortOrder = columnProps.sortOrder,
-    dataIndex = columnProps.dataIndex;
+exports.parseServerDefaultColumnConfig = parseServerDefaultColumnConfig;
+const parseProSortOrder = (proSort, columnProps) => {
+  const {
+    sorter,
+    sortOrder: columnSortOrder,
+    dataIndex
+  } = columnProps;
 
   // 优先使用用户明确设置的 sortOrder
   if (columnSortOrder !== undefined) return columnSortOrder;
@@ -354,10 +296,10 @@ var parseProSortOrder = exports.parseProSortOrder = function parseProSortOrder(p
   if (sorter == null) return undefined;
 
   // 如果是本地排序，不使用 proSort 中的值
-  if (isLocaleSorter(sorter)) return undefined;
+  if (isLocalSorter(sorter)) return undefined;
 
   // 服务端排序：确定排序键
-  var sortKey = typeof sorter === 'string' ? sorter : parseDataIndex(dataIndex);
+  const sortKey = typeof sorter === 'string' ? sorter : parseDataIndex(dataIndex);
 
   // 返回对应的排序值
   return sortKey ? proSort[sortKey] : undefined;
@@ -369,11 +311,14 @@ var parseProSortOrder = exports.parseProSortOrder = function parseProSortOrder(p
  * @param columnProps 列配置
  * @returns 筛选值
  */
-var parseProFilteredValue = exports.parseProFilteredValue = function parseProFilteredValue(proFilter, columnProps) {
-  var filters = columnProps.filters,
-    onFilter = columnProps.onFilter,
-    columnFilteredValue = columnProps.filteredValue,
-    dataIndex = columnProps.dataIndex;
+exports.parseProSortOrder = parseProSortOrder;
+const parseProFilteredValue = (proFilter, columnProps) => {
+  const {
+    filters,
+    onFilter,
+    filteredValue: columnFilteredValue,
+    dataIndex
+  } = columnProps;
 
   // 优先使用用户设置的 filteredValue
   if (columnFilteredValue !== undefined) return columnFilteredValue;
@@ -382,11 +327,12 @@ var parseProFilteredValue = exports.parseProFilteredValue = function parseProFil
   if (filters == null) return undefined;
 
   // 如果是本地筛选，不使用 proFilter 中的值
-  if (isLocaleFilter(filters, onFilter)) return undefined;
+  if (isLocalFilter(filters, onFilter)) return undefined;
 
   // 服务端排序：获取筛选键
-  var filterKey = parseDataIndex(dataIndex);
+  const filterKey = parseDataIndex(dataIndex);
 
   // 返回对应的筛选值
   return filterKey ? proFilter[filterKey] : undefined;
-};
+};
+exports.parseProFilteredValue = parseProFilteredValue;

package/lib/table/utils/useDragSort.d.ts

@@ -1,4 +1,4 @@
-import type { TableComponents } from 'rc-table/es/interface';
+import type { TableComponents } from '@rc-component/table/es/interface';
 import React from 'react';
 export interface UseDragSortOptions<T> {
     dataSource?: T[];