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

package/es/table/utils/genProColumnToColumn.js

@@ -1,117 +1,140 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { Table } from 'antd';
 import { proFieldParsingValueEnumToArray } from "../../field";
 import { omitBoolean, omitUndefinedAndEmptyArr, runFunction } from "../../utils";
 import { columnRender, defaultOnFilter, renderColumnsTitle } from "./columnRender";
 import { genColumnKey, parseProFilteredValue, parseProSortOrder } from "./index";
+function resolveOnFilter(columnProps) {
+  const {
+    onFilter,
+    dataIndex
+  } = columnProps;
+  if (onFilter === true) {
+    return (value, row) => defaultOnFilter(value, row, dataIndex);
+  }
+  return omitBoolean(onFilter);
+}
+function resolveFilters(columnProps) {
+  const {
+    filters = [],
+    valueEnum
+  } = columnProps;
+  if (filters === true) {
+    return proFieldParsingValueEnumToArray(runFunction(valueEnum, undefined)).filter(valueItem => valueItem && valueItem.value !== 'all');
+  }
+  return filters;
+}
+function getColumnConfig(columnsMap, columnKey, columnProps) {
+  const config = columnsMap?.[columnKey] || {
+    fixed: columnProps.fixed
+  };
+  return {
+    fixed: config.fixed
+  };
+}
+function parseColumnFilterSort(proFilter, proSort, columnProps) {
+  return {
+    filteredValue: parseProFilteredValue(proFilter, columnProps),
+    sortOrder: parseProSortOrder(proSort, columnProps)
+  };
+}
+function updateSubNameRecord(rowData, index, keyName, childrenColumnName, subNameRecord) {
+  if (typeof rowData !== 'object' || rowData === null || !Reflect.has(rowData, keyName)) {
+    return undefined;
+  }
+  const record = rowData;
+  const uniqueKey = record[keyName];
+  const parentInfo = subNameRecord.get(uniqueKey) || [];
+  record[childrenColumnName]?.forEach(item => {
+    const itemUniqueKey = item[keyName];
+    if (!subNameRecord.has(itemUniqueKey)) {
+      subNameRecord.set(itemUniqueKey, parentInfo.concat([index, childrenColumnName]));
+    }
+  });
+  return uniqueKey;
+}
+function createCellRender(columnProps, context, subNameRecord) {
+  let keyName = context.rowKey ?? 'id';
+  return function cellRender(text, rowData, index) {
+    if (typeof context.rowKey === 'function') {
+      keyName = context.rowKey(rowData, index);
+    }
+    const uniqueKey = updateSubNameRecord(rowData, index, keyName, context.childrenColumnName, subNameRecord);
+    return columnRender({
+      columnProps,
+      text,
+      rowData,
+      index,
+      columnEmptyText: context.columnEmptyText,
+      counter: context.counter,
+      type: context.type,
+      marginSM: context.marginSM,
+      subName: subNameRecord.get(uniqueKey) ?? [],
+      editableUtils: context.editableUtils
+    });
+  };
+}
+
 /**
  * 转化 columns 到 pro 的格式 主要是 render 方法的自行实现
  *
- * @param columns
- * @param map
- * @param columnEmptyText
+ * @param params.columns 列配置
+ * @param params.context 列计算上下文（表级配置与状态）
+ * @param params.parents 父列，递归子列时传入
  */
