@hw-component/table 1.10.18 → 1.10.19

package/es/HTableBody/hooks/useControl.js

@@ -1,11 +1,4 @@
 // welcome to hoo hoo hoo
-import _Object$getOwnPropertySymbols from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols';
-import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/filter';
-import _Object$getOwnPropertyDescriptor from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor';
-import _Object$getOwnPropertyDescriptors from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors';
-import _Object$defineProperties from '@babel/runtime-corejs3/core-js-stable/object/define-properties';
-import _Object$defineProperty from '@babel/runtime-corejs3/core-js-stable/object/define-property';
-import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/for-each';
 import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array';
@@ -16,8 +9,6 @@ import _keysInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instanc
 import { useState, useEffect, useMemo } from 'react';
 import { useHTableContext } from '../../context.js';
 
-function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useSize = function useSize(size) {
   var _useState = useState(size),
     _useState2 = _slicedToArray(_useState, 2),
@@ -85,11 +76,12 @@ var useTableChange = function useTableChange(_ref) {
     }
     var orderByField = typeof order === "undefined" ? undefined : field;
     var asc = typeof order === "undefined" ? undefined : order === "ascend";
-    tableInstance === null || tableInstance === void 0 || tableInstance.table.reloadWithParams(_objectSpread({
-      current: 1,
+    tableInstance === null || tableInstance === void 0 || tableInstance.table.reloadWithParams({
+      current: 1
+    }, filtersMk(filters), {
       orderByField: orderByField,
       asc: asc
-    }, filtersMk(filters)));
+    });
   };
 };
 var useSynchronousKeys = function useSynchronousKeys(_ref4) {

package/es/Table.js

@@ -79,17 +79,25 @@ var Table = (function (_ref) {
     table: table,
     reload: function reload(params) {
       rowSelectionReload();
-      return run(params);
+      return run({
+        params: params
+      });
     },
     changeRowData: rowOnChange,
     dispatch: dispatch,
     reloadWithParams: function reloadWithParams() {
       var reloadParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var filters = arguments.length > 1 ? arguments[1] : undefined;
+      var sorter = arguments.length > 2 ? arguments[2] : undefined;
       rowSelectionReload();
-      return run(_objectSpread(_objectSpread({}, saveParams.old), reloadParams));
+      return run({
+        params: reloadParams,
+        filters: filters,
+        sorter: sorter
+      });
     },
     getTableParams: function getTableParams() {
-      return saveParams.old;
+      return _objectSpread(_objectSpread(_objectSpread({}, saveParams.oldParams), saveParams.filters), saveParams.sorter);
     },
     selectedRowData: selectedRowData,
     dataSource: data
@@ -99,11 +107,13 @@ var Table = (function (_ref) {
     tableInstance: tableInstance,
     onFinish: function onFinish(value) {
       rowSelectionReload();
-      var size = saveParams.old.size;
-      return run(_objectSpread(_objectSpread({}, value), {}, {
-        current: 1,
-        size: size
-      }));
+      var size = saveParams.oldParams.size;
+      return run({
+        params: _objectSpread(_objectSpread({}, value), {}, {
+          current: 1,
+          size: size
+        })
+      });
     },
     selectedRowData: selectedRowData,
     rowOnChange: rowOnChange,

package/es/TableCustomize.js

@@ -55,17 +55,25 @@ var Index = function Index(_ref) {
     table: table,
     reload: function reload(params) {
       rowOnChange([], []);
-      return run(params);
+      return run({
+        params: params
+      });
     },
     changeRowData: rowOnChange,
     dispatch: dispatch,
     reloadWithParams: function reloadWithParams() {
       var reloadParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var filters = arguments.length > 1 ? arguments[1] : undefined;
+      var sorter = arguments.length > 2 ? arguments[2] : undefined;
       rowOnChange([], []);
-      return run(_objectSpread(_objectSpread({}, saveParams.old), reloadParams));
+      return run({
+        params: _objectSpread(_objectSpread({}, saveParams.oldParams), reloadParams),
+        filters: filters,
+        sorter: sorter
+      });
     },
     getTableParams: function getTableParams() {
-      return saveParams.old;
+      return _objectSpread(_objectSpread(_objectSpread({}, saveParams.oldParams), saveParams.filters), saveParams.sorter);
     },
     selectedRowData: selectedRowData,
     dataSource: data
@@ -81,12 +89,14 @@ var Index = function Index(_ref) {
       allSelectChange: allSelectChange,
       action: action,
       configData: configData,
-      params: saveParams.old,
+      params: saveParams.oldParams,
       onFinish: function onFinish(value) {
         rowOnChange([], []);
-        return run(_objectSpread(_objectSpread(_objectSpread({}, saveParams.old), value), {}, {
-          current: 1
-        }));
+        return run({
+          params: _objectSpread(_objectSpread(_objectSpread({}, saveParams.oldParams), value), {}, {
+            current: 1
+          })
+        });
       },
       onPageChange: tableInstance.table.reloadWithParams,
       setSelectedRowData: setSelectedRowData,

package/es/hooks/useReq.d.ts

@@ -8,30 +8,39 @@ export interface IParamsModal {
     manual?: boolean;
     formInitValues?: Record<string, any>;
 }
+interface RequestParams {
+    params?: Record<string, any>;
+    filters?: any;
+    sorter?: any;
+}
 declare const _default: ({ request, loading, error, reload, dataSource, manual, formInitValues, }: IParamsModal) => {
     saveParams: {
-        old: {};
+        oldParams: {};
+        filters: {};
+        sorter: {};
     };
     reset: () => void;
     fetches: {
-        [x: string]: import("@ahooksjs/use-request/lib/types").FetchResult<ResultModal, [params?: any]>;
+        [x: string]: import("@ahooksjs/use-request/lib/types").FetchResult<ResultModal, [reqParams?: RequestParams | undefined]>;
     };
     loading: boolean;
     data: ResultModal | undefined;
     error: Error | undefined;
-    params: [params?: any];
+    params: [reqParams?: RequestParams | undefined];
     cancel: import("@ahooksjs/use-request/lib/types").noop;
     refresh: () => Promise<ResultModal>;
     mutate: import("@ahooksjs/use-request/lib/types").Mutate<ResultModal>;
-    run: (params?: any) => Promise<ResultModal>;
+    run: (reqParams?: RequestParams | undefined) => Promise<ResultModal>;
     unmount: () => void;
 } | {
     loading: boolean | undefined;
     error: Error | undefined;
     data: ResultModal;
-    run: (params?: Record<string, any>) => Promise<void>;
+    run: (reqParams?: RequestParams) => Promise<void>;
     saveParams: {
-        old: {};
+        oldParams: {};
+        filters: {};
+        sorter: {};
     };
 };
 export default _default;

package/es/hooks/useReq.js

@@ -7,8 +7,8 @@ import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js-stable/inst
 import _Object$getOwnPropertyDescriptors from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors';
 import _Object$defineProperties from '@babel/runtime-corejs3/core-js-stable/object/define-properties';
 import _Object$defineProperty from '@babel/runtime-corejs3/core-js-stable/object/define-property';
-import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
@@ -18,8 +18,7 @@ import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array
 import { useMemo, useEffect, useState } from 'react';
 import { useRequest } from 'ahooks';
 
-var _excluded = ["size", "current"],
-  _excluded2 = ["size", "current"];
+var _excluded = ["size", "current"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var defaultDataSource = {
@@ -85,7 +84,9 @@ var useReq = (function (_ref2) {
     formInitValues = _ref2$formInitValues === void 0 ? {} : _ref2$formInitValues;
   var saveParams = useMemo(function () {
     return {
-      old: {}
+      oldParams: {},
+      filters: {},
+      sorter: {}
     };
   }, []);
   var _useDataSource = useDataSource({
@@ -94,50 +95,46 @@ var useReq = (function (_ref2) {
     }),
     localReload = _useDataSource.reload,
     localDataSource = _useDataSource.dataSource;
+  var getReqParams = function getReqParams(reqParams) {
+    var _ref3 = reqParams || {},
+      _ref3$params = _ref3.params,
+      params = _ref3$params === void 0 ? {} : _ref3$params,
+      filters = _ref3.filters,
+      sorter = _ref3.sorter;
+    var _params$size = params.size,
+      size = _params$size === void 0 ? "10" : _params$size,
+      _params$current = params.current,
+      current = _params$current === void 0 ? "1" : _params$current,
+      oParams = _objectWithoutProperties(params, _excluded);
+    var requestParams = _objectSpread({
+      size: size,
+      current: current
+    }, oParams);
+    var cuFilters = filters || saveParams.filters;
+    var cuSorter = sorter || saveParams.sorter;
+    saveParams.oldParams = requestParams;
+    saveParams.filters = cuFilters;
+    saveParams.sorter = cuSorter;
+    return _objectSpread(_objectSpread(_objectSpread({}, requestParams), cuFilters), cuSorter);
+  };
   var reloadFn = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var params,
-        _params$size,
-        size,
-        _params$current,
-        current,
-        oParams,
-        requestParams,
-        _args = arguments;
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(reqParams) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            _params$size = params.size, size = _params$size === void 0 ? "10" : _params$size, _params$current = params.current, current = _params$current === void 0 ? "1" : _params$current, oParams = _objectWithoutProperties(params, _excluded);
-            requestParams = _objectSpread({
-              size: size,
-              current: current
-            }, oParams);
-            saveParams.old = requestParams;
-            return _context.abrupt("return", localReload(requestParams));
-          case 5:
+            return _context.abrupt("return", localReload(getReqParams(reqParams)));
+          case 1:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function reloadFn() {
-      return _ref3.apply(this, arguments);
+    return function reloadFn(_x) {
+      return _ref4.apply(this, arguments);
     };
   }();
-  var resultAction = useRequest(function () {
-    var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _params$size2 = params.size,
-      size = _params$size2 === void 0 ? "10" : _params$size2,
-      _params$current2 = params.current,
-      current = _params$current2 === void 0 ? "1" : _params$current2,
-      oParams = _objectWithoutProperties(params, _excluded2);
-    var reqParams = _objectSpread({
-      size: size,
-      current: current
-    }, oParams);
-    saveParams.old = reqParams;
-    return request === null || request === void 0 ? void 0 : request(reqParams);
+  var resultAction = useRequest(function (reqParams) {
+    return request === null || request === void 0 ? void 0 : request(getReqParams(reqParams));
   }, {
     manual: true
   });

package/es/modal.d.ts

@@ -96,7 +96,7 @@ export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;
     setSelectedRowData: (keys: React.Key[], data: any) => void;
     dispatch: (key: string, params: any) => void;
-    reloadWithParams: (params?: ParamsModal) => Promise<any>;
+    reloadWithParams: (params?: ParamsModal, filters?: any, sorter?: any) => Promise<any>;
     getParams: () => any;
     getSelectedRowData: () => RowObj;
     getTableSourceData: (full?: boolean) => any;

package/es/render/Text.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/lib/HTableBody/hooks/useControl.js

@@ -1,12 +1,5 @@
 'use strict';
 
-var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
-var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
-var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor');
-var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
-var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
-var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
-var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
 var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
@@ -17,8 +10,6 @@ var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/insta
 var React = require('react');
 var context = require('../../context.js');
 
-function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useSize = function useSize(size) {
   var _useState = React.useState(size),
     _useState2 = _slicedToArray(_useState, 2),
@@ -86,11 +77,12 @@ var useTableChange = function useTableChange(_ref) {
     }
     var orderByField = typeof order === "undefined" ? undefined : field;
     var asc = typeof order === "undefined" ? undefined : order === "ascend";
-    tableInstance === null || tableInstance === void 0 || tableInstance.table.reloadWithParams(_objectSpread({
-      current: 1,
+    tableInstance === null || tableInstance === void 0 || tableInstance.table.reloadWithParams({
+      current: 1
+    }, filtersMk(filters), {
       orderByField: orderByField,
       asc: asc
-    }, filtersMk(filters)));
+    });
   };
 };
 var useSynchronousKeys = function useSynchronousKeys(_ref4) {

package/lib/Table.js

@@ -82,17 +82,25 @@ var Table = (function (_ref) {
     table: table,
     reload: function reload(params) {
       rowSelectionReload();
-      return run(params);
+      return run({
+        params: params
+      });
     },
     changeRowData: rowOnChange,
     dispatch: dispatch,
     reloadWithParams: function reloadWithParams() {
       var reloadParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var filters = arguments.length > 1 ? arguments[1] : undefined;
+      var sorter = arguments.length > 2 ? arguments[2] : undefined;
       rowSelectionReload();
-      return run(_objectSpread(_objectSpread({}, saveParams.old), reloadParams));
+      return run({
+        params: reloadParams,
+        filters: filters,
+        sorter: sorter
+      });
     },
     getTableParams: function getTableParams() {
-      return saveParams.old;
+      return _objectSpread(_objectSpread(_objectSpread({}, saveParams.oldParams), saveParams.filters), saveParams.sorter);
     },
     selectedRowData: selectedRowData,
     dataSource: data
@@ -102,11 +110,13 @@ var Table = (function (_ref) {
     tableInstance: tableInstance,
     onFinish: function onFinish(value) {
       rowSelectionReload();
-      var size = saveParams.old.size;
-      return run(_objectSpread(_objectSpread({}, value), {}, {
-        current: 1,
-        size: size
-      }));
+      var size = saveParams.oldParams.size;
+      return run({
+        params: _objectSpread(_objectSpread({}, value), {}, {
+          current: 1,
+          size: size
+        })
+      });
     },
     selectedRowData: selectedRowData,
     rowOnChange: rowOnChange,

package/lib/TableCustomize.js

@@ -58,17 +58,25 @@ var Index = function Index(_ref) {
     table: table,
     reload: function reload(params) {
       rowOnChange([], []);
-      return run(params);
+      return run({
+        params: params
+      });
     },
     changeRowData: rowOnChange,
     dispatch: dispatch,
     reloadWithParams: function reloadWithParams() {
       var reloadParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var filters = arguments.length > 1 ? arguments[1] : undefined;
+      var sorter = arguments.length > 2 ? arguments[2] : undefined;
       rowOnChange([], []);
-      return run(_objectSpread(_objectSpread({}, saveParams.old), reloadParams));
+      return run({
+        params: _objectSpread(_objectSpread({}, saveParams.oldParams), reloadParams),
+        filters: filters,
+        sorter: sorter
+      });
     },
     getTableParams: function getTableParams() {
-      return saveParams.old;
+      return _objectSpread(_objectSpread(_objectSpread({}, saveParams.oldParams), saveParams.filters), saveParams.sorter);
     },
     selectedRowData: selectedRowData,
     dataSource: data
@@ -84,12 +92,14 @@ var Index = function Index(_ref) {
       allSelectChange: allSelectChange,
       action: action,
       configData: configData,
-      params: saveParams.old,
+      params: saveParams.oldParams,
       onFinish: function onFinish(value) {
         rowOnChange([], []);
-        return run(_objectSpread(_objectSpread(_objectSpread({}, saveParams.old), value), {}, {
-          current: 1
-        }));
+        return run({
+          params: _objectSpread(_objectSpread(_objectSpread({}, saveParams.oldParams), value), {}, {
+            current: 1
+          })
+        });
       },
       onPageChange: tableInstance.table.reloadWithParams,
       setSelectedRowData: setSelectedRowData,

package/lib/hooks/useReq.d.ts

@@ -8,30 +8,39 @@ export interface IParamsModal {
     manual?: boolean;
     formInitValues?: Record<string, any>;
 }
+interface RequestParams {
+    params?: Record<string, any>;
+    filters?: any;
+    sorter?: any;
+}
 declare const _default: ({ request, loading, error, reload, dataSource, manual, formInitValues, }: IParamsModal) => {
     saveParams: {
-        old: {};
+        oldParams: {};
+        filters: {};
+        sorter: {};
     };
     reset: () => void;
     fetches: {
-        [x: string]: import("@ahooksjs/use-request/lib/types").FetchResult<ResultModal, [params?: any]>;
+        [x: string]: import("@ahooksjs/use-request/lib/types").FetchResult<ResultModal, [reqParams?: RequestParams | undefined]>;
     };
     loading: boolean;
     data: ResultModal | undefined;
     error: Error | undefined;
-    params: [params?: any];
+    params: [reqParams?: RequestParams | undefined];
     cancel: import("@ahooksjs/use-request/lib/types").noop;
     refresh: () => Promise<ResultModal>;
     mutate: import("@ahooksjs/use-request/lib/types").Mutate<ResultModal>;
-    run: (params?: any) => Promise<ResultModal>;
+    run: (reqParams?: RequestParams | undefined) => Promise<ResultModal>;
     unmount: () => void;
 } | {
     loading: boolean | undefined;
     error: Error | undefined;
     data: ResultModal;
-    run: (params?: Record<string, any>) => Promise<void>;
+    run: (reqParams?: RequestParams) => Promise<void>;
     saveParams: {
-        old: {};
+        oldParams: {};
+        filters: {};
+        sorter: {};
     };
 };
 export default _default;

package/lib/hooks/useReq.js

@@ -10,8 +10,8 @@ var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/in
 var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
 var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
-var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
@@ -21,8 +21,7 @@ var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-arr
 var React = require('react');
 var ahooks = require('ahooks');
 
-var _excluded = ["size", "current"],
-  _excluded2 = ["size", "current"];
+var _excluded = ["size", "current"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var defaultDataSource = {
@@ -88,7 +87,9 @@ var useReq = (function (_ref2) {
     formInitValues = _ref2$formInitValues === void 0 ? {} : _ref2$formInitValues;
   var saveParams = React.useMemo(function () {
     return {
-      old: {}
+      oldParams: {},
+      filters: {},
+      sorter: {}
     };
   }, []);
   var _useDataSource = useDataSource({
@@ -97,50 +98,46 @@ var useReq = (function (_ref2) {
     }),
     localReload = _useDataSource.reload,
     localDataSource = _useDataSource.dataSource;
+  var getReqParams = function getReqParams(reqParams) {
+    var _ref3 = reqParams || {},
+      _ref3$params = _ref3.params,
+      params = _ref3$params === void 0 ? {} : _ref3$params,
+      filters = _ref3.filters,
+      sorter = _ref3.sorter;
+    var _params$size = params.size,
+      size = _params$size === void 0 ? "10" : _params$size,
+      _params$current = params.current,
+      current = _params$current === void 0 ? "1" : _params$current,
+      oParams = _objectWithoutProperties(params, _excluded);
+    var requestParams = _objectSpread({
+      size: size,
+      current: current
+    }, oParams);
+    var cuFilters = filters || saveParams.filters;
+    var cuSorter = sorter || saveParams.sorter;
+    saveParams.oldParams = requestParams;
+    saveParams.filters = cuFilters;
+    saveParams.sorter = cuSorter;
+    return _objectSpread(_objectSpread(_objectSpread({}, requestParams), cuFilters), cuSorter);
+  };
   var reloadFn = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var params,
-        _params$size,
-        size,
-        _params$current,
-        current,
-        oParams,
-        requestParams,
-        _args = arguments;
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(reqParams) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            _params$size = params.size, size = _params$size === void 0 ? "10" : _params$size, _params$current = params.current, current = _params$current === void 0 ? "1" : _params$current, oParams = _objectWithoutProperties(params, _excluded);
-            requestParams = _objectSpread({
-              size: size,
-              current: current
-            }, oParams);
-            saveParams.old = requestParams;
-            return _context.abrupt("return", localReload(requestParams));
-          case 5:
+            return _context.abrupt("return", localReload(getReqParams(reqParams)));
+          case 1:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function reloadFn() {
-      return _ref3.apply(this, arguments);
+    return function reloadFn(_x) {
+      return _ref4.apply(this, arguments);
     };
   }();
-  var resultAction = ahooks.useRequest(function () {
-    var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _params$size2 = params.size,
-      size = _params$size2 === void 0 ? "10" : _params$size2,
-      _params$current2 = params.current,
-      current = _params$current2 === void 0 ? "1" : _params$current2,
-      oParams = _objectWithoutProperties(params, _excluded2);
-    var reqParams = _objectSpread({
-      size: size,
-      current: current
-    }, oParams);
-    saveParams.old = reqParams;
-    return request === null || request === void 0 ? void 0 : request(reqParams);
+  var resultAction = ahooks.useRequest(function (reqParams) {
+    return request === null || request === void 0 ? void 0 : request(getReqParams(reqParams));
   }, {
     manual: true
   });

package/lib/modal.d.ts

@@ -96,7 +96,7 @@ export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;
     setSelectedRowData: (keys: React.Key[], data: any) => void;
     dispatch: (key: string, params: any) => void;
-    reloadWithParams: (params?: ParamsModal) => Promise<any>;
+    reloadWithParams: (params?: ParamsModal, filters?: any, sorter?: any) => Promise<any>;
     getParams: () => any;
     getSelectedRowData: () => RowObj;
     getTableSourceData: (full?: boolean) => any;

package/lib/render/Text.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "1.10.18",
+  "version": "1.10.19",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/HTableBody/hooks/useControl.tsx

@@ -66,10 +66,7 @@ export const useTableChange = ({
     const asc = typeof order === "undefined" ? undefined : order === "ascend";
     tableInstance?.table.reloadWithParams({
       current: 1,
-      orderByField,
-      asc,
-      ...filtersMk(filters),
-    });
+    },filtersMk(filters),{orderByField,asc});
   };
 };
 

package/src/components/Table.tsx

@@ -53,16 +53,26 @@ export default ({
     table,
     reload: (params) => {
       rowSelectionReload();
-      return run(params);
+      return run({
+        params
+      });
     },
     changeRowData: rowOnChange,
     dispatch,
-    reloadWithParams: (reloadParams = {}) => {
+    reloadWithParams: (reloadParams = {},filters?:any,sorter?:any) => {
       rowSelectionReload();
-      return run({ ...saveParams.old, ...reloadParams });
+      return run({
+        params:reloadParams,
+        filters,
+        sorter
+      });
     },
     getTableParams: () => {
-      return saveParams.old;
+      return {
+        ... saveParams.oldParams,
+        ...saveParams.filters,
+        ...saveParams.sorter
+      }
     },
     selectedRowData,
     dataSource: data,
@@ -74,8 +84,10 @@ export default ({
       tableInstance={tableInstance}
       onFinish={(value) => {
         rowSelectionReload();
-        const { size } = saveParams.old as Record<string, any>;
-        return run({ ...value, current: 1, size });
+        const { size } = saveParams.oldParams as Record<string, any>;
+        return run({
+          params:{ ...value, current: 1, size }
+        });
       }}
       selectedRowData={selectedRowData}
       rowOnChange={rowOnChange}

package/src/components/TableCustomize.tsx

@@ -6,6 +6,7 @@ import type { IParamsModal } from "./hooks/useReq";
 import useReq from "./hooks/useReq";
 import useDispatch from "./hooks/useDispatch";
 import React, { useState } from "react";
+
 const Index: React.FC<HTableProps> = ({
   request,
   configData,
@@ -31,16 +32,26 @@ const Index: React.FC<HTableProps> = ({
     table,
     reload: (params) => {
       rowOnChange([], []);
-      return run(params);
+      return run({
+          params
+      });
     },
     changeRowData: rowOnChange,
     dispatch,
-    reloadWithParams: (reloadParams = {}) => {
+    reloadWithParams: (reloadParams = {},filters?:any,sorter?:any) => {
       rowOnChange([], []);
-      return run({ ...saveParams.old, ...reloadParams });
+      return run({
+          params:{ ...saveParams.oldParams, ...reloadParams },
+          filters,
+          sorter
+      });
     },
     getTableParams: () => {
-      return saveParams.old;
+      return {
+          ... saveParams.oldParams,
+          ...saveParams.filters,
+          ...saveParams.sorter
+      }
     },
     selectedRowData,
     dataSource: data,
@@ -57,10 +68,12 @@ const Index: React.FC<HTableProps> = ({
         allSelectChange,
         action,
         configData,
-        params: saveParams.old,
+        params: saveParams.oldParams,
         onFinish: (value) => {
           rowOnChange([], []);
-          return run({ ...saveParams.old, ...value, current: 1 });
+          return run({
+              params:{ ...saveParams.oldParams, ...value, current: 1 }
+          });
         },
         onPageChange: tableInstance.table.reloadWithParams,
         setSelectedRowData,

package/src/components/hooks/useReq.ts

@@ -58,6 +58,13 @@ const useDataSource = ({ reload, dataSource }: IParamsModal) => {
     dataSource: cpDataSource,
   };
 };
+
+interface RequestParams {
+  params?:Record<string, any>;
+  filters?:any;
+  sorter?:any;
+}
+
 export default ({
   request,
   loading,
@@ -69,25 +76,32 @@ export default ({
 }: IParamsModal) => {
   const saveParams = useMemo(() => {
     return {
-      old: {},
+      oldParams: {},
+      filters:{},
+      sorter:{}
     };
   }, []);
   const { reload: localReload, dataSource: localDataSource } = useDataSource({
     reload,
     dataSource,
   });
-  const reloadFn = async (params: Record<string, any> = {}) => {
+  const getReqParams=(reqParams?:RequestParams)=>{
+    const {params={},filters,sorter}=reqParams||{};
     const { size = "10", current = "1", ...oParams } = params;
     const requestParams = { size, current, ...oParams };
-    saveParams.old = requestParams;
-    return localReload(requestParams);
+    const cuFilters=filters||saveParams.filters;
+    const cuSorter=sorter||saveParams.sorter;
+    saveParams.oldParams = requestParams;
+    saveParams.filters = cuFilters;
+    saveParams.sorter = cuSorter;
+    return  { ...requestParams,...cuFilters,...cuSorter }
+  }
+  const reloadFn = async (reqParams?:RequestParams) => {
+    return localReload(getReqParams(reqParams));
   };
   const resultAction = useRequest(
-    (params = {}) => {
-      const { size = "10", current = "1", ...oParams } = params;
-      const reqParams = { size, current, ...oParams };
-      saveParams.old = reqParams;
-      return request?.(reqParams);
+    (reqParams?:RequestParams) => {
+      return request?.( getReqParams(reqParams));
     },
     { manual: true }
   );

package/src/components/modal.ts

@@ -129,7 +129,7 @@ export interface TableInstance {
   reload: (params?: ParamsModal) => Promise<any>;
   setSelectedRowData: (keys: React.Key[], data: any) => void;
   dispatch: (key: string, params: any) => void;
-  reloadWithParams: (params?: ParamsModal) => Promise<any>;
+  reloadWithParams: (params?: ParamsModal,filters?:any,sorter?:any) => Promise<any>;
   getParams: () => any;
   getSelectedRowData: () => RowObj;
   getTableSourceData: (full?: boolean) => any;

package/src/pages/Table/index.tsx

@@ -19,7 +19,7 @@ import { HFormConfigProvider, HRangePicker } from "@hw-component/form";
 import { SettingOutlined } from "@ant-design/icons";
 import ProTable from "@ant-design/pro-table";
 import { useRequest } from "ahooks";
-import { useEffect, useState } from "react";
+import {useEffect, useRef, useState} from "react";
 import TagsComponent from "@/components/render/TagsComponent";
 
 export const configData = () => {
@@ -88,6 +88,7 @@ export const configData = () => {
   ];
 };
 const listReq = (params) => {
+  console.log(params)
   return new Promise((resolve) => {
     setTimeout(() => {
       const { current } = params;
@@ -137,6 +138,7 @@ export default () => {
       }, 2000);
     });
   });
+  const ref=useRef();
   const [dataSource, setDataSource] = useState({
     records: [],
     total: "100",
@@ -148,6 +150,7 @@ export default () => {
       title: "操作1",
       dataIndex: "op1",
       width: 120,
+      sorter:true
     },
     {
       title: "操作2",
@@ -165,6 +168,7 @@ export default () => {
     <HFormConfigProvider>
       <ProTable
         columns={cols}
+        actionRef={ref}
         columnsState={{
           persistenceKey: "text",
           persistenceType: "localStorage",
@@ -228,7 +232,6 @@ export default () => {
           <HTable
             configData={cols}
             configItemRender={(d1) => {
-              console.log(d1);
               return d1;
             }}
             columnsState={{
@@ -253,9 +256,6 @@ export default () => {
             affixProps={{
               target: () => document.querySelector(".body"),
             }}
-            scroll={{
-              x: 2000,
-            }}
             formInitValues={{
               select: "orderNo",
             }}