@ant-design/pro-components 3.0.0-beta.3 → 3.0.2-0

package/es/form/components/Radio/index.js

@@ -4,6 +4,8 @@ var _ref3;
 var _excluded = ["fieldProps", "options", "radioType", "layout", "proFieldProps", "valueEnum"];
 import { Radio } from 'antd';
 import React from 'react';
+import FieldRadio from "../../../field/components/Radio";
+import { ProConfigProvider } from "../../../provider";
 import { runFunction } from "../../../utils";
 import ProField from "../Field";
 import warpField from "../FormItem/warpField";
@@ -16,20 +18,53 @@ var RadioGroup = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     proFieldProps = _ref.proFieldProps,
     valueEnum = _ref.valueEnum,
     rest = _objectWithoutProperties(_ref, _excluded);
-  return /*#__PURE__*/_jsx(ProField, _objectSpread(_objectSpread({
-    valueType: radioType === 'button' ? 'radioButton' : 'radio',
-    ref: ref,
-    valueEnum: runFunction(valueEnum, undefined)
-  }, rest), {}, {
-    fieldProps: _objectSpread({
-      options: options,
-      layout: layout
-    }, fieldProps),
-    proFieldProps: proFieldProps,
-    filedConfig: {
-      customLightMode: true
-    }
-  }));
+  return /*#__PURE__*/_jsx(ProConfigProvider, {
+    valueTypeMap: {
+      radio: {
+        render: function render(text, props) {
+          return /*#__PURE__*/_jsx(FieldRadio, _objectSpread(_objectSpread({}, props), {}, {
+            text: text
+          }));
+        },
+        formItemRender: function formItemRender(text, props) {
+          return /*#__PURE__*/_jsx(FieldRadio, _objectSpread(_objectSpread({}, props), {}, {
+            text: text
+          }));
+        }
+      },
+      radioButton: {
+        render: function render(text, props) {
+          console.log(props);
+          return /*#__PURE__*/_jsx(FieldRadio, _objectSpread(_objectSpread({
+            radioType: 'button'
+          }, props), {}, {
+            text: text
+          }));
+        },
+        formItemRender: function formItemRender(text, props) {
+          return /*#__PURE__*/_jsx(FieldRadio, _objectSpread(_objectSpread({
+            radioType: 'button'
+          }, props), {}, {
+            text: text
+          }));
+        }
+      }
+    },
+    children: /*#__PURE__*/_jsx(ProField, _objectSpread(_objectSpread({
+      valueType: radioType === 'button' ? 'radioButton' : 'radio',
+      ref: ref,
+      valueEnum: runFunction(valueEnum, undefined)
+    }, rest), {}, {
+      fieldProps: _objectSpread({
+        options: options,
+        layout: layout
+      }, fieldProps),
+      proFieldProps: proFieldProps,
+      fieldConfig: {
+        customLightMode: true
+      }
+    }))
+  });
 });
 
 /**

package/es/form/components/Rate/index.js

@@ -35,7 +35,7 @@ var ProFormRate = function ProFormRate(_ref, ref) {
       fieldProps: fieldProps,
       ref: ref,
       proFieldProps: proFieldProps,
-      filedConfig: {
+      fieldConfig: {
         ignoreWidth: true
       }
     }, rest))

package/es/form/components/SchemaForm/index.js

@@ -140,12 +140,11 @@ function BetaSchemaForm(props) {
     propsOnValuesChange === null || propsOnValuesChange === void 0 || propsOnValuesChange(changedValues, values);
   }, [propsRef, shouldUpdate]);
   var formChildrenDoms = useDeepCompareMemo(function () {
-    if (!formRef.current) return;
     // like StepsForm's columns but not only for StepsForm
     if (columns.length && Array.isArray(columns[0])) return;
     return genItems(columns);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [columns, restProps === null || restProps === void 0 ? void 0 : restProps.open, action, type, formDomsDeps]);
+  }, [columns, restProps === null || restProps === void 0 ? void 0 : restProps.open, action, type, formDomsDeps, formRef.current]);
 
   /**
    * Append layoutType component specific props

package/es/form/components/Segmented/index.js

@@ -39,7 +39,7 @@ var ProFormSegmented = function ProFormSegmented(_ref, ref) {
       ref: ref,
       request: request,
       params: params,
-      filedConfig: {
+      fieldConfig: {
         customLightMode: true
       },
       proFieldProps: proFieldProps

package/es/form/components/Select/index.js

@@ -46,7 +46,7 @@ var ProFormSelectComponents = function ProFormSelectComponents(_ref, ref) {
       request: request,
       params: params,
       valueType: "select",
-      filedConfig: {
+      fieldConfig: {
         customLightMode: true
       },
       fieldProps: _objectSpread({
@@ -104,7 +104,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (_ref2, ref) {
       request: request,
       params: params,
       valueType: "select",
-      filedConfig: {
+      fieldConfig: {
         customLightMode: true
       },
       fieldProps: _objectSpread({

package/es/form/components/Slider/index.js

@@ -49,7 +49,7 @@ var ProFormSlider = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       }),
       ref: ref,
       proFieldProps: proFieldProps,
-      filedConfig: {
+      fieldConfig: {
         ignoreWidth: true
       }
     }, rest))

package/es/form/components/Switch/index.js

@@ -40,7 +40,7 @@ var ProFormSwitch = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       ref: ref,
       valuePropName: "checked",
       proFieldProps: proFieldProps,
-      filedConfig: {
+      fieldConfig: {
         valuePropName: 'checked',
         ignoreWidth: true,
         customLightMode: true

package/es/form/components/Text/index.js

@@ -25,7 +25,7 @@ var ProFormText = function ProFormText(_ref) {
   return /*#__PURE__*/_jsx(ProField, _objectSpread({
     valueType: valueType,
     fieldProps: fieldProps,
-    filedConfig: {
+    fieldConfig: {
       valueType: valueType
     },
     proFieldProps: proFieldProps
@@ -126,7 +126,7 @@ var Password = function Password(_ref2) {
               }
             }),
             proFieldProps: proFieldProps,
-            filedConfig: {
+            fieldConfig: {
               valueType: valueType
             }
           }, rest))
