@teamix/pro 1.2.4 → 1.2.8

package/lib/table/index.js

@@ -40,6 +40,8 @@ var _lodash = _interopRequireDefault(require("lodash.debounce"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _pageContainer = _interopRequireDefault(require("../page-container"));
+
 var _typing = require("./typing");
 
 Object.keys(_typing).forEach(function (key) {
@@ -53,7 +55,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -139,6 +141,7 @@ var ProTable = function ProTable(props) {
       getRowSelection = props.getRowSelection,
       primaryKey = props.primaryKey,
       footerAction = props.footerAction,
+      footer = props.footer,
       url = props.url,
       pageKey = props.pageKey,
       pageSizeKey = props.pageSizeKey,
@@ -279,10 +282,10 @@ var ProTable = function ProTable(props) {
 
   var dataFilterForm = (0, _react.useMemo)(function () {
     return (0, _form.createForm)();
-  }, []); // 获取内容区是否超出一屏（仅支持全家桶）
+  }, []); // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
 
   var getFooterSuctionState = function getFooterSuctionState() {
-    var containerDom = document.querySelector('.teamix-pro-page-container');
+    var containerDom = document.querySelector('.teamix-pro-page-container-scroll-container');
 
     if (containerDom) {
       var offsetHeight = containerDom.offsetHeight;
@@ -293,6 +296,11 @@ var ProTable = function ProTable(props) {
       } else {
         setFooterSuctionState(false);
       }
+    } else {
+      // 非全家桶用户暂时不判断滚动条逻辑
+      if (footerSuction) {
+        setFooterSuctionState(true);
+      }
     }
   }; // rowSelection 相关
 
@@ -408,7 +416,9 @@ var ProTable = function ProTable(props) {
       return _request(params);
     },
     request: function request(params) {
-      return _request(params);
+      if (dataFilterForm.validate()) {
+        _request(params);
+      }
     },
     reset: function reset() {
       var _actionRef$current, _actionRef$current$se;
@@ -695,7 +705,7 @@ var ProTable = function ProTable(props) {
   var renderFooterAction = function renderFooterAction() {
     var _footerAction$actions;
 
-    if (_typeof(footerAction) === 'object' && (footerAction === null || footerAction === void 0 ? void 0 : (_footerAction$actions = footerAction.actions) === null || _footerAction$actions === void 0 ? void 0 : _footerAction$actions.length) > 0) {
+    if (_typeof(footerAction) === 'object' && (footerAction === null || footerAction === void 0 ? void 0 : (_footerAction$actions = footerAction.actions) === null || _footerAction$actions === void 0 ? void 0 : _footerAction$actions.length) >= 0) {
       // 默认 context
       var defaultContext = {
         action: actionRef.current,
@@ -757,7 +767,7 @@ var ProTable = function ProTable(props) {
       }
     }
 
-    if (showPagination || footerAction) {
+    if (showPagination) {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer', {
           'footer-has-rowSelection': rowSelection
@@ -786,6 +796,14 @@ var ProTable = function ProTable(props) {
           return onChangePaginationSize(number);
         }
       }, props.paginationProps))));
+    } else if (!showPagination) {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: cls('footer', {
+          'footer-has-rowSelection': rowSelection
+        })
+      }, renderRowSelection(), /*#__PURE__*/_react.default.createElement("div", {
+        className: cls('footer-right-wrapper')
+      }, showSkeleton ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Pagination, null) : footer));
     }
   };
 
@@ -795,11 +813,11 @@ var ProTable = function ProTable(props) {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: cls({
       '': true,
-      fullscreen: fullscreenState,
-      'footer-suction': footerSuctionState && footerSuction
+      fullscreen: fullscreenState // 'footer-suction': footerSuctionState && footerSuction,
+
     }),
     ref: tableRef
-  }, renderTable(), renderFooter()));
+  }, renderTable(), footerSuctionState && footerSuction && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && renderFooter()));
 };
 
 var _default = ProTable;

package/lib/table/index.scss

@@ -13,6 +13,7 @@ $fullscreenPadding: 24px;
   --checkbox-semi-select-icon-content: '\ead5';
   &-footer {
     padding: 8px 0;
+    width: 100%;
   }
   &-footer-fixed {
     position: fixed;

package/lib/table/typing.d.ts

@@ -4,7 +4,7 @@
 import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
 import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
 import { IFilterProps } from '../form';
-import { ActionGroupProps, ProActionButtonProps } from '../actions';
+import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
 import { Method } from 'axios';
@@ -50,7 +50,7 @@ export declare type ProTableColumnProps = {
     /** 表头的过滤菜单宽度 */
     filtersWidth?: string | number;
     /** 操作组配置 */
-    actionSchema?: ActionGroupProps;
+    actionSchema?: ProActionGroupProps;
     /** 指定列对应的字段，支持`a.b`形式的快速取值 和 数组取值 */
     dataIndex?: string | string[];
     /** 指定 valueType 为日期时间格式时，可以格式化日期时间 */
@@ -99,7 +99,9 @@ export declare type ProTableProps = {
     /** 获取内置 rowSelection */
     getRowSelection?: (rowSelection: rowSelectionType) => void;
     /** 表格底部（左侧）配置 */
-    footerAction?: ActionGroupProps | React.ReactNode;
+    footerAction?: ProActionGroupProps | React.ReactNode;
+    /** 表格底部（右层）配置 */
+    footer?: React.ReactNode;
     /** 筛选区自动搜索的防抖时间（毫秒） */
     filterDebounce?: number;
     /** ProTable action 的引用，便于手动触发一些方法  */
@@ -211,7 +213,7 @@ export declare type ProTableTopAreaProps = {
     /** 标题区 */
     header?: ProTableHeaderProps;
     /** 主操作区 */
-    mainAction?: ActionGroupProps | React.ReactNode;
+    mainAction?: ProActionGroupProps | React.ReactNode;
     /** 工具栏区 */
     toolBar?: boolean | ProTableToolBarItem[];
     /** 快捷操作区 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.4",
+  "version": "1.2.8",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
@@ -22,9 +22,9 @@
   ],
   "private": false,
   "dependencies": {
-    "@formily/core": "2.0.2",
-    "@formily/react": "2.0.2",
-    "@teamix/formily": "2.0.2",
+    "@formily/core": "2.0.4",
+    "@formily/react": "2.0.4",
+    "@teamix/formily": "2.0.4",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.2",
     "@teamix/pro-field": "^1.0.0",