@teamix/pro 1.4.8 → 1.4.11

package/dist/pro.js

@@ -63747,12 +63747,9 @@ var FieldDate = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().forwar
     if (type === 'timeRange') {
       if (mode === 'edit') {
         return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("div", {
-          style: {
-            border: '1px solid #ddd',
-            display: 'inline-block'
-          },
           ref: ref,
           className: classnames__WEBPACK_IMPORTED_MODULE_2___default()({
+            'teamix-pro-field-time-range': true,
             'teamix-pro-field-date': true,
             'teamix-pro-field-layout-compact': true
           })
@@ -70610,6 +70607,11 @@ function mappingOptions(fieldVal, render, options, beforeFormatter, customOption
 
   if (render && (render === null || render === void 0 ? void 0 : render.type) === 'warningLevelTag') {
     return getNodeForRender(value, targetOptions, render, renderWarningLevelTag);
+  } // 输出 event level tag
+
+
+  if (render && (render === null || render === void 0 ? void 0 : render.type) === 'eventLevelTag') {
+    return getNodeForRender(value, targetOptions, render, renderEventLevelTag);
   } // 输出 circle
 
 
@@ -70699,14 +70701,16 @@ var renderTag = function renderTag(item, render) {
   if (_typeof(render.color) === 'object') {
     return (0,_commonComponents__WEBPACK_IMPORTED_MODULE_8__/* .renderTags */ .as)(_objectSpread({
       type: 'normal',
-      children: item
+      children: item,
+      size: render.size
     }, render.color));
   }
 
   return (0,_commonComponents__WEBPACK_IMPORTED_MODULE_8__/* .renderTags */ .as)({
     color: render.color,
     type: 'normal',
-    children: item
+    children: item,
+    size: render.size
   });
 };
 /**
@@ -70735,7 +70739,31 @@ var renderWarningLevelTag = function renderWarningLevelTag(item, render) {
   return (0,_commonComponents__WEBPACK_IMPORTED_MODULE_8__/* .renderTags */ .as)({
     type: 'normal',
     children: formatLabel(item),
-    className: "custom-field-tag-".concat(item)
+    className: "custom-field-tag-".concat(item),
+    size: render.size
+  });
+};
+/**
+ * 渲渲染事件等级tag
+ * @param item 输出的文本
+ * @param render Field的render。此时render一定是ProFieldRenderProps类型
+ * @param beforeFormatter 开发者传入的最终输出前的处理
+ * @returns
+ */
+
+
+var renderEventLevelTag = function renderEventLevelTag(item, render) {
+  if ((0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNull */ .Ft)(item)) {
+    var _render$emptyText6;
+
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText6 = render.emptyText) !== null && _render$emptyText6 !== void 0 ? _render$emptyText6 : '');
+  }
+
+  return (0,_commonComponents__WEBPACK_IMPORTED_MODULE_8__/* .renderTags */ .as)({
+    type: 'normal',
+    children: item,
+    className: "custom-field-tag-event-level custom-field-tag-event-level-".concat(item),
+    size: render.size
   });
 };
 /**
@@ -70747,7 +70775,7 @@ var renderWarningLevelTag = function renderWarningLevelTag(item, render) {
 
 
 var renderStatusTag = function renderStatusTag(item, render) {
-  var rules = /(warning|success|fail|process|pause|loading)/;
+  var rules = /(warning|success|fail|process|pause|loading|help)/;
   var _render$color = render.color,
       color = _render$color === void 0 ? 'process' : _render$color,
       icon = render.icon;
@@ -70761,9 +70789,9 @@ var renderStatusTag = function renderStatusTag(item, render) {
   var colorTypeIsPreset = rules.test(color !== null && color !== void 0 ? color : '');
 
   if ((0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNull */ .Ft)(item)) {
-    var _render$emptyText6;
+    var _render$emptyText7;
 
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText6 = render.emptyText) !== null && _render$emptyText6 !== void 0 ? _render$emptyText6 : '');
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText7 = render.emptyText) !== null && _render$emptyText7 !== void 0 ? _render$emptyText7 : '');
   }
 
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_status_tag__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, _objectSpread(_objectSpread({
@@ -70786,7 +70814,7 @@ var renderStatusTag = function renderStatusTag(item, render) {
 
 
 var renderStatusIconTag = function renderStatusIconTag(item, render) {
-  var rules = /(warning|success|fail|process|pause|loading)/;
+  var rules = /(warning|success|fail|process|pause|loading|help)/;
   var _render$color2 = render.color,
       color = _render$color2 === void 0 ? 'process' : _render$color2;
 
@@ -70800,9 +70828,9 @@ var renderStatusIconTag = function renderStatusIconTag(item, render) {
   var colorTypeIsPreset = rules.test(processColor !== null && processColor !== void 0 ? processColor : '');
 
   if ((0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNull */ .Ft)(item)) {
-    var _render$emptyText7;
+    var _render$emptyText8;
 
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText7 = render.emptyText) !== null && _render$emptyText7 !== void 0 ? _render$emptyText7 : '');
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText8 = render.emptyText) !== null && _render$emptyText8 !== void 0 ? _render$emptyText8 : '');
   }
 
   var colorObject = {};
@@ -70837,9 +70865,9 @@ var renderCircle = function renderCircle(item, render) {
   var color = render.color;
 
   if ((0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNull */ .Ft)(item)) {
-    var _render$emptyText8;
+    var _render$emptyText9;
 
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText8 = render.emptyText) !== null && _render$emptyText8 !== void 0 ? _render$emptyText8 : '');
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText9 = render.emptyText) !== null && _render$emptyText9 !== void 0 ? _render$emptyText9 : '');
   }
 
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_Circle__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z, _objectSpread(_objectSpread({}, (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .hasProps */ .s_)({
@@ -76326,7 +76354,7 @@ function useDialogTableAction(action, context) {
 /* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(54842);
 /* harmony import */ var _request__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(67096);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(95983);
-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 _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -76361,7 +76389,9 @@ var FooterForm = function FooterForm(props) {
   var schema = props.schema,
       context = props.context,
       formRef = props.formRef;
-  var form = (0,_form__WEBPACK_IMPORTED_MODULE_6__/* .createForm */ .Np)();
+  var form = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
+    return (0,_form__WEBPACK_IMPORTED_MODULE_6__/* .createForm */ .Np)();
+  }, []);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
     formRef.current = form;
   }, []);
@@ -76404,6 +76434,8 @@ function useDialogAction(action, actionContext, hasForm) {
         formatResult = action.formatResult,
         onSuccess = action.onSuccess,
         onError = action.onError,
+        propsOnOk = action.onOk,
+        propsOnCancel = action.onCancel,
         others = _objectWithoutPropertiesLoose(action, _excluded);
 
     var _getTargetValue = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getTargetValue)(others, context),
@@ -76484,33 +76516,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) {
@@ -76533,7 +76566,9 @@ function useDialogAction(action, actionContext, hasForm) {
     });
     var dialogContent = Component ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, (0,_utils__WEBPACK_IMPORTED_MODULE_10__/* .addContext */ .F)(componentProps, dialogContext)) : addContextForReactNode(content, dialogContext);
 
