@teamix/pro 1.2.15 → 1.2.19

package/es/form/Filter/index2.js

@@ -1,7 +1,11 @@
 var _excluded = ["schema", "onChange", "onSubmit"],
     _excluded2 = ["form", "schema", "onSubmit", "onChange"],
-    _excluded3 = ["schema", "onSubmit", "onChange", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"],
-    _excluded4 = ["addonAfter", "addonBefore", "onFilter", "mode", "expand"];
+    _excluded3 = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"],
+    _excluded4 = ["addonAfter", "addonBefore", "onFilter", "onInit", "onReset", "mode", "expand"];
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -38,7 +42,8 @@ import cls from 'classnames';
 import { Tag, Button, Badge } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
 import { createForm } from '@formily/core';
-import { usePrefixCls, getMessage, isSignificative } from '@teamix/utils';
+import { toJS } from '@formily/reactive';
+import { usePrefixCls, getMessage, isSignificative, isStr, isPlainObj } from '@teamix/utils';
 import ProField from '../../field/index';
 import ProForm from '../ProForm';
 import fieldTypeMap from '../fieldTypeMap';
@@ -98,9 +103,17 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter-light'
   });
+  var onBtnClick = useCallback(function () {
+    onChange && onChange(toJS(form.values));
+  }, [form]);
   var LightSchema = useMemo(function () {
     return [{
       component: 'LightFilter',
+      props: {
+        buttonProps: {
+          onClick: onBtnClick
+        }
+      },
       children: schema
     }, {
       component: 'Submit',
@@ -110,19 +123,12 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
         }
       }
     }];
-  }, [schema]); // useEffect(() => {
-  //   form.addEffects('onChange', () => {
-  //     onFieldValueChange('',(field:any) => {
-  //       console.log(field.value);
-  //     });
-  //   });
-  // }, [form, onChange]);
-
+  }, [schema, onBtnClick]);
   return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: form,
     className: cls(prefixCls, props.className),
     schema: LightSchema,
-    feedbackLayout: "popover",
+    feedbackLayout: "none",
     breakpoints: [],
     bordered: false,
     onSubmit: onSubmit,
