@teamix/pro 1.4.8 → 1.4.11

package/lib/actions/dialog.js

@@ -30,7 +30,7 @@ var _request = require("./request");
 
 var _utils2 = require("./utils");
 
-var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
+var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel"],
     _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -77,7 +77,9 @@ var FooterForm = function FooterForm(props) {
   var schema = props.schema,
       context = props.context,
       formRef = props.formRef;
-  var form = (0, _form.createForm)();
+  var form = (0, _react.useMemo)(function () {
+    return (0, _form.createForm)();
+  }, []);
   (0, _react.useEffect)(function () {
     formRef.current = form;
   }, []);
@@ -121,6 +123,8 @@ function useDialogAction(action, actionContext, hasForm) {
         formatResult = action.formatResult,
         onSuccess = action.onSuccess,
         onError = action.onError,
+        propsOnOk = action.onOk,
+        propsOnCancel = action.onCancel,
         others = _objectWithoutProperties(action, _excluded);
 
     var _getTargetValue = (0, _utils.getTargetValue)(others, context),
@@ -201,33 +205,34 @@ function useDialogAction(action, actionContext, hasForm) {
 
                 case 6:
                   onFinish && onFinish();
+                  propsOnOk && propsOnOk(context);
                   resolve(true);
-                  _context.next = 18;
+                  _context.next = 19;
                   break;
 
-                case 10:
-                  _context.prev = 10;
+                case 11:
+                  _context.prev = 11;
                   _context.t0 = _context["catch"](2);
                   setLoading(false); // 如果 beforeRequest 中返回了 false 并且不是 dialog-form，则直接关闭弹窗
 
                   if (!(beforeRequest && !hasForm)) {
-                    _context.next = 16;
+                    _context.next = 17;
                     break;
                   }
 
                   resolve(true);
                   return _context.abrupt("return");
 
-                case 16:
+                case 17:
                   resolve(false);
                   return _context.abrupt("return");
 
-                case 18:
+                case 19:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[2, 10]]);
+          }, _callee, null, [[2, 11]]);
         }));
 
         return function (_x) {
@@ -250,7 +255,9 @@ function useDialogAction(action, actionContext, hasForm) {
     });
     var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
-    var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
+    var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "onCancel", function onCancel() {
+      propsOnCancel && propsOnCancel(context);
+    }), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
       className: "teamix-pro-dialog-before-content"
     }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/_react.default.createElement("div", {
       className: "teamix-pro-dialog-message"

package/lib/form/Components/ProField/mapDateFormat.js

@@ -117,7 +117,6 @@ var mapDateFormat = function mapDateFormat(props, field) {
       _ref2 = _slicedToArray(_ref, 1),
       component = _ref2[0];
 
-  console.log(component);
   return {};
 };
 

package/lib/form/Filter/AdvancedFilter.js

@@ -15,7 +15,7 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
 
 var _utils2 = require("../utils");
 
-var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "forceClear"];
+var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "gridProps", "forceClear"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -23,12 +23,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -41,6 +35,12 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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; }
@@ -57,6 +57,8 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       wrapperAlign = props.wrapperAlign,
       labelCol = props.labelCol,
       wrapperCol = props.wrapperCol,
+      breakpoints = props.breakpoints,
+      gridProps = props.gridProps,
       forceClear = props.forceClear,
       otherProps = _objectWithoutProperties(props, _excluded);
 