-    var quickShowProps = _extends((_extends2 = {}, _extends2["" + (isPop ? 'onConfirm' : 'onOk')] = onOk, _extends2.title = addContextForReactNode(title, dialogContext), _extends2.content = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, beforeContent && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+    var quickShowProps = _extends((_extends2 = {}, _extends2["" + (isPop ? 'onConfirm' : 'onOk')] = onOk, _extends2.onCancel = function onCancel() {
+      propsOnCancel && propsOnCancel(context);
+    }, _extends2.title = addContextForReactNode(title, dialogContext), _extends2.content = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, beforeContent && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "teamix-pro-dialog-before-content"
     }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "teamix-pro-dialog-message"
@@ -78463,9 +78498,7 @@ var Text = function Text(_ref) {
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(80653);
 /* harmony import */ var _ProForm__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(44344);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(51344);
-var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "forceClear"];
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "gridProps", "forceClear"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -78479,6 +78512,8 @@ 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 _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 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; }
 
 
@@ -78499,6 +78534,8 @@ var AdvancedFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(fu
       wrapperAlign = _ref.wrapperAlign,
       labelCol = _ref.labelCol,
       wrapperCol = _ref.wrapperCol,
+      breakpoints = _ref.breakpoints,
+      gridProps = _ref.gridProps,
       forceClear = _ref.forceClear,
       otherProps = _objectWithoutPropertiesLoose(_ref, _excluded);
 
@@ -78507,13 +78544,13 @@ var AdvancedFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(fu
     return [{
       name: 'FormGrid',
       component: 'FormGrid',
-      props: {
+      props: _extends({
         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: {
@@ -78545,15 +78582,22 @@ var AdvancedFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(fu
     }];
   }, [schema, onReset]);
   var getTeamixLayout = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
-    return {
+    return breakpoints === true ? {
       breakpoints: [990],
       layout: (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .mergeArrayValue */ .UT)(['vertical'], layout),
       labelAlign: (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .mergeArrayValue */ .UT)(['left'], labelAlign),
       wrapperAlign: (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .mergeArrayValue */ .UT)(['left'], wrapperAlign),
       labelCol: (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .mergeArrayValue */ .UT)([24], labelCol),
       wrapperCol: (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .mergeArrayValue */ .UT)([24], wrapperCol)
+    } : {
+      breakpoints: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.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__WEBPACK_IMPORTED_MODULE_0___default().createElement(_ProForm__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, _extends({
     className: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.cls)(prefixCls(), props.className),
     schema: gridSchema,
@@ -78563,6 +78607,7 @@ var AdvancedFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(fu
   }));
 });
 AdvancedFilter.defaultProps = {
+  breakpoints: true,
   layout: 'horizontal',
   labelAlign: 'right',
   labelCol: 6,
@@ -79950,20 +79995,20 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
   var onAutoSubmit = (0,_useAutoSubmit__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(onSubmit, context); // todo 需要formily支持断点下的属性更新
 
   var getTeamixLayout = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
-    return breakpoints ? {
-      breakpoints: breakpoints,
-      layout: layout,
-      labelAlign: labelAlign,
-      wrapperAlign: wrapperAlign,
-      labelCol: labelCol,
-      wrapperCol: wrapperCol
-    } : {
+    return breakpoints === true ? {
       breakpoints: [480],
       layout: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)(['vertical'], layout),
       labelAlign: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)(['left'], labelAlign),
       wrapperAlign: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)(['left'], wrapperAlign),
       labelCol: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)([24], labelCol),
       wrapperCol: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)([24], wrapperCol)
+    } : {
+      breakpoints: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.isBool)(breakpoints) ? undefined : breakpoints,
+      layout: layout,
+      labelAlign: labelAlign,
+      wrapperAlign: wrapperAlign,
+      labelCol: labelCol,
+      wrapperCol: wrapperCol
     };
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
@@ -79999,7 +80044,7 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
         });
       });
     }