@@ -136,7 +142,6 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
 var AdvancedFilter = /*#__PURE__*/memo(function (props) {
   var schema = props.schema,
       onSubmit = props.onSubmit,
-      onChange = props.onChange,
       onReset = props.onReset,
       layout = props.layout,
       labelAlign = props.labelAlign,
@@ -211,25 +216,79 @@ AdvancedFilter.defaultProps = {
   labelCol: 6,
   wrapperCol: 18
 };
+
+var getSpecialProps = function getSpecialProps(props) {
+  var initialValues = props.initialValues,
+      initialRequest = props.initialRequest;
+  var hasDefault = !!initialValues;
+  var hasAsyncDefault = !!initialRequest;
+  var hasRequired = false;
+
+  var hasDefaultOrRule = function hasDefaultOrRule(schema) {
+    schema.forEach(function (item) {
+      var value = item.default,
+          required = item.required,
+          rules = item.rules,
+          request = item.request,
+          dataSource = item.dataSource,
+          children = item.children;
+      hasDefault = hasDefault || isSignificative(value);
+      hasRequired = hasRequired || required || !!rules;
+      hasAsyncDefault = hasAsyncDefault || !!request || // 如果dataSource是异步且default取自dataSource
+      !!(isPlainObj(dataSource) && isStr(value) && value.indexOf('.dataSource'));
+
+      if (children === null || children === void 0 ? void 0 : children.length) {
+        hasDefaultOrRule(children);
+      }
+    });
+  };
+
+  hasDefaultOrRule(props.schema);
+  return {
+    hasDefault: hasDefault,
+    hasAsyncDefault: hasAsyncDefault,
+    hasRequired: hasRequired
+  };
+};
 /**
  * 查询筛选
  */
 
+
 var QueryFilter = /*#__PURE__*/memo(function (props) {
   var addonAfter = props.addonAfter,
       addonBefore = props.addonBefore,
       onFilter = props.onFilter,
+      onInit = props.onInit,
+      onReset = props.onReset,
       mode = props.mode,
       expand = props.expand,
       otherProps = _objectWithoutProperties(props, _excluded4);
 
-  var form = useMemo(function () {
-    return props.form || createForm({
+  var simpleForm = useMemo(function () {
+    return createForm({
+      validateFirst: true
+    });
+  }, []);
+  var lightForm = useMemo(function () {
+    return createForm({
+      validateFirst: true
+    });
+  }, []);
+  var advancedForm = useMemo(function () {
+    return createForm({
       validateFirst: true
     });
   }, []);
 
-  var _useState = useState(expand),
+  var _getSpecialProps = getSpecialProps(props),
+      hasDefault = _getSpecialProps.hasDefault,
+      hasAsyncDefault = _getSpecialProps.hasAsyncDefault,
+      hasRequired = _getSpecialProps.hasRequired;
+
+  var hasDefaultOrRequired = hasDefault || hasAsyncDefault || hasRequired;
+
+  var _useState = useState(!!expand || hasDefaultOrRequired),
       _useState2 = _slicedToArray(_useState, 2),
       advancedFilterVisible = _useState2[0],
       setAdvancedFilterVisible = _useState2[1];
@@ -241,7 +300,8 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter'
-  }); // 展开收起高级筛选
+  });
+  var currentForm = mode === 'panel' ? advancedFilterVisible ? 'advanced' : 'light' : 'simple'; // 展开收起高级筛选
 
   var toggleAdvancedFilter = useCallback(function () {
     setAdvancedFilterVisible(function (visible) {
@@ -267,31 +327,78 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     }).filter(function (item) {
       return isSignificative(item.value);
     });
-  }, []); // 表单值提交
-
-  var onFormSubmit = useCallback(function (values) {
-    setTagDataSource(getTagDataSource(form));
-    onFilter && onFilter(values);
-  }, []); // 轻量表单onChange
+  }, []); // 设置标签数据
+
+  var configTag = useCallback(function () {
+    setTagDataSource(getTagDataSource(advancedForm));
+  }, []); // 简单搜索Filter
+
+  var onSimpleFilter = useCallback(function (values) {
+    if (currentForm === 'simple') {
+      onFilter && onFilter(values);
+    }
+  }, [onFilter, currentForm]); // 轻量搜索Filter
+
+  var onLightFilter = useCallback( /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(currentForm === 'light')) {
+                _context.next = 5;
+                break;
+              }
+
+              onFilter && onFilter(values);
+              _context.next = 4;
+              return advancedForm.reset();
+
+            case 4:
+              configTag();
+
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
 
-  var onLightValueChange = useCallback(function (values) {
-    form.reset();
-    setTagDataSource(getTagDataSource(form));
-    onFilter && onFilter(values);
-  }, [form]); // 简单表单onChange
+    return function (_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }(), [onFilter, currentForm]); // 高级搜索Filter
 
-  var onSimpleValueChange = useCallback(function (values) {
-    setTagDataSource(getTagDataSource(form));
-    onFilter && onFilter(values);
-  }, []); // 关闭标签清空表单字段值
+  var onAdvancedFilter = useCallback(function (values) {
+    if (currentForm === 'advanced') {
+      onFilter && onFilter(values);
+      configTag();
+      lightForm.reset();
+    }
+  }, [onFilter, currentForm]); // 关闭标签清空表单字段值
 
   var onTagClose = useCallback(function (key) {
-    form.setValuesIn(key, undefined);
-  }, [form]); // 设置默认值标签数据
+    advancedForm.setValuesIn(key, undefined);
+    setTagDataSource(getTagDataSource(advancedForm));
+  }, []); // 判断表单是否有校验和默认值
 
   useEffect(function () {
-    setTagDataSource(getTagDataSource(form));
-  }, []);
+    if (hasDefault || hasAsyncDefault || hasRequired) {}
+  }, [hasDefault, hasAsyncDefault, hasRequired]); // 设置默认值标签数据
+
+  useEffect(function () {// onInit
+    // if (mode === 'panel') {
+    //   if (expand) {
+    //     onInit && onInit(toJS(advancedForm.values));
+    //   } else {
+    //     onInit && onInit(toJS(lightForm.values));
+    //   }
+    //   configTag();
+    // } else {
+    //   onInit && onInit(toJS(simpleForm.values));
+    // }
+  }, [mode]);
   return /*#__PURE__*/React.createElement("div", {
     className: cls(prefixCls, props.className)
   }, /*#__PURE__*/React.createElement("div", {
@@ -301,11 +408,11 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }, addonBefore ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-addonBefore")
   }, addonBefore) : null, mode === 'panel' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-inline-form")
+    className: cls("".concat(prefixCls, "-inline-form"), hasAsyncDefault ? "".concat(prefixCls, "-inline-form-hidden") : '')
   }, /*#__PURE__*/React.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
-    form: form,
-    onFilter: onLightValueChange,
-    onSubmit: onFormSubmit
+    form: lightForm,
+    onChange: onLightFilter,
+    onSubmit: onLightFilter
   }))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-toggle")
   }, /*#__PURE__*/React.createElement(Badge, {
@@ -325,20 +432,20 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }), getMessage('advancedFilter'))))) : /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-inline-form")
   }, /*#__PURE__*/React.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