@@ -65,13 +67,13 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     return [{
       name: 'FormGrid',
       component: 'FormGrid',
-      props: {
+      props: _objectSpread({
         breakpoints: [480, 720, 990, 1200, Infinity],
         maxColumns: [1, 2, 3, 3, 4],
         maxWidth: [480, 360, 330, 400],
         columnGap: 16,
         rowGap: 12
-      },
+      }, gridProps),
       children: [].concat(_toConsumableArray(schema), [{
         component: 'FormGrid.GridColumn',
         props: {
@@ -103,15 +105,22 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     }];
   }, [schema, onReset]);
   var getTeamixLayout = (0, _react.useMemo)(function () {
-    return {
+    return breakpoints === true ? {
       breakpoints: [990],
       layout: (0, _utils2.mergeArrayValue)(['vertical'], layout),
       labelAlign: (0, _utils2.mergeArrayValue)(['left'], labelAlign),
       wrapperAlign: (0, _utils2.mergeArrayValue)(['left'], wrapperAlign),
       labelCol: (0, _utils2.mergeArrayValue)([24], labelCol),
       wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
+    } : {
+      breakpoints: (0, _utils.isBool)(breakpoints) ? undefined : breakpoints,
+      layout: layout,
+      labelAlign: labelAlign,
+      wrapperAlign: wrapperAlign,
+      labelCol: labelCol,
+      wrapperCol: wrapperCol
     };
-  }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
+  }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
     className: (0, _utils.cls)(prefixCls(), props.className),
     schema: gridSchema,
@@ -121,6 +130,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }));
 });
 AdvancedFilter.defaultProps = {
+  breakpoints: true,
   layout: 'horizontal',
   labelAlign: 'right',
   labelCol: 6,

package/lib/form/ProForm/index.js

@@ -133,20 +133,20 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit, context); // todo 需要formily支持断点下的属性更新
 
   var getTeamixLayout = (0, _react.useMemo)(function () {
-    return breakpoints ? {
-      breakpoints: breakpoints,
-      layout: layout,
-      labelAlign: labelAlign,
-      wrapperAlign: wrapperAlign,
-      labelCol: labelCol,
-      wrapperCol: wrapperCol
-    } : {
+    return breakpoints === true ? {
       breakpoints: [480],
       layout: (0, _utils2.mergeArrayValue)(['vertical'], layout),
       labelAlign: (0, _utils2.mergeArrayValue)(['left'], labelAlign),
       wrapperAlign: (0, _utils2.mergeArrayValue)(['left'], wrapperAlign),
       labelCol: (0, _utils2.mergeArrayValue)([24], labelCol),
       wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
+    } : {
+      breakpoints: (0, _utils.isBool)(breakpoints) ? undefined : breakpoints,
+      layout: layout,
+      labelAlign: labelAlign,
+      wrapperAlign: wrapperAlign,
+      labelCol: labelCol,
+      wrapperCol: wrapperCol
     };
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
   (0, _react.useMemo)(function () {
@@ -182,7 +182,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         });
       });
     }
-  }, [onChange]);
+  }, [onChange, form]);
   (0, _react.useEffect)(function () {
     // 配置国际化
     (0, _core.setValidateLanguage)((0, _utils.getLanguage)() || 'zh-cn');
@@ -201,8 +201,9 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 });
 ProForm.defaultProps = {
   colon: false,
-  labelAlign: 'left',
-  validateFirst: true
+  validateFirst: true,
+  breakpoints: true,
+  labelAlign: 'left'
 };
 var _default = ProForm;
 exports.default = _default;

package/lib/form/typing.d.ts

@@ -59,7 +59,7 @@ export interface ProFormSchemaItem {
     data?: AnyObject;
 }
 export declare type ProFormSchema = ProFormSchemaItem[];
-export interface ProFormProps extends IFormLayoutProps {
+export interface ProFormProps extends Omit<IFormLayoutProps, 'breakpoints'> {
     form?: FormType | false;
     schema?: ProFormSchema;
     scope?: any;
@@ -77,6 +77,7 @@ export interface ProFormProps extends IFormLayoutProps {
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
     onInitialComplete?: (form: FormType) => void;
+    breakpoints?: number[] | boolean;
 }
 export interface FilterProps extends ProFormProps {
     form: FormType;
@@ -108,6 +109,7 @@ export interface QueryFilterProps extends ProFormProps {
     purePanel?: boolean;
     /** 面板是否默认展开，仅在 mode='panel' 时生效 */
     expand?: boolean;
+    gridProps?: any;
     /** 是否强制清除 */
     forceClear?: boolean;
     /** 顶部筛选区前缀 */

package/lib/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.4.8";
+declare const version = "1.4.11";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -317,5 +317,5 @@ if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMI
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
 
-var version = '1.4.8';
+var version = '1.4.11';
 exports.version = version;

package/lib/page-header/index.scss

@@ -17,6 +17,10 @@ $prefix: 'teamix-pro-page-header';
 
     &.with-description {
       margin-bottom: 0;
+      .#{$prefix}-right {
+        align-self: flex-start;
+        margin-top: 2px;
+      }
     }
   }
 

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$ge6, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge6, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s, _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
 
       (_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
 
@@ -212,24 +212,18 @@ var Filter = function Filter(props) {
         rules: selected,
         params: param
       })));
