@teamix/pro 1.2.16 → 1.2.17

package/es/actions/index.d.ts

@@ -24,6 +24,7 @@ export declare type ProActionConfig = ({
 export declare function registerActionHandler(id: string, extendActionId: string, defaultConfig: any): void;
 export declare function useAction(config?: ProActionConfig, context?: any): any;
 export interface ProActionButtonProps extends ButtonProps {
+    key?: string | number;
     config?: ProActionConfig;
     visible?: any;
     disabled?: any;
@@ -33,6 +34,7 @@ export interface ProActionButtonProps extends ButtonProps {
 }
 export declare const ProActionButton: (props: ProActionButtonProps) => JSX.Element;
 export interface ProActionMenuButtonProps extends MenuButtonProps {
+    key?: string | number;
     actions: ProActionProps[];
     visible?: any;
     icon?: string;

package/es/actions/index.js

@@ -3,8 +3,8 @@ var _excluded = ["type"],
     _excluded3 = ["loading"],
     _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["actions"],
-    _excluded7 = ["config"],
+    _excluded6 = ["key", "actions"],
+    _excluded7 = ["key", "config"],
     _excluded8 = ["type", "divider", "max", "moreText", "context", "actions", "className"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -205,8 +205,8 @@ function renderCommonActionButtonMenuItem(action, key, context) {
     return /*#__PURE__*/React.createElement(Menu.SubMenu, {
       key: key,
       label: menuBtn.label || menuBtn.children
-    }, menuBtn.actions.map(function (a, j) {
-      return renderCommonActionButtonMenuItem(a, String(j), context);
+    }, menuBtn.actions.map(function (a) {
+      return renderCommonActionButtonMenuItem(a, a.key, context);
     }));
   }
 
@@ -241,7 +241,7 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
     type: type,
     label: buttonContent(label || children, icon, iconSize, context)
   }, others), actions.map(function (action, i) {
-    return renderCommonActionButtonMenuItem(action, String(i), context);
+    return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
 }; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
 
@@ -252,7 +252,9 @@ function formatGroupActions(actions, max, moreConfig) {
     return actions;
   }
 
-  return [].concat(_toConsumableArray(actions.slice(0, MAX - 1)), [_objectSpread(_objectSpread({}, moreConfig), {}, {
+  return [].concat(_toConsumableArray(actions.slice(0, MAX - 1)), [_objectSpread(_objectSpread({
+    key: '__teamix_pro_action_group_more_btn'
+  }, moreConfig), {}, {
     actions: actions.slice(MAX - 1)
   })]);
 } // 渲染一个 button 或者 menu button
@@ -298,22 +300,34 @@ function getDefaultMoreButton(type, moreText) {
 
 var MAX_ACTTIONS = 4;
 
-function getActionConfig(action, context) {
+function getKey(index, key) {
+  if (key !== undefined) {
+    return key;
+  }
+
+  return "__teamix_pro_action_key_".concat(index);
+}
+
+function getActionConfig(action, index, context) {
   if (action.actions) {
-    var actions = action.actions,
+    var _key = action.key,
+        actions = action.actions,
         _others = _objectWithoutProperties(action, _excluded6);
 
     return _objectSpread({
-      actions: actions.map(function (a) {
-        return getActionConfig(a, context);
+      key: getKey(index, _key),
+      actions: actions.map(function (a, j) {
+        return getActionConfig(a, j, context);
       })
     }, getTargetValue(_others, context));
   }
 
-  var config = action.config,
+  var key = action.key,
+      config = action.config,
       others = _objectWithoutProperties(action, _excluded7);
 
   return _objectSpread({
+    key: getKey(index, key),
     config: config
   }, getTargetValue(others, context));
 }
@@ -333,8 +347,8 @@ export function ProActionGroup(props) {
       containerProps = _objectWithoutProperties(props, _excluded8);
 
   var isTypeText = type === 'text';
-  var filteredActions = actions.map(function (action) {
-    return getActionConfig(action, context);
+  var filteredActions = actions.map(function (action, index) {
+    return getActionConfig(action, index, context);
   }).filter(function (action) {
     return action.visible !== false;
   });
@@ -346,7 +360,7 @@ export function ProActionGroup(props) {
   }, containerProps), formatedActions.map(function (actionBtn, i) {
     var isLastOne = i === formatedActions.length - 1;
     return /*#__PURE__*/React.createElement(React.Fragment, {
-      key: i
+      key: actionBtn.key
     }, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/React.createElement(Divider, {
       direction: "ver"
     }));

package/es/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.15";
+declare const version = "1.2.16";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/es/index.js

@@ -27,7 +27,7 @@ export * from './page-header';
 export * from './skeleton';
 export * from './table'; // export * from './sidebar';
 
-var version = '1.2.15';
+var version = '1.2.16';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 hooks, nocode, templates, utils };

package/es/nocode/configurators/ProTable.js

@@ -18,6 +18,7 @@ var initialValues = {
   },
   mainAction: {
     actions: [{
+      key: 'action',
       children: '操作按钮'
     }]
   }

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

@@ -140,7 +140,7 @@ var Filter = function Filter(props) {
   return /*#__PURE__*/React.createElement(Dropdown, {
     trigger: /*#__PURE__*/React.createElement(TeamixIcon, {
       size: "small",
-      type: "filter-line",
+      type: selected.length > 0 && visible === false ? 'filter-fill' : 'filter-line',
       className: cls({
         icon: true,
         'icon-selected': selected.length > 0
@@ -149,6 +149,8 @@ var Filter = function Filter(props) {
         setVisible(!visible);
       }
     }),
+    //@ts-ignore
+    v2: true,
     triggerType: ['click'],
     align: "tl bl",
     visible: visible,
@@ -171,7 +173,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$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _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
 
@@ -199,24 +201,30 @@ var Filter = function Filter(props) {
         return null;
       })), [[column.dataIndex, param]]).filter(function (item) {
         return item && (item === null || item === void 0 ? void 0 : item[1]);
-      }));
-      var targetPageKey = 'currentPage';
-      var pageInfo = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.pageInfo;
+      })); // 再设置所有的列筛选状态
 
-      if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
-        targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
-      } // 再设置所有的列筛选状态
-
-
-      (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$s = _actionRef$current5.setFilterRules) === null || _actionRef$current5$s === void 0 ? void 0 : _actionRef$current5$s.call(_actionRef$current5, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
+      (_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,
         params: param
-      }))); // 发送请求
+      })));
+
+      if (selected.length > 0) {
+        var _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.pageInfo;
+
+        if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+          targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
+        (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
 
-      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
+        (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
+      }
 
-      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       setVisible(false);
     }
   }, getMessage('ok')), /*#__PURE__*/React.createElement(Button, {
@@ -234,7 +242,25 @@ var Filter = function Filter(props) {
         rules: [],
         params: ''
       })));
-      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex); // setVisible(!visible);
+      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex);
+
+      if (selected.length > 0) {
+        var _actionRef$current12, _actionRef$current13, _actionRef$current13$, _actionRef$current14, _actionRef$current14$, _actionRef$current15, _actionRef$current15$;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current12 = actionRef.current) === null || _actionRef$current12 === void 0 ? void 0 : _actionRef$current12.pageInfo;
+
+        if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+          targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current13 = actionRef.current) === null || _actionRef$current13 === void 0 ? void 0 : (_actionRef$current13$ = _actionRef$current13.request) === null || _actionRef$current13$ === void 0 ? void 0 : _actionRef$current13$.call(_actionRef$current13, _defineProperty({}, targetPageKey, 1));
+        (_actionRef$current14 = actionRef.current) === null || _actionRef$current14 === void 0 ? void 0 : (_actionRef$current14$ = _actionRef$current14.resetPage) === null || _actionRef$current14$ === void 0 ? void 0 : _actionRef$current14$.call(_actionRef$current14); // 清空表格选择
+
+        (_actionRef$current15 = actionRef.current) === null || _actionRef$current15 === void 0 ? void 0 : (_actionRef$current15$ = _actionRef$current15.clearRowSelection) === null || _actionRef$current15$ === void 0 ? void 0 : _actionRef$current15$.call(_actionRef$current15);
+      } // setVisible(!visible);
+
     }
   }, getMessage('reset'))))));
 };