-  }, [onChange]);
+  }, [onChange, form]);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
     // 配置国际化
     (0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.setValidateLanguage)((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.getLanguage)() || 'zh-cn');
@@ -80018,8 +80063,9 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
 });
 ProForm.defaultProps = {
   colon: false,
-  labelAlign: 'left',
-  validateFirst: true
+  validateFirst: true,
+  breakpoints: true,
+  labelAlign: 'left'
 };
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ProForm);
 
@@ -82379,7 +82425,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
 
 
 
-var version = '1.4.8';
+var version = '1.4.11';
 
 
 /***/ }),
@@ -87189,7 +87235,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current4, _extends2;
+      var _actionRef$current2, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current4, _extends2, _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current8;
 
       (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.filterDataSource == null ? void 0 : _actionRef$current2.filterDataSource(column.dataIndex); // 先获取此列的param
 
@@ -87208,24 +87254,18 @@ var Filter = function Filter(props) {
         rules: selected,
         params: param
       }, _extends2)));
+      var targetPageKey = 'currentPage';
+      var pageInfo = (_actionRef$current5 = actionRef.current) == null ? void 0 : _actionRef$current5.pageInfo;
 
-      if (selected.length > 0) {
-        var _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current8;
+      if (pageInfo && pageInfo != null && pageInfo.targetPageKey) {
+        targetPageKey = pageInfo == null ? void 0 : pageInfo.targetPageKey;
+      } // 发送请求
 
-        var targetPageKey = 'currentPage';
-        var pageInfo = (_actionRef$current5 = actionRef.current) == null ? void 0 : _actionRef$current5.pageInfo;
 
-        if (pageInfo && pageInfo != null && pageInfo.targetPageKey) {
-          targetPageKey = pageInfo == null ? void 0 : pageInfo.targetPageKey;
-        } // 发送请求
-
-
-        (_actionRef$current6 = actionRef.current) == null ? void 0 : _actionRef$current6.request == null ? void 0 : _actionRef$current6.request((_actionRef$current6$r = {}, _actionRef$current6$r[targetPageKey] = 1, _actionRef$current6$r));
-        (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.resetPage == null ? void 0 : _actionRef$current7.resetPage(); // 清空表格选择
-
-        (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
-      }
+      (_actionRef$current6 = actionRef.current) == null ? void 0 : _actionRef$current6.request == null ? void 0 : _actionRef$current6.request((_actionRef$current6$r = {}, _actionRef$current6$r[targetPageKey] = 1, _actionRef$current6$r));
+      (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.resetPage == null ? void 0 : _actionRef$current7.resetPage(); // 清空表格选择
 
+      (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
       setVisible(false);
     }
   }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.getMessage)('ok')), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Button, {
@@ -87285,7 +87325,7 @@ var Filter = function Filter(props) {
 /* harmony import */ var _form__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(89417);
 /* harmony import */ var _ToolBar__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(75348);
 /* harmony import */ var _QuickAction__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(96379);
-var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "rowSelection"];
+var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "rowSelection", "toolBar"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -87310,6 +87350,7 @@ var Layout = function Layout(props) {
       dataFilterFormRef = props.dataFilterFormRef,
       afterDataFilter = props.afterDataFilter,
       rowSelection = props.rowSelection,
+      toolBar = props.toolBar,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded); // 渲染主操作区
 
 
@@ -87348,7 +87389,8 @@ var Layout = function Layout(props) {
       quickAction: extra,
       rowSelection: rowSelection
     }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_ToolBar__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z, _extends({
-      actionRef: actionRef
+      actionRef: actionRef,
+      toolBar: toolBar
     }, otherProps)));
   }; // 渲染新版 QueryFilter
 