+      var targetPageKey = 'currentPage';
+      var pageInfo = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.pageInfo;
 
-      if (selected.length > 0) {
-        var _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
+      if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+        targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+      } // 发送请求
 
-        var targetPageKey = 'currentPage';
-        var pageInfo = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.pageInfo;
 
-        if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
-          targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
-        } // 发送请求
-
-
-        (_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, _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); // 清空表格选择
-
-        (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
-      }
+      (_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, _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); // 清空表格选择
 
+      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       setVisible(false);
     }
   }, (0, _utils.getMessage)('ok')), /*#__PURE__*/_react.default.createElement(_components.Button, {

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

@@ -21,7 +21,7 @@ var _QuickAction = _interopRequireDefault(require("../QuickAction"));
 
 require("./index.scss");
 
-var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "rowSelection"];
+var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "rowSelection", "toolBar"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -52,6 +52,7 @@ var Layout = function Layout(props) {
       dataFilterFormRef = props.dataFilterFormRef,
       afterDataFilter = props.afterDataFilter,
       rowSelection = props.rowSelection,
+      toolBar = props.toolBar,
       otherProps = _objectWithoutProperties(props, _excluded); // 渲染主操作区
 
 
@@ -90,7 +91,8 @@ var Layout = function Layout(props) {
       quickAction: extra,
       rowSelection: rowSelection
     }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-      actionRef: actionRef
+      actionRef: actionRef,
+      toolBar: toolBar
     }, otherProps)));
   }; // 渲染新版 QueryFilter
 
@@ -107,13 +109,11 @@ var Layout = function Layout(props) {
           onExpand: function onExpand(expand) {
             // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
             setTimeout(function () {
-              var _actionRef$current, _actionRef$current$ge;
-
-              if ((_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge = _actionRef$current.getState) === null || _actionRef$current$ge === void 0 ? void 0 : _actionRef$current$ge.call(_actionRef$current).fullScreenState) {
-                var _actionRef$current2, _actionRef$current2$r;
+              var _actionRef$current, _actionRef$current$re;
 
-                (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$r = _actionRef$current2.resetTableMaxBodyHeight) === null || _actionRef$current2$r === void 0 ? void 0 : _actionRef$current2$r.call(_actionRef$current2);
-              }
+              // if (actionRef.current?.getState?.().fullScreenState) {
+              // 偏移量8像素为面板展开后的下margin
+              (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$re = _actionRef$current.resetTableMaxBodyHeight) === null || _actionRef$current$re === void 0 ? void 0 : _actionRef$current$re.call(_actionRef$current, expand ? 8 : 0); // }
             });
             (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand) && (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand(expand));
           },
@@ -127,13 +127,11 @@ var Layout = function Layout(props) {
           onExpand: function onExpand(expand) {
             // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
             setTimeout(function () {
-              var _actionRef$current3, _actionRef$current3$g;
-
-              if ((_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState) === null || _actionRef$current3$g === void 0 ? void 0 : _actionRef$current3$g.call(_actionRef$current3).fullScreenState) {
-                var _actionRef$current4, _actionRef$current4$r;
+              var _actionRef$current2, _actionRef$current2$r;
 
-                (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$r = _actionRef$current4.resetTableMaxBodyHeight) === null || _actionRef$current4$r === void 0 ? void 0 : _actionRef$current4$r.call(_actionRef$current4);
-              }
+              // if (actionRef.current?.getState?.().fullScreenState) {
+              // 偏移量8像素为面板展开后的下margin
+              (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$r = _actionRef$current2.resetTableMaxBodyHeight) === null || _actionRef$current2$r === void 0 ? void 0 : _actionRef$current2$r.call(_actionRef$current2, expand ? 8 : 0); // }
             });
             (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand) && (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand(expand));
           },
@@ -195,9 +193,13 @@ var Layout = function Layout(props) {
     }
   };
 
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: cls()
-  }, renderLayout());
+  if ((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.schema) || mainAction || header || extra || toolBar !== false) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: cls()
+    }, renderLayout());
+  }
+
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
 };
 
 var _default = /*#__PURE__*/_react.default.memo(Layout);