@@ -153,7 +153,7 @@ var Password = function Password(_ref2) {
       valueType: "password",
       fieldProps: fieldProps,
       proFieldProps: proFieldProps,
-      filedConfig: {
+      fieldConfig: {
         valueType: valueType
       }
     }, rest))

package/es/form/components/TreeSelect/index.js

@@ -38,7 +38,7 @@ var ProFormTreeSelect = function ProFormTreeSelect(_ref, ref) {
       ref: ref,
       request: request,
       params: params,
-      filedConfig: {
+      fieldConfig: {
         customLightMode: true
       },
       proFieldProps: proFieldProps

package/es/form/components/UploadButton/index.d.ts

@@ -48,5 +48,5 @@ export type ProFormUploadButtonProps = ProFormFieldItemProps<UploadProps<any>, H
      */
     imageProps?: Omit<ImageProps, 'src'>;
 } & PickUploadProps;
-declare const ProFormUploadButton: React.ForwardRefRenderFunction<any, ProFormUploadButtonProps>;
+declare const ProFormUploadButton: React.FC<ProFormUploadButtonProps>;
 export default ProFormUploadButton;

package/es/form/components/UploadButton/index.js

@@ -30,7 +30,7 @@ var getBase64 = function getBase64(file) {
  *
  * @param
  */
-var BaseProFormUploadButton = function BaseProFormUploadButton(_ref, ref) {
+var BaseProFormUploadButton = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _fieldProps$name;
   var fieldProps = _ref.fieldProps,
     action = _ref.action,
@@ -128,8 +128,8 @@ var BaseProFormUploadButton = function BaseProFormUploadButton(_ref, ref) {
       src: previewImage
     }))]
   });