-export function genProColumnToColumn(params, parents) {
-  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,
-    proFilter = params.proFilter,
-    proSort = params.proSort;
-  var subNameRecord = new Map();
-  return columns === null || columns === void 0 || (_columns$map = columns.map(function (columnProps, columnsIndex) {
+export function genProColumnToColumn(params) {
+  const {
+    columns,
+    context,
+    parents
+  } = params;
+  const subNameRecord = new Map();
+  return columns?.map((columnProps, columnsIndex) => {
     if (columnProps === Table.EXPAND_COLUMN) return columnProps;
     if (columnProps === 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;
-    var columnKey = 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;
+    const {
+      key,
+      dataIndex,
+      valueEnum,
+      valueType = 'text',
+      children
+    } = columnProps;
+    const columnKey = genColumnKey(key || dataIndex?.toString(), [parents?.key, columnsIndex].filter(Boolean).join('-'));
+    const noNeedPro = !valueEnum && !valueType && !children;
     if (noNeedPro) {
-      return _objectSpread({
-        index: columnsIndex
-      }, columnProps);
+      return {
+        index: columnsIndex,
+        ...columnProps
+      };
     }
-    var config = counter.columnsMap[columnKey] || {
-      fixed: columnProps.fixed
-    };
-    var genOnFilter = function genOnFilter() {
-      if (onFilter === true) {
-        return function (value, row) {
-          return defaultOnFilter(value, row, dataIndex);
-        };
-      }
-      return omitBoolean(onFilter);
-    };
-    var keyName = rowKey;
-    var tempColumns = _objectSpread(_objectSpread({
+    const {
+      filteredValue,
+      sortOrder
+    } = parseColumnFilterSort(context.proFilter, context.proSort, columnProps);
+    const {
+      fixed
+    } = getColumnConfig(context.counter.columnsMap, columnKey, columnProps);
+    const tempColumns = {
       index: columnsIndex,
-      key: columnKey
-    }, columnProps), {}, {
+      key: columnKey,
+      ...columnProps,
       title: renderColumnsTitle(columnProps),
-      valueEnum: valueEnum,
-      filters: filters === true ? proFieldParsingValueEnumToArray(runFunction(valueEnum, undefined)).filter(function (valueItem) {
-        return valueItem && valueItem.value !== 'all';
-      }) : filters,
-      onFilter: genOnFilter(),
-      filteredValue: parseProFilteredValue(proFilter, columnProps),
-      sortOrder: parseProSortOrder(proSort, columnProps),
-      fixed: config.fixed,
+      valueEnum,
+      filters: resolveFilters(columnProps),
+      onFilter: resolveOnFilter(columnProps),
+      filteredValue,
+      sortOrder,
+      fixed,
       width: columnProps.width || (columnProps.fixed ? 200 : undefined),
-      children: columnProps.children ? genProColumnToColumn(_objectSpread(_objectSpread({}, params), {}, {
-        columns: (columnProps === null || columnProps === void 0 ? void 0 : columnProps.children) || []
-      }), _objectSpread(_objectSpread({}, columnProps), {}, {
-        key: columnKey
-      })) : undefined,
-      render: function render(text, rowData, index) {
-        if (typeof rowKey === 'function') {
-          keyName = rowKey(rowData, index);
-        }
-        var uniqueKey;
-        if (_typeof(rowData) === 'object' && rowData !== null && Reflect.has(rowData, keyName)) {
-          var _childrenColumnName;
-          uniqueKey = rowData[keyName];
-          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]));
-            }
-          });
+      children: columnProps.children ? genProColumnToColumn({
+        columns: columnProps?.children ?? [],
+        context,
+        parents: {
+          ...columnProps,
+          key: columnKey
         }
-        var renderProps = {
-          columnProps: columnProps,
-          text: text,
-          rowData: rowData,
-          index: index,
-          columnEmptyText: columnEmptyText,
-          counter: counter,
-          type: type,
-          marginSM: marginSM,
-          subName: subNameRecord.get(uniqueKey),
-          editableUtils: editableUtils
-        };
-        return columnRender(renderProps);
-      }
-    });
+      }) : undefined,
+      render: createCellRender(columnProps, context, subNameRecord)
+    };
     return omitUndefinedAndEmptyArr(tempColumns);
-  })) === null || _columns$map === void 0 ? void 0 : _columns$map.filter(function (item) {
-    return !item.hideInTable;
-  });
+  })?.filter(item => !item.hideInTable);
 }

package/es/table/utils/index.d.ts

@@ -74,12 +74,22 @@ export declare const flattenColumns: (data: any[]) => any[];
  * @param onFilter 筛选函数
  * @returns 是否为本地筛选
  */
+export declare const isLocalFilter: <T>(filters: ProColumnType<T>['filters'], onFilter: ProColumnType<T>['onFilter']) => boolean;
+/**
+ * @deprecated typo kept for backward compatibility
+ * use `isLocalFilter` instead
+ */
 export declare const isLocaleFilter: <T>(filters: ProColumnType<T>['filters'], onFilter: ProColumnType<T>['onFilter']) => boolean;
 /**
  * 判断是否为本地排序
  * @param sorter 排序配置
  * @returns 是否为本地排序
  */
+export declare const isLocalSorter: <T>(sorter: ProSorter<T>) => boolean;
+/**
+ * @deprecated typo kept for backward compatibility
+ * use `isLocalSorter` instead
+ */
 export declare const isLocaleSorter: <T>(sorter: ProSorter<T>) => boolean;
 /**
  * 获取服务端筛选数据