@teamix/pro 1.2.26 → 1.2.30

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

@@ -1,4 +1,4 @@
-var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterForm", "rowSelection"];
+var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "rowSelection"];
 
 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; }
 
@@ -8,35 +8,18 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 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; }
 
-import React, { useEffect, useState, isValidElement } from 'react';
+import React, { isValidElement } from 'react';
 import { Header, baseClass } from '@teamix/utils';
-import { Button, Badge } from '@alicloudfe/components';
-import TeamixIcon from '@teamix/icon';
 import { ProActionGroup } from '../../../actions';
-import { SimpleFilter, AdvancedFilter, formilyReactive } from '../../../form';
-import { getMessage } from '@teamix/utils';
+import { QueryFilter, QueryFilterLayout } from '../../../form';
 import ToolBar from '../ToolBar';
 import QuickAction from '../QuickAction';
-import isEmpty from 'lodash.isempty';
 import './index.scss';
 var cls = baseClass('teamix-pro-table-layout');
-var toJS = formilyReactive.toJS;
 
 var Layout = function Layout(props) {
   var header = props.header,
@@ -44,27 +27,10 @@ var Layout = function Layout(props) {
       extra = props.extra,
       actionRef = props.actionRef,
       dataFilter = props.dataFilter,
-      dataFilterForm = props.dataFilterForm,
+      dataFilterFormRef = props.dataFilterFormRef,
       rowSelection = props.rowSelection,
-      otherProps = _objectWithoutProperties(props, _excluded);
-
-  var mode = dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.mode;
+      otherProps = _objectWithoutProperties(props, _excluded); // 渲染主操作区
 
-  var _useState = useState((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.expand) || false),
-      _useState2 = _slicedToArray(_useState, 2),
-      expand = _useState2[0],
-      setExpand = _useState2[1];
-
-  var _useState3 = useState(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      hasDot = _useState4[0],
-      setHasDot = _useState4[1];
-
-  useEffect(function () {
-    if (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.expand) {
-      setExpand(dataFilter.expand);
-    }
-  }, [dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.expand]); // 渲染主操作区
 
   var renderMainAction = function renderMainAction() {
     var _mainAction$actions;
@@ -90,95 +56,80 @@ var Layout = function Layout(props) {
         context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context)
       })));
     } else return mainAction;
-  }; // 渲染 mode='inline' 数据过滤区
+  }; // 渲染新版 QueryFilter
 
 
-  var renderInlineFilter = function renderInlineFilter() {
+  var renderQueryFilter = function renderQueryFilter() {
     var _dataFilter$schema;
 
-    if (dataFilter && (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) > 0) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: cls('inline-filter')
-      }, /*#__PURE__*/React.createElement(SimpleFilter, _objectSpread({
-        form: dataFilterForm
-      }, dataFilter)));
-    }
-  }; // 渲染 mode='panel' 数据过滤区
-
-
-  var renderPanelFilter = function renderPanelFilter() {
-    if (dataFilter) {
+    if (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) {
       var _dataFilter$schema2;
 
       if ( /*#__PURE__*/isValidElement(dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content)) {
-        // 自定义渲染内容，当 `schema=[]` 时生效
-        return /*#__PURE__*/React.createElement("div", {
-          className: cls('panel-filter'),
-          style: {
-            display: expand ? 'block' : 'none'
-          }
-        }, dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content);
+        // 自定义渲染内容
+        return /*#__PURE__*/React.createElement(QueryFilterLayout, _objectSpread({
+          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;
+
+                (_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);
+              }
+            });
+            (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand) && (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand(expand));
+          },
+          panelContent: dataFilter.content,
+          addonBefore: renderMainAction(),
+          addonAfter: /*#__PURE__*/React.createElement(React.Fragment, null, extra && !header && /*#__PURE__*/React.createElement(QuickAction, {
+            actionRef: actionRef,
+            quickAction: extra,
+            rowSelection: rowSelection
+          }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
+            actionRef: actionRef
+          }, otherProps)))
+        }, dataFilter));
       } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
-        return /*#__PURE__*/React.createElement("div", {
-          className: cls('panel-filter'),
-          style: {
-            display: expand ? 'block' : 'none'
-          }
-        }, /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread({
-          form: dataFilterForm
-        }, dataFilter)));
+        return /*#__PURE__*/React.createElement(QueryFilter, _objectSpread({
+          formRef: dataFilterFormRef,
+          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;
+
+                (_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);
+              }
+            });
+            (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand) && (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand(expand));
+          },
+          addonBefore: renderMainAction(),
+          addonAfter: /*#__PURE__*/React.createElement(React.Fragment, null, extra && !header && /*#__PURE__*/React.createElement(QuickAction, {
+            actionRef: actionRef,
+            quickAction: extra,
+            rowSelection: rowSelection
+          }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
+            actionRef: actionRef
+          }, otherProps)))
+        }, dataFilter));
       }