-};
-var ProFormUploadButton = (_ref3 = warpField) === null || _ref3 === void 0 ? void 0 : _ref3( /*#__PURE__*/React.forwardRef(BaseProFormUploadButton), {
+});
+var ProFormUploadButton = (_ref3 = warpField) === null || _ref3 === void 0 ? void 0 : _ref3(BaseProFormUploadButton, {
   getValueFromEvent: function getValueFromEvent(value) {
     return value.fileList;
   }

package/es/form/layouts/ProForm/index.d.ts

@@ -14,7 +14,7 @@ declare namespace ProForm {
     var Provider: React.FC<import("antd/es/form/context").FormProviderProps>;
     var useFormInstance: typeof import("antd/es/form/hooks/useFormInstance").default;
     var EditOrReadOnlyContext: React.Context<{
-        mode: "read" | "edit" | "update";
+        mode: "update" | "read" | "edit";
     }>;
 }
 export { ProForm };

package/es/form/typing.d.ts

@@ -67,7 +67,7 @@ export type ExtendsProps = {
      */
     formItemProps?: FormItemProps;
     /** 给自定义组件行为开的口子 */
-    filedConfig?: ProFormItemCreateConfig;
+    fieldConfig?: ProFormItemCreateConfig;
     fieldRef?: React.Ref<CaptFieldRef | null | undefined>;
 };
 export type ProFormGroupProps = ProFormBaseGroupProps & ProFormGridConfig;

package/es/layout/ProLayout.js

@@ -125,6 +125,9 @@ var defaultPageTitleRender = function defaultPageTitleRender(pageProps, props) {
       }));
     }
     warning(typeof title === 'string', 'pro-layout: renderPageTitle return value should be a string');
+    // 当 pageTitleRender 返回非字符串值时，返回默认的 pageTitleInfo
+    // 而不是使用可能包含非字符串值的 title
+    return pageTitleInfo;
   }
   return pageTitleInfo;
 };

package/es/layout/components/SiderMenu/index.js

