@teamix/pro 1.1.39 → 1.1.40

package/lib/table/components/EmptyContent/index.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _result = _interopRequireDefault(require("@teamix/result"));
+
+var _utils = require("@teamix/utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/** ProTable 空状态 */
+var _default = function _default() {
+  return /*#__PURE__*/_react.default.createElement(_result.default, {
+    theme: "hybridcloud-container",
+    img: "noData",
+    title: (0, _utils.getMessage)('noData')
+  });
+};
+
+exports.default = _default;

package/lib/table/components/Filter/index.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import './index.scss';
-import { ProColumnProps, ProTableActionType } from '../../typing';
+import { ProTableColumnProps, ProTableActionType } from '../../typing';
 declare type ProTableFilterProps = {
-    column: ProColumnProps;
+    column: ProTableColumnProps;
     actionRef: React.MutableRefObject<ProTableActionType | undefined>;
 };
 declare const Filter: React.FC<ProTableFilterProps>;

package/lib/table/components/Filter/index.js

@@ -191,7 +191,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$r, _actionRef$current5, _actionRef$current5$s;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r;
 
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex); // 先获取此列的param
 
@@ -219,14 +219,22 @@ var Filter = function Filter(props) {
         return null;
       })), [[column.dataIndex, param]]).filter(function (item) {
         return item && (item === null || item === void 0 ? void 0 : item[1]);
-      })); // 先发送请求。因为这会置空组件的列筛选状态
+      }));
+      var targetPageKey = 'currentPage';
+      var pageInfo = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.pageInfo;
+
+      if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+        targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+      } // 再设置所有的列筛选状态
 
-      (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$r = _actionRef$current4.request) === null || _actionRef$current4$r === void 0 ? void 0 : _actionRef$current4$r.call(_actionRef$current4, _objectSpread({}, params)); // 再设置所有的列筛选状态
 
       (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$s = _actionRef$current5.setFilterRules) === null || _actionRef$current5$s === void 0 ? void 0 : _actionRef$current5$s.call(_actionRef$current5, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: selected,
         params: param
-      })));
+      }))); // 发送请求
+
+      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
+      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7);
       setVisible(false);
     }
   }, "\u786E\u5B9A"), /*#__PURE__*/_react.default.createElement(_components.Button, {
@@ -236,15 +244,15 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current$ge6, _actionRef$current6, _actionRef$current6$g, _actionRef$current6$g2, _actionRef$current7, _actionRef$current7$s, _actionRef$current8, _actionRef$current8$f;
+      var _actionRef$current$ge6, _actionRef$current8, _actionRef$current8$g, _actionRef$current8$g2, _actionRef$current9, _actionRef$current9$s, _actionRef$current10, _actionRef$current10$;
 
       setSelected([]);
-      var rules = (_actionRef$current$ge6 = (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$g = _actionRef$current6.getState) === null || _actionRef$current6$g === void 0 ? void 0 : (_actionRef$current6$g2 = _actionRef$current6$g.call(_actionRef$current6)) === null || _actionRef$current6$g2 === void 0 ? void 0 : _actionRef$current6$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$s = _actionRef$current7.setFilterRules) === null || _actionRef$current7$s === void 0 ? void 0 : _actionRef$current7$s.call(_actionRef$current7, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
+      var rules = (_actionRef$current$ge6 = (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$g = _actionRef$current8.getState) === null || _actionRef$current8$g === void 0 ? void 0 : (_actionRef$current8$g2 = _actionRef$current8$g.call(_actionRef$current8)) === null || _actionRef$current8$g2 === void 0 ? void 0 : _actionRef$current8$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
+      (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$s = _actionRef$current9.setFilterRules) === null || _actionRef$current9$s === void 0 ? void 0 : _actionRef$current9$s.call(_actionRef$current9, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: [],
         params: ''
       })));
-      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$f = _actionRef$current8.filterDataSource) === null || _actionRef$current8$f === void 0 ? void 0 : _actionRef$current8$f.call(_actionRef$current8, column.dataIndex); // setVisible(!visible);
+      (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.filterDataSource) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, column.dataIndex); // setVisible(!visible);
     }
   }, "\u91CD\u7F6E")))));
 };

package/lib/table/components/Layout/index.js