package/lib/table/index.js

@@ -53,7 +53,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -215,6 +215,8 @@ var ProTable = function ProTable(props) {
       propsSize = _props$size === void 0 ? 'medium' : _props$size,
       disableSelectAll = props.disableSelectAll,
       context = props.context,
+      _props$fixedTableBody = props.fixedTableBody,
+      fixedTableBody = _props$fixedTableBody === void 0 ? false : _props$fixedTableBody,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -296,9 +298,36 @@ var ProTable = function ProTable(props) {
       actionRefCallback = _useState24[0]; // 存储定时器 id
 
 
-  var autoRefreshTimerRef = (0, _react.useRef)(); // 获取header高度，用作全屏吸底吸底高度计算
+  var autoRefreshTimerRef = (0, _react.useRef)();
+  var onResize = null;
+  (0, _react.useEffect)(function () {
+    getHeaderHeight(fullscreenState);
+
+    if (window.onresize) {
+      onResize = window.onresize;
+
+      window.onresize = function () {
+        var _onResize;
+
+        (_onResize = onResize) === null || _onResize === void 0 ? void 0 : _onResize();
+        getHeaderHeight(fullscreenState);
+      };
+    } else {
+      window.onresize = function () {
+        getHeaderHeight(fullscreenState);
+      };
+    }
 
-  var getHeaderHeight = function getHeaderHeight() {
+    return function () {
+      if (onResize) {
+        window.onresize = onResize;
+      } else {
+        window.onresize = null;
+      }
+    };
+  }, []); // 获取header高度，用作全屏吸底吸底高度计算以及固定body高度计算（滚动条在底部）
+
+  var getHeaderHeight = function getHeaderHeight(isFullscreen, offset) {
     var _tableDom$getElements, _tableDom$getElements2;
 
     var tableDom = tableRef.current;
@@ -307,16 +336,29 @@ var ProTable = function ProTable(props) {
       base: true
     });
     var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName(basePrefix('table-header-inner'))) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
-    return new Promise(function (resolve) {
-      setTimeout(function () {
-        var _headerDom$offsetHeig, _tableHeaderDom$offse;
+    var pageContainerDom = document.querySelector('.teamix-pro-page-container-header');
+    var teamixNavDom = document.querySelector('.teamix-nav-console');
+    var footerRowSelectionDom = document.querySelector('.teamix-pro-page-container-footer');
+    setTimeout(function () {
+      var _headerDom$offsetHeig, _tableHeaderDom$offse;
 
-        var headerHeight = (_headerDom$offsetHeig = headerDom === null || headerDom === void 0 ? void 0 : headerDom.offsetHeight) !== null && _headerDom$offsetHeig !== void 0 ? _headerDom$offsetHeig : 0; // table表头默认一行。即42px
+      var headerHeight = (_headerDom$offsetHeig = headerDom === null || headerDom === void 0 ? void 0 : headerDom.offsetHeight) !== null && _headerDom$offsetHeig !== void 0 ? _headerDom$offsetHeig : 0; // table表头默认一行。即42px
 
-        var tableHeaderHeight = (_tableHeaderDom$offse = tableHeaderDom === null || tableHeaderDom === void 0 ? void 0 : tableHeaderDom.offsetHeight) !== null && _tableHeaderDom$offse !== void 0 ? _tableHeaderDom$offse : 42;
-        resolve(headerHeight + tableHeaderHeight);
-      }, 50);
-    });
+      var tableHeaderHeight = (_tableHeaderDom$offse = tableHeaderDom === null || tableHeaderDom === void 0 ? void 0 : tableHeaderDom.offsetHeight) !== null && _tableHeaderDom$offse !== void 0 ? _tableHeaderDom$offse : 42;
+      var footerRowSelectionHeight = (footerRowSelectionDom === null || footerRowSelectionDom === void 0 ? void 0 : footerRowSelectionDom.offsetHeight) || 50; // 固定表格主体高度
+
+      if (fixedTableBody && !isFullscreen) {
+        var _pageContainerDom$off, _teamixNavDom$offsetH;
+
+        // 16px 为 padding
+        var pageHeaderHeight = ((_pageContainerDom$off = pageContainerDom === null || pageContainerDom === void 0 ? void 0 : pageContainerDom.offsetHeight) !== null && _pageContainerDom$off !== void 0 ? _pageContainerDom$off : 0) + 16;
+        var teamixNavHeight = (_teamixNavDom$offsetH = teamixNavDom === null || teamixNavDom === void 0 ? void 0 : teamixNavDom.offsetHeight) !== null && _teamixNavDom$offsetH !== void 0 ? _teamixNavDom$offsetH : 0;
+        setHeaderHeight(headerHeight + tableHeaderHeight + pageHeaderHeight + teamixNavHeight + footerRowSelectionHeight + 16 + (offset !== null && offset !== void 0 ? offset : 0));
+      } else {
+        // 24px 为 padding
+        setHeaderHeight(headerHeight + tableHeaderHeight + footerRowSelectionHeight + 24 + (offset !== null && offset !== void 0 ? offset : 0));
+      }
+    }, 50);
   }; // header 区域高度。用作全屏计算吸顶吸底高度。默认不做计算
 
 
@@ -514,10 +556,8 @@ var ProTable = function ProTable(props) {
 
       var state = !fullscreenState; // 全屏时需要重新计算header高度
 
-      getHeaderHeight().then(function (height) {
-        setHeaderHeight(height);
-      });
       setFullscreenState(state);
+      getHeaderHeight(state);
       actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'fullScreenState', state);
       return state;
     },