@@ -87367,11 +87409,9 @@ var Layout = function Layout(props) {
             setTimeout(function () {
               var _actionRef$current;
 
-              if ((_actionRef$current = actionRef.current) != null && _actionRef$current.getState != null && _actionRef$current.getState().fullScreenState) {
-                var _actionRef$current2;
-
-                (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.resetTableMaxBodyHeight == null ? void 0 : _actionRef$current2.resetTableMaxBodyHeight();
-              }
+              // if (actionRef.current?.getState?.().fullScreenState) {
+              // 偏移量8像素为面板展开后的下margin
+              (_actionRef$current = actionRef.current) == null ? void 0 : _actionRef$current.resetTableMaxBodyHeight == null ? void 0 : _actionRef$current.resetTableMaxBodyHeight(expand ? 8 : 0); // }
             });
             (dataFilter == null ? void 0 : dataFilter.onExpand) && (dataFilter == null ? void 0 : dataFilter.onExpand(expand));
           },
@@ -87385,13 +87425,11 @@ var Layout = function Layout(props) {
           onExpand: function onExpand(expand) {
             // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
             setTimeout(function () {
-              var _actionRef$current3;
+              var _actionRef$current2;
 
-              if ((_actionRef$current3 = actionRef.current) != null && _actionRef$current3.getState != null && _actionRef$current3.getState().fullScreenState) {
-                var _actionRef$current4;
-
-                (_actionRef$current4 = actionRef.current) == null ? void 0 : _actionRef$current4.resetTableMaxBodyHeight == null ? void 0 : _actionRef$current4.resetTableMaxBodyHeight();
-              }
+              // if (actionRef.current?.getState?.().fullScreenState) {
+              // 偏移量8像素为面板展开后的下margin
+              (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.resetTableMaxBodyHeight == null ? void 0 : _actionRef$current2.resetTableMaxBodyHeight(expand ? 8 : 0); // }
             });
             (dataFilter == null ? void 0 : dataFilter.onExpand) && (dataFilter == null ? void 0 : dataFilter.onExpand(expand));
           },
@@ -87453,9 +87491,13 @@ var Layout = function Layout(props) {
     }
   };
 
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
-    className: cls()
-  }, renderLayout());
+  if (dataFilter != null && dataFilter.schema || mainAction || header || extra || toolBar !== false) {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+      className: cls()
+    }, renderLayout());
+  }
+
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null);
 };
 
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (/*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().memo(Layout));
@@ -88684,7 +88726,7 @@ var ToolBar = function ToolBar(props) {
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(28266);
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_13__);
 /* harmony import */ var _page_container__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(2781);
-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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -88842,6 +88884,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 = _objectWithoutPropertiesLoose(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -88911,9 +88955,34 @@ var ProTable = function ProTable(props) {
       actionRefCallback = _useState12[0]; // 存储定时器 id
 
 
-  var autoRefreshTimerRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(); // 获取header高度，用作全屏吸底吸底高度计算
+  var autoRefreshTimerRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
+  var onResize = null;
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
+    getHeaderHeight(fullscreenState);
+
+    if (window.onresize) {
+      onResize = window.onresize;
+
+      window.onresize = function () {
+        onResize == null ? void 0 : onResize();
+        getHeaderHeight(fullscreenState);
+      };
+    } else {
+      window.onresize = function () {
+        getHeaderHeight(fullscreenState);
+      };
+    }
+
+    return function () {
+      if (onResize) {
+        window.onresize = onResize;
+      } else {
+        window.onresize = null;
+      }
+    };
+  }, []); // 获取header高度，用作全屏吸底吸底高度计算以及固定body高度计算（滚动条在底部）
 
-  var getHeaderHeight = function getHeaderHeight() {
+  var getHeaderHeight = function getHeaderHeight(isFullscreen, offset) {
     var _tableDom$getElements, _tableDom$getElements2;
 
     var tableDom = tableRef.current;
@@ -88922,16 +88991,29 @@ var ProTable = function ProTable(props) {
       base: true
     });
     var tableHeaderDom = tableDom == null ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName(basePrefix('table-header-inner'))) == null ? 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 ? void 0 : headerDom.offsetHeight) != null ? _headerDom$offsetHeig : 0; // table表头默认一行。即42px