@@ -42,8 +42,10 @@ var SiderMenuWrapper = function SiderMenuWrapper(props) {
     placement: direction === 'rtl' ? 'right' : 'left',
     className: classNames("".concat(prefixCls, "-drawer-sider"), className),
     open: !collapsed,
-    afterOpenChange: function afterOpenChange() {
-      onCollapse === null || onCollapse === void 0 || onCollapse(true);
+    afterOpenChange: function afterOpenChange(open) {
+      if (!open) {
+        onCollapse === null || onCollapse === void 0 || onCollapse(true);
+      }
     },
     style: _objectSpread({
       padding: 0,

package/es/layout/index.d.ts

@@ -20,7 +20,6 @@ import { getPageTitle } from './getPageTitle';
 import type { ProLayoutProps } from './ProLayout';
 import { ProLayout } from './ProLayout';
 import { getMenuData } from './utils/getMenuData';
-export { Watermark as WaterMark } from 'antd';
 export * from './components/Help';
 export type { ProSettings, ProSettings as Settings } from './defaultSettings';
 export type { MenuDataItem } from './typing';

package/es/layout/index.js

@@ -11,7 +11,8 @@ import { RouteContext } from "./context/RouteContext";
 import { getPageTitle } from "./getPageTitle";
 import { ProLayout } from "./ProLayout";
 import { getMenuData } from "./utils/getMenuData";
-export { Watermark as WaterMark } from 'antd';
+
+// WaterMark component has been removed, please use antd Watermark directly
 export * from "./components/Help";
 export { DefaultFooter, DefaultHeader, FooterToolbar, getMenuData, getPageTitle, GridContent, PageContainer, PageHeader, PageLoading, ProBreadcrumb, ProLayout, ProPageHeader, RouteContext, SettingDrawer, TopNavHeader };
 export default ProLayout;

package/es/table/Table.js

@@ -6,7 +6,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["rowKey", "tableClassName", "defaultClassName", "action", "tableColumn", "type", "pagination", "rowSelection", "size", "defaultSize", "tableStyle", "toolbarDom", "hideToolbar", "searchNode", "style", "cardProps", "alertDom", "name", "onSortChange", "onFilterChange", "options", "isLightFilter", "className", "cardBordered", "editableUtils", "getRowKey"],
+var _excluded = ["rowKey", "tableClassName", "defaultClassName", "action", "tableColumn", "type", "pagination", "rowSelection", "size", "defaultSize", "tableStyle", "toolbarDom", "hideToolbar", "searchNode", "style", "cardProps", "alertDom", "name", "onSortChange", "onFilterChange", "options", "isLightFilter", "className", "cardBordered", "editableUtils", "getRowKey", "tableRef"],
   _excluded2 = ["cardBordered", "request", "className", "params", "defaultData", "headerTitle", "postData", "ghost", "pagination", "actionRef", "columns", "toolBarRender", "optionsRender", "onLoad", "onRequestError", "style", "cardProps", "tableStyle", "tableClassName", "options", "search", "name", "onLoadingChange", "rowSelection", "beforeSearchSubmit", "tableAlertRender", "defaultClassName", "formRef", "type", "columnEmptyText", "toolbar", "rowKey", "manualRequest", "polling", "tooltip", "revalidateOnFocus", "searchFormRender"];
 import { ConfigProvider, Table } from 'antd';
 import classNames from 'classnames';
@@ -24,7 +24,7 @@ import Toolbar from "./components/ToolBar";
 import { Container, TableContext } from "./Store/Provide";
 import { useStyle } from "./style";
 import useFetchData from "./useFetchData";
-import { genColumnKey, isBordered, mergePagination, parseDefaultColumnConfig, useActionType } from "./utils";
+import { flattenColumns, genColumnKey, getServerFilterResult, getServerSorterResult, isBordered, mergePagination, parseServerDefaultColumnConfig, useActionType } from "./utils";
 import { columnSort } from "./utils/columnSort";
 import { genProColumnToColumn } from "./utils/genProColumnToColumn";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -58,6 +58,7 @@ function TableRender(props) {
     cardBordered = props.cardBordered,
     editableUtils = props.editableUtils,
     getRowKey = props.getRowKey,
+    tableRef = props.tableRef,
     rest = _objectWithoutProperties(props, _excluded);
   var counter = useContext(TableContext);
 
@@ -82,6 +83,14 @@ function TableRender(props) {
     return loopFilter(tableColumns);
   }, [counter.columnsMap, tableColumns]);
 
+  // 需要进行筛选的列
+  var useFilterColumns = useMemo(function () {
+    var _columns = flattenColumns(columns);
+    return _columns.filter(function (column) {
+      return !!column.filters;
+    });
+  }, [columns]);
+
   /**
    * 如果是分页的新增，总是加到最后一行
    *
@@ -133,22 +142,14 @@ function TableRender(props) {
       onChange: function onChange(changePagination, filters, sorter, extra) {
         var _rest$onChange;
         (_rest$onChange = rest.onChange) === null || _rest$onChange === void 0 || _rest$onChange.call(rest, changePagination, filters, sorter, extra);
-        onFilterChange(omitUndefined(filters));
-
-        // 制造筛选的数据
-        // 制造一个排序的数据
-        if (Array.isArray(sorter)) {
-          var _omitUndefined;
-          var data = sorter.reduce(function (pre, value) {
-            return _objectSpread(_objectSpread({}, pre), {}, _defineProperty({}, "".concat(value.field), value.order));
-          }, {});
-          onSortChange((_omitUndefined = omitUndefined(data)) !== null && _omitUndefined !== void 0 ? _omitUndefined : {});
-        } else {
-          var _sorter$column, _omitUndefined2;
-          var sorterOfColumn = (_sorter$column = sorter.column) === null || _sorter$column === void 0 ? void 0 : _sorter$column.sorter;
-          var isSortByField = (sorterOfColumn === null || sorterOfColumn === void 0 ? void 0 : sorterOfColumn.toString()) === sorterOfColumn;
-          onSortChange((_omitUndefined2 = omitUndefined(_defineProperty({}, "".concat(isSortByField ? sorterOfColumn : sorter.field), sorter.order))) !== null && _omitUndefined2 !== void 0 ? _omitUndefined2 : {});
-        }
+
+        // 传递服务端筛选数据
+        var serverFilter = getServerFilterResult(filters, useFilterColumns);
+        onFilterChange(omitUndefined(serverFilter));
+
+        // 传递服务端排序数据
+        var serverSorter = getServerSorterResult(sorter);
+        onSortChange(omitUndefined(serverSorter));
       }
     });
   };
@@ -171,7 +172,8 @@ function TableRender(props) {
       rowProps: undefined
     },
     children: /*#__PURE__*/_jsx(Table, _objectSpread(_objectSpread({}, getTableProps()), {}, {
-      rowKey: rowKey
+      rowKey: rowKey,
+      ref: tableRef
     }))
   });
 
@@ -324,6 +326,8 @@ var ProTable = function ProTable(props) {
 
   /** 通用的来操作子节点的工具类 */
   var actionRef = useRef();
+  // antd Table 实例 ref（仅用于转发 scrollTo 能力）
+  var antTableRef = useRef(null);
   var defaultFormRef = useRef();
   var formRef = propRef || defaultFormRef;
   useImperativeHandle(propsActionRef, function () {
@@ -348,54 +352,25 @@ var ProTable = function ProTable(props) {
     _useMountMergeState4 = _slicedToArray(_useMountMergeState3, 2),
     formSearch = _useMountMergeState4[0],
     setFormSearch = _useMountMergeState4[1];
-  var _useMountMergeState5 = useMountMergeState({}),
+  var _useMemo = useMemo(function () {
+      var _parseServerDefaultCo = parseServerDefaultColumnConfig(propsColumns),
+        sort = _parseServerDefaultCo.sort,
+        filter = _parseServerDefaultCo.filter;
+      return {
+        defaultProFilter: filter,
+        defaultProSort: sort
+      };
+    }, [propsColumns]),
+    defaultProFilter = _useMemo.defaultProFilter,
+    defaultProSort = _useMemo.defaultProSort;
+  var _useMountMergeState5 = useMountMergeState(defaultProFilter),
     _useMountMergeState6 = _slicedToArray(_useMountMergeState5, 2),
     proFilter = _useMountMergeState6[0],
     setProFilter = _useMountMergeState6[1];
-  var _useMountMergeState7 = useMountMergeState({}),
+  var _useMountMergeState7 = useMountMergeState(defaultProSort),
     _useMountMergeState8 = _slicedToArray(_useMountMergeState7, 2),
     proSort = _useMountMergeState8[0],
     setProSort = _useMountMergeState8[1];
-
-  // 平铺所有columns, 用于判断是用的是本地筛选/排序
-  var loopColumns = useCallback(function (data) {
-    var _columns = [];
-    for (var i = 0; i < data.length; i++) {
-      var _curItem = data[i];
-      if (_curItem.children) {
-        loopColumns(_curItem.children);
-      } else {
-        _columns.push(_curItem);
-      }
-    }
-    return _columns;
-  }, []);
-
-  /** 如果所有列中的 filters = true | undefined 说明是用的是本地筛选 任何一列配置 filters=false，就能绕过这个判断 */
-  var useLocaleFilter = useMemo(function () {
-    var _columns = loopColumns(propsColumns);
-    return _columns === null || _columns === void 0 ? void 0 : _columns.every(function (column) {
-      return !!column.filters && !!column.onFilter || column.filters === undefined && column.onFilter === undefined;
-    });
-  }, [loopColumns, propsColumns]);
-
-  /** 如果所有列中的 sorter != true 说明是用的是本地排序 任何一列配置 sorter=true，就能绕过这个判断 */
-  var useLocaleSorter = useMemo(function () {
-    var _columns = loopColumns(propsColumns);
-    return _columns === null || _columns === void 0 ? void 0 : _columns.every(function (column) {
-      return column.sorter !== true;
-    });
-  }, [loopColumns, propsColumns]);
-
-  /** 设置默认的服務端排序和筛选值 */
-  useEffect(function () {
-    var _parseDefaultColumnCo = parseDefaultColumnConfig(propsColumns),
-      sort = _parseDefaultColumnCo.sort,
-      filter = _parseDefaultColumnCo.filter;
-    if (!useLocaleFilter) setProFilter(filter);
-    if (!useLocaleSorter) setProSort(sort);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
   var intl = useIntl();
 
   /** 需要初始化 不然默认可能报错 这里取了 defaultCurrent 和 current 为了保证不会重复刷新 */
@@ -611,13 +586,6 @@ var ProTable = function ProTable(props) {
       var _formRef$current;
       // 清空选中行
       _onCleanSelected();
-      var _parseDefaultColumnCo2 = parseDefaultColumnConfig(propsColumns),
-        sort = _parseDefaultColumnCo2.sort,
-        filter = _parseDefaultColumnCo2.filter;
-      // 清空筛选
-      setProFilter(filter);
-      // 清空排序
-      setProSort(sort);
 
       // 清空 toolbar 搜索
       counter.setKeyWords(undefined);
@@ -626,11 +594,19 @@ var ProTable = function ProTable(props) {
         current: 1
       });
 
+      // 重置绑定筛选值
+      setProFilter(defaultProFilter);
+      // 重置绑定排序值
+      setProSort(defaultProSort);
+
       // 重置表单
       formRef === null || formRef === void 0 || (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.resetFields();
-      setFormSearch({});
     },
-    editableUtils: editableUtils
+    editableUtils: editableUtils,
+    scrollTo: function scrollTo(arg) {
+      var _current, _current$scrollTo;
+      return antTableRef === null || antTableRef === void 0 || (_current = antTableRef.current) === null || _current === void 0 || (_current$scrollTo = _current.scrollTo) === null || _current$scrollTo === void 0 ? void 0 : _current$scrollTo.call(_current, arg);
+    }
   });
 
   /** 同步 action */
@@ -804,15 +780,16 @@ var ProTable = function ProTable(props) {
     toolbarDom: toolbarDom,
     hideToolbar: hideToolbar,
     onSortChange: function onSortChange(sortConfig) {
-      if (useLocaleSorter || sortConfig === proSort) return;
-      setProSort(sortConfig);
+      if (isEqual(sortConfig, proSort)) return;
+      setProSort(sortConfig !== null && sortConfig !== void 0 ? sortConfig : {});
     },
     onFilterChange: function onFilterChange(filterConfig) {
-      if (useLocaleFilter || filterConfig === proFilter) return;
-      setProFilter(filterConfig);
+      if (isEqual(filterConfig, proFilter)) return;
+      setProFilter(filterConfig !== null && filterConfig !== void 0 ? filterConfig : {});
     },
     editableUtils: editableUtils,
-    getRowKey: getRowKey
+    getRowKey: getRowKey,
+    tableRef: antTableRef
   })));
 };
 

package/es/table/components/ColumnSetting/index.js

@@ -143,7 +143,9 @@ var CheckboxList = function CheckboxList(_ref3) {
             checkedKeys.push(columnKey);
           }
         }
-        treeMap.set(key, item);
+        treeMap.set(key, _objectSpread(_objectSpread({}, item), {}, {
+          parentKey: parentConfig === null || parentConfig === void 0 ? void 0 : parentConfig.columnKey
+        }));
         return item;
       });
     };
