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

package/lib/table/components/ListToolBar/style.d.ts

@@ -4,6 +4,6 @@ export interface ProListToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/lib/table/style/index.d.ts

@@ -5,6 +5,6 @@ export interface ProListToken extends ProAliasToken {
 }
 export declare const turn: any;
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/lib/table/typing.d.ts

@@ -3,10 +3,10 @@ import type { SizeType } from 'antd/lib/config-provider/SizeContext';
 import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
 import type { NamePath } from 'antd/lib/form/interface';
 import type { SearchProps } from 'antd/lib/input';
-import type { ColumnFilterItem, ColumnType, CompareFn, SortOrder } from 'antd/lib/table/interface';
+import type { ColumnFilterItem, ColumnType, CompareFn, SorterResult, SortOrder } from 'antd/lib/table/interface';
 import type dayjs from 'dayjs';
 import type React from 'react';
-import type { CSSProperties } from 'react';
+import type { CSSProperties, Key } from 'react';
 import type { ProCardProps } from '../card';
 import type { ProFieldEmptyText } from '../field';
 import type { LightWrapperProps, ProFormProps, QueryFilterProps } from '../form';
@@ -49,13 +49,24 @@ export type ColumnRenderInterface<T> = {
     counter: ReturnType<ContainerType>;
 };
 export type TableRowSelection = TableProps<any>['rowSelection'];
