@teamix/pro 1.2.30 → 1.2.34

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

@@ -56,6 +56,19 @@ var Layout = function Layout(props) {
         context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context)
       })));
     } else return mainAction;
+  }; // 渲染 addonAfter
+
+
+  var renderAddonAfter = function renderAddonAfter() {
+    return /*#__PURE__*/React.createElement("div", {
+      className: cls('addon-after-wrapper')
+    }, extra && !header && /*#__PURE__*/React.createElement(QuickAction, {
+      actionRef: actionRef,
+      quickAction: extra,
+      rowSelection: rowSelection
+    }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
+      actionRef: actionRef
+    }, otherProps)));
   }; // 渲染新版 QueryFilter
 
 
@@ -83,13 +96,7 @@ var Layout = function Layout(props) {
           },
           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)))
+          addonAfter: renderAddonAfter()
         }, 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(QueryFilter, _objectSpread({
@@ -108,27 +115,18 @@ var Layout = function Layout(props) {
             (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)))
+          addonAfter: renderAddonAfter()
         }, dataFilter));
       }
     } 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)))
+        addonAfter: renderAddonAfter()
+      });
+    } else {
+      return /*#__PURE__*/React.createElement(QueryFilterLayout, {
+        addonAfter: renderAddonAfter()
       });
     }
   }; // 区域组合渲染
@@ -148,11 +146,19 @@ var Layout = function Layout(props) {
         rowSelection: rowSelection
       }))), renderQueryFilter());
     } else if (header && !mainAction) {
+      var _dataFilter$schema3, _dataFilter$schema4;
+
       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)), renderQueryFilter())));
+      }, header && /*#__PURE__*/React.createElement(Header, _objectSpread({}, header)), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter()), /*#__PURE__*/React.createElement("div", {
+        className: cls('right')
+      }, extra && /*#__PURE__*/React.createElement(QuickAction, {
+        actionRef: actionRef,
+        quickAction: extra,
+        rowSelection: rowSelection
+      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter())));
     } else if (!header && mainAction) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {

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

@@ -37,4 +37,11 @@ $prefix: 'teamix-pro-table-layout';
     padding: 16px;
     background: var(--panel-filter-bg, var(--color-fill1-2));
   }
+  &-main-action {
+    margin-bottom: 8px;
+  }
+  &-addon-after-wrapper {
+    display: flex;
+    align-items: center;
+  }
 }

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

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { Message, Overlay } from '@alicloudfe/components';
 import './index.scss';