@@ -99,7 +99,7 @@ var Layout = function Layout(props) {
       };
       return /*#__PURE__*/_react.default.createElement("div", {
         className: cls('main-action')
-      }, /*#__PURE__*/_react.default.createElement(_actions.ActionGroup, _objectSpread(_objectSpread({}, mainAction), {}, {
+      }, /*#__PURE__*/_react.default.createElement(_actions.ProActionGroup, _objectSpread(_objectSpread({}, mainAction), {}, {
         context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context)
       })));
     } else return mainAction;

package/lib/table/components/QuickAction/index.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import { IActionButton } from '../../../actions';
+import { ProActionButtonProps } from '../../../actions';
 import { ProTableActionType, innerRowSelectionType, rowSelectionType } from '../../typing';
 interface QuickActionProps {
-    quickAction?: IActionButton | React.ReactNode | React.ReactNode[];
+    quickAction?: ProActionButtonProps | React.ReactNode | React.ReactNode[];
     actionRef: React.MutableRefObject<ProTableActionType | undefined>;
     rowSelection?: innerRowSelectionType | rowSelectionType;
 }

package/lib/table/components/QuickAction/index.js

@@ -24,7 +24,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 var QuickAction = function QuickAction(props) {
   var quickAction = props.quickAction,
       actionRef = props.actionRef,
-      rowSelection = props.rowSelection; // 如果传对象的话，默认为主要文字类型的 ActionButton
+      rowSelection = props.rowSelection; // 如果传对象的话，默认为主要文字类型的 ProActionButton
 
   if (_typeof(quickAction) === 'object') {
     // 默认 context

package/lib/table/components/ToolBar/Fullscreen.js

@@ -60,6 +60,7 @@ var FullScreen = function FullScreen(props) {
     canCloseByOutSideClick: false,
     align: "cc cc",
     cache: true,
+    v2: false,
     disableScroll: true,
     shouldUpdatePosition: true,
     animation: {

package/lib/table/index.js

@@ -30,6 +30,8 @@ var _useTableSelection = _interopRequireDefault(require("./utils/useTableSelecti
 
 var _Fullscreen = _interopRequireDefault(require("./components/ToolBar/Fullscreen"));
 
+var _EmptyContent = _interopRequireDefault(require("./components/EmptyContent"));
+
 var _form = require("../form");
 
 var _actions = require("../actions");
@@ -235,7 +237,7 @@ var ProTable = function ProTable(props) {
       setShowLoading = _useState20[1]; // 存储定时器 id
 
 
-  var autoRefreshTimerRef = (0, _react.useRef)(); // 获取header高度，用作全屏吸底吸顶高度计算
+  var autoRefreshTimerRef = (0, _react.useRef)(); // 获取header高度，用作全屏吸底吸底高度计算
 
   var getHeaderHeight = function getHeaderHeight() {
     var _tableDom$getElements, _tableDom$getElements2;
@@ -265,13 +267,35 @@ var ProTable = function ProTable(props) {
   var _useState23 = (0, _react.useState)(false),
       _useState24 = _slicedToArray(_useState23, 2),
       fullscreenState = _useState24[0],
-      setFullscreenState = _useState24[1];
+      setFullscreenState = _useState24[1]; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
+
+
+  var _useState25 = (0, _react.useState)(false),
+      _useState26 = _slicedToArray(_useState25, 2),
+      footerSuctionState = _useState26[0],
+      setFooterSuctionState = _useState26[1];
   /** 筛选区域 form */
 
 
   var dataFilterForm = (0, _react.useMemo)(function () {
     return (0, _form.createForm)();
-  }, []); // rowSelection 相关
+  }, []); // 获取内容区是否超出一屏（仅支持全家桶）
+
+  var getFooterSuctionState = function getFooterSuctionState() {
+    var containerDom = document.querySelector('.teamix-pro-page-container');
+
+    if (containerDom) {
+      var offsetHeight = containerDom.offsetHeight;
+      var scrollHeight = containerDom.scrollHeight;
+
+      if (offsetHeight < scrollHeight) {
+        setFooterSuctionState(true);
+      } else {
+        setFooterSuctionState(false);
+      }
+    }
+  }; // rowSelection 相关
+
 
   var rowSelectionHook = (0, _useTableSelection.default)(_objectSpread(_objectSpread({}, propsRowSelection), {}, {
     // 当初始出现骨架屏的时候，不可选择
@@ -387,12 +411,19 @@ var ProTable = function ProTable(props) {
       return _request(params);
     },
     reset: function reset() {
-      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
+      var _actionRef$current, _actionRef$current$se;
+
+      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
+
+      (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setFilterRules) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, {});
       dataFilterForm.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
     },
+    resetPage: function resetPage() {
+      setCurrentPage(1);
+    },
     clearRowSelection: function clearRowSelection() {
       rowSelectionHook.setSelectedRowKeys([]);
       rowSelectionHook.setSelectedRecords([]);
@@ -401,8 +432,11 @@ var ProTable = function ProTable(props) {
     pageInfo: {
       total: total,
       current: currentPage,
+      targetPageKey: targetPageKey,
+      targetPageSizeKey: targetPageSizeKey,
       pageSize: pageSize
     },
+    dataFilterForm: dataFilterForm,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
         setHeaderHeight(height);
@@ -469,6 +503,11 @@ var ProTable = function ProTable(props) {
         });
       } else {
         onFormatResult(nextData);
+      } // 重新计算是否需要吸底
+
+
+      if (footerSuction) {
+        getFooterSuctionState();
       }
     },
     onError: function onError(error) {
@@ -478,12 +517,17 @@ var ProTable = function ProTable(props) {
         props.onError(error);
       } else {
         _components.Message.error(error.toString());
+      } // 重新计算是否需要吸底
+
+
+      if (footerSuction) {
+        getFooterSuctionState();
       }
     }
   }); // 请求函数
 
   function _request(params, noLoading) {
-    var _actionRef$current, _actionRef$current$se, _objectSpread2;
+    var _actionRef$current$ge, _actionRef$current2, _actionRef$current2$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -492,13 +536,15 @@ var ProTable = function ProTable(props) {
 
     var nextShowLoading = !noLoading;
     nextShowLoading !== showLoading && setShowLoading(nextShowLoading); // 请求前需要优先清空列过滤条件
+    // actionRef.current?.setFilterRules?.({});
 
-    (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setFilterRules) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, {});
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
-    var dataFilterParams = toJS(dataFilterForm.values); // 格式化后的请求参数
+    var dataFilterParams = toJS(dataFilterForm.values); // 列过滤请求参数
 
-    var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams) : _objectSpread(_objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, targetPageKey, currentPage), _defineProperty(_objectSpread2, targetPageSizeKey, pageSize), _objectSpread2), dataFilterParams), propsParams), sortParams)), params));
+    var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$g = _actionRef$current2.getFilterRules) === null || _actionRef$current2$g === void 0 ? void 0 : _actionRef$current2$g.call(_actionRef$current2)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
+
+    var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, targetPageKey, currentPage), _defineProperty(_objectSpread2, targetPageSizeKey, pageSize), _objectSpread2), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params));
 
     if (requestData) {
       if (autoRefreshTimerRef.current) {
@@ -545,6 +591,15 @@ var ProTable = function ProTable(props) {
   }
 
   (0, _react.useEffect)(function () {
+    // 监听 浏览器变化 更吸底状态
+    if (footerSuction) {
+      getFooterSuctionState();
+
+      window.onresize = function () {
+        getFooterSuctionState();
+      };
+    }
+
     if (requestWhenMount) {
       _request();
     }
@@ -553,6 +608,10 @@ var ProTable = function ProTable(props) {
       if (autoRefreshTimerRef.current) {
         clearTimeout(autoRefreshTimerRef.current);
       }
+
+      if (window.onresize) {
+        window.onresize = null;
+      }
     };
   }, []);
 
@@ -568,9 +627,12 @@ var ProTable = function ProTable(props) {
   var dataFilter = _objectSpread(_objectSpread({}, propsDataFilter), {}, {
     onFilter: (0, _lodash.default)(function () {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(_objectSpread({}, toJS(dataFilterForm.values))));
-      setCurrentPage(1);
 
-      _request(_defineProperty({}, targetPageKey, 1));
+      if (dataFilterForm.validate()) {
+        setCurrentPage(1);
+
+        _request(_defineProperty({}, targetPageKey, 1));
+      }
     }, filterDebounce),
     onReset: function onReset() {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
@@ -616,6 +678,7 @@ var ProTable = function ProTable(props) {
         sort: sort,
         primaryKey: primaryKey,
         rowSelection: rowSelection,
+        emptyContent: /*#__PURE__*/_react.default.createElement(_EmptyContent.default, null),
         sortIcons: (0, _getTableSortIcons.default)(),
         fixedHeader: fullscreenState,
         // 102px 为 底部 50px + 空格10px + 顶部 24px padding
@@ -651,7 +714,7 @@ var ProTable = function ProTable(props) {
 
       return /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer-action')
-      }, /*#__PURE__*/_react.default.createElement(_actions.ActionGroup, _objectSpread(_objectSpread({}, targetFooterActions), {}, {
+      }, /*#__PURE__*/_react.default.createElement(_actions.ProActionGroup, _objectSpread(_objectSpread({}, targetFooterActions), {}, {
         context: _objectSpread(_objectSpread({}, defaultContext), targetFooterActions === null || targetFooterActions === void 0 ? void 0 : targetFooterActions.context)
       })));
     } else return footerAction;
@@ -679,7 +742,7 @@ var ProTable = function ProTable(props) {
         if (showSkeleton) {
           return /*#__PURE__*/_react.default.createElement("div", {
             className: cls('footer-left-wrapper')
-          }, /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Footer.Operation, null));
+          }, /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Operation, null));
         } else {
           return /*#__PURE__*/_react.default.createElement("div", {
             className: cls('footer-left-wrapper')
@@ -701,7 +764,7 @@ var ProTable = function ProTable(props) {
         })
       }, renderRowSelection(), /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer-right-wrapper')
-      }, showSkeleton ? /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Footer.Pagination, null) : /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread({
+      }, showSkeleton ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Pagination, null) : /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread({
         className: cls('pagination'),
         onChange: function onChange(number) {
           return onChangePagination(number);
@@ -733,7 +796,7 @@ var ProTable = function ProTable(props) {
     className: cls({
       '': true,
       fullscreen: fullscreenState,
-      'footer-suction': footerSuction
+      'footer-suction': footerSuctionState && footerSuction
     }),
     ref: tableRef
   }, renderTable(), renderFooter()));

package/lib/table/index.scss

@@ -104,3 +104,7 @@ $fullscreenPadding: 24px;
     z-index: 2;
   }
 }
+
+.next-table-empty {
+  --table-empty-padding: 48px;
+}

package/lib/table/typing.d.ts

@@ -2,19 +2,19 @@
  * ProTable 类型定义
  */
 import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
-import { IProFieldType, IProFieldFormatterProps, IProFieldOptionItem } from '../field';
+import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
 import { IFilterProps } from '../form';
-import { ActionGroupProps, IActionButton } from '../actions';
+import { ActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
 import { Method } from 'axios';
 import React from 'react';
 import type { Form as FormType } from '@formily/core';
-declare type IFieldRenderProps = keyof IProFieldFormatterProps;
+declare type IFieldRenderProps = keyof ProFieldRenderProps;
 /** 列record函数 */
 declare type ProTableCellFunProp = (value: any, index: number, record: any) => any;
 declare type ITableCellRender = {
-    [key in IFieldRenderProps]?: IProFieldFormatterProps[key] | ProTableCellFunProp;
+    [key in IFieldRenderProps]?: ProFieldRenderProps[key] | ProTableCellFunProp;
 } | ((...other: any) => React.ReactNode);
 declare type TDataService = {
     /** 翻页器总数 */
@@ -22,7 +22,7 @@ declare type TDataService = {
     /** 表格数据 */
     data?: any;
 };
-export declare type ProColumnProps = {
+export declare type ProTableColumnProps = {
     /**
      * 会在 title 之后展示一个 icon，hover 之后提示一些信息
      */
@@ -32,7 +32,7 @@ export declare type ProColumnProps = {
      */
     tooltipIcon?: React.ReactNode;
     /** 对应 ProField 里面的 type */
-    valueType?: IProFieldType;
+    valueType?: ProFieldType;
     /** 【列配置】是否默认隐藏列 */
     columnFilters?: boolean;
     /** 【列配置】是否禁用隐藏列 */
@@ -40,7 +40,7 @@ export declare type ProColumnProps = {
     /** 渲染单元格内容字段 */
     render?: ITableCellRender;
     /** 枚举值 */
-    dataSource?: IProFieldOptionItem[] | ProTableCellFunProp;
+    dataSource?: ProFieldDataSourceItem[] | ProTableCellFunProp;
     /** 表头的过滤菜单项，当值为 true 时，自动使用 dataSource 生成 */
     filters?: boolean | ProTableColumnsFilterItemProps[];
     /** 表头的过滤菜单项过滤方式 single 单选 multiple 多选 */
@@ -56,9 +56,10 @@ export declare type ProColumnProps = {
     /** 指定 valueType 为日期时间格式时，可以格式化日期时间 */
     format?: string;
 } & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode'>;
+export declare type ProColumnProps = ProTableColumnProps;
 export declare type ProTableProps = {
     /** ProColums 定义，取代 Table 的 columns */
-    columns: ProColumnProps[];
+    columns: ProTableColumnProps[];
     /** 请求地址 */
     url?: string;
     /** 请求方法 */
@@ -163,7 +164,15 @@ export declare type ProTableActionType = {
         current?: number;
         /** 每页数据量 */
         pageSize?: number;
+        /** 翻页页数的请求参数名*/
+        targetPageKey?: string;
+        /** 翻页单页数量的请求参数名 */
+        targetPageSizeKey?: string;
     };
+    /** 重置翻页器为1，不发送请求 */
+    resetPage?: () => void;
+    /** 获取数据过滤区表单实例 */
+    dataFilterForm?: FormType;
 } & ProTableActionTypeMutations;
 /** action State 定义 */
 export declare type ProTableActionTypeMutations = {
@@ -177,6 +186,8 @@ export declare type ProTableActionTypeMutations = {
     off?: (...args: any) => void;
     /** 设置 列 过滤规则 */
     setFilterRules?: (rules: ProTableColumnsFilterRulesItem) => void;
+    /** 获取 列 过滤规则 */
+    getFilterRules?: () => object;
     /** 重新计算表格maxHeight高度 */
     resetTableMaxBodyHeight?: () => void;
 };
@@ -185,7 +196,7 @@ export declare type ProTableActionTypeState = {
     fullScreenState: boolean;
     filterRules: ProTableColumnsFilterRulesItem;
 };
-export declare type dataFilterProps = {
+export declare type ProTableDataFilterProps = {
     /** 展示形式 */
     mode?: 'inline' | 'panel';
     /** mode='panel' 时是否默认展开 */
@@ -195,25 +206,27 @@ export declare type dataFilterProps = {
     /** 搜索时是否传入值为空字符串的参数，默认不传 */
     searchEmptyString?: boolean;
 } & IFilterProps;
+export declare type dataFilterProps = ProTableDataFilterProps;
 export declare type ProTableTopAreaProps = {
     /** 标题区 */
     header?: ProTableHeaderProps;
     /** 主操作区 */
     mainAction?: ActionGroupProps | React.ReactNode;
     /** 工具栏区 */
-    toolBar?: boolean | toolBarItem[];
+    toolBar?: boolean | ProTableToolBarItem[];
     /** 快捷操作区 */
-    extra?: IActionButton | React.ReactNode | React.ReactNode[];
+    extra?: ProActionButtonProps | React.ReactNode | React.ReactNode[];
     /** 数据过滤区 */
-    dataFilter?: dataFilterProps;
+    dataFilter?: ProTableDataFilterProps;
     /** 数据过滤区 form 表单模型 */
     dataFilterForm?: FormType;
 };
 /** 单个工具栏 */
-declare type toolBarItem = React.ReactNode | 'refresh' | 'density' | 'filterColumn' | 'fullscreen';
+export declare type ProTableToolBarItem = React.ReactNode | 'refresh' | 'density' | 'filterColumn' | 'fullscreen';
+export declare type toolBarItem = ProTableToolBarItem;
 export declare type ProTableLayoutProps = {
     actionRef: React.MutableRefObject<ProTableActionType | undefined>;
-    columns?: ProColumnProps[];
+    columns?: ProTableColumnProps[];
     rowSelection?: innerRowSelectionType | rowSelectionType;
 } & ProTableTopAreaProps;
 /** columns 列过滤 */

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

@@ -2,12 +2,12 @@
  * 渲染列的逻辑函数
  */
 import React from 'react';
-import { ProColumnProps, ProTableActionType } from '../typing';
+import { ProTableColumnProps, ProTableActionType } from '../typing';
 /**
  * 增加了 icon 的功能 render title
  */
-export declare const renderColumnsTitle: (item: ProColumnProps, actionRef: React.MutableRefObject<ProTableActionType | undefined>) => JSX.Element;
+export declare const renderColumnsTitle: (item: ProTableColumnProps, actionRef: React.MutableRefObject<ProTableActionType | undefined>) => JSX.Element;
 /**
  * 负责单元格的具体渲染
  */
-export declare const renderCell: (value: any, item: ProColumnProps, index: number, record: any, actionRef: React.MutableRefObject<ProTableActionType | undefined>) => JSX.Element;
+export declare const renderCell: (value: any, item: ProTableColumnProps, index: number, record: any, actionRef: React.MutableRefObject<ProTableActionType | undefined>) => JSX.Element;

package/lib/table/utils/columnRender.js

@@ -106,7 +106,7 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
       record: record,
       action: actionRef.current
     };
-    return /*#__PURE__*/_react.default.createElement(_actions.ActionGroup, _objectSpread(_objectSpread({
+    return /*#__PURE__*/_react.default.createElement(_actions.ProActionGroup, _objectSpread(_objectSpread({
       type: "text"
     }, actionSchema), {}, {
       context: _objectSpread(_objectSpread({}, defaultContext), actionSchema.context)

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

@@ -1,9 +1,9 @@
 import React from 'react';
-import { ProColumnProps, ProTableActionType } from '../typing';
+import { ProTableColumnProps, ProTableActionType } from '../typing';
 import { ColumnProps } from '@alicloudfe/components/types/table';
 /**
  * ProColumn => Column
  */
-export default function genProColumnToColumn(columns: ProColumnProps[], 
+export default function genProColumnToColumn(columns: ProTableColumnProps[], 
 /** 是否渲染骨架屏 */
 showSkeleton: boolean, actionRef: React.MutableRefObject<ProTableActionType | undefined>): ColumnProps[];

package/lib/table/utils/genProColumnToColumn.js

@@ -41,9 +41,9 @@ showSkeleton, actionRef) {
         filters: undefined,
         sortable: false,
         dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
-        title: /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Table.TH, null),
+        title: /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Table.TH, null),
         cell: function cell() {
-          return /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Table.TD, null);
+          return /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Table.TD, null);
         }
       });
     }

package/lib/table/utils/index.js

@@ -56,6 +56,28 @@ var mutations = {
     state.filterRules = rules;
   },
 
+  /**
+   * 获取筛选规则。为params
+   */
+  getFilterRules: function getFilterRules() {
+    var result = {};
+
+    if (state.filterRules) {
+      result = Object.entries(state.filterRules).map(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+            k = _ref2[0],
+            v = _ref2[1];
+
+        return _defineProperty({}, k, v.params);
+      }).reduce(function (acc, cur) {
+        acc = _objectSpread(_objectSpread({}, acc), cur);
+        return acc;
+      }, {});
+    }
+
+    return result;
+  },
+
   /**
    * 绑定监听函数
    * @param fun 监听函数
@@ -66,14 +88,14 @@ var mutations = {
     callback[state][name] = fun;
   },
   off: function off(name) {
-    callback = Object.fromEntries(Object.entries(callback).map(function (_ref) {
-      var _ref2 = _slicedToArray(_ref, 2),
-          k = _ref2[0],
-          v = _ref2[1];
+    callback = Object.fromEntries(Object.entries(callback).map(function (_ref4) {
+      var _ref5 = _slicedToArray(_ref4, 2),
+          k = _ref5[0],
+          v = _ref5[1];
 
-      var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref3) {
-        var _ref4 = _slicedToArray(_ref3, 1),
-            k = _ref4[0];
+      var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref6) {
+        var _ref7 = _slicedToArray(_ref6, 1),
+            k = _ref7[0];
 
         return k !== name;
       }));
@@ -88,10 +110,10 @@ var useOn = function useOn(state) {
   }
 
   if (callback[state]) {
-    Object.entries(callback[state]).forEach(function (_ref5) {
-      var _ref6 = _slicedToArray(_ref5, 2),
-          k = _ref6[0],
-          v = _ref6[1];
+    Object.entries(callback[state]).forEach(function (_ref8) {
+      var _ref9 = _slicedToArray(_ref8, 2),
+          k = _ref9[0],
+          v = _ref9[1];
 
       if (v) {
         v === null || v === void 0 ? void 0 : v.apply(void 0, args);

package/lib/templates/List/index.d.ts

@@ -1,8 +1,8 @@
 import { PageProps } from '../../page-container';
-import { PageHeaderProps } from '../../page-header';
+import { ProPageHeaderProps } from '../../page-header';
 import { ProTableProps } from '../../table';
 export declare type ListPageProps = PageProps<{
-    header: PageHeaderProps;
+    header: ProPageHeaderProps;
     content: ProTableProps;
 }>;
 export declare const ListPage: (props: ListPageProps) => JSX.Element;

package/lib/utils/message.d.ts

@@ -0,0 +1,3 @@
+import { MessageProps } from '@alicloudfe/components/types/message';
+export declare type ProMessageProps = MessageProps | string;
+export declare const renderProMessage: (message: ProMessageProps) => JSX.Element;