package/es/table/utils/columnRender.js

@@ -96,7 +96,7 @@ export var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
   };
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelIconTip, {
-    label: getItemLabel(),
+    label: item.title,
     tooltip: item.tooltip,
     icon: item.tooltipIcon
   }), item.filters && /*#__PURE__*/React.createElement(Filter, {

package/lib/actions/index.d.ts

@@ -24,6 +24,7 @@ export declare type ProActionConfig = ({
 export declare function registerActionHandler(id: string, extendActionId: string, defaultConfig: any): void;
 export declare function useAction(config?: ProActionConfig, context?: any): any;
 export interface ProActionButtonProps extends ButtonProps {
+    key?: string | number;
     config?: ProActionConfig;
     visible?: any;
     disabled?: any;
@@ -33,6 +34,7 @@ export interface ProActionButtonProps extends ButtonProps {
 }
 export declare const ProActionButton: (props: ProActionButtonProps) => JSX.Element;
 export interface ProActionMenuButtonProps extends MenuButtonProps {
+    key?: string | number;
     actions: ProActionProps[];
     visible?: any;
     icon?: string;

package/lib/actions/index.js

@@ -54,8 +54,8 @@ var _excluded = ["type"],
     _excluded3 = ["loading"],
     _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["actions"],
-    _excluded7 = ["config"],
+    _excluded6 = ["key", "actions"],
+    _excluded7 = ["key", "config"],
     _excluded8 = ["type", "divider", "max", "moreText", "context", "actions", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -242,8 +242,8 @@ function renderCommonActionButtonMenuItem(action, key, context) {
     return /*#__PURE__*/_react.default.createElement(_components.Menu.SubMenu, {
       key: key,
       label: menuBtn.label || menuBtn.children
-    }, menuBtn.actions.map(function (a, j) {
-      return renderCommonActionButtonMenuItem(a, String(j), context);
+    }, menuBtn.actions.map(function (a) {
+      return renderCommonActionButtonMenuItem(a, a.key, context);
     }));
   }
 
@@ -278,7 +278,7 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
     type: type,
     label: buttonContent(label || children, icon, iconSize, context)
   }, others), actions.map(function (action, i) {
-    return renderCommonActionButtonMenuItem(action, String(i), context);
+    return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
 }; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
 
@@ -292,7 +292,9 @@ function formatGroupActions(actions, max, moreConfig) {
     return actions;
   }
 
-  return [].concat(_toConsumableArray(actions.slice(0, MAX - 1)), [_objectSpread(_objectSpread({}, moreConfig), {}, {
+  return [].concat(_toConsumableArray(actions.slice(0, MAX - 1)), [_objectSpread(_objectSpread({
+    key: '__teamix_pro_action_group_more_btn'
+  }, moreConfig), {}, {
     actions: actions.slice(MAX - 1)
   })]);
 } // 渲染一个 button 或者 menu button
@@ -338,22 +340,34 @@ function getDefaultMoreButton(type, moreText) {
 
 var MAX_ACTTIONS = 4;
 
-function getActionConfig(action, context) {
+function getKey(index, key) {
+  if (key !== undefined) {
+    return key;
+  }
+
+  return "__teamix_pro_action_key_".concat(index);
+}
+
+function getActionConfig(action, index, context) {
   if (action.actions) {
-    var actions = action.actions,
+    var _key = action.key,
+        actions = action.actions,
         _others = _objectWithoutProperties(action, _excluded6);
 
     return _objectSpread({
-      actions: actions.map(function (a) {
-        return getActionConfig(a, context);
+      key: getKey(index, _key),
+      actions: actions.map(function (a, j) {
+        return getActionConfig(a, j, context);
       })
     }, (0, _utils.getTargetValue)(_others, context));
   }
 
-  var config = action.config,
+  var key = action.key,
+      config = action.config,
       others = _objectWithoutProperties(action, _excluded7);
 
   return _objectSpread({
+    key: getKey(index, key),
     config: config
   }, (0, _utils.getTargetValue)(others, context));
 }
@@ -373,8 +387,8 @@ function ProActionGroup(props) {
       containerProps = _objectWithoutProperties(props, _excluded8);
 
   var isTypeText = type === 'text';
-  var filteredActions = actions.map(function (action) {
-    return getActionConfig(action, context);
+  var filteredActions = actions.map(function (action, index) {
+    return getActionConfig(action, index, context);
   }).filter(function (action) {
     return action.visible !== false;
   });
@@ -386,7 +400,7 @@ function ProActionGroup(props) {
   }, containerProps), formatedActions.map(function (actionBtn, i) {
     var isLastOne = i === formatedActions.length - 1;
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
-      key: i
+      key: actionBtn.key
     }, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/_react.default.createElement(_components.Divider, {
       direction: "ver"
     }));

package/lib/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.15";
+declare const version = "1.2.16";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -253,5 +253,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
 // export * from './sidebar';
-var version = '1.2.15';
+var version = '1.2.16';
 exports.version = version;

package/lib/nocode/configurators/ProTable.js

@@ -26,6 +26,7 @@ var initialValues = {
   },
   mainAction: {
     actions: [{
+      key: 'action',
       children: '操作按钮'
     }]
   }

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

@@ -160,7 +160,7 @@ var Filter = function Filter(props) {
   return /*#__PURE__*/_react.default.createElement(_components.Dropdown, {
     trigger: /*#__PURE__*/_react.default.createElement(_icon.default, {
       size: "small",
-      type: "filter-line",
+      type: selected.length > 0 && visible === false ? 'filter-fill' : 'filter-line',
       className: cls({
         icon: true,
         'icon-selected': selected.length > 0
@@ -169,6 +169,8 @@ var Filter = function Filter(props) {
         setVisible(!visible);
       }
     }),
+    //@ts-ignore
+    v2: true,
     triggerType: ['click'],
     align: "tl bl",
     visible: visible,
@@ -191,7 +193,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$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _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
 
@@ -219,24 +221,30 @@ var Filter = function Filter(props) {
         return null;
       })), [[column.dataIndex, param]]).filter(function (item) {
         return item && (item === null || item === void 0 ? void 0 : item[1]);
-      }));
-      var targetPageKey = 'currentPage';
-      var pageInfo = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.pageInfo;
+      })); // 再设置所有的列筛选状态
 
-      if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
-        targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
-      } // 再设置所有的列筛选状态
-
-
-      (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$s = _actionRef$current5.setFilterRules) === null || _actionRef$current5$s === void 0 ? void 0 : _actionRef$current5$s.call(_actionRef$current5, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
+      (_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,
         params: param
-      }))); // 发送请求
+      })));
+
+      if (selected.length > 0) {
+        var _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.pageInfo;
+
+        if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+          targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
+        (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
 
-      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
+        (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
+      }
 
-      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       setVisible(false);
     }
   }, (0, _utils.getMessage)('ok')), /*#__PURE__*/_react.default.createElement(_components.Button, {
@@ -254,7 +262,25 @@ var Filter = function Filter(props) {
         rules: [],
         params: ''
       })));
-      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex); // setVisible(!visible);
+      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex);
+
+      if (selected.length > 0) {
+        var _actionRef$current12, _actionRef$current13, _actionRef$current13$, _actionRef$current14, _actionRef$current14$, _actionRef$current15, _actionRef$current15$;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current12 = actionRef.current) === null || _actionRef$current12 === void 0 ? void 0 : _actionRef$current12.pageInfo;
+
+        if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+          targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current13 = actionRef.current) === null || _actionRef$current13 === void 0 ? void 0 : (_actionRef$current13$ = _actionRef$current13.request) === null || _actionRef$current13$ === void 0 ? void 0 : _actionRef$current13$.call(_actionRef$current13, _defineProperty({}, targetPageKey, 1));
+        (_actionRef$current14 = actionRef.current) === null || _actionRef$current14 === void 0 ? void 0 : (_actionRef$current14$ = _actionRef$current14.resetPage) === null || _actionRef$current14$ === void 0 ? void 0 : _actionRef$current14$.call(_actionRef$current14); // 清空表格选择
+
+        (_actionRef$current15 = actionRef.current) === null || _actionRef$current15 === void 0 ? void 0 : (_actionRef$current15$ = _actionRef$current15.clearRowSelection) === null || _actionRef$current15$ === void 0 ? void 0 : _actionRef$current15$.call(_actionRef$current15);
+      } // setVisible(!visible);
+
     }
   }, (0, _utils.getMessage)('reset'))))));
 };

package/lib/table/utils/columnRender.js

@@ -106,7 +106,7 @@ var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
   };
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
-    label: getItemLabel(),
+    label: item.title,
     tooltip: item.tooltip,
     icon: item.tooltipIcon
   }), item.filters && /*#__PURE__*/_react.default.createElement(_Filter.default, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.16",
+  "version": "1.2.17",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",