-    }
-  }; // 渲染过滤器按钮
-
-
-  var renderFilterBtn = function renderFilterBtn() {
-    var handleBtnClick = function handleBtnClick() {
-      setExpand(!expand);
-      var filterValues = Object.values(toJS(dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.values)).filter(function (v) {
-        return !isEmpty(v);
-      }); // console.log('filterValues', filterValues);
-
-      if (filterValues && (filterValues === null || filterValues === void 0 ? void 0 : filterValues.length) > 0) {
-        setHasDot(true);
-      } else {
-        setHasDot(false);
-      } // 全屏模式下展开收起过滤器需要重新计算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;
-
-          (_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);
-        }
+    } else if (mainAction) {
+      // 没传 dataFilter 但是传了 mainAction
+      return /*#__PURE__*/React.createElement(QueryFilterLayout, {
+        className: "mb8",
+        addonBefore: renderMainAction(),
+        addonAfter: /*#__PURE__*/React.createElement(React.Fragment, null, extra && !header && /*#__PURE__*/React.createElement(QuickAction, {
+          actionRef: actionRef,
+          quickAction: extra,
+          rowSelection: rowSelection
+        }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
+          actionRef: actionRef
+        }, otherProps)))
       });
-    };
-
-    if (mode === 'panel') {
-      if (expand === false && hasDot) {
-        return /*#__PURE__*/React.createElement(Badge, {
-          dot: true,
-          className: cls('filter-btn')
-        }, /*#__PURE__*/React.createElement(Button, {
-          onClick: handleBtnClick,
-          style: {
-            minWidth: 'unset'
-          }
-        }, /*#__PURE__*/React.createElement(TeamixIcon, {
-          type: expand ? 'up-line' : 'filter-line'
-        }), getMessage('filter')));
-      } else return /*#__PURE__*/React.createElement(Button, {
-        onClick: handleBtnClick,
-        className: cls('filter-btn'),
-        style: {
-          minWidth: 'unset'
-        }
-      }, /*#__PURE__*/React.createElement(TeamixIcon, {
-        type: expand ? 'up-line' : 'filter-line'
-      }), getMessage('filter'));
     }
   }; // 区域组合渲染
 
@@ -195,61 +146,21 @@ var Layout = function Layout(props) {
         actionRef: actionRef,
         quickAction: extra,
         rowSelection: rowSelection
-      }))), /*#__PURE__*/React.createElement("div", {
-        className: cls('wrapper')
-      }, /*#__PURE__*/React.createElement("div", {
-        className: cls('left')
-      }, mainAction && renderMainAction(), mode === 'panel' && renderFilterBtn(), mode === 'inline' && renderInlineFilter()), /*#__PURE__*/React.createElement("div", {
-        className: cls('right')
-      }, /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-        actionRef: actionRef
-      }, otherProps)))), mode === 'panel' && renderPanelFilter());
+      }))), renderQueryFilter());
     } else if (header && !mainAction) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
         className: cls('wrapper')
       }, /*#__PURE__*/React.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/React.createElement(Header, _objectSpread({}, header)), mode === 'panel' && renderFilterBtn(), mode === 'inline' && renderInlineFilter()), /*#__PURE__*/React.createElement("div", {
-        className: cls('right')
-      }, extra && /*#__PURE__*/React.createElement(QuickAction, {
-        actionRef: actionRef,
-        quickAction: extra,
-        rowSelection: rowSelection
-      }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-        actionRef: actionRef
-      }, otherProps)))), mode === 'panel' && renderPanelFilter());
+      }, header && /*#__PURE__*/React.createElement(Header, _objectSpread({}, header)), renderQueryFilter())));
     } else if (!header && mainAction) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-        className: cls('wrapper')
-      }, /*#__PURE__*/React.createElement("div", {
-        className: cls('left')
-      }, mainAction && renderMainAction(), mode === 'panel' && renderFilterBtn(), mode === 'inline' && renderInlineFilter()), /*#__PURE__*/React.createElement("div", {
-        className: cls('right')
-      }, extra && /*#__PURE__*/React.createElement(QuickAction, {
-        actionRef: actionRef,
-        quickAction: extra,
-        rowSelection: rowSelection
-      }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-        actionRef: actionRef
-      }, otherProps)))), mode === 'panel' && renderPanelFilter());
+      return /*#__PURE__*/React.createElement(React.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {
-      if (!dataFilterForm && !extra) {
+      if (!dataFilterFormRef && !extra) {
         return null;
       }
 
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-        className: cls('wrapper')
-      }, /*#__PURE__*/React.createElement("div", {
-        className: cls('left')
-      }, mode === 'panel' && renderFilterBtn(), mode === 'inline' && renderInlineFilter()), /*#__PURE__*/React.createElement("div", {
-        className: cls('right')
-      }, extra && /*#__PURE__*/React.createElement(QuickAction, {
-        actionRef: actionRef,
-        quickAction: extra,
-        rowSelection: rowSelection
-      }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-        actionRef: actionRef
-      }, otherProps)))), mode === 'panel' && renderPanelFilter());
+      return /*#__PURE__*/React.createElement(React.Fragment, null, renderQueryFilter());
     }
   };
 

package/es/table/components/Layout/index.scss

@@ -9,9 +9,10 @@ $prefix: 'teamix-pro-table-layout';
     display: flex;
     justify-content: space-between;
     margin-bottom: 8px;