@@ -188,7 +190,7 @@ var CheckboxList = function CheckboxList(_ref3) {
   var onCheckTree = useRefFunction(function (e) {
     var newColumnMap = _objectSpread({}, columnsMap);
     var loopSetShow = function loopSetShow(key) {
-      var _treeDataConfig$map;
+      var _treeDataConfig$map, _treeDataConfig$map2;
       var newSetting = _objectSpread({}, newColumnMap[key]);
       newSetting.show = e.checked;
       // 如果含有子节点，也要选中
@@ -198,6 +200,14 @@ var CheckboxList = function CheckboxList(_ref3) {
           return loopSetShow(item.key);
         });
       }
+
+      // 如果子节点选择，那父节点也应该选中
+      var parentKey = (_treeDataConfig$map2 = treeDataConfig.map) === null || _treeDataConfig$map2 === void 0 || (_treeDataConfig$map2 = _treeDataConfig$map2.get(key)) === null || _treeDataConfig$map2 === void 0 ? void 0 : _treeDataConfig$map2.parentKey;
+      if (parentKey) {
+        newColumnMap[parentKey] = _objectSpread(_objectSpread({}, newColumnMap[parentKey]), {}, {
+          show: true
+        });
+      }
       newColumnMap[key] = newSetting;
     };
     loopSetShow(e.node.key);

package/es/table/typing.d.ts

@@ -3,9 +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 { Key } from 'react';
 import type { CSSProperties } from 'react';
 import type { ProCardProps } from '../card';
 import type { ProFieldEmptyText } from '../field';
@@ -49,13 +50,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;
@@ -187,7 +199,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 默认的数据 */
@@ -324,6 +336,16 @@ export type ProTableProps<DataSource, U, ValueType = 'text'> = {
 export type ActionType = ProCoreActionType & {
     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/es/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'>;
 /**