@teamix/pro 1.1.36 → 1.1.40

package/lib/page-header/index.js

@@ -25,29 +25,35 @@ var _info = _interopRequireDefault(require("../info"));
 
 require("./index.scss");
 
-var _excluded = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
+var _excluded = ["text", "children"],
+    _excluded2 = ["text", "children", "closable"],
+    _excluded3 = ["color", "title", "num", "className"],
+    _excluded4 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 var cls = (0, _utils.baseClass)('teamix-pro-page-header');
 
 var renderNav = function renderNav(breadcrumbs) {
   if (breadcrumbs && breadcrumbs.length) {
     return /*#__PURE__*/_react.default.createElement(_components.Breadcrumb, null, breadcrumbs.map(function (b, i) {
-      return /*#__PURE__*/_react.default.createElement(_components.Breadcrumb.Item, {
-        key: i,
-        link: b.link
-      }, b.text);
+      var text = b.text,
+          children = b.children,
+          others = _objectWithoutProperties(b, _excluded);
+
+      return /*#__PURE__*/_react.default.createElement(_components.Breadcrumb.Item, _objectSpread({
+        key: i
+      }, others), text || children);
     }));
   }
 
@@ -69,7 +75,7 @@ var renderActionGroup = function renderActionGroup(group, defaultProps) {
         type: buttonType
       }, item);
     });
-    return /*#__PURE__*/_react.default.createElement(_actions.ActionGroup, _objectSpread(_objectSpread(_objectSpread({}, defaultProps), actionGroup), {}, {
+    return /*#__PURE__*/_react.default.createElement(_actions.ProActionGroup, _objectSpread(_objectSpread(_objectSpread({}, defaultProps), actionGroup), {}, {
       actions: actions
     }));
   }
@@ -85,15 +91,29 @@ var renderTags = function renderTags(tags) {
   return /*#__PURE__*/_react.default.createElement(_components.Tag.Group, {
     className: cls('tags')
   }, tags.map(function (tag, i) {
-    return /*#__PURE__*/_react.default.createElement(_components.Tag, {
+    // @ts-ignore
+    var text = tag.text,
+        children = tag.children,
+        closable = tag.closable,
+        others = _objectWithoutProperties(tag, _excluded2);
+
+    if (closable) {
+      return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, _objectSpread({
+        key: i,
+        size: "large",
+        style: {
+          marginBottom: 0
+        }
+      }, others), text || children);
+    }
+
+    return /*#__PURE__*/_react.default.createElement(_components.Tag, _objectSpread({
       key: i,
       size: "large",
-      type: tag.type,
-      color: tag.color,
       style: {
         marginBottom: 0
       }
-    }, tag.text);
+    }, others), text || children);
   }));
 };
 
@@ -130,26 +150,30 @@ var renderData = function renderData(data) {
   }
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, data.map(function (item, i) {
-    var _getColorAndStyle = getColorAndStyle(item.color),
+    var color = item.color,
+        title = item.title,
+        num = item.num,
+        customClassName = item.className,
+        others = _objectWithoutProperties(item, _excluded3);
+
+    var _getColorAndStyle = getColorAndStyle(color),
         className = _getColorAndStyle.className,
         style = _getColorAndStyle.style;
 
-    return /*#__PURE__*/_react.default.createElement("div", {
+    return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
       key: i,
-      className: cls('data-item')
-    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames2.default)(cls('data-item'), customClassName)
+    }, others), /*#__PURE__*/_react.default.createElement("div", {
       className: cls('data-item-title')
-    }, item.title), /*#__PURE__*/_react.default.createElement("div", {
+    }, title), /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames2.default)(cls('data-item-num'), className),
       style: style
-    }, item.num));
+    }, num));
   }));
 };
 
 var renderInfo = function renderInfo(info) {
-  // @ts-ignore
   if (info === null || info === void 0 ? void 0 : info.columns) {
-    // @ts-ignore
     return /*#__PURE__*/_react.default.createElement(_info.default, _objectSpread({
       type: "header"
     }, info));
@@ -158,7 +182,7 @@ var renderInfo = function renderInfo(info) {
   return info;
 };
 
-var PageHeader = function PageHeader(props) {
+var ProPageHeader = function ProPageHeader(props) {
   var title = props.title,
       description = props.description,
       icon = props.icon,
@@ -178,7 +202,7 @@ var PageHeader = function PageHeader(props) {
       children = props.children,
       className = props.className,
       style = props.style,
-      others = _objectWithoutProperties(props, _excluded);
+      others = _objectWithoutProperties(props, _excluded4);
 
   var history = (0, _reactRouterDom.useHistory)();
   var backgroundImage = image ? "url('".concat(image, "')") : undefined;
@@ -228,7 +252,7 @@ var PageHeader = function PageHeader(props) {
     className: cls('section')
   }, /*#__PURE__*/_react.default.createElement("nav", {
     className: cls('nav')
-  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Header.Nav, null), !loading && renderNav(breadcrumb)), /*#__PURE__*/_react.default.createElement("section", {
+  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Header.Nav, null), !loading && renderNav(breadcrumb)), /*#__PURE__*/_react.default.createElement("section", {
     className: cls('extra')
   }, !loading && renderActionGroup(extra, {
     type: 'text',
@@ -241,18 +265,18 @@ var PageHeader = function PageHeader(props) {
     className: cls('left')
   }, /*#__PURE__*/_react.default.createElement("section", {
     className: cls('title')
-  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Header.Title, null), !loading && renderTitle()), description !== undefined && /*#__PURE__*/_react.default.createElement("section", {
+  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Header.Title, null), !loading && renderTitle()), description !== undefined && /*#__PURE__*/_react.default.createElement("section", {
     className: cls('description')
-  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.BaseSkeleton.Header.Description, null), !loading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, description))), /*#__PURE__*/_react.default.createElement("section", {
+  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Header.Description, null), !loading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, description))), /*#__PURE__*/_react.default.createElement("section", {
     className: cls('right')
   }, data && !loading && /*#__PURE__*/_react.default.createElement("section", {
     className: cls('data')
   }, renderData(data)), /*#__PURE__*/_react.default.createElement("section", {
     className: cls('operation')
-  }, !loading && renderActionGroup(operation)))), info && !loading && /*#__PURE__*/_react.default.createElement("section", {
+  }, !loading && renderActionGroup(operation)))), info && /*#__PURE__*/_react.default.createElement("section", {
     className: (0, _classnames2.default)(cls('section'), cls('info'))
-  }, renderInfo(info)), children);
+  }, !loading && renderInfo(info), loading && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Info.Header, null)), children);
 };
 