+      var headerHeight = (_headerDom$offsetHeig = headerDom == null ? void 0 : headerDom.offsetHeight) != null ? _headerDom$offsetHeig : 0; // table表头默认一行。即42px
 
-        var tableHeaderHeight = (_tableHeaderDom$offse = tableHeaderDom == null ? void 0 : tableHeaderDom.offsetHeight) != null ? _tableHeaderDom$offse : 42;
-        resolve(headerHeight + tableHeaderHeight);
-      }, 50);
-    });
+      var tableHeaderHeight = (_tableHeaderDom$offse = tableHeaderDom == null ? void 0 : tableHeaderDom.offsetHeight) != null ? _tableHeaderDom$offse : 42;
+      var footerRowSelectionHeight = (footerRowSelectionDom == null ? void 0 : footerRowSelectionDom.offsetHeight) || 50; // 固定表格主体高度
+
+      if (fixedTableBody && !isFullscreen) {
+        var _pageContainerDom$off, _teamixNavDom$offsetH;
+
+        // 16px 为 padding
+        var pageHeaderHeight = ((_pageContainerDom$off = pageContainerDom == null ? void 0 : pageContainerDom.offsetHeight) != null ? _pageContainerDom$off : 0) + 16;
+        var teamixNavHeight = (_teamixNavDom$offsetH = teamixNavDom == null ? void 0 : teamixNavDom.offsetHeight) != null ? _teamixNavDom$offsetH : 0;
+        setHeaderHeight(headerHeight + tableHeaderHeight + pageHeaderHeight + teamixNavHeight + footerRowSelectionHeight + 16 + (offset != null ? offset : 0));
+      } else {
+        // 24px 为 padding
+        setHeaderHeight(headerHeight + tableHeaderHeight + footerRowSelectionHeight + 24 + (offset != null ? offset : 0));
+      }
+    }, 50);
   }; // header 区域高度。用作全屏计算吸顶吸底高度。默认不做计算
 
 
@@ -89123,10 +89205,8 @@ var ProTable = function ProTable(props) {
 
       var state = !fullscreenState; // 全屏时需要重新计算header高度
 
-      getHeaderHeight().then(function (height) {
-        setHeaderHeight(height);
-      });
       setFullscreenState(state);
+      getHeaderHeight(state);
       actionRef == null ? void 0 : (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.setState == null ? void 0 : _actionRef$current2.setState('fullScreenState', state);
       return state;
     },
@@ -89197,10 +89277,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 中
 
@@ -89482,9 +89560,8 @@ var ProTable = function ProTable(props) {
         rowSelection: rowSelection,
         emptyContent: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_EmptyContent__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, null),
         sortIcons: (0,_utils_getTableSortIcons__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(),
-        fixedHeader: fullscreenState // 102px 为 底部 50px + 空格10px + 顶部 24px padding
-        ,
-        maxBodyHeight: "calc(100vh - 84px - " + headerHeight + "px)" // 过滤出可以传到 Table 的 Props
+        fixedHeader: fullscreenState || fixedTableBody,
+        maxBodyHeight: "calc(100vh - " + headerHeight + "px)" // 过滤出可以传到 Table 的 Props
 
       }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.pickProps)((0,_utils_getTableProps__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z)(), otherProps))));
     } else {
@@ -89631,7 +89708,7 @@ var ProTable = function ProTable(props) {
 
       }),
       ref: tableRef
-    }, renderTable(isFullScreen), footerSuctionState && footerSuction && !fullscreenState && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_page_container__WEBPACK_IMPORTED_MODULE_14__/* ["default"].FixedFooter */ .ZP.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && !fullscreenState && renderFooter(), fullscreenState && renderFooter());
+    }, renderTable(isFullScreen), (footerSuctionState && footerSuction && !fullscreenState || fixedTableBody) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_page_container__WEBPACK_IMPORTED_MODULE_14__/* ["default"].FixedFooter */ .ZP.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && !fullscreenState && !fixedTableBody && renderFooter(), fullscreenState && renderFooter());
   });
 };