-export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'render' | 'children' | 'title' | 'filters' | 'onFilter' | 'sorter'> & {
-    sorter?: string | boolean | CompareFn<T> | {
-        compare?: CompareFn<T>;
-        /** Config multiple sorter order priority */
-        multiple?: number;
+/**
+ * Request filter 參數
+ * @description 与 antd 不同，Pro 有自己定义的 request FilterValue 类型，主要做了值内容的转换
+ */
+export type FilterValue = (string | number)[] | null;
+export type ProSorter<T> = string | boolean | CompareFn<T> | {
+    compare?: CompareFn<T>;
+    /** Config multiple sorter order priority */
+    multiple?: number;
+};
+export type ProSorterResult<T> = Omit<SorterResult<T>, 'column'> & {
+    column?: ColumnType<T> & {
+        sorter?: ProSorter<T>;
     };
 };
+export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'render' | 'children' | 'title' | 'filters' | 'onFilter' | 'sorter'> & {
+    sorter?: ProSorter<T>;
+};
 export type ProColumnType<T = unknown, ValueType = 'text'> = ProSchema<T, ExtraProColumnType<T> & {
     children?: ProColumns<T>[];
     index?: number;
@@ -159,12 +170,12 @@ export type ProTableProps<DataSource, U, ValueType = 'text'> = {
     /**
      * @name 渲染 table
      */
-    tableRender?: (props: ProTableProps<DataSource, U, ValueType>, defaultDom: JSX.Element, 
+    tableRender?: (props: ProTableProps<DataSource, U, ValueType>, defaultDom: React.ReactNode, 
     /** 各个区域的 dom */
     domList: {
-        toolbar: JSX.Element | undefined;
-        alert: JSX.Element | undefined;
-        table: JSX.Element | undefined;
+        toolbar: React.ReactNode;
+        alert: React.ReactNode;
+        table: React.ReactNode;
     }) => React.ReactNode;
     /**
      * @name 渲染 table 视图，用于定制 ProList，不推荐直接使用
@@ -187,7 +198,7 @@ export type ProTableProps<DataSource, U, ValueType = 'text'> = {
         pageSize?: number;
         current?: number;
         keyword?: string;
-    }, sort: Record<string, SortOrder>, filter: Record<string, (string | number)[] | null>) => Promise<Partial<RequestData<DataSource>>>;
+    }, sort: Record<string, SortOrder>, filter: Record<string, FilterValue>) => Promise<Partial<RequestData<DataSource>>>;
     /** @name 对数据进行一些处理 */
     postData?: any;
     /** @name 默认的数据 */
@@ -322,8 +333,22 @@ export type ProTableProps<DataSource, U, ValueType = 'text'> = {
     ErrorBoundary?: React.ComponentClass<any, any> | false;
 } & Omit<TableProps<DataSource>, 'columns' | 'rowSelection'>;
 export type ActionType = ProCoreActionType & {
+    /** 原生 DOM 元素引用 */
+    nativeElement?: HTMLDivElement;
+    /** 聚焦方法 */
+    focus?: () => void;
     fullScreen?: () => void;
     setPageInfo?: (page: Partial<PageInfo>) => void;
+    /**
+     * 对齐 antd Table ScrollConfig
+     * - number: 作为 top 处理
+     * - { index?, key?, top? }
+     */
+    scrollTo?: (arg: number | {
+        index?: number;
+        key?: Key;
+        top?: number;
+    }) => void;
 };
 /**
  * 用于定义 useFetch 的参数类型

package/lib/table/useFetchData.js

@@ -13,7 +13,6 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
-var _reactDom = require("react-dom");
 var _utils = require("../utils");
 var _index = require("./utils/index");
 var _excluded = ["data", "success", "total"];
@@ -143,14 +142,12 @@ var useFetchData = function useFetchData(getData, defaultData, options) {
 
   // Batching update  https://github.com/facebook/react/issues/14259
   var setDataAndLoading = function setDataAndLoading(newData, dataTotal) {
-    (0, _reactDom.unstable_batchedUpdates)(function () {
-      setTableDataList(newData);
-      if ((pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.total) !== dataTotal) {
-        _setPageInfo((0, _objectSpread2.default)((0, _objectSpread2.default)({}, pageInfo), {}, {
-          total: dataTotal || newData.length
-        }));
-      }
-    });
+    setTableDataList(newData);
+    if ((pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.total) !== dataTotal) {
+      _setPageInfo((0, _objectSpread2.default)((0, _objectSpread2.default)({}, pageInfo), {}, {
+        total: dataTotal || newData.length
+      }));
+    }
   };
 
   /**
@@ -176,10 +173,8 @@ var useFetchData = function useFetchData(getData, defaultData, options) {
    * https://github.com/ant-design/pro-components/issues/4390
    */
   var requestFinally = (0, _utils.useRefFunction)(function () {
-    (0, _reactDom.unstable_batchedUpdates)(function () {
-      setTableLoading(false);
-      setPollingLoading(false);
-    });
+    setTableLoading(false);
+    setPollingLoading(false);
   });
   /** 请求数据 */
   var fetchList = /*#__PURE__*/function () {

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

@@ -22,7 +22,7 @@ type ColumnRenderInterface<T> = {
  *
  * @param item
  */
-export declare const renderColumnsTitle: (item: ProColumns<any>) => string | number | boolean | import("react/jsx-runtime").JSX.Element | Iterable<React.ReactNode> | null | undefined;
+export declare const renderColumnsTitle: (item: ProColumns<any>) => string | number | boolean | Iterable<React.ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
 /**
  * 默认的 filter 方法
  *

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

@@ -4,7 +4,7 @@ import { SortOrder } from 'antd/lib/table/interface';
 import type { ProFieldEmptyText } from '../../field';
 import type { ProSchemaComponentTypes, UseEditableUtilType } from '../../utils';
 import type { ContainerType } from '../Store/Provide';
-import type { ProColumns } from '../typing';
+import type { FilterValue, ProColumns } from '../typing';
 type ColumnToColumnReturnType<T> = (TableColumnType<T> & {
     index?: number;
 })[];
@@ -14,7 +14,7 @@ type ColumnToColumnParams<T> = {
     columnEmptyText: ProFieldEmptyText;
     type: ProSchemaComponentTypes;
     editableUtils: UseEditableUtilType;
-    proFilter: Record<string, (string | number)[] | null>;
+    proFilter: Record<string, FilterValue>;
     proSort: Record<string, SortOrder>;
 } & Pick<TableProps<T>, 'rowKey' | 'childrenColumnName'>;
 /**

package/lib/table/utils/genProColumnToColumn.js

@@ -31,8 +31,7 @@ function genProColumnToColumn(params, parents) {
     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,
+    proFilter = params.proFilter,
     proSort = params.proSort;
   var subNameRecord = new Map();
   return columns === null || columns === void 0 || (_columns$map = columns.map(function (columnProps, columnsIndex) {
@@ -47,9 +46,7 @@ function genProColumnToColumn(params, parents) {
       children = _ref.children,
       onFilter = _ref.onFilter,
       _ref$filters = _ref.filters,
-      filters = _ref$filters === void 0 ? [] : _ref$filters,
-      sorter = _ref.sorter,
-      columnFilteredValue = _ref.filteredValue;
+      filters = _ref$filters === void 0 ? [] : _ref$filters;
     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;
@@ -69,11 +66,6 @@ function genProColumnToColumn(params, parents) {
       }
       return (0, _utils.omitBoolean)(onFilter);
     };
-
-    // 对应筛选值，用作双向绑定
-    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,
@@ -85,12 +77,8 @@ function genProColumnToColumn(params, parents) {
         return valueItem && valueItem.value !== 'all';
       }) : filters,
       onFilter: genOnFilter(),
-      filteredValue:
-      // 优先使用用户明确设置的 filteredValue
-      columnFilteredValue !== undefined ? columnFilteredValue :
-      // 否则，只有在服务端筛选时才使用计算的 filteredValue
-      filters && genOnFilter() == null && filteredValue !== null ? filteredValue : undefined,
-      sortOrder: sorter === true ? sortOrder : undefined,
+      filteredValue: (0, _index.parseProFilteredValue)(proFilter, columnProps),
+      sortOrder: (0, _index.parseProSortOrder)(proSort, columnProps),
       fixed: config.fixed,
       width: columnProps.width || (columnProps.fixed ? 200 : undefined),
       children: columnProps.children ? genProColumnToColumn((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {

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

@@ -1,10 +1,10 @@
 import type { TablePaginationConfig } from 'antd';
-import type { SortOrder } from 'antd/lib/table/interface';
+import type { FilterValue as AntFilterValue, SorterResult, SortOrder } from 'antd/lib/table/interface';
 import type React from 'react';
 import { Key } from 'react';
 import type { IntlType } from '../../provider';
 import type { UseEditableUtilType } from '../../utils';
-import type { ActionType, Bordered, BorderedType, ProColumns, UseFetchDataAction } from '../typing';
+import type { ActionType, Bordered, BorderedType, FilterValue, ProColumns, ProColumnType, ProSorter, UseFetchDataAction } from '../typing';
 /**
  * 检查值是否存在 为了 避开 0 和 false
  *
@@ -29,10 +29,14 @@ export declare function mergePagination<T>(pagination: TablePaginationConfig | b
  * @param onCleanSelected
  */
 export declare function useActionType<T>(ref: React.MutableRefObject<ActionType | undefined>, action: UseFetchDataAction<T>, props: {
+    nativeElement?: HTMLDivElement;
+    focus?: () => void;
     fullScreen: () => void;
     onCleanSelected: () => void;
     resetAll: () => void;
     editableUtils: UseEditableUtilType;
+    /** 透传给 ActionType 的滚动能力 */
+    scrollTo?: ActionType['scrollTo'];
 }): void;
 type PostDataType<T> = (data: T) => T;
 /**
@@ -53,12 +57,63 @@ export declare const isMergeCell: (dom: any) => any;
  */
 export declare const genColumnKey: (key?: string | number | Key, index?: number | string) => string;
 /**
- * 从 ProColumns 数组中取出默认的排序和筛选数据
+ * 将 ProTable - column - dataIndex 转为字符串形式
  *
+ * @param dataIndex Column 中的 dataIndex
+ */
+export declare const parseDataIndex: (dataIndex: ProColumnType['dataIndex']) => string | undefined;
+/**
+ * 平铺所有columns, 用于判断是用的是本地筛选/排序
+ * @param data 列配置
+ * @returns 平铺后的列配置
+ */
+export declare const flattenColumns: (data: any[]) => any[];
+/**
+ * 判断是否为本地筛选
+ * @param filters 筛选配置
+ * @param onFilter 筛选函数
+ * @returns 是否为本地筛选
+ */
+export declare const isLocaleFilter: <T>(filters: ProColumnType<T>['filters'], onFilter: ProColumnType<T>['onFilter']) => boolean;
+/**
+ * 判断是否为本地排序
+ * @param sorter 排序配置
+ * @returns 是否为本地排序
+ */
+export declare const isLocaleSorter: <T>(sorter: ProSorter<T>) => boolean;
+/**
+ * 获取服务端筛选数据
+ * @param filters 筛选数据
+ * @param columns 列配置
+ * @returns 服务端筛选数据
+ */
+export declare const getServerFilterResult: <T>(filters: Record<string, AntFilterValue | null>, columns: ProColumnType<T>[]) => Record<string, FilterValue>;
+/**
+ * 获取服务端排序数据
+ * @param sorterResult 排序数据
+ * @returns 服务端排序数据
+ */
+export declare const getServerSorterResult: <T>(sorterResult: SorterResult<T> | SorterResult<T>[]) => Record<string, SortOrder | undefined>;
+/**
+ * 从 ProColumns 数组中取出默认的服务端排序和筛选数据
  * @param columns ProColumns
  */
-export declare function parseDefaultColumnConfig<T, Value>(columns: ProColumns<T, Value>[]): {
+export declare const parseServerDefaultColumnConfig: <T, Value>(columns: ProColumns<T, Value>[]) => {
     sort: Record<string, SortOrder>;
-    filter: Record<string, (string | number)[] | null>;
+    filter: Record<string, FilterValue>;
 };
+/**
+ * 解析对应排序值，用作双向绑定
+ * @param proSort 排序配置
+ * @param columnProps 列配置
+ * @returns 排序值
+ */
+export declare const parseProSortOrder: <T>(proSort: Record<string, SortOrder>, columnProps: ProColumnType<T>) => SortOrder | undefined;
+/**
+ * 解析对应筛选值，用作双向绑定
+ * @param proFilter 筛选配置
+ * @param columnProps 列配置
+ * @returns 筛选值
+ */
+export declare const parseProFilteredValue: <T>(proFilter: Record<string, FilterValue>, columnProps: ProColumnType<T>) => FilterValue | undefined;
 export {};

package/lib/table/utils/index.js

@@ -4,11 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isMergeCell = exports.isBordered = exports.genColumnKey = exports.checkUndefinedOrNull = void 0;
+exports.isMergeCell = exports.isLocaleSorter = exports.isLocaleFilter = exports.isBordered = exports.getServerSorterResult = exports.getServerFilterResult = exports.genColumnKey = exports.flattenColumns = exports.checkUndefinedOrNull = void 0;
 exports.mergePagination = mergePagination;
-exports.parseDefaultColumnConfig = parseDefaultColumnConfig;
+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"));
@@ -73,6 +75,8 @@ function useActionType(ref, action, props) {
   /** 这里生成action的映射，保证 action 总是使用的最新 只需要渲染一次即可 */
   var userAction = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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) {
@@ -158,7 +162,9 @@ function useActionType(ref, action, props) {
     },
     setPageInfo: function setPageInfo(rest) {
       return action.setPageInfo(rest);
-    }
+    },
+    // 透出 scrollTo（如上层提供）
+    scrollTo: props.scrollTo
   });
   // eslint-disable-next-line no-param-reassign
   ref.current = userAction;
@@ -213,41 +219,174 @@ var genColumnKey = exports.genColumnKey = function genColumnKey(key, index) {
  *
  * @param dataIndex Column 中的 dataIndex
  */
-function parseDataIndex(dataIndex) {
+var parseDataIndex = exports.parseDataIndex = function parseDataIndex(dataIndex) {
   if (Array.isArray(dataIndex)) {
     return dataIndex.join(',');
   }
   return dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString();
-}
+};
 
 /**
- * 从 ProColumns 数组中取出默认的排序和筛选数据
- *
+ * 平铺所有columns, 用于判断是用的是本地筛选/排序
+ * @param data 列配置
+ * @returns 平铺后的列配置
+ */
+var flattenColumns = exports.flattenColumns = function flattenColumns(data) {
+  var _columns = [];
+  for (var i = 0; i < data.length; i++) {
+    var _curItem = data[i];
+    if (_curItem.children) {
+      _columns.push.apply(_columns, (0, _toConsumableArray2.default)(flattenColumns(_curItem.children)));
+    } else {
+      _columns.push(_curItem);
+    }
+  }
+  return _columns;
+};
+
+/**
+ * 判断是否为本地筛选
+ * @param filters 筛选配置
+ * @param onFilter 筛选函数
+ * @returns 是否为本地筛选
+ */
+var isLocaleFilter = exports.isLocaleFilter = function isLocaleFilter(filters, onFilter) {
+  return !!filters && !!onFilter;
+};
+
+/**
+ * 判断是否为本地排序
+ * @param sorter 排序配置
+ * @returns 是否为本地排序
+ */
+var isLocaleSorter = exports.isLocaleSorter = function isLocaleSorter(sorter) {
+  return typeof sorter === 'function' || (0, _typeof2.default)(sorter) === 'object' && typeof sorter.compare === 'function';
+};
+
+/**
+ * 获取服务端筛选数据
+ * @param filters 筛选数据
+ * @param columns 列配置
+ * @returns 服务端筛选数据
+ */
+var getServerFilterResult = exports.getServerFilterResult = function 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 acc;
+  }, {});
+};
+
+/**
+ * 获取服务端排序数据
+ * @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);
+    if (sortKey != null) acc[sortKey] = item.order;
+    return acc;
+  }, {});
+  return serverSorter;
+};
+
+/**
+ * 从 ProColumns 数组中取出默认的服务端排序和筛选数据
  * @param columns ProColumns
  */
-function parseDefaultColumnConfig(columns) {
+var parseServerDefaultColumnConfig = exports.parseServerDefaultColumnConfig = function parseServerDefaultColumnConfig(columns) {
   var filter = {};
   var sort = {};
   columns.forEach(function (column) {
     // 转换 dataIndex
     var dataIndex = parseDataIndex(column.dataIndex);
-    if (!dataIndex) {
-      return;
+    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;
     }
-    // 当 column 启用 filters 功能时，取出默认的筛选值
-    if (column.filters) {
-      var defaultFilteredValue = column.defaultFilteredValue;
-      if (defaultFilteredValue !== undefined) {
-        filter[dataIndex] = column.defaultFilteredValue;
+
+    // 当 column 启用服务端 sorter 功能时，取出默认的排序值
+    if (column.sorter && !isLocaleSorter(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;
+      } else {
+        var _column$defaultSortOr2;
+        sort[dataIndex] = (_column$defaultSortOr2 = column.defaultSortOrder) !== null && _column$defaultSortOr2 !== void 0 ? _column$defaultSortOr2 : null;
       }
     }
-    // 当 column 启用 sorter 功能时，取出默认的排序值
-    if (column.sorter && column.defaultSortOrder) {
-      sort[dataIndex] = column.defaultSortOrder;
-    }
   });
   return {
     sort: sort,
     filter: filter
   };
-}
+};
+
+/**
+ * 解析对应排序值，用作双向绑定
+ * @param proSort 排序配置
+ * @param columnProps 列配置
+ * @returns 排序值
+ */
+var parseProSortOrder = exports.parseProSortOrder = function parseProSortOrder(proSort, columnProps) {
+  var sorter = columnProps.sorter,
+    columnSortOrder = columnProps.sortOrder,
+    dataIndex = columnProps.dataIndex;
+
+  // 优先使用用户明确设置的 sortOrder
+  if (columnSortOrder !== undefined) return columnSortOrder;
+
+  // 如果没有排序器配置，直接返回 undefined
+  if (sorter == null) return undefined;
+
+  // 如果是本地排序，不使用 proSort 中的值
+  if (isLocaleSorter(sorter)) return undefined;
+
+  // 服务端排序：确定排序键
+  var sortKey = typeof sorter === 'string' ? sorter : parseDataIndex(dataIndex);
+
+  // 返回对应的排序值
+  return sortKey ? proSort[sortKey] : undefined;
+};
+
+/**
+ * 解析对应筛选值，用作双向绑定
+ * @param proFilter 筛选配置
+ * @param columnProps 列配置
+ * @returns 筛选值
+ */
+var parseProFilteredValue = exports.parseProFilteredValue = function parseProFilteredValue(proFilter, columnProps) {
+  var filters = columnProps.filters,
+    onFilter = columnProps.onFilter,
+    columnFilteredValue = columnProps.filteredValue,
+    dataIndex = columnProps.dataIndex;
+
+  // 优先使用用户设置的 filteredValue
+  if (columnFilteredValue !== undefined) return columnFilteredValue;
+
+  // 如果没有筛选配置，直接返回 undefined
+  if (filters == null) return undefined;
+
+  // 如果是本地筛选，不使用 proFilter 中的值
+  if (isLocaleFilter(filters, onFilter)) return undefined;
+
+  // 服务端排序：获取筛选键
+  var filterKey = parseDataIndex(dataIndex);
+
+  // 返回对应的筛选值
+  return filterKey ? proFilter[filterKey] : undefined;
+};

package/lib/utils/components/DropdownFooter/style.d.ts

@@ -4,6 +4,6 @@ export interface ProToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/lib/utils/components/FieldLabel/style.d.ts

@@ -4,6 +4,6 @@ export interface ProToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/lib/utils/components/FilterDropdown/index.js

@@ -36,7 +36,7 @@ var FilterDropdown = exports.FilterDropdown = function FilterDropdown(props) {
     open: open || false,
     onOpenChange: onOpenChange,
     styles: {
-      body: {
+      container: {
         padding: 0
       }
     },

package/lib/utils/components/FilterDropdown/style.d.ts

@@ -4,6 +4,6 @@ export interface ProToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/lib/utils/components/InlineErrorFormItem/style.d.ts

@@ -4,6 +4,6 @@ export interface ProToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/lib/utils/components/LabelIconTip/style.d.ts

@@ -4,6 +4,6 @@ export interface ProToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/lib/utils/conversionMomentValue/index.js

@@ -140,17 +140,29 @@ var conversionMomentValue = exports.conversionMomentValue = function conversionM
       tmpValue[valueKey] = conversionMomentValue(itemValue, dateFormatter, valueTypeMap, omitNil, namePath);
       return;
     }
+    var currentDateFormatter = dateFormatter !== null && dateFormatter !== void 0 ? dateFormatter : 'string';
+    var finalDateFormatter;
+    if (currentDateFormatter === 'number' || currentDateFormatter === false || typeof currentDateFormatter === 'function') {
+      finalDateFormatter = currentDateFormatter;
+    } else if (currentDateFormatter === 'string') {
+      finalDateFormatter = dateFormat || dateFormatterMap[valueType];
+    } else {
+      // Custom format string
+      finalDateFormatter = currentDateFormatter;
+    }
     // 处理 FormList 的 value
     if (Array.isArray(itemValue)) {
       tmpValue[valueKey] = itemValue.map(function (arrayValue, index) {
         if (_dayjs.default.isDayjs(arrayValue) || isMoment(arrayValue)) {
-          return convertMoment(arrayValue, dateFormat || dateFormatter, valueType);
+          // For arrays, if no format is defined and dateFormatter is 'string', use 'string' with default format
+          var arrayDateFormatter = finalDateFormatter === undefined && currentDateFormatter === 'string' ? 'string' : finalDateFormatter;
+          return convertMoment(arrayValue, arrayDateFormatter, valueType);
         }
         return conversionMomentValue(arrayValue, dateFormatter, valueTypeMap, omitNil, [valueKey, "".concat(index)].flat(1));
       });
       return;
     }
-    tmpValue[valueKey] = convertMoment(itemValue, dateFormat || (dateFormatter === 'string' ? dateFormatterMap[valueType] : dateFormatter), valueType);
+    tmpValue[valueKey] = convertMoment(itemValue, finalDateFormatter, valueType);
   });
   return tmpValue;
 };

package/lib/utils/proFieldParsingText/index.js

@@ -118,7 +118,7 @@ var TableStatus = {
 var proFieldParsingText = exports.proFieldParsingText = function proFieldParsingText(text, valueEnumParams, key) {
   if (Array.isArray(text)) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
-      split: ",",
+      separator: ",",
       size: 2,
       wrap: true,
       children: text.map(function (value, index) {