-    &:not(:first-child) {
-      margin-top: 8px;
-    }
+    // margin-bottom: 8px;
+    // &:not(:first-child) {
+    //   margin-top: 8px;
+    // }
   }
   &-left {
     display: flex;

package/es/table/components/Pagination/index.js

@@ -61,6 +61,7 @@ export default (function (props) {
     onChange: propsOnChange,
     total: total,
     pageSize: pageSize,
+    current: current,
     shape: 'arrow-only',
     pageSizeList: pageSizeList,
     pageSizeSelector: pageSizeSelector,

package/es/table/components/ToolBar/FullScreenIcon.js

@@ -27,17 +27,11 @@ var FullScreenIcon = function FullScreenIcon(props) {
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
-      visible = _useState2[0],
-      setVisible = _useState2[1];
-
-  var _useState3 = useState(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      fullscreen = _useState4[0],
-      setFullscreen = _useState4[1]; // 点击全屏
+      fullscreen = _useState2[0],
+      setFullscreen = _useState2[1]; // 点击全屏
 
 
   var allScreenHandle = function allScreenHandle() {
-    setVisible(false);
     setTimeout(function () {
       var _actionRef$current, _actionRef$current$fu;
 
@@ -55,7 +49,8 @@ var FullScreenIcon = function FullScreenIcon(props) {
   }, []); // 监听全屏变化
 
   (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$o = _actionRef$current3.on) === null || _actionRef$current3$o === void 0 ? void 0 : _actionRef$current3$o.call(_actionRef$current3, function (state) {
-    setFullscreen(state);
+    // console.log('dataFilterForm', actionRef.current?.dataFilterForm);
+    setFullscreen(state); // actionRef.current?.dataFilterForm?.setValues(formValues);
   }, 'fullScreenState', 'fullscreenIcon');
   return /*#__PURE__*/React.createElement(Button, {
     iconSize: "small",

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

@@ -7,28 +7,37 @@ var FullScreen = function FullScreen(props) {
   var children = props.children,
       visible = props.visible,
       actionRef = props.actionRef;
+  var _actionRef$current = actionRef.current,
+      normalDataFilterForm = _actionRef$current.normalDataFilterForm,
+      fullscreenDataFilterForm = _actionRef$current.fullscreenDataFilterForm;
 
   function closeByESC(e) {
     if (visible && e.code === 'Escape') {
-      var _actionRef$current, _actionRef$current$se, _actionRef$current2, _actionRef$current2$f;
+      var _actionRef$current2, _actionRef$current2$s, _actionRef$current3, _actionRef$current3$f;
 
-      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setFullScreenState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, false);
-      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.fullScreen) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2);
+      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setFullScreenState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, false);
+      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$f = _actionRef$current3.fullScreen) === null || _actionRef$current3$f === void 0 ? void 0 : _actionRef$current3$f.call(_actionRef$current3);
     }
   } // 监听esc按钮
 
 
   useEffect(function () {
-    var _actionRef$current3, _actionRef$current3$s;
+    var _actionRef$current4, _actionRef$current4$s;
 
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setFullScreenState) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, visible);
+    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFullScreenState) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, visible);
     window.addEventListener('keydown', closeByESC);
     return function () {
       window.removeEventListener('keydown', closeByESC);
     };
-  }, [visible]); // 全屏开启之后
+  }, [visible]);
+
+  var afterClose = function afterClose() {
+    normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm.values);
+  }; // 全屏开启之后
+
 
   var afterOpen = function afterOpen() {
+    fullscreenDataFilterForm.setValues(normalDataFilterForm.values);
     Message.show({
       type: 'notice',
       content: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, getMessage('press')), /*#__PURE__*/React.createElement("span", {
@@ -40,13 +49,15 @@ var FullScreen = function FullScreen(props) {
     });
   };
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, children, /*#__PURE__*/React.createElement(Overlay, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, children(false), /*#__PURE__*/React.createElement(Overlay, {
     canCloseByOutSideClick: false,
     align: "cc cc",
     cache: true,
     v2: false,
     disableScroll: true,
     shouldUpdatePosition: true,
+    afterClose: afterClose,
+    afterOpen: afterOpen,
     animation: {
       in: 'fadeIn',
       out: 'fadeOut'
@@ -55,15 +66,14 @@ var FullScreen = function FullScreen(props) {
     wrapperStyle: {
       zIndex: 999
     },
-    afterOpen: afterOpen,
     onRequestClose: function onRequestClose() {
-      var _actionRef$current4, _actionRef$current4$f;
+      var _actionRef$current5, _actionRef$current5$f;
 
-      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$f = _actionRef$current4.fullScreen) === null || _actionRef$current4$f === void 0 ? void 0 : _actionRef$current4$f.call(_actionRef$current4);
+      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$f = _actionRef$current5.fullScreen) === null || _actionRef$current5$f === void 0 ? void 0 : _actionRef$current5$f.call(_actionRef$current5);
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "teamix-pro-table-full-screen"
-  }, children)));
+  }, children(true))));
 };
 
 export default FullScreen;