-var _default = PageHeader;
+var _default = ProPageHeader;
 exports.default = _default;

package/lib/page-header/index.scss

@@ -32,6 +32,7 @@ $prefix: 'teamix-pro-page-header';
   .#{$prefix}-info {
     padding-top: var(--s-2, 8px);
     margin-bottom: 0;
+    flex-direction: column;
   }
 
   .#{$prefix}-title {
@@ -62,7 +63,7 @@ $prefix: 'teamix-pro-page-header';
 
   .#{$prefix}-description {
     margin: var(--s-2, 8px) 0;
-    color: var(--color-text1-8, #848484);
+    color: var(--color-text1-2, #5a5a5a);
   }
 
   .#{$prefix}-data {

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

@@ -0,0 +1,2 @@
+declare const _default: () => JSX.Element;
+export default _default;

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

@@ -55,7 +55,9 @@ var RadioItem = _components.Menu.RadioItem;
 
 var Filter = function Filter(props) {
   var column = props.column,
-      actionRef = props.actionRef; // 选中过滤项
+      actionRef = props.actionRef;
+  var _column$filtersWidth = column.filtersWidth,
+      filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth; // 选中过滤项
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -174,7 +176,10 @@ var Filter = function Filter(props) {
       return setVisible(false);
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: cls()
+    className: cls(),
+    style: {
+      width: filtersWidth
+    }
   }, /*#__PURE__*/_react.default.createElement(_components.Menu, null, renderSelect(), /*#__PURE__*/_react.default.createElement("div", {
     className: cls({
       'btn-box': true
@@ -186,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
 
@@ -214,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, {
@@ -231,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/Filter/index.scss

@@ -1,5 +1,5 @@
 .teamix-pro-table-toolbar-filter {
-  width: 130px;
+  min-width: 130px;
   max-height: 350px;
   overflow-y: auto;
   box-shadow: var(--popup-local-shadow, 0px 6px 24px 0px rgba(0, 0, 0, 0.1));

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;
+}