@zat-design/sisyphus-react 4.0.0-beta.2 → 4.0.0-beta.3

package/lib/ProTable/hooks/useAntdTable.js

@@ -1,268 +1,254 @@
-"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
+// src/ProTable/hooks/useAntdTable.ts
+var useAntdTable_exports = {};
+__export(useAntdTable_exports, {
+  default: () => useAntdTable_default
 });
-exports.default = void 0;
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
-var _set2 = _interopRequireDefault(require("lodash/set"));
-var _merge2 = _interopRequireDefault(require("lodash/merge"));
-var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
-var _pickBy3 = _interopRequireDefault(require("lodash/pickBy"));
-var _react = require("react");
-var _ahooks = require("ahooks");
-var _antd = require("antd");
-var _index = require("../index");
-var _utils = require("../utils");
-var _locale = _interopRequireWildcard(require("../../locale"));
-var _excluded = ["page", "filters", "sorter"];
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
-var useDefaultOptions = function useDefaultOptions(options) {
-  var _useState = (0, _react.useState)((options === null || options === void 0 ? void 0 : options.page) || _index.defaultPage),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    page = _useState2[0],
-    onPageChange = _useState2[1];
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, options), {}, {
-    rowSelectType: (options === null || options === void 0 ? void 0 : options.rowSelectType) || 'checkbox',
-    page: page,
-    onPageChange: (options === null || options === void 0 ? void 0 : options.onPageChange) || onPageChange
-  });
+module.exports = __toCommonJS(useAntdTable_exports);
+var import_react = require("react");
+var import_ahooks = require("ahooks");
+var import_lodash = require("lodash");
+var import_antd = require("antd");
+var import__ = require("../index");
+var import_utils = require("../utils");
+var import_locale = __toESM(require("../../locale"));
+var useDefaultOptions = (options) => {
+  const [page, onPageChange] = (0, import_react.useState)((options == null ? void 0 : options.page) || import__.defaultPage);
+  return {
+    ...options,
+    rowSelectType: (options == null ? void 0 : options.rowSelectType) || "checkbox",
+    page,
+    onPageChange: (options == null ? void 0 : options.onPageChange) || onPageChange
+  };
 };
 var previousSearchValues = null;
 function useAntdTable(service, options, useRequestOptions) {
-  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params, _form$getFieldsValue3;
-  var _useSetState = (0, _ahooks.useSetState)({
-      data: [],
-      total: 0,
-      selectedRecords: [],
-      selectedRowKeys: [],
-      extraFilter: {
-        filters: undefined,
-        sorter: undefined
-      },
-      allSelected: false,
-      searchValues: {}
-    }),
-    _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
-    _useSetState2$ = _useSetState2[0],
-    data = _useSetState2$.data,
-    total = _useSetState2$.total,
-    selectedRecords = _useSetState2$.selectedRecords,
-    selectedRowKeys = _useSetState2$.selectedRowKeys,
-    extraFilter = _useSetState2$.extraFilter,
-    allSelected = _useSetState2$.allSelected,
-    searchValues = _useSetState2$.searchValues,
-    setState = _useSetState2[1];
-  var _useDefaultOptions = useDefaultOptions(options),
-    _form = _useDefaultOptions.form,
-    page = _useDefaultOptions.page,
-    extraParams = _useDefaultOptions.extraParams,
-    rowKey = _useDefaultOptions.rowKey,
-    _useDefaultOptions$ro = _useDefaultOptions.rowSelection,
-    returnRowSelection = _useDefaultOptions$ro === void 0 ? false : _useDefaultOptions$ro,
-    rowSelectType = _useDefaultOptions.rowSelectType,
-    rowSelections = _useDefaultOptions.rowSelections,
-    _useDefaultOptions$is = _useDefaultOptions.isResetQuery,
-    isResetQuery = _useDefaultOptions$is === void 0 ? false : _useDefaultOptions$is,
-    _useDefaultOptions$cr = _useDefaultOptions.crossPageSelect,
-    crossPageSelect = _useDefaultOptions$cr === void 0 ? false : _useDefaultOptions$cr,
-    onPageChange = _useDefaultOptions.onPageChange,
-    transformParams = _useDefaultOptions.transformParams,
-    transformResponse = _useDefaultOptions.transformResponse,
-    disabled = _useDefaultOptions.disabled;
-  var _Form$useForm = _antd.Form.useForm(_form),
-    _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
-    form = _Form$useForm2[0];
-  var _ref = useRequestOptions || {},
-    defaultParams = _ref.defaultParams;
-  var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
-  var initPage = (options === null || options === void 0 ? void 0 : options.page) || _index.defaultPage;
-  var previousPage = (0, _ahooks.usePrevious)(page || _index.defaultPage);
-  var getTransformParams = function getTransformParams(params) {
-    var _pickBy2;
-    var realParams = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultParam), extraParams), params);
-    var _realParams$page = realParams.page,
-      page = _realParams$page === void 0 ? initPage : _realParams$page,
-      filters = realParams.filters,
-      sorter = realParams.sorter,
-      otherParams = (0, _objectWithoutProperties2.default)(realParams, _excluded);
-    var queryBean = (0, _objectSpread2.default)({
-      filters: JSON.stringify(filters) === '{}' ? undefined : filters,
-      sorter: JSON.stringify(sorter) === '{}' ? undefined : sorter
-    }, otherParams);
-    var requestParams = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, page), {}, {
-      queryBean: (_pickBy2 = (0, _pickBy3.default)(queryBean, function (item) {
-        return item !== undefined;
-      })) !== null && _pickBy2 !== void 0 ? _pickBy2 : {}
-    });
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  const [
+    {
+      data,
+      total,
+      selectedRecords,
+      selectedRowKeys,
+      extraFilter,
+      allSelected,
+      searchValues
+    },
+    setState
+  ] = (0, import_ahooks.useSetState)({
+    data: [],
+    total: 0,
+    selectedRecords: [],
+    selectedRowKeys: [],
+    extraFilter: {
+      filters: void 0,
+      sorter: void 0
+    },
+    allSelected: false,
+    searchValues: {}
+  });
+  const {
+    form: _form,
+    page,
+    extraParams,
+    rowKey,
+    rowSelection: returnRowSelection = false,
+    rowSelectType,
+    rowSelections,
+    isResetQuery = false,
+    crossPageSelect = false,
+    onPageChange,
+    transformParams,
+    transformResponse,
+    disabled
+  } = useDefaultOptions(options);
+  const [form] = import_antd.Form.useForm(_form);
+  const { defaultParams } = useRequestOptions || {};
+  const defaultParam = Array.isArray(defaultParams) ? defaultParams == null ? void 0 : defaultParams[0] : defaultParams || {};
+  const initPage = (options == null ? void 0 : options.page) || import__.defaultPage;
+  const previousPage = (0, import_ahooks.usePrevious)(page || import__.defaultPage);
+  const getTransformParams = (params) => {
+    const realParams = {
+      ...defaultParam,
+      ...extraParams,
+      ...params
+    };
+    const { page: page2 = initPage, filters, sorter, ...otherParams } = realParams;
+    const queryBean = {
+      filters: JSON.stringify(filters) === "{}" ? void 0 : filters,
+      sorter: JSON.stringify(sorter) === "{}" ? void 0 : sorter,
+      ...otherParams
+    };
+    const requestParams = {
+      ...page2,
+      queryBean: (0, import_lodash.pickBy)(queryBean, (item) => item !== void 0) ?? {}
+    };
     if (transformParams) {
       return transformParams(realParams, requestParams);
     }
     return requestParams;
   };