-import { getMessage } from '@teamix/utils';
+import { getMessage, getValidValues } from '@teamix/utils';
 
 var FullScreen = function FullScreen(props) {
   var children = props.children,
@@ -9,35 +9,59 @@ var FullScreen = function FullScreen(props) {
       actionRef = props.actionRef;
   var _actionRef$current = actionRef.current,
       normalDataFilterForm = _actionRef$current.normalDataFilterForm,
-      fullscreenDataFilterForm = _actionRef$current.fullscreenDataFilterForm;
+      fullscreenDataFilterForm = _actionRef$current.fullscreenDataFilterForm,
+      filterEnableRef = _actionRef$current.filterEnableRef;
 
-  function closeByESC(e) {
+  var closeByESC = function closeByESC(e) {
     if (visible && e.code === 'Escape') {
-      var _actionRef$current2, _actionRef$current2$s, _actionRef$current3, _actionRef$current3$f;
+      var _actionRef$current2, _actionRef$current2$f;
 
-      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);
+      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);
     }
-  } // 监听esc按钮
+  }; // 监听esc按钮
 
 
   useEffect(function () {
-    var _actionRef$current4, _actionRef$current4$s;
-
-    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, actionRef]);
 
   var afterClose = function afterClose() {
-    normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm.values);
+    // 判断全屏前后筛选表单值是否有改变
+    var n = JSON.stringify(getValidValues(normalDataFilterForm.values));
+    var f = JSON.stringify(getValidValues(fullscreenDataFilterForm.values));
+
+    if (n === f) {
+      // 关闭全屏后，表单值未变化，开启普通表单onFilter
+      filterEnableRef.current.normal = true;
+    } else {
+      // 关闭全屏后，表单值有变化，修改表单值
+      normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm.values);
+    } // 关闭全屏后，关闭全屏表单onFilter
+
+
+    filterEnableRef.current.fullscreen = false;
   }; // 全屏开启之后
 
 
   var afterOpen = function afterOpen() {
-    fullscreenDataFilterForm.setValues(normalDataFilterForm.values);
+    // 判断全屏前后筛选表单值是否有改变
+    var n = JSON.stringify(getValidValues(normalDataFilterForm.values));
+    var f = JSON.stringify(getValidValues(fullscreenDataFilterForm.values));
+
+    if (n === f) {
+      // 全屏后，表单值未变化，开启全屏表单onFilter
+      filterEnableRef.current.fullscreen = true;
+    } else {
+      // 全屏后，表单值变化，修改表单值
+      fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.setValues(normalDataFilterForm.values);
+    } // 全屏后，关闭普通表单onFilter
+
+
+    filterEnableRef.current.normal = false; // 消息提示
+
     Message.show({
       type: 'notice',
       content: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, getMessage('press')), /*#__PURE__*/React.createElement("span", {
@@ -67,9 +91,9 @@ var FullScreen = function FullScreen(props) {
       zIndex: 999
     },
     onRequestClose: function onRequestClose() {
-      var _actionRef$current5, _actionRef$current5$f;
+      var _actionRef$current3, _actionRef$current3$f;
 
-      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);
+      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);
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "teamix-pro-table-full-screen"

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

@@ -1,6 +1,7 @@
 .teamix-pro-table-toolbar {
   width: 100%;
   text-align: right;
+  margin-bottom: 8px;
 }
 .teamix-pro-table-toolbar-custom {
   display: inline-block;

package/es/table/index.js

@@ -40,7 +40,7 @@ import { baseClass, useRequest, request as utilResquest, getDeepValue, getMessag
 import { ProSkeletonRaw as Skeleton } from '../skeleton';
 import './index.scss';
 import Layout from './components/Layout';
-import { emit, initActionRef, processDefaultFilter, useActionType } from './utils';
+import { actionRefUseStateOn, emit, initActionRef, processDefaultFilter, useActionType } from './utils';
 import getTableProps from './utils/getTableProps';
 import getTableSortIcons from './utils/getTableSortIcons';
 import useTableSelection from './utils/useTableSelection';
@@ -121,7 +121,7 @@ var globalFormatSort = function globalFormatSort(sort) {
 };
 
 var ProTable = function ProTable(props) {
-  var _rowSelection$selecte, _dataFilterForm4;
+  var _rowSelection$selecte;
 
   var header = props.header,
       className = props.className,
@@ -237,7 +237,24 @@ var ProTable = function ProTable(props) {
   var _useState19 = useState(true),
       _useState20 = _slicedToArray(_useState19, 2),
       showLoading = _useState20[0],
-      setShowLoading = _useState20[1]; // 存储定时器 id
+      setShowLoading = _useState20[1]; // 存储能够被 on 监听到的 ProTable 状态
+  // 因为只做存储用。不需要更新视图以及需要同步更改。所以不使用 setState 更新
+
+
+  var _useState21 = useState({
+    fullScreenState: false,
+    filterRules: {},
+    filterColumns: []
+  }),
+      _useState22 = _slicedToArray(_useState21, 1),
+      actionRefState = _useState22[0]; // 存储 on 监听事件
+
+
+  var _useState23 = useState({
+    fullScreenState: {}
+  }),
+      _useState24 = _slicedToArray(_useState23, 1),
+      actionRefCallback = _useState24[0]; // 存储定时器 id
 
 
   var autoRefreshTimerRef = useRef(); // 获取header高度，用作全屏吸底吸底高度计算
@@ -261,18 +278,23 @@ var ProTable = function ProTable(props) {
   }; // header 区域高度。用作全屏计算吸顶吸底高度。默认不做计算
 
 
-  var _useState21 = useState(0),
-      _useState22 = _slicedToArray(_useState21, 2),
-      headerHeight = _useState22[0],
-      setHeaderHeight = _useState22[1]; // 全屏显示 className
+  var _useState25 = useState(0),
+      _useState26 = _slicedToArray(_useState25, 2),
+      headerHeight = _useState26[0],
+      setHeaderHeight = _useState26[1]; // 全屏显示 className
 
 
-  var _useState23 = useState(false),
-      _useState24 = _slicedToArray(_useState23, 2),
-      fullscreenState = _useState24[0],
-      setFullscreenState = _useState24[1]; // 非全屏状态下的
+  var _useState27 = useState(false),
+      _useState28 = _slicedToArray(_useState27, 2),
+      fullscreenState = _useState28[0],
+      setFullscreenState = _useState28[1]; // 切换全屏搜索开关
 
 
+  var filterEnableRef = useRef({
+    fullscreen: false,
+    normal: true
+  }); // 非全屏状态下的
+
   var normalDataFilterFormRef = useRef();
   var fullscreenDataFilterFormRef = useRef();
   var normalDataFilterForm = normalDataFilterFormRef.current;
@@ -281,10 +303,10 @@ var ProTable = function ProTable(props) {
   var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
   var dataFilterForm = dataFilterFormRef.current; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
 
-  var _useState25 = useState(false),
-      _useState26 = _slicedToArray(_useState25, 2),
-      footerSuctionState = _useState26[0],
-      setFooterSuctionState = _useState26[1]; // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
+  var _useState29 = useState(false),
+      _useState30 = _slicedToArray(_useState29, 2),
+      footerSuctionState = _useState30[0],
+      setFooterSuctionState = _useState30[1]; // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
 
 
   var getFooterSuctionState = function getFooterSuctionState() {
@@ -407,25 +429,63 @@ var ProTable = function ProTable(props) {
     if (propsDataSource) {
       setData(propsDataSource);
     }
-  }, [propsDataSource]); // 绑定 Actions
+  }, [propsDataSource]); // 初始化 ActionRef。
+
+  initActionRef(actionRef, {
+    getState: function getState() {
+      return actionRefState;
+    },
+    getCallback: function getCallback() {
+      return actionRefCallback;
+    },
+    setState: function setState(key, value) {
+      actionRefState[key] = value;
+      actionRefUseStateOn(actionRefCallback, key, value);
+    },
+    on: function on(fun, state, name) {
+      if (!actionRefCallback[state]) {
+        actionRefCallback[state] = {};
+      }
+
+      actionRefCallback[state][name] = fun;
+    },
+    off: function off(name) {
+      actionRefCallback = Object.fromEntries(Object.entries(actionRefCallback).map(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+            k = _ref2[0],
+            v = _ref2[1];
+
+        var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref3) {
+          var _ref4 = _slicedToArray(_ref3, 1),
+              k = _ref4[0];
+
+          return k !== name;
+        }));
+        return [k, filterV];
+      }));
+    }
+  }); // 绑定 Actions
 
   useActionType(actionRef, {
     fullScreen: function fullScreen() {
+      var _actionRef$current2, _actionRef$current2$s;
+
       var state = !fullscreenState; // 全屏时需要重新计算header高度
 
       getHeaderHeight().then(function (height) {
         setHeaderHeight(height);
       });
       setFullscreenState(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;
     },
     setColumn: function setColumn(newColumns) {
-      var _actionRef$current2, _actionRef$current2$s;
+      var _actionRef$current3, _actionRef$current3$s;
 
       var update = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var columns = processColumns(newColumns, propsColumns);
       setFilteredColumns(columns);
-      (_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, 'filterColumns', columns);
+      (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setState) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, 'filterColumns', columns);
 
       if (update) {
         emit('refreshFilterState', newColumns);
@@ -450,12 +510,12 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current3, _actionRef$current3$s, _dataFilterForm;
+      var _actionRef$current4, _actionRef$current4$s;
 
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
 
-      (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setFilterRules) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, {});
-      (_dataFilterForm = dataFilterForm) === null || _dataFilterForm === void 0 ? void 0 : _dataFilterForm.reset();
+      (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, {});
+      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
@@ -480,6 +540,7 @@ var ProTable = function ProTable(props) {
     dataFilterForm: dataFilterForm,
     normalDataFilterForm: normalDataFilterForm,
     fullscreenDataFilterForm: fullscreenDataFilterForm,
+    filterEnableRef: filterEnableRef,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
         setHeaderHeight(height);
@@ -568,8 +629,8 @@ var ProTable = function ProTable(props) {
     }
   }); // 请求函数
 
-  function _request(params, noLoading) {
-    var _dataFilterForm2, _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
+  function _request(params, noLoading, filterParams) {
+    var _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -582,9 +643,9 @@ var ProTable = function ProTable(props) {
 
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
-    var dataFilterParams = toJS((_dataFilterForm2 = dataFilterForm) === null || _dataFilterForm2 === void 0 ? void 0 : _dataFilterForm2.values); // 列过滤请求参数
+    var dataFilterParams = filterParams !== null && filterParams !== void 0 ? filterParams : dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.values; // 列过滤请求参数
 
-    var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$g = _actionRef$current4.getFilterRules) === null || _actionRef$current4$g === void 0 ? void 0 : _actionRef$current4$g.call(_actionRef$current4)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
+    var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$g = _actionRef$current5.getFilterRules) === null || _actionRef$current5$g === void 0 ? void 0 : _actionRef$current5$g.call(_actionRef$current5)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
 
     var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, targetPageKey, currentPage), _defineProperty(_objectSpread2, targetPageSizeKey, pageSize), _objectSpread2), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params));
 
@@ -633,33 +694,24 @@ var ProTable = function ProTable(props) {
   }
 
   useEffect(function () {
-    // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
-    initActionRef();
-    dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
+    var _propsDataFilter$sche, _propsDataFilter$sche2;
 
+    // 监听 浏览器变化 更吸底状态
     if (footerSuction) {
       getFooterSuctionState();
 
       window.onresize = function () {
         getFooterSuctionState();
       };
-    }
+    } // 如果不传 dataFilter，则在这里初始化请求
 
-    if (propsDataFilter) {
-      var _dataFilterForm3;
 
-      if (requestWhenMount && ((_dataFilterForm3 = dataFilterForm) === null || _dataFilterForm3 === void 0 ? void 0 : _dataFilterForm3.id)) {
-        // 在请求发送之前 处理漏斗默认数据
-        processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
+    var hasDataFilter = (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : (_propsDataFilter$sche = propsDataFilter.schema) === null || _propsDataFilter$sche === void 0 ? void 0 : _propsDataFilter$sche.length) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : (_propsDataFilter$sche2 = propsDataFilter.schema) === null || _propsDataFilter$sche2 === void 0 ? void 0 : _propsDataFilter$sche2.length) > 0;
 
-        _request();
-      }
-    } else {
-      if (requestWhenMount) {
-        processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
+    if (requestWhenMount && !hasDataFilter) {
+      processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
 
-        _request();
-      }
+      _request();
     }
 
     return function () {
@@ -673,7 +725,7 @@ var ProTable = function ProTable(props) {
 
       actionRef.current = undefined;
     };
-  }, [(_dataFilterForm4 = dataFilterForm) === null || _dataFilterForm4 === void 0 ? void 0 : _dataFilterForm4.id]);
+  }, []);
 
   function onSort(dataIndex, order) {
     var nextSort = _defineProperty({}, dataIndex, order);
@@ -687,24 +739,40 @@ var ProTable = function ProTable(props) {
   var dataFilter = _objectSpread(_objectSpread({
     mode: 'inline'
   }, propsDataFilter), {}, {
+    onInit: function onInit(values) {
+      // 表单初始化请求处理
+      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit(values));
+      !fullscreenState && _request({}, false, values);
+      return true;
+    },
     onFilter: function onFilter(values) {
-      var _actionRef$current5, _actionRef$current5$c;
+      var _actionRef$current6, _actionRef$current6$c;
+
+      // 全屏状态，判断全屏表单onFilter是否禁用
+      if (fullscreenState && !filterEnableRef.current.fullscreen) {
+        filterEnableRef.current.fullscreen = true;
+        return;
+      } // 非全屏状态，判断普通表单onFiler是否禁用
+
+
+      if (!fullscreenState && !filterEnableRef.current.normal) {
+        filterEnableRef.current.normal = true;
+        return;
+      }
 
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values)); // 搜索变化时，暂时先清空选择
 
-      (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$c = _actionRef$current5.clearRowSelection) === null || _actionRef$current5$c === void 0 ? void 0 : _actionRef$current5$c.call(_actionRef$current5);
+      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
       setCurrentPage(1);
 
-      _request(_defineProperty({}, targetPageKey, 1));
+      _request(_defineProperty({}, targetPageKey, 1), false, values);
     },
-    onReset: function onReset() {
-      var _dataFilterForm5;
-
+    onReset: function onReset(values) {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
-      (_dataFilterForm5 = dataFilterForm) === null || _dataFilterForm5 === void 0 ? void 0 : _dataFilterForm5.reset();
+      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
       setCurrentPage(1);
 
-      _request(_defineProperty({}, targetPageKey, 1));
+      _request(_defineProperty({}, targetPageKey, 1), false, values);
     }
   });
 
