@teamix/pro 1.2.27 → 1.2.31

package/es/actions/index.d.ts

@@ -41,6 +41,7 @@ export interface ProActionCommonProps {
 export interface ProActionMenuButtonProps extends ProActionCommonProps, Omit<MenuButtonProps, 'visible'> {
     actions: ProActionProps[];
     icon?: string;
+    noArrow?: boolean;
 }
 export declare const ProActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
 export interface ProActionDividerProps extends ProActionCommonProps {
@@ -61,9 +62,7 @@ export declare type ProActionGroupProps = {
      */
     moreText?: string;
     /** 更多按钮的配置，只有在actions数量超过max时才有效 */
-    more?: string | (ProActionButtonProps & {
-        noArrow?: boolean;
-    });
+    more?: string | Omit<ProActionMenuButtonProps, 'actions'>;
     /** 是否有分割线，只有type="text"时生效，默认有分割线 */
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;

package/es/actions/index.js

@@ -1,12 +1,11 @@
 var _excluded = ["type"],
     _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "onClick"],
     _excluded3 = ["loading"],
-    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
+    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["noArrow", "className"],
-    _excluded7 = ["key", "actions"],
-    _excluded8 = ["key", "config"],
-    _excluded9 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
+    _excluded6 = ["key", "actions"],
+    _excluded7 = ["key", "config"],
+    _excluded8 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -243,6 +242,8 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
       context = props.context,
       _props$type2 = props.type,
       type = _props$type2 === void 0 ? 'primary' : _props$type2,
+      className = props.className,
+      noArrow = props.noArrow,
       others = _objectWithoutProperties(props, _excluded4);
 
   return /*#__PURE__*/React.createElement(MenuButton, _objectSpread({
@@ -256,7 +257,10 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
       v2: true
     },
     type: type,
-    label: buttonContent(label || children, icon, iconSize, context)
+    label: buttonContent(label || children, icon, iconSize, context),
+    className: cls(className, {
+      'teamix-pro-actions-text-menu-btn-no-arrow': noArrow
+    })
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
@@ -316,14 +320,12 @@ function renderCommonActionButton(button, context, isTypeText) {
 }
 
 function getDefaultMoreButton(type, more) {
-  var noArrowClassName = 'teamix-pro-actions-text-menu-btn-no-arrow';
   var defaultConfig = type === 'button' ? {
     children: getMessage('more')
   } : {
     icon: 'more-line',
-    // iconSize: 'small',
     autoWidth: false,
-    className: noArrowClassName
+    noArrow: true
   };
 
   if (!more) {
@@ -338,13 +340,7 @@ function getDefaultMoreButton(type, more) {
     return Object.assign(defaultConfig, moreConfig);
   }
 
-  var noArrow = moreConfig.noArrow,
-      className = moreConfig.className,
-      others = _objectWithoutProperties(moreConfig, _excluded6);
-
-  return _objectSpread({
-    className: cls(className, _defineProperty({}, "".concat(noArrowClassName), noArrow))
-  }, others);
+  return moreConfig;
 }
 
 var MAX_ACTTIONS = 4;
@@ -361,7 +357,7 @@ function getActionConfig(action, index, context) {
   if (action.actions) {
     var _key = action.key,
         actions = action.actions,
-        _others = _objectWithoutProperties(action, _excluded7);
+        _others = _objectWithoutProperties(action, _excluded6);
 
     return _objectSpread({
       key: getKey(index, _key),
@@ -373,7 +369,7 @@ function getActionConfig(action, index, context) {
 
   var key = action.key,
       config = action.config,
-      others = _objectWithoutProperties(action, _excluded8);
+      others = _objectWithoutProperties(action, _excluded7);
 
   return _objectSpread({
     key: getKey(index, key),
@@ -394,7 +390,7 @@ export function ProActionGroup(props) {
       _props$actions = props.actions,
       actions = _props$actions === void 0 ? [] : _props$actions,
       className = props.className,
-      containerProps = _objectWithoutProperties(props, _excluded9);
+      containerProps = _objectWithoutProperties(props, _excluded8);
 
   var isTypeText = type === 'text';
   var filteredActions = actions.map(function (action, index) {

package/es/form/Filter/SimpleFilter.js

@@ -10,13 +10,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-import React, { memo, useCallback, useMemo, useRef } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useRef } from 'react';
 import cls from 'classnames';
-import { usePrefixCls } from '@teamix/utils';
+import { usePrefixCls, isValid } from '@teamix/utils';
 import ProForm from '../ProForm'; // 初始化Search组件，内置部分属性
 
 var initializeSearch = function initializeSearch(schema) {
-  var searchName;
+  var searchName = '';
   var initializedSchema = schema.map(function (item) {
     if (item.component === 'Search') {
       searchName = item.name;
@@ -85,6 +85,13 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, name, value);
     }
   }, [searchName, searchValue.current]);
+  useEffect(function () {
+    var _props$form$initialVa, _props$form$initialVa2;
+
+    // 处理Search组件，缓存input的默认值
+    var searchDefaultValue = (_props$form$initialVa = props.form.initialValues) === null || _props$form$initialVa === void 0 ? void 0 : (_props$form$initialVa2 = _props$form$initialVa[searchName]) === null || _props$form$initialVa2 === void 0 ? void 0 : _props$form$initialVa2[1];
+    searchValue.current = isValid(searchDefaultValue) ? searchDefaultValue : '';
+  }, []);
   return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({}, otherProps), {}, {
     className: cls(prefixCls, props.className),
     schema: simpleSchema,

package/es/form/typing.d.ts

@@ -24,7 +24,7 @@ export interface ProFormSchemaItem {
     name?: string;
     description?: React.ReactNode;
     title?: string;
-    component?: IBaseComponent | IButtonComponent | IComboComponent | ILayoutComponent | 'ProField' | any;
+    component?: IBaseComponent | IButtonComponent | IComboComponent | ILayoutComponent | any;
     props?: AnyObject | any;
     decorator?: string | null;
     decoratorProps?: AnyObject;

package/es/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './step';
-declare const version = "1.2.27";
+declare const version = "1.2.31";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };

package/es/index.js

@@ -30,7 +30,7 @@ export * from './table';
 export * from './utils'; // export * from './sidebar';
 
 export * from './step';
-var version = '1.2.27';
+var version = '1.2.31';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 ProStep, hooks, nocode, templates, utils };

package/es/info/components/baseInfo/index.js

@@ -84,7 +84,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/React.createElement(Row, {
     wrap: true,
-    className: "teamix-pro-info-content-row"
+    className: "teamix-pro-info-content-row",
+    gutter: 20
   }, renderContent()));
 };
 

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

@@ -51,10 +51,10 @@ var Filter = function Filter(props) {
       setVisible = _useState4[1];
 
   useEffect(function () {
-    var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3, _actionRef$current$ge4;
+    var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3, _actionRef$current$ge4, _actionRef$current$ge5;
 
     // 从全局状态中读取上次存储的条件
-    var rules = (_actionRef$current$ge = (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState) === null || _actionRef$current$ge2 === void 0 ? void 0 : (_actionRef$current$ge3 = _actionRef$current$ge2.call(_actionRef$current).filterRules) === null || _actionRef$current$ge3 === void 0 ? void 0 : (_actionRef$current$ge4 = _actionRef$current$ge3[column.dataIndex]) === null || _actionRef$current$ge4 === void 0 ? void 0 : _actionRef$current$ge4.rules) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : [];
+    var rules = (_actionRef$current$ge = (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState) === null || _actionRef$current$ge2 === void 0 ? void 0 : (_actionRef$current$ge3 = _actionRef$current$ge2.call(_actionRef$current)) === null || _actionRef$current$ge3 === void 0 ? void 0 : (_actionRef$current$ge4 = _actionRef$current$ge3.filterRules) === null || _actionRef$current$ge4 === void 0 ? void 0 : (_actionRef$current$ge5 = _actionRef$current$ge4[column.dataIndex]) === null || _actionRef$current$ge5 === void 0 ? void 0 : _actionRef$current$ge5.rules) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : [];
     setSelected(rules);
   }, []); // 获取过滤项
 
@@ -172,7 +172,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _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$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
 
@@ -187,7 +187,7 @@ var Filter = function Filter(props) {
       } // 需要带上其他所有的信息
 
 
-      var rules = (_actionRef$current$ge5 = (_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$g2 = _actionRef$current3$g.call(_actionRef$current3)) === null || _actionRef$current3$g2 === void 0 ? void 0 : _actionRef$current3$g2.filterRules) !== null && _actionRef$current$ge5 !== void 0 ? _actionRef$current$ge5 : {}; // 再设置所有的列筛选状态
+      var rules = (_actionRef$current$ge6 = (_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$g2 = _actionRef$current3$g.call(_actionRef$current3)) === null || _actionRef$current3$g2 === void 0 ? void 0 : _actionRef$current3$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {}; // 再设置所有的列筛选状态
 
       (_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, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: selected,
@@ -220,10 +220,10 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current$ge6, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
+      var _actionRef$current$ge7, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
 
       setSelected([]);
-      var rules = (_actionRef$current$ge6 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
+      var rules = (_actionRef$current$ge7 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge7 !== void 0 ? _actionRef$current$ge7 : {};
       (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.setFilterRules) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: [],
         params: ''

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

@@ -60,8 +60,10 @@ var Layout = function Layout(props) {
 
 
   var renderQueryFilter = function renderQueryFilter() {
-    if (dataFilter) {
-      var _dataFilter$schema;
+    var _dataFilter$schema;
+
+    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)) {
         // 自定义渲染内容
@@ -89,7 +91,7 @@ var Layout = function Layout(props) {
             actionRef: actionRef
           }, otherProps)))
         }, dataFilter));
-      } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) >= 0) {
+      } 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({
           formRef: dataFilterFormRef,
           onExpand: function onExpand(expand) {
@@ -115,6 +117,19 @@ var Layout = function Layout(props) {
           }, otherProps)))
         }, 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)))
+      });
     }
   }; // 区域组合渲染
 

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;
+  var _rowSelection$selecte, _dataFilterForm4;
 
   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,16 +278,16 @@ 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 normalDataFilterFormRef = useRef();
@@ -278,13 +295,13 @@ var ProTable = function ProTable(props) {
   var normalDataFilterForm = normalDataFilterFormRef.current;
   var fullscreenDataFilterForm = fullscreenDataFilterFormRef.current; // 传给 QueryFilter 的 formRef
 
-  var dataFilterFormRef = fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
+  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,7 +424,42 @@ 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() {
@@ -450,12 +502,12 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current3, _actionRef$current3$s;
+      var _actionRef$current3, _actionRef$current3$s, _dataFilterForm;
 
       (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 === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
+      (_dataFilterForm = dataFilterForm) === null || _dataFilterForm === void 0 ? void 0 : _dataFilterForm.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
@@ -569,7 +621,7 @@ var ProTable = function ProTable(props) {
   }); // 请求函数
 
   function _request(params, noLoading) {
-    var _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
+    var _dataFilterForm2, _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -582,7 +634,7 @@ var ProTable = function ProTable(props) {
 
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
-    var dataFilterParams = toJS(dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.values); // 列过滤请求参数
+    var dataFilterParams = toJS((_dataFilterForm2 = dataFilterForm) === null || _dataFilterForm2 === void 0 ? void 0 : _dataFilterForm2.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 : {}; // 格式化后的请求参数
 
@@ -633,8 +685,7 @@ var ProTable = function ProTable(props) {
   }
 
   useEffect(function () {
-    // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
-    initActionRef(); // 监听 浏览器变化 更吸底状态
+    dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
 
     if (footerSuction) {
       getFooterSuctionState();
@@ -644,11 +695,21 @@ var ProTable = function ProTable(props) {
       };
     }
 
-    if (requestWhenMount) {
-      // 在请求发送之前 处理漏斗默认数据
-      processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
+    if (propsDataFilter) {
+      var _dataFilterForm3;
+
+      if (requestWhenMount && ((_dataFilterForm3 = dataFilterForm) === null || _dataFilterForm3 === void 0 ? void 0 : _dataFilterForm3.id)) {
+        // 在请求发送之前 处理漏斗默认数据
+        processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
 
-      _request();
+        _request();
+      }
+    } else {
+      if (requestWhenMount) {
+        processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
+
+        _request();
+      }
     }
 
     return function () {
@@ -662,7 +723,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,8 +748,10 @@ var ProTable = function ProTable(props) {
       _request(_defineProperty({}, targetPageKey, 1));
     },
     onReset: function onReset() {
+      var _dataFilterForm5;
+
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
-      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
+      (_dataFilterForm5 = dataFilterForm) === null || _dataFilterForm5 === void 0 ? void 0 : _dataFilterForm5.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));

package/es/table/index.scss

@@ -114,4 +114,8 @@ $fullscreenPadding: 24px;
 // 后面在基础组件里面覆盖
 .next-table.next-table td .next-table-cell-wrapper {
   text-overflow: unset;
+}
+
+.mb8 {
+  margin-bottom: 8px;
 }

package/es/table/typing.d.ts

@@ -201,8 +201,6 @@ export declare type ProTableActionTypeMutations = {
     getState?: () => ProTableActionTypeState;
     /** 设置state 状态 */
     setState?: (key: string, value: any) => void;
-    /** 初始化 state 状态 */
-    initState?: () => void;
     /** 设置全屏状态 */
     setFullScreenState?: (state: boolean) => void;
     /** 绑定state监听事件 */
@@ -217,6 +215,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

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;
 /**