-  // 仅清数据源相关，查询相关
-  var handleSetStateCallback = function handleSetStateCallback(values) {
-    setState((0, _objectSpread2.default)({
+  const handleSetStateCallback = (values) => {
+    setState({
       data: [],
       total: 0,
       selectedRecords: [],
       selectedRowKeys: [],
-      allSelected: false
-    }, values));
+      allSelected: false,
+      ...values
+    });
   };
-  var curService = (0, _react.useMemo)(function () {
-    return service.toString();
-  }, [service]);
-  var curExtraParams = (0, _react.useMemo)(function () {
+  const curService = (0, import_react.useMemo)(() => service.toString(), [service]);
+  const curExtraParams = (0, import_react.useMemo)(() => {
     return extraParams ? JSON.stringify(extraParams) : extraParams;
   }, [extraParams]);
-  // 调接口
-  var result = (0, _ahooks.useRequest)(service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    debounceWait: 300
-  }, useRequestOptions), {}, {
+  const result = (0, import_ahooks.useRequest)(service, {
+    debounceWait: 300,
+    ...useRequestOptions,
     defaultParams: [getTransformParams()],
-    onSuccess: function onSuccess(res, params) {
-      var transformResult = transformResponse ? transformResponse(res) : res || {};
-      var _ref2 = (0, _utils.isListResult)(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},
-        _ref2$list = _ref2.list,
-        list = _ref2$list === void 0 ? [] : _ref2$list,
-        _ref2$total = _ref2.total,
-        total = _ref2$total === void 0 ? 0 : _ref2$total;
+    onSuccess: (res, params) => {
+      var _a2, _b2;
+      const transformResult = transformResponse ? transformResponse(res) : res || {};
+      const { list = [], total: total2 = 0 } = (0, import_utils.isListResult)(transformResult) ? transformResult : (transformResult == null ? void 0 : transformResult.data) || {};
       if (list !== null && !Array.isArray(list)) {
-        var _locale$ProTable;
-        return _antd.message.error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable = _locale.default.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.transformResponseMsg);
+        return import_antd.message.error((_b2 = (_a2 = import_locale.default) == null ? void 0 : _a2.ProTable) == null ? void 0 : _b2.transformResponseMsg);
       }
       setState({
-        total: total,
+        total: total2,
         data: list || []
       });
-      if (useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.onSuccess) {
+      if (useRequestOptions == null ? void 0 : useRequestOptions.onSuccess) {
         useRequestOptions.onSuccess(res, params);
       }
     }
-  }));
-  var run = result.run,
-    refreshAsync = result.refreshAsync;
-  // service变化时触发 (禁止掉防止service变更时导致的死循环)
-  var clearSelected = function clearSelected() {
+  });
+  const { run, refreshAsync } = result;
+  const clearSelected = () => {
     setState({
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: []
     });
   };
-  /**
-   * 手动触发时，手动调用run
-   */
-  (0, _react.useEffect)(function () {
-    if (!(useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual)) {
+  (0, import_react.useEffect)(() => {
+    if (!(useRequestOptions == null ? void 0 : useRequestOptions.manual)) {
       run(getTransformParams());
     }
-  }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
-  (0, _ahooks.useDeepCompareEffect)(function () {
+  }, [useRequestOptions == null ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
+  (0, import_ahooks.useDeepCompareEffect)(() => {
     if (allSelected) {
-      var filterList = data.filter(function (item) {
-        return !selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[rowKey]);
-      });
-      var nextObject = {
-        selectedRecords: [].concat((0, _toConsumableArray2.default)(selectedRecords), (0, _toConsumableArray2.default)(filterList)),
-        selectedRowKeys: [].concat((0, _toConsumableArray2.default)(selectedRowKeys), (0, _toConsumableArray2.default)(filterList === null || filterList === void 0 ? void 0 : filterList.map(function (item) {
-          return item === null || item === void 0 ? void 0 : item[rowKey];
-        })))
+      const filterList = data.filter((item) => !selectedRowKeys.includes(item == null ? void 0 : item[rowKey]));
+      let nextObject = {
+        selectedRecords: [...selectedRecords, ...filterList],
+        selectedRowKeys: [
+          ...selectedRowKeys,
+          ...filterList == null ? void 0 : filterList.map((item) => item == null ? void 0 : item[rowKey])
+        ]
       };
-      if (typeof disabled === 'function') {
-        var _selectedRecords$filt, _nextSelectRecords$ma;
-        var _nextObject = nextObject,
-          _selectedRecords = _nextObject.selectedRecords;
-        var nextSelectRecords = (_selectedRecords$filt = _selectedRecords.filter(function (item) {
-          // 去掉禁用的
+      if (typeof disabled === "function") {
+        const { selectedRecords: selectedRecords2 } = nextObject;
+        const nextSelectRecords = selectedRecords2.filter((item) => {
           return !disabled(item);
-        })) !== null && _selectedRecords$filt !== void 0 ? _selectedRecords$filt : [];
-        var nextSelectedRowKeys = (_nextSelectRecords$ma = nextSelectRecords.map(function (item) {
-          return item === null || item === void 0 ? void 0 : item[rowKey];
-        })) !== null && _nextSelectRecords$ma !== void 0 ? _nextSelectRecords$ma : [];
-        nextObject = {
-          selectedRecords: nextSelectRecords,
-          selectedRowKeys: nextSelectedRowKeys
-        };
+        }) ?? [];
+        const nextSelectedRowKeys = nextSelectRecords.map((item) => {
+          return item == null ? void 0 : item[rowKey];
+        }) ?? [];
+        nextObject = { selectedRecords: nextSelectRecords, selectedRowKeys: nextSelectedRowKeys };
       }
       setState(nextObject);
     }
   }, [allSelected, data]);
-  // 释放
-  (0, _react.useEffect)(function () {
-    return function () {
+  (0, import_react.useEffect)(() => {
+    return () => {
       previousSearchValues = null;
     };
   }, []);
-  // 分页变更
-  var handlePageChange = function handlePageChange(current, pageSize) {
-    var _form$getFieldsValue;
-    var page = {
+  const handlePageChange = (current, pageSize) => {
+    const page2 = {
       pageNum: current,
-      pageSize: pageSize
+      pageSize
     };
-    onPageChange(page);
+    onPageChange(page2);
     if (!rowSelections && !crossPageSelect) {
       setState({
         selectedRecords: [],
         selectedRowKeys: []
       });
     }
-    var newValues = (_form$getFieldsValue = form.getFieldsValue()) !== null && _form$getFieldsValue !== void 0 ? _form$getFieldsValue : {};
-    var nextValues = (0, _utils.removeEmptyKeys)(newValues);
-    run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
-      page: page
-    }, nextValues), extraFilter)));
+    const newValues = form.getFieldsValue() ?? {};
+    const nextValues = (0, import_utils.removeEmptyKeys)(newValues);
+    run(
+      getTransformParams({
+        page: page2,
+        ...nextValues,
+        ...extraFilter
+      })
+    );
   };
-  var handleTableChange = function handleTableChange(pagination, filters, sorter, extra) {
-    var _form$getFieldsValue2;
-    // 跳过分页改变，使用pagination的onChange
-    if (extra.action === 'paginate') {
+  const handleTableChange = (pagination2, filters, sorter, extra) => {
+    if (extra.action === "paginate") {
       return;
     }
-    var page = {
-      pageNum: pagination.current,
-      pageSize: pagination.pageSize
+    const page2 = {
+      pageNum: pagination2.current,
+      pageSize: pagination2.pageSize
     };
-    onPageChange(page);
+    onPageChange(page2);
     setState({
       selectedRecords: [],
       selectedRowKeys: [],
       extraFilter: {
-        filters: filters,
-        sorter: sorter
+        filters,
+        sorter
       }
     });
-    var _values = (_form$getFieldsValue2 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
-    run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
-      page: page
-    }, _values), {}, {
-      filters: filters,
-      sorter: sorter
-    })));
+    const _values = (form == null ? void 0 : form.getFieldsValue()) ?? {};
+    run(
+      getTransformParams({
+        page: page2,
+        ..._values,
+        filters,
+        sorter
+      })
+    );
   };
-  var onSearch = function onSearch(values) {
-    var newPage = {
+  const onSearch = (values) => {
+    const newPage = {
       pageNum: 1,
       pageSize: page.pageSize
     };
-    var _values = (0, _utils.removeEmptyKeys)(values);
-    // 如果 previousPage 存在且与 page 不相等，则触发页面变化
-    if (previousPage && !(0, _isEqual2.default)(previousPage, page)) {
+    const _values = (0, import_utils.removeEmptyKeys)(values);
+    if (previousPage && !(0, import_lodash.isEqual)(previousPage, page)) {
       onPageChange(newPage);
     }
-    // 减少查询按钮的渲染，只有需要重置值时才需要调用
-    if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) || !(0, _isEqual2.default)(previousSearchValues, _values)) {
+    if ((selectedRecords == null ? void 0 : selectedRecords.length) || (0, import_utils.isNonEmptyObject)(_values) || !(0, import_lodash.isEqual)(previousSearchValues, _values)) {
       previousSearchValues = _values;
       setState({
         searchValues: _values,
@@ -271,103 +257,86 @@ function useAntdTable(service, options, useRequestOptions) {
         selectedRowKeys: []
       });
     }
-    run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
-      page: newPage
-    }, extraFilter), _values)));
+    run(
+      getTransformParams({
+        page: newPage,
+        ...extraFilter,
+        ..._values
+      })
+    );
   };
-  var resetParams = function resetParams(page) {
+  const resetParams = (page2) => {
     setState({
       searchValues: {},
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: [],
       extraFilter: {
-        filters: undefined,
-        sorter: undefined
+        filters: void 0,
+        sorter: void 0
       }
     });
   };
-  // 重置查询条件: 页码还原、勾选清空
-  var onReset = function onReset() {
-    form === null || form === void 0 ? void 0 : form.resetFields();
-    var newPage = {
+  const onReset = () => {
+    form == null ? void 0 : form.resetFields();
+    const newPage = {
       pageNum: 1,
       pageSize: page.pageSize
     };
     resetParams(newPage);
     if (isResetQuery) {
       onPageChange(newPage);
-      run(getTransformParams({
-        page: newPage
-      }));
+      run(
+        getTransformParams({
+          page: newPage
+        })
+      );
     }
   };
-  var refreshPage = function refreshPage(res) {
-    var transformResult = transformResponse ? transformResponse(res) : res || {};
-    var _ref3 = (0, _utils.isListResult)(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},
-      _ref3$total = _ref3.total,
-      total = _ref3$total === void 0 ? 0 : _ref3$total;
-    var totalPage = Math.floor((total + page.pageSize - 1) / page.pageSize) || 1;
+  const refreshPage = (res) => {
+    const transformResult = transformResponse ? transformResponse(res) : res || {};
+    const { total: total2 = 0 } = (0, import_utils.isListResult)(transformResult) ? transformResult : (transformResult == null ? void 0 : transformResult.data) || {};
+    const totalPage = Math.floor((total2 + page.pageSize - 1) / page.pageSize) || 1;
     if (page.pageNum > totalPage) {
-      var newPage = {
+      const newPage = {
         pageNum: totalPage,
         pageSize: page.pageSize
       };
       onPageChange(newPage);
-      run(getTransformParams({
-        page: newPage
-      }));
+      run(
+        getTransformParams({
+          page: newPage
+        })
+      );
     }
   };
-  var handleRefresh = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee() {
-      var res;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.n) {
-          case 0:
-            setState({
-              allSelected: false,
-              selectedRecords: [],
-              selectedRowKeys: []
-            });
-            _context.n = 1;
-            return refreshAsync();
-          case 1:
-            res = _context.v;
-            refreshPage(res);
-          case 2:
-            return _context.a(2);
-        }
-      }, _callee);
-    }));
-    return function handleRefresh() {
-      return _ref4.apply(this, arguments);
-    };
-  }();
-  var _rowSelection = {
+  const handleRefresh = async () => {
+    setState({
+      allSelected: false,
+      selectedRecords: [],
+      selectedRowKeys: []
+    });
+    const res = await refreshAsync();
+    refreshPage(res);
+  };
+  const _rowSelection = {
     fixed: true,
     type: rowSelectType,
-    columnWidth: rowSelections ? 64 : undefined,
-    selectedRowKeys: selectedRowKeys,
-    onChange: function onChange(rowKeys, rows) {
+    columnWidth: rowSelections ? 64 : void 0,
+    selectedRowKeys,
+    onChange(rowKeys, rows) {
+      var _a2, _b2, _c2;
       if (crossPageSelect) {
-        var _data$map, _Array$from, _ref5;
-        var removeKeys = data === null || data === void 0 ? void 0 : (_data$map = data.map(function (item) {
-          return item === null || item === void 0 ? void 0 : item[rowKey];
-        })) === null || _data$map === void 0 ? void 0 : _data$map.filter(function (key) {
-          return !rowKeys.includes(key);
-        });
-        var newSelectedKeys = (_Array$from = Array.from(new Set([].concat((0, _toConsumableArray2.default)(selectedRowKeys), (0, _toConsumableArray2.default)(rowKeys))))) === null || _Array$from === void 0 ? void 0 : _Array$from.filter(function (item) {
-          return !removeKeys.includes(item);
-        });
-        var selectedRecordObj = (_ref5 = [].concat((0, _toConsumableArray2.default)(selectedRecords), (0, _toConsumableArray2.default)(rows))) === null || _ref5 === void 0 ? void 0 : _ref5.reduce(function (acc, cur) {
-          acc[cur === null || cur === void 0 ? void 0 : cur[rowKey]] = cur;
+        const removeKeys = (_a2 = data == null ? void 0 : data.map((item) => item == null ? void 0 : item[rowKey])) == null ? void 0 : _a2.filter((key) => !rowKeys.includes(key));
+        const newSelectedKeys = (_b2 = Array.from(/* @__PURE__ */ new Set([...selectedRowKeys, ...rowKeys]))) == null ? void 0 : _b2.filter(
+          (item) => !removeKeys.includes(item)
+        );
+        const selectedRecordObj = (_c2 = [...selectedRecords, ...rows]) == null ? void 0 : _c2.reduce((acc, cur) => {
+          acc[cur == null ? void 0 : cur[rowKey]] = cur;
           return acc;
         }, {});
         setState({
-          selectedRecords: newSelectedKeys === null || newSelectedKeys === void 0 ? void 0 : newSelectedKeys.map(function (item) {
-            return selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[item];
-          }),
+          selectedRecords: newSelectedKeys == null ? void 0 : newSelectedKeys.map((item) => selectedRecordObj == null ? void 0 : selectedRecordObj[item]),
           selectedRowKeys: newSelectedKeys
         });
       } else {
@@ -377,7 +346,7 @@ function useAntdTable(service, options, useRequestOptions) {
         });
       }
     },
-    onSelectAll: function onSelectAll(selected) {
+    onSelectAll: (selected) => {
       if (rowSelections && allSelected && !selected) {
         setState({
           allSelected: false,
@@ -386,145 +355,114 @@ function useAntdTable(service, options, useRequestOptions) {
         });
       }
     },
-    getCheckboxProps: function getCheckboxProps(record) {
-      return {
-        className: allSelected && rowSelections ? 'checkbox-disabled' : ''
-      };
-    },
-    selections: rowSelections ? [{
-      key: 'currentPage',
-      text: (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable2 = _locale.default.ProTable) === null || _locale$ProTable2 === void 0 ? void 0 : _locale$ProTable2.selectCurPage, {
-        total: (data === null || data === void 0 ? void 0 : data.length) || 0
-      }),
-      onSelect: function onSelect(changeableRowKeys) {
-        setState({
-          allSelected: false,
-          selectedRecords: (0, _toConsumableArray2.default)(data),
-          selectedRowKeys: changeableRowKeys
-        });
-      }
-    }, {
-      key: 'all',
-      text: (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable3 = _locale.default.ProTable) === null || _locale$ProTable3 === void 0 ? void 0 : _locale$ProTable3.selectAll, {
-        total: total
-      }),
-      onSelect: function () {
-        var _onSelect = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee2(changeableRowKeys) {
-          return _regenerator().w(function (_context2) {
-            while (1) switch (_context2.n) {
-              case 0:
-                setState({
-                  allSelected: true,
-                  selectedRecords: (0, _toConsumableArray2.default)(data),
-                  selectedRowKeys: changeableRowKeys
-                });
-              case 1:
-                return _context2.a(2);
-            }
-          }, _callee2);
-        }));
-        function onSelect(_x) {
-          return _onSelect.apply(this, arguments);
+    getCheckboxProps: (record) => ({
+      className: allSelected && rowSelections ? "checkbox-disabled" : ""
+    }),
+    selections: rowSelections ? [
+      {
+        key: "currentPage",
+        text: (0, import_locale.formatMessage)((_b = (_a = import_locale.default) == null ? void 0 : _a.ProTable) == null ? void 0 : _b.selectCurPage, { total: (data == null ? void 0 : data.length) || 0 }),
+        onSelect: (changeableRowKeys) => {
+          setState({
+            allSelected: false,
+            selectedRecords: [...data],
+            selectedRowKeys: changeableRowKeys
+          });
         }
-        return onSelect;
-      }()
-    }, {
-      key: 'uncheckAll',
-      text: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable4 = _locale.default.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.deselect,
-      onSelect: function () {
-        var _onSelect2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee3() {
-          return _regenerator().w(function (_context3) {
-            while (1) switch (_context3.n) {
-              case 0:
-                setState({
-                  allSelected: false,
-                  selectedRecords: [],
-                  selectedRowKeys: []
-                });
-              case 1:
-                return _context3.a(2);
-            }
-          }, _callee3);
-        }));
-        function onSelect() {
-          return _onSelect2.apply(this, arguments);
+      },
+      {
+        key: "all",
+        text: (0, import_locale.formatMessage)((_d = (_c = import_locale.default) == null ? void 0 : _c.ProTable) == null ? void 0 : _d.selectAll, { total }),
+        onSelect: async (changeableRowKeys) => {
+          setState({
+            allSelected: true,
+            selectedRecords: [...data],
+            selectedRowKeys: changeableRowKeys
+          });
+        }
+      },
+      {
+        key: "uncheckAll",
+        text: (_f = (_e = import_locale.default) == null ? void 0 : _e.ProTable) == null ? void 0 : _f.deselect,
+        onSelect: async () => {
+          setState({
+            allSelected: false,
+            selectedRecords: [],
+            selectedRowKeys: []
+          });
         }
-        return onSelect;
-      }()
-    }] : false
+      }
+    ] : false
   };
-  var rowSelection = (0, _isObject2.default)(returnRowSelection) ? (0, _merge2.default)(_rowSelection, returnRowSelection) : _rowSelection;
-  if ((0, _isObject2.default)(returnRowSelection) && !(0, _isEqual2.default)(rowSelection, _rowSelection)) {
-    // getCheckboxProps需要特殊兼容原有的逻辑，特殊处理
-    var isHasGetCheckboxProps = Reflect.ownKeys(returnRowSelection).includes('getCheckboxProps');
+  const rowSelection = (0, import_lodash.isObject)(returnRowSelection) ? (0, import_lodash.merge)(_rowSelection, returnRowSelection) : _rowSelection;
+  if ((0, import_lodash.isObject)(returnRowSelection) && !(0, import_lodash.isEqual)(rowSelection, _rowSelection)) {
+    const isHasGetCheckboxProps = Reflect.ownKeys(returnRowSelection).includes("getCheckboxProps");
     if (isHasGetCheckboxProps) {
-      (0, _set2.default)(rowSelection, 'getCheckboxProps', function (record) {
-        var _rowSelection$getChec;
-        var passReturnObjects = (_rowSelection$getChec = rowSelection.getCheckboxProps(record)) !== null && _rowSelection$getChec !== void 0 ? _rowSelection$getChec : {};
-        return (0, _objectSpread2.default)({
-          className: allSelected && rowSelections ? 'checkbox-disabled' : ''
-        }, passReturnObjects);
+      (0, import_lodash.set)(rowSelection, "getCheckboxProps", (record) => {
+        const passReturnObjects = rowSelection.getCheckboxProps(record) ?? {};
+        return {
+          className: allSelected && rowSelections ? "checkbox-disabled" : "",
+          ...passReturnObjects
+        };
       });
     }
   }
-  var selectedTip = allSelected && selectedRowKeys.length ? (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable5 = _locale.default.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.selectAll, {
-    total: allSelected ? total : selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length
+  const selectedTip = allSelected && selectedRowKeys.length ? (0, import_locale.formatMessage)((_h = (_g = import_locale.default) == null ? void 0 : _g.ProTable) == null ? void 0 : _h.selectAll, {
+    total: allSelected ? total : selectedRowKeys == null ? void 0 : selectedRowKeys.length
   }) : null;
-  var pagination = {
+  const pagination = {
     current: page.pageNum,
     pageSize: page.pageSize,
     showSizeChanger: true,
     showQuickJumper: true,
     onPaginationChange: true,
-    total: total,
-    showTotal: function showTotal(total) {
-      var _locale$ProTable6;
-      if (!total) return;
-      return (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable6 = _locale.default.ProTable) === null || _locale$ProTable6 === void 0 ? void 0 : _locale$ProTable6.total, {
-        total: total
-      });
+    total,
+    showTotal: (total2) => {
+      var _a2, _b2;
+      if (!total2)
+        return;
+      return (0, import_locale.formatMessage)((_b2 = (_a2 = import_locale.default) == null ? void 0 : _a2.ProTable) == null ? void 0 : _b2.total, { total: total2 });
     },
     onShowSizeChange: handlePageChange,
     onChange: handlePageChange
   };
-  var useAntdTableProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, result), {}, {
-    form: form,
-    data: data,
-    params: (result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
-    rowSelection: rowSelection,
-    searchValues: (_form$getFieldsValue3 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
-    allSelected: allSelected,
-    selectedTip: selectedTip,
-    selectedRowKeys: selectedRowKeys,
-    selectedRecords: selectedRecords,
-    clearSelected: clearSelected,
-    setSelectedRowKeys: function setSelectedRowKeys(selectedRowKeys) {
+  const useAntdTableProps = {
+    ...result,
+    form,
+    data,
+    params: ((_i = result == null ? void 0 : result.params) == null ? void 0 : _i[0]) || {},
+    rowSelection,
+    searchValues: (form == null ? void 0 : form.getFieldsValue()) ?? {},
+    allSelected,
+    selectedTip,
+    selectedRowKeys,
+    selectedRecords,
+    clearSelected,
+    setSelectedRowKeys: (selectedRowKeys2) => {
       setState({
-        selectedRowKeys: selectedRowKeys
+        selectedRowKeys: selectedRowKeys2
       });
     },
-    setSelectedRecords: function setSelectedRecords(selectedRecords) {
+    setSelectedRecords: (selectedRecords2) => {
       setState({
-        selectedRecords: selectedRecords
+        selectedRecords: selectedRecords2
       });
     },
-    pagination: pagination,
-    onReset: onReset,
-    onSearch: onSearch,
+    pagination,
+    onReset,
+    onSearch,
     refresh: handleRefresh,
     tableProps: {
-      rowKey: rowKey,
+      rowKey,
       loading: result.loading,
       dataSource: data,
-      rowSelection: returnRowSelection || rowSelections ? rowSelection : undefined,
-      pagination: pagination,
+      rowSelection: returnRowSelection || rowSelections ? rowSelection : void 0,
+      pagination,
       onChange: handleTableChange
     },
-    handleSetStateCallback: handleSetStateCallback
-  });
-  useAntdTableProps.tableProps.formTableProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(useAntdTableProps, 'tableProps')), {}, {
-    form: form
-  });
+    handleSetStateCallback
+  };
+  useAntdTableProps.tableProps.formTableProps = { ...(0, import_lodash.omit)(useAntdTableProps, "tableProps"), form };
   return useAntdTableProps;
 }
-var _default = exports.default = useAntdTable;
+var useAntdTable_default = useAntdTable;