-    form: form,
-    onFilter: onSimpleValueChange,
-    onSubmit: onFormSubmit
+    form: simpleForm,
+    onChange: onSimpleFilter,
+    onSubmit: onSimpleFilter
   })))), addonAfter ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-addonAfter")
   }, addonAfter) : null), mode === 'panel' ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-panel")
   }, /*#__PURE__*/React.createElement("div", {
     className: cls("".concat(prefixCls, "-tag"), advancedFilterVisible ? "".concat(prefixCls, "-tag-hidden") : '')
-  }, /*#__PURE__*/React.createElement(Tag.Group, null, tagDataSource.map(function (_ref3) {
-    var key = _ref3.key,
-        label = _ref3.label,
-        value = _ref3.value,
-        type = _ref3.type;
+  }, /*#__PURE__*/React.createElement(Tag.Group, null, tagDataSource.map(function (_ref4) {
+    var key = _ref4.key,
+        label = _ref4.label,
+        value = _ref4.value,
+        type = _ref4.type;
     return /*#__PURE__*/React.createElement(Tag.Closeable, {
       key: key,
       afterClose: function afterClose() {
@@ -355,8 +462,8 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }))), /*#__PURE__*/React.createElement("div", {
     className: cls("".concat(prefixCls, "-advanced-wrap"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-wrap-hidden") : '')
   }, /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
-    form: form,
-    onSubmit: onFormSubmit
+    form: advancedForm,
+    onSubmit: onAdvancedFilter
   })))) : null);
 });
 QueryFilter.defaultProps = {

package/es/form/Filter/index2.scss

@@ -19,6 +19,9 @@ $query-filter: #{$teamix-pro-form}-query-filter;
     margin-right: 8px;
     margin-bottom: 8px;
   }
+  .#{$query-filter}-inline-form-hidden {
+    display: none;
+  }
   .#{$query-filter}-toggle {
     margin-bottom: 8px;
   }

package/es/form/ProForm/index.js

@@ -21,6 +21,7 @@ import { mergeArrayValue } from '../utils';
 import useAutoSubmit from './useAutoSubmit';
 import useInitialRequest from './useInitialRequest';
 import validateLocale from '../locales/validate';
+import debounce from 'lodash.debounce';
 import './index.scss';
 registerValidateLocale(validateLocale);
 var ProForm = /*#__PURE__*/memo(function (_ref) {
@@ -78,12 +79,13 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]); // 添加onChange
 
   useEffect(function () {
+    form.removeEffects('onChange');
     form.addEffects('onChange', function () {
-      onFormValuesChange(function (form) {
+      onFormValuesChange(debounce(function (form) {
         if (onChange) {
           onChange(toJS(form.values));
         }
-      });
+      }, 300));
     });
   }, [form, onChange]); // 配置表单默认值
 

package/es/form/ProForm/useFieldRequest.js

@@ -5,18 +5,11 @@ 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 { useField } from '@formily/react';
-import { isPlainObj } from '@teamix/utils';
 export default (function () {
   var field = useField();
 
   var refresh = function refresh() {
-    if (!isPlainObj(field.data)) {
-      field.data = {
-        refresh: {}
-      };
-    } else {
-      field.data.refresh = _objectSpread({}, field.data.refresh);
-    }
+    field.data.refresh = _objectSpread({}, field.data.refresh);
   };
 
   return {

package/es/form/SchemaForm/index.js

@@ -223,7 +223,9 @@ export default /*#__PURE__*/memo(function (_ref) {
         rules: defaultRules,
         reactions: defaultReactions,
         dataSource: defaultDataSource,
-        data: data
+        data: data || {
+          placeholder: true
+        }
       })); // 递归子组件
 
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {
@@ -242,7 +244,7 @@ export default /*#__PURE__*/memo(function (_ref) {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, []); // console.log(proFormSchema);
+  }, [schema]); // console.log(proFormSchema);
 
   return /*#__PURE__*/React.createElement(SchemaField, {
     schema: proFormSchema,

package/es/form/typing.d.ts

@@ -64,6 +64,10 @@ export interface ProFormProps extends IFormLayoutProps {
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
+export interface FilterProps extends ProFormProps {
+    form: FormType;
+    onReset?: (payload?: any) => void;
+}
 export interface QueryFilterProps extends ProFormProps {
     /**
      * @deprecated triggerType已弃用
@@ -73,6 +77,7 @@ export interface QueryFilterProps extends ProFormProps {
     expand?: boolean;
     addonBefore?: ReactNode;
     addonAfter?: ReactNode;
+    onInit?: (values: any) => void;
     onFilter?: (values: any) => void;
     onReset?: (payload?: any) => void;
 }

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.14";
+declare const version = "1.2.18";
 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.14';
+var version = '1.2.18';
 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/components/ToolBar/FilterColumnIcon.js

@@ -344,7 +344,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         },
         disabled: columnFiltersDisabled
       }, /*#__PURE__*/React.createElement(Ellipsis, {
-        tooltip: false
+        tooltip: title
       }, title)));
     }))));
   };