@@ -585,10 +625,8 @@ var ProTable = function ProTable(props) {
     normalDataFilterForm: normalDataFilterForm,
     fullscreenDataFilterForm: fullscreenDataFilterForm,
     filterEnableRef: filterEnableRef,
-    resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
-      getHeaderHeight().then(function (height) {
-        setHeaderHeight(height);
-      });
+    resetTableMaxBodyHeight: function resetTableMaxBodyHeight(offset) {
+      getHeaderHeight(fullscreenState, offset);
     }
   }); // 将 Actions 绑定到传入的 propsActionRef 中
 
@@ -869,9 +907,8 @@ var ProTable = function ProTable(props) {
         rowSelection: rowSelection,
         emptyContent: /*#__PURE__*/_react.default.createElement(_EmptyContent.default, null),
         sortIcons: (0, _getTableSortIcons.default)(),
-        fixedHeader: fullscreenState,
-        // 102px 为 底部 50px + 空格10px + 顶部 24px padding
-        maxBodyHeight: "calc(100vh - 84px - ".concat(headerHeight, "px)")
+        fixedHeader: fullscreenState || fixedTableBody,
+        maxBodyHeight: "calc(100vh - ".concat(headerHeight, "px)")
       }, (0, _utils.pickProps)((0, _getTableProps.default)(), otherProps))));
     } else {
       // 不传 columns 直接返回原始 Table
@@ -1013,7 +1050,7 @@ var ProTable = function ProTable(props) {
 
       }),
       ref: tableRef
-    }, renderTable(isFullScreen), footerSuctionState && footerSuction && !fullscreenState && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && !fullscreenState && renderFooter(), fullscreenState && renderFooter());
+    }, renderTable(isFullScreen), (footerSuctionState && footerSuction && !fullscreenState || fixedTableBody) && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && !fullscreenState && !fixedTableBody && renderFooter(), fullscreenState && renderFooter());
   });
 };
 

package/lib/table/typing.d.ts

@@ -141,6 +141,8 @@ export declare type ProTableProps = {
     disableSelectAll?: boolean;
     /** 接收外部传来的 context，eg: dialog-table */
     context?: any;
+    /** 是否固定表格主体（开启后横向滚动条会固定在底部） */
+    fixedTableBody?: boolean;
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;
@@ -224,7 +226,7 @@ export declare type ProTableActionTypeMutations = {
     /** 获取 列 过滤规则 */
     getFilterRules?: () => object;
     /** 重新计算表格maxHeight高度 */
-    resetTableMaxBodyHeight?: () => void;
+    resetTableMaxBodyHeight?: (offset: number) => void;
     /** 列筛选规则 */
     filterColumns?: any[];
     /** 获取所有 on 监听事件 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.4.8",
+  "version": "1.4.11",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",