@@ -788,21 +856,21 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
-      var _actionRef$current6, _actionRef$current6$c;
+      var _actionRef$current7, _actionRef$current7$c;
 
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       // 翻页暂时先清空选择
-      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
+      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
       setCurrentPage(currentPage);
 
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _actionRef$current7, _actionRef$current7$c, _request5;
+      var _actionRef$current8, _actionRef$current8$c, _request5;
 
       // 翻页暂时先清空选择
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.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);
       setPageSize(currentPageSize);
       setCurrentPage(1);
 

package/es/table/typing.d.ts

@@ -192,6 +192,7 @@ export declare type ProTableActionType = {
     dataFilterForm?: FormType;
     normalDataFilterForm?: FormType;
     fullscreenDataFilterForm?: FormType;
+    filterEnableRef?: any;
     /** 表格当前的数据 */
     data?: any[];
 } & ProTableActionTypeMutations;
@@ -201,8 +202,6 @@ export declare type ProTableActionTypeMutations = {
     getState?: () => ProTableActionTypeState;
     /** 设置state 状态 */
     setState?: (key: string, value: any) => void;
-    /** 初始化 state 状态 */
-    initState?: () => void;
     /** 设置全屏状态 */
     setFullScreenState?: (state: boolean) => void;
     /** 绑定state监听事件 */
@@ -217,6 +216,8 @@ export declare type ProTableActionTypeMutations = {
     resetTableMaxBodyHeight?: () => void;
     /** 列筛选规则 */
     filterColumns?: any[];
+    /** 获取所有 on 监听事件 */
+    getCallback?: () => any;
 };
 /** action Mutations 定义 */
 export declare type ProTableActionTypeState = {

package/es/table/utils/columnRender.js

@@ -144,7 +144,7 @@ export var renderCell = function renderCell(value, item, index, record, actionRe
 
     if (valueType === 'selectGroup') {
       newRender = _objectSpread(_objectSpread({
-        maxShowNumber: 1,
+        maxShowNumber: 'auto',
         foldText: 'more',
         editOnClick: function editOnClick() {},
         edit: true
@@ -223,7 +223,7 @@ var processRenderFunction = function processRenderFunction() {
   var index = arguments.length > 2 ? arguments[2] : undefined;
   var record = arguments.length > 3 ? arguments[3] : undefined;
   // 当 ProField render 类型为 function 时。需要表格预先处理以塞入 record
-  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick'];
+  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick', 'extra', 'prefixExtra'];
   return Object.fromEntries(Object.entries(render).map(function (_ref3) {
     var _ref4 = _slicedToArray(_ref3, 2),
         k = _ref4[0],

package/es/table/utils/index.d.ts

@@ -1,13 +1,14 @@
 /// <reference types="react" />
 import { ProTableActionType } from '../typing';
 import { ProTableProps, ProTableColumnProps } from '..';
-export declare function initActionRef(): void;
+export declare function actionRefUseStateOn(callback: any, state: string, ...args: any): void;
 /** table 组件内监听 不对外暴露 */
 export declare function on(fun: any, key: string): void;
 /** table 组件内销毁监听 不对外暴露 */
 export declare function off(key: string): void;
 /** table 组件内触发事件 不对外暴露 */
 export declare function emit(key: string, ...args: any): void;
+export declare function initActionRef(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
 export declare function useActionType<T>(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
 export declare function cloneDeep<T>(obj: T): T;
 /**