@ant-design/pro-components 3.0.0-beta.1 → 3.0.0-beta.2

package/lib/table/utils/genProColumnToColumn.js

@@ -1,166 +1,136 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/table/utils/genProColumnToColumn.tsx
-var genProColumnToColumn_exports = {};
-__export(genProColumnToColumn_exports, {
-  genProColumnToColumn: () => genProColumnToColumn
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(genProColumnToColumn_exports);
-var import_antd = require("antd");
-var import_field = require("../../field");
-var import_utils = require("../../utils");
-var import_columnRender = require("./columnRender");
-var import_index = require("./index");
+exports.genProColumnToColumn = genProColumnToColumn;
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _antd = require("antd");
+var _field = require("../../field");
+var _utils = require("../../utils");
+var _columnRender = require("./columnRender");
+var _index = require("./index");
+/**
+ * 转化 columns 到 pro 的格式 主要是 render 方法的自行实现
+ *
+ * @param columns
+ * @param map
+ * @param columnEmptyText
+ */
 function genProColumnToColumn(params, parents) {
-  var _a;
-  const {
-    columns,
-    counter,
-    columnEmptyText,
-    type,
-    editableUtils,
-    marginSM,
-    rowKey = "id",
-    childrenColumnName = "children",
-    proFilter = {},
-    proSort
-  } = params;
-  const subNameRecord = /* @__PURE__ */ new Map();
-  return (_a = columns == null ? void 0 : columns.map((columnProps, columnsIndex) => {
-    if (columnProps === import_antd.Table.EXPAND_COLUMN)
-      return columnProps;
-    if (columnProps === import_antd.Table.SELECTION_COLUMN)
-      return columnProps;
-    const {
-      key,
-      dataIndex,
-      valueEnum,
-      valueType = "text",
-      children,
-      onFilter,
-      filters = [],
-      sorter,
-      filteredValue: columnFilteredValue
-    } = columnProps;
-    const columnKey = (0, import_index.genColumnKey)(
-      key || (dataIndex == null ? void 0 : dataIndex.toString()),
-      [parents == null ? void 0 : parents.key, columnsIndex].filter(Boolean).join("-")
-    );
-    const noNeedPro = !valueEnum && !valueType && !children;
+  var _columns$map;
+  var columns = params.columns,
+    counter = params.counter,
+    columnEmptyText = params.columnEmptyText,
+    type = params.type,
+    editableUtils = params.editableUtils,
+    marginSM = params.marginSM,
+    _params$rowKey = params.rowKey,
+    rowKey = _params$rowKey === void 0 ? 'id' : _params$rowKey,
+    _params$childrenColum = params.childrenColumnName,
+    childrenColumnName = _params$childrenColum === void 0 ? 'children' : _params$childrenColum,
+    _params$proFilter = params.proFilter,
+    proFilter = _params$proFilter === void 0 ? {} : _params$proFilter,
+    proSort = params.proSort;
+  var subNameRecord = new Map();
+  return columns === null || columns === void 0 || (_columns$map = columns.map(function (columnProps, columnsIndex) {
+    if (columnProps === _antd.Table.EXPAND_COLUMN) return columnProps;
+    if (columnProps === _antd.Table.SELECTION_COLUMN) return columnProps;
+    var _ref = columnProps,
+      key = _ref.key,
+      dataIndex = _ref.dataIndex,
+      valueEnum = _ref.valueEnum,
+      _ref$valueType = _ref.valueType,
+      valueType = _ref$valueType === void 0 ? 'text' : _ref$valueType,
+      children = _ref.children,
+      onFilter = _ref.onFilter,
+      _ref$filters = _ref.filters,
+      filters = _ref$filters === void 0 ? [] : _ref$filters,
+      sorter = _ref.sorter,
+      columnFilteredValue = _ref.filteredValue;
+    var columnKey = (0, _index.genColumnKey)(key || (dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString()), [parents === null || parents === void 0 ? void 0 : parents.key, columnsIndex].filter(Boolean).join('-'));
+    // 这些都没有，说明是普通的表格不需要 pro 管理
+    var noNeedPro = !valueEnum && !valueType && !children;
     if (noNeedPro) {
-      return __spreadValues({
+      return (0, _objectSpread2.default)({
         index: columnsIndex
       }, columnProps);
     }
-    const config = counter.columnsMap[columnKey] || {
+    var config = counter.columnsMap[columnKey] || {
       fixed: columnProps.fixed
     };
-    const genOnFilter = () => {
+    var genOnFilter = function genOnFilter() {
       if (onFilter === true) {
-        return (value, row) => (0, import_columnRender.defaultOnFilter)(value, row, dataIndex);
+        return function (value, row) {
+          return (0, _columnRender.defaultOnFilter)(value, row, dataIndex);
+        };
       }
-      return (0, import_utils.omitBoolean)(onFilter);
+      return (0, _utils.omitBoolean)(onFilter);
     };
-    const filteredValue = columnKey && (proFilter == null ? void 0 : proFilter[columnKey]) !== void 0 ? proFilter == null ? void 0 : proFilter[columnKey] : null;
-    const sortOrder = columnKey && proSort[columnKey] !== void 0 ? proSort[columnKey] : null;
-    let keyName = rowKey;
-    const tempColumns = __spreadProps(__spreadValues({
+
+    // 对应筛选值，用作双向绑定
+    var filteredValue = columnKey && (proFilter === null || proFilter === void 0 ? void 0 : proFilter[columnKey]) !== undefined ? proFilter === null || proFilter === void 0 ? void 0 : proFilter[columnKey] : null;
+    // 对应排序值，用作双向绑定
+    var sortOrder = columnKey && proSort[columnKey] !== undefined ? proSort[columnKey] : null;
+    var keyName = rowKey;
+    var tempColumns = (0, _objectSpread2.default)((0, _objectSpread2.default)({
       index: columnsIndex,
       key: columnKey
-    }, columnProps), {
-      title: (0, import_columnRender.renderColumnsTitle)(columnProps),
-      valueEnum,
-      filters: filters === true ? (0, import_field.proFieldParsingValueEnumToArray)(
-        (0, import_utils.runFunction)(valueEnum, void 0)
-      ).filter((valueItem) => valueItem && valueItem.value !== "all") : filters,
+    }, columnProps), {}, {
+      title: (0, _columnRender.renderColumnsTitle)(columnProps),
+      valueEnum: valueEnum,
+      filters: filters === true ? (0, _field.proFieldParsingValueEnumToArray)((0, _utils.runFunction)(valueEnum, undefined)).filter(function (valueItem) {
+        return valueItem && valueItem.value !== 'all';
+      }) : filters,
       onFilter: genOnFilter(),
-      filteredValue: (
-        // 优先使用用户明确设置的 filteredValue
-        columnFilteredValue !== void 0 ? columnFilteredValue : (
-          // 否则，只有在服务端筛选时才使用计算的 filteredValue
-          filters && genOnFilter() == null && filteredValue !== null ? filteredValue : void 0
-        )
-      ),
-      sortOrder: sorter === true ? sortOrder : void 0,
+      filteredValue:
+      // 优先使用用户明确设置的 filteredValue
+      columnFilteredValue !== undefined ? columnFilteredValue :
+      // 否则，只有在服务端筛选时才使用计算的 filteredValue
+      filters && genOnFilter() == null && filteredValue !== null ? filteredValue : undefined,
+      sortOrder: sorter === true ? sortOrder : undefined,
       fixed: config.fixed,
-      width: columnProps.width || (columnProps.fixed ? 200 : void 0),
-      children: columnProps.children ? genProColumnToColumn(
-        __spreadProps(__spreadValues({}, params), {
-          columns: (columnProps == null ? void 0 : columnProps.children) || []
-        }),
-        __spreadProps(__spreadValues({}, columnProps), { key: columnKey })
-      ) : void 0,
-      render: (text, rowData, index) => {
-        var _a2;
-        if (typeof rowKey === "function") {
+      width: columnProps.width || (columnProps.fixed ? 200 : undefined),
+      children: columnProps.children ? genProColumnToColumn((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+        columns: (columnProps === null || columnProps === void 0 ? void 0 : columnProps.children) || []
+      }), (0, _objectSpread2.default)((0, _objectSpread2.default)({}, columnProps), {}, {
+        key: columnKey
+      })) : undefined,
+      render: function render(text, rowData, index) {
+        if (typeof rowKey === 'function') {
           keyName = rowKey(rowData, index);
         }
-        let uniqueKey;
-        if (typeof rowData === "object" && rowData !== null && Reflect.has(rowData, keyName)) {
+        var uniqueKey;
+        if ((0, _typeof2.default)(rowData) === 'object' && rowData !== null && Reflect.has(rowData, keyName)) {
+          var _childrenColumnName;
           uniqueKey = rowData[keyName];
-          const parentInfo = subNameRecord.get(uniqueKey) || [];
-          (_a2 = rowData[childrenColumnName]) == null ? void 0 : _a2.forEach(
-            (item) => {
-              const itemUniqueKey = item[keyName];
-              if (!subNameRecord.has(itemUniqueKey)) {
-                subNameRecord.set(
-                  itemUniqueKey,
-                  parentInfo.concat([index, childrenColumnName])
-                );
-              }
+          var parentInfo = subNameRecord.get(uniqueKey) || [];
+          (_childrenColumnName = rowData[childrenColumnName]) === null || _childrenColumnName === void 0 || _childrenColumnName.forEach(function (item) {
+            var itemUniqueKey = item[keyName];
+            if (!subNameRecord.has(itemUniqueKey)) {
+              subNameRecord.set(itemUniqueKey, parentInfo.concat([index, childrenColumnName]));
             }
-          );
+          });
         }
-        const renderProps = {
-          columnProps,
-          text,
-          rowData,
-          index,
-          columnEmptyText,
-          counter,
-          type,
-          marginSM,
+        var renderProps = {
+          columnProps: columnProps,
+          text: text,
+          rowData: rowData,
+          index: index,
+          columnEmptyText: columnEmptyText,
+          counter: counter,
+          type: type,
+          marginSM: marginSM,
           subName: subNameRecord.get(uniqueKey),
-          editableUtils
+          editableUtils: editableUtils
         };
-        return (0, import_columnRender.columnRender)(renderProps);
+        return (0, _columnRender.columnRender)(renderProps);
       }
     });
-    return (0, import_utils.omitUndefinedAndEmptyArr)(tempColumns);
-  })) == null ? void 0 : _a.filter(
-    (item) => !item.hideInTable
-  );
-}
+    return (0, _utils.omitUndefinedAndEmptyArr)(tempColumns);
+  })) === null || _columns$map === void 0 ? void 0 : _columns$map.filter(function (item) {
+    return !item.hideInTable;
+  });
+}

package/lib/table/utils/index.js

@@ -1,177 +1,253 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
+"use strict";
 
-// src/table/utils/index.ts
-var utils_exports = {};
-__export(utils_exports, {
-  checkUndefinedOrNull: () => checkUndefinedOrNull,
-  genColumnKey: () => genColumnKey,
-  isBordered: () => isBordered,
-  isMergeCell: () => isMergeCell,
-  mergePagination: () => mergePagination,
-  parseDefaultColumnConfig: () => parseDefaultColumnConfig,
-  postDataPipeline: () => postDataPipeline,
-  useActionType: () => useActionType
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(utils_exports);
-var checkUndefinedOrNull = (value) => value !== void 0 && value !== null;
+exports.isMergeCell = exports.isBordered = exports.genColumnKey = exports.checkUndefinedOrNull = void 0;
+exports.mergePagination = mergePagination;
+exports.parseDefaultColumnConfig = parseDefaultColumnConfig;
+exports.postDataPipeline = postDataPipeline;
+exports.useActionType = useActionType;
+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;
+};
+
+/**
+ * 合并用户 props 和 预设的 props
+ *
+ * @param pagination
+ * @param action
+ * @param intl
+ */
 function mergePagination(pagination, pageInfo, intl) {
-  var _a, _b;
+  var _pagination$current, _pagination$pageSize;
   if (pagination === false) {
     return false;
   }
-  const { total, current, pageSize, setPageInfo } = pageInfo;
-  const defaultPagination = typeof pagination === "object" ? pagination : {};
-  return __spreadProps(__spreadValues({
-    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 ? (_a = pagination.current) != null ? _a : current : current,
-    pageSize: pagination !== true && pagination ? (_b = pagination.pageSize) != null ? _b : pageSize : pageSize,
-    onChange: (page, newPageSize) => {
-      const { onChange } = pagination;
-      onChange == null ? void 0 : onChange(page, newPageSize || 20);
+  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);
+      // pageSize 改变之后就没必要切换页码
       if (newPageSize !== pageSize || current !== page) {
-        setPageInfo({ pageSize: newPageSize, current: page });
+        setPageInfo({
+          pageSize: newPageSize,
+          current: page
+        });
       }
     }
   });
 }
+
+/**
+ * 获取用户的 action 信息
+ *
+ * @param actionRef
+ * @param counter
+ * @param onCleanSelected
+ */
 function useActionType(ref, action, props) {
-  const userAction = __spreadProps(__spreadValues({}, props.editableUtils), {
+  /** 这里生成action的映射，保证 action 总是使用的最新 只需要渲染一次即可 */
+  var userAction = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.editableUtils), {}, {
     pageInfo: action.pageInfo,
-    reload: (resetPageIndex) => __async(this, null, function* () {
-      if (resetPageIndex) {
-        yield action.setPageInfo({
-          current: 1
-        });
+    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);
       }
-      yield action == null ? void 0 : action.reload();
-    }),
-    reloadAndRest: () => __async(this, null, function* () {
-      props.onCleanSelected();
-      yield action.setPageInfo({
-        current: 1
-      });
-      yield action == null ? void 0 : action.reload();
-    }),
-    reset: () => __async(this, null, function* () {
-      var _a;
-      yield props.resetAll();
-      yield (_a = action == null ? void 0 : action.reset) == null ? void 0 : _a.call(action);
-      yield action == null ? void 0 : action.reload();
-    }),
-    fullScreen: () => props.fullScreen(),
-    clearSelected: () => props.onCleanSelected(),
-    setPageInfo: (rest) => action.setPageInfo(rest)
+      return reset;
+    }(),
+    fullScreen: function fullScreen() {
+      return props.fullScreen();
+    },
+    clearSelected: function clearSelected() {
+      return props.onCleanSelected();
+    },
+    setPageInfo: function setPageInfo(rest) {
+      return action.setPageInfo(rest);
+    }
   });
+  // eslint-disable-next-line no-param-reassign
   ref.current = userAction;
 }
+/**
+ * 一个转化的 pipeline 列表
+ *
+ * @param data
+ * @param pipeline
+ */
 function postDataPipeline(data, pipeline) {
-  if (pipeline.filter((item) => item).length < 1) {
+  if (pipeline.filter(function (item) {
+    return item;
+  }).length < 1) {
     return data;
   }
-  return pipeline.reduce((pre, postData) => {
+  return pipeline.reduce(function (pre, postData) {
     return postData(pre);
   }, data);
 }
-var isBordered = (borderType, border) => {
-  if (border === void 0) {
+var isBordered = exports.isBordered = function isBordered(borderType, border) {
+  if (border === undefined) {
     return false;
   }
-  if (typeof border === "boolean") {
+  if (typeof border === 'boolean') {
     return border;
   }
   return border[borderType];
 };
-var isMergeCell = (dom) => {
-  var _a;
-  return dom && typeof dom === "object" && ((_a = dom == null ? void 0 : dom.props) == null ? void 0 : _a.colSpan);
+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);
 };
-var genColumnKey = (key, index) => {
+
+/**
+ * 根据 key 和 dataIndex 生成唯一 id
+ *
+ * @param key 用户设置的 key
+ * @param dataIndex 在对象中的数据
+ * @param index 序列号，理论上唯一
+ */
+var genColumnKey = exports.genColumnKey = function genColumnKey(key, index) {
   if (key) {
-    return Array.isArray(key) ? key.join("-") : key.toString();
+    return Array.isArray(key) ? key.join('-') : key.toString();
   }
-  return `${index}`;
+  return "".concat(index);
 };
+
+/**
+ * 将 ProTable - column - dataIndex 转为字符串形式
+ *
+ * @param dataIndex Column 中的 dataIndex
+ */
 function parseDataIndex(dataIndex) {
   if (Array.isArray(dataIndex)) {
-    return dataIndex.join(",");
+    return dataIndex.join(',');
   }
-  return dataIndex == null ? void 0 : dataIndex.toString();
+  return dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString();
 }
+
+/**
+ * 从 ProColumns 数组中取出默认的排序和筛选数据
+ *
+ * @param columns ProColumns
+ */
 function parseDefaultColumnConfig(columns) {
-  const filter = {};
-  const sort = {};
-  columns.forEach((column) => {
-    const dataIndex = parseDataIndex(column.dataIndex);
+  var filter = {};
+  var sort = {};
+  columns.forEach(function (column) {
+    // 转换 dataIndex
+    var dataIndex = parseDataIndex(column.dataIndex);
     if (!dataIndex) {
       return;
     }
+    // 当 column 启用 filters 功能时，取出默认的筛选值
     if (column.filters) {
-      const defaultFilteredValue = column.defaultFilteredValue;
-      if (defaultFilteredValue !== void 0) {
+      var defaultFilteredValue = column.defaultFilteredValue;
+      if (defaultFilteredValue !== undefined) {
         filter[dataIndex] = column.defaultFilteredValue;
       }
     }
+    // 当 column 启用 sorter 功能时，取出默认的排序值
     if (column.sorter && column.defaultSortOrder) {
       sort[dataIndex] = column.defaultSortOrder;
     }
   });
-  return { sort, filter };
-}
+  return {
+    sort: sort,
+    filter: filter
+  };
+}