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

package/es/ProTable/components/RenderTabs/index.js

@@ -1,14 +1,11 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/tabs/style";
-import _Tabs from "antd/es/tabs";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Tabs, Form } from 'antd';
 import { useMemo, useState, useEffect, memo } from 'react';
-import useEnum from '../../../ProEnum/hooks/useEnum';
+import useEnum from "../../../ProEnum/hooks/useEnum";
+import { jsx as _jsx } from "react/jsx-runtime";
 var RenderTabs = function RenderTabs(props) {
   var code = props.code,
     _props$dataSource = props.dataSource,
@@ -28,7 +25,8 @@ var RenderTabs = function RenderTabs(props) {
   var _useEnum = useEnum(code),
     _useEnum2 = _slicedToArray(_useEnum, 1),
     options = _useEnum2[0];
-  var fieldValue = _Form.useWatch(name, form);
+  var fieldValue = Form.useWatch(name, form);
+
   // 使用useMemo计算派生状态
   var tabItems = useMemo(function () {
     var defaultItems = [].concat(_toConsumableArray(dataSource), _toConsumableArray(options || []));
@@ -57,12 +55,12 @@ var RenderTabs = function RenderTabs(props) {
   }, [dataSource, options, transformResponse]);
   useEffect(function () {
     var _tabItems$;
-    setActiveKey(fieldValue || (tabItems === null || tabItems === void 0 ? void 0 : (_tabItems$ = tabItems[0]) === null || _tabItems$ === void 0 ? void 0 : _tabItems$.key));
+    setActiveKey(fieldValue || (tabItems === null || tabItems === void 0 || (_tabItems$ = tabItems[0]) === null || _tabItems$ === void 0 ? void 0 : _tabItems$.key));
   }, [fieldValue]);
-  if (!(tabItems === null || tabItems === void 0 ? void 0 : tabItems.length)) {
+  if (!(tabItems !== null && tabItems !== void 0 && tabItems.length)) {
     return null;
   }
-  return _jsx(_Tabs, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(Tabs, _objectSpread(_objectSpread({
     className: "pro-table-tabs",
     onChange: function onChange(key) {
       var fieldsValues = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};
@@ -72,7 +70,7 @@ var RenderTabs = function RenderTabs(props) {
       if (transformParams && typeof transformParams === 'function') {
         params = transformParams(params);
       }
-      onSearch === null || onSearch === void 0 ? void 0 : onSearch(params);
+      onSearch === null || onSearch === void 0 || onSearch(params);
     },
     type: "card"
   }, tabsProps), {}, {

package/es/ProTable/components/TableResizable/index.js

@@ -2,11 +2,11 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["onDrag", "width", "minwidth"];
-import { jsx as _jsx } from "react/jsx-runtime";
 import { useState } from 'react';
 import { Resizable } from 'react-resizable';
 import classnames from 'classnames';
-import { getParentElement } from '../FormatColumn';
+import { getParentElement } from "../FormatColumn";
+import { jsx as _jsx } from "react/jsx-runtime";
 var ResizableTitle = function ResizableTitle(props) {
   var _restProps$className;
   var onDrag = props.onDrag,
@@ -14,19 +14,21 @@ var ResizableTitle = function ResizableTitle(props) {
     _props$minwidth = props.minwidth,
     minwidth = _props$minwidth === void 0 ? 50 : _props$minwidth,
     restProps = _objectWithoutProperties(props, _excluded);
+
   // 添加偏移量
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     offset = _useState2[0],
     setOffset = _useState2[1];
-  if (restProps === null || restProps === void 0 ? void 0 : (_restProps$className = restProps.className) === null || _restProps$className === void 0 ? void 0 : _restProps$className.includes('ant-table-selection-column')) {
-    return _jsx("th", _objectSpread({}, restProps));
+  if (restProps !== null && restProps !== void 0 && (_restProps$className = restProps.className) !== null && _restProps$className !== void 0 && _restProps$className.includes('ant-table-selection-column')) {
+    return /*#__PURE__*/_jsx("th", _objectSpread({}, restProps));
   }
-  return _jsx(Resizable, {
+  var ResizableComponent = Resizable;
+  return /*#__PURE__*/_jsx(ResizableComponent, {
     width: Number(width) + Number(offset),
     minConstraints: [minwidth, 0],
     height: 0,
-    handle: _jsx("span", {
+    handle: /*#__PURE__*/_jsx("span", {
       className: classnames(['react-resizable-handle', offset && 'active']),
       style: {
         transform: "translateX(".concat(offset, "px)")
@@ -69,11 +71,11 @@ var ResizableTitle = function ResizableTitle(props) {
     draggableOpts: {
       enableUserSelectHack: false
     },
-    children: _jsx("th", _objectSpread(_objectSpread({}, restProps), {}, {
+    children: /*#__PURE__*/_jsx("th", _objectSpread(_objectSpread({}, restProps), {}, {
       style: _objectSpread({
         overflow: 'visible'
       }, restProps.style),
-      children: _jsx("div", {
+      children: /*#__PURE__*/_jsx("div", {
         className: "pro-table-th-cell",
         children: restProps.children
       })

package/es/ProTable/components/TooltipTitle/index.js

@@ -1,19 +1,19 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Tooltip } from 'antd';
 import { ReactSVG } from 'react-svg';
-import tipSvg from '../../../assets/tip.svg';
+import tipSvg from "../../../assets/tip.svg";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var TooltipTitle = function TooltipTitle(props) {
   var title = props.title,
     tooltip = props.tooltip;
   var _ref = tooltip || {},
     tooltipTitle = _ref.title,
     icon = _ref.icon;
-  return _jsxs("span", {
+  return /*#__PURE__*/_jsxs("span", {
     className: "pro-table-tooltip",
-    children: [title, _jsx(_Tooltip, {
+    children: [title, /*#__PURE__*/_jsx(Tooltip, {
       title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip,
-      children: _jsx(ReactSVG, {
+      children: /*#__PURE__*/_jsx(ReactSVG, {
         className: "icon-tip",
         src: icon || tipSvg
       })

package/es/ProTable/components/index.js

@@ -2,29 +2,34 @@
  * 表格可伸缩列组件
  * @description 实现表格列宽可调整功能
  */
-export { default as TableResizable } from './TableResizable';
+export { default as TableResizable } from "./TableResizable";
+
 /**
  * 表格空数据渲染组件
  * @description 当表格数据为空时的显示内容
  */
-export { default as RenderEmptyText } from './RenderEmptyText';
+export { default as RenderEmptyText } from "./RenderEmptyText";
+
 /**
  * 表格汇总行组件
  * @description 用于渲染表格底部的汇总信息
  */
-export { default as RenderSummary } from './RenderSummary';
+export { default as RenderSummary } from "./RenderSummary";
+
 /**
  * 表格头部渲染组件
  * @description 自定义表格头部区域，支持自定义内容和操作按钮
  */
-export { default as RenderTableHeader } from './RenderTableHeader';
+export { default as RenderTableHeader } from "./RenderTableHeader";
+
 /**
  * 表格底部渲染组件
  * @description 自定义表格底部区域，支持添加额外操作按钮
  */
-export { default as RenderFooter } from './RenderFooter';
+export { default as RenderFooter } from "./RenderFooter";
+
 /**
  * 表格标签页组件
  * @description 实现表格顶部的标签页切换功能，用于数据分类展示
  */
-export { default as RenderTabs } from './RenderTabs';
+export { default as RenderTabs } from "./RenderTabs";

package/es/ProTable/hooks/useAntdTable.d.ts

@@ -1,7 +1,4 @@
 import { useRequest } from 'ahooks';
 import type { ProTableRequestOptionsType, ProTableServiceType } from '../propsType';
-export declare const SELECTION_ALL = "SELECTION_ALL";
-export declare const CURRENT_PAGE = "CURRENT_PAGE";
-export declare const UNCHECK_ALL = "UNCHECK_ALL";
 declare function useAntdTable<I, R extends Record<string, any>, S extends ProTableServiceType<I, R>>(service: S, options?: ProTableRequestOptionsType<I, R>, useRequestOptions?: Parameters<typeof useRequest>[1]): any;
 export default useAntdTable;

package/es/ProTable/hooks/useAntdTable.js

@@ -1,25 +1,17 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import "antd/es/message/style";
-import _message from "antd/es/message";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _omit from "lodash/omit";
-import _isEqual from "lodash/isEqual";
-import _set from "lodash/set";
-import _merge from "lodash/merge";
-import _isObject from "lodash/isObject";
-import _pickBy from "lodash/pickBy";
 var _excluded = ["page", "filters", "sorter"];
 import { useEffect, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect, usePrevious } from 'ahooks';
-import { defaultPage } from '../index';
-import { isListResult, removeEmptyKeys, isNonEmptyObject } from '../utils';
-import locale, { formatMessage } from '../../locale';
+import { pickBy, isObject, merge, set, isEqual, omit } from 'lodash';
+import { Form, message } from 'antd';
+import { defaultPage } from "../index";
+import { isListResult, removeEmptyKeys, isNonEmptyObject } from "../utils";
+import locale, { formatMessage } from "../../locale";
 var useDefaultOptions = function useDefaultOptions(options) {
   var _useState = useState((options === null || options === void 0 ? void 0 : options.page) || defaultPage),
     _useState2 = _slicedToArray(_useState, 2),
@@ -32,9 +24,6 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var previousSearchValues = null;
-export var SELECTION_ALL = 'SELECTION_ALL';
-export var CURRENT_PAGE = 'CURRENT_PAGE';
-export var UNCHECK_ALL = 'UNCHECK_ALL';
 function useAntdTable(service, options, useRequestOptions) {
   var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params, _form$getFieldsValue3;
   var _useSetState = useSetState({
@@ -76,7 +65,7 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
-  var _Form$useForm = _Form.useForm(_form),
+  var _Form$useForm = Form.useForm(_form),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var _ref = useRequestOptions || {},
@@ -85,7 +74,7 @@ function useAntdTable(service, options, useRequestOptions) {
   var initPage = (options === null || options === void 0 ? void 0 : options.page) || defaultPage;
   var previousPage = usePrevious(page || defaultPage);
   var getTransformParams = function getTransformParams(params) {
-    var _pickBy2;
+    var _pickBy;
     var realParams = _objectSpread(_objectSpread(_objectSpread({}, defaultParam), extraParams), params);
     var _realParams$page = realParams.page,
       page = _realParams$page === void 0 ? initPage : _realParams$page,
@@ -97,15 +86,16 @@ function useAntdTable(service, options, useRequestOptions) {
       sorter: JSON.stringify(sorter) === '{}' ? undefined : sorter
     }, otherParams);
     var requestParams = _objectSpread(_objectSpread({}, page), {}, {
-      queryBean: (_pickBy2 = _pickBy(queryBean, function (item) {
+      queryBean: (_pickBy = pickBy(queryBean, function (item) {
         return item !== undefined;
-      })) !== null && _pickBy2 !== void 0 ? _pickBy2 : {}
+      })) !== null && _pickBy !== void 0 ? _pickBy : {}
     });
     if (transformParams) {
       return transformParams(realParams, requestParams);
     }
     return requestParams;
   };
+
   // 仅清数据源相关，查询相关
   var handleSetStateCallback = function handleSetStateCallback(values) {
     setState(_objectSpread({
@@ -122,6 +112,7 @@ function useAntdTable(service, options, useRequestOptions) {
   var curExtraParams = useMemo(function () {
     return extraParams ? JSON.stringify(extraParams) : extraParams;
   }, [extraParams]);
+
   // 调接口
   var result = useRequest(service, _objectSpread(_objectSpread({
     debounceWait: 300
@@ -136,20 +127,22 @@ function useAntdTable(service, options, useRequestOptions) {
         total = _ref2$total === void 0 ? 0 : _ref2$total;
       if (list !== null && !Array.isArray(list)) {
         var _locale$ProTable;
-        return _message.error(locale === null || locale === void 0 ? void 0 : (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.transformResponseMsg);
+        return message.error(locale === null || locale === void 0 || (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.transformResponseMsg);
       }
       setState({
         total: total,
         data: list || []
       });
-      if (useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.onSuccess) {
+      if (useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.onSuccess) {
         useRequestOptions.onSuccess(res, params);
       }
     }
   }));
   var run = result.run,
     refreshAsync = result.refreshAsync;
+
   // service变化时触发 (禁止掉防止service变更时导致的死循环)
+
   var clearSelected = function clearSelected() {
     setState({
       allSelected: false,
@@ -157,11 +150,12 @@ function useAntdTable(service, options, useRequestOptions) {
       selectedRowKeys: []
     });
   };
+
   /**
    * 手动触发时，手动调用run
    */
   useEffect(function () {
-    if (!(useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual)) {
+    if (!(useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.manual)) {
       run(getTransformParams());
     }
   }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
@@ -195,12 +189,14 @@ function useAntdTable(service, options, useRequestOptions) {
       setState(nextObject);
     }
   }, [allSelected, data]);
+
   // 释放
   useEffect(function () {
     return function () {
       previousSearchValues = null;
     };
   }, []);
+
   // 分页变更
   var handlePageChange = function handlePageChange(current, pageSize) {
     var _form$getFieldsValue;
@@ -254,12 +250,14 @@ function useAntdTable(service, options, useRequestOptions) {
       pageSize: page.pageSize
     };
     var _values = removeEmptyKeys(values);
+
     // 如果 previousPage 存在且与 page 不相等，则触发页面变化
-    if (previousPage && !_isEqual(previousPage, page)) {
+    if (previousPage && !isEqual(previousPage, page)) {
       onPageChange(newPage);
     }
+
     // 减少查询按钮的渲染，只有需要重置值时才需要调用
-    if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values) || !_isEqual(previousSearchValues, _values)) {
+    if (selectedRecords !== null && selectedRecords !== void 0 && selectedRecords.length || isNonEmptyObject(_values) || !isEqual(previousSearchValues, _values)) {
       previousSearchValues = _values;
       setState({
         searchValues: _values,
@@ -284,9 +282,10 @@ function useAntdTable(service, options, useRequestOptions) {
       }
     });
   };
+
   // 重置查询条件: 页码还原、勾选清空
   var onReset = function onReset() {
-    form === null || form === void 0 ? void 0 : form.resetFields();
+    form === null || form === void 0 || form.resetFields();
     var newPage = {
       pageNum: 1,
       pageSize: page.pageSize
@@ -317,7 +316,7 @@ function useAntdTable(service, options, useRequestOptions) {
     }
   };
   var handleRefresh = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -342,92 +341,6 @@ function useAntdTable(service, options, useRequestOptions) {
       return _ref4.apply(this, arguments);
     };
   }();
-  // 内置选择下拉
-  var defaultSelections = [{
-    key: 'currentPage',
-    text: formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTable2 = locale.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: _toConsumableArray(data),
-        selectedRowKeys: changeableRowKeys
-      });
-    }
-  }, {
-    key: 'all',
-    text: formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTable3 = locale.ProTable) === null || _locale$ProTable3 === void 0 ? void 0 : _locale$ProTable3.selectAll, {
-      total: total
-    }),
-    onSelect: function () {
-      var _onSelect = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              setState({
-                allSelected: true,
-                selectedRecords: _toConsumableArray(data),
-                selectedRowKeys: changeableRowKeys
-              });
-            case 1:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      function onSelect(_x) {
-        return _onSelect.apply(this, arguments);
-      }
-      return onSelect;
-    }()
-  }, {
-    key: 'uncheckAll',
-    text: locale === null || locale === void 0 ? void 0 : (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.deselect,
-    onSelect: function () {
-      var _onSelect2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              setState({
-                allSelected: false,
-                selectedRecords: [],
-                selectedRowKeys: []
-              });
-            case 1:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3);
-      }));
-      function onSelect() {
-        return _onSelect2.apply(this, arguments);
-      }
-      return onSelect;
-    }()
-  }];
-  var selections = useMemo(function () {
-    if (rowSelections === true) {
-      return defaultSelections;
-    }
-    if (Array.isArray(rowSelections)) {
-      return rowSelections.map(function (item) {
-        if (typeof item === 'string') {
-          if (item === CURRENT_PAGE) {
-            return defaultSelections[0];
-          }
-          if (item === SELECTION_ALL) {
-            return defaultSelections[1];
-          }
-          if (item === UNCHECK_ALL) {
-            return defaultSelections[2];
-          }
-        }
-        return item;
-      });
-    }
-    return false;
-  }, [rowSelections]);
   var _rowSelection = {
     fixed: true,
     type: rowSelectType,
@@ -436,7 +349,7 @@ function useAntdTable(service, options, useRequestOptions) {
     onChange: function onChange(rowKeys, rows) {
       if (crossPageSelect) {
         var _data$map, _Array$from, _ref5;
-        var removeKeys = data === null || data === void 0 ? void 0 : (_data$map = data.map(function (item) {
+        var removeKeys = data === null || data === 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);
@@ -475,14 +388,76 @@ function useAntdTable(service, options, useRequestOptions) {
         className: allSelected && rowSelections ? 'checkbox-disabled' : ''
       };
     },
-    selections: selections
+    selections: rowSelections ? [{
+      key: 'currentPage',
+      text: formatMessage(locale === null || locale === void 0 || (_locale$ProTable2 = locale.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: _toConsumableArray(data),
+          selectedRowKeys: changeableRowKeys
+        });
+      }
+    }, {
+      key: 'all',
+      text: formatMessage(locale === null || locale === void 0 || (_locale$ProTable3 = locale.ProTable) === null || _locale$ProTable3 === void 0 ? void 0 : _locale$ProTable3.selectAll, {
+        total: total
+      }),
+      onSelect: function () {
+        var _onSelect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                setState({
+                  allSelected: true,
+                  selectedRecords: _toConsumableArray(data),
+                  selectedRowKeys: changeableRowKeys
+                });
+              case 1:
+              case "end":
+                return _context2.stop();
+            }
+          }, _callee2);
+        }));
+        function onSelect(_x) {
+          return _onSelect.apply(this, arguments);
+        }
+        return onSelect;
+      }()
+    }, {
+      key: 'uncheckAll',
+      text: locale === null || locale === void 0 || (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.deselect,
+      onSelect: function () {
+        var _onSelect2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                setState({
+                  allSelected: false,
+                  selectedRecords: [],
+                  selectedRowKeys: []
+                });
+              case 1:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        function onSelect() {
+          return _onSelect2.apply(this, arguments);
+        }
+        return onSelect;
+      }()
+    }] : false
   };
-  var rowSelection = _isObject(returnRowSelection) ? _merge(_rowSelection, returnRowSelection) : _rowSelection;
-  if (_isObject(returnRowSelection) && !_isEqual(rowSelection, _rowSelection)) {
+  var rowSelection = isObject(returnRowSelection) ? merge(_rowSelection, returnRowSelection) : _rowSelection;
+  if (isObject(returnRowSelection) && !isEqual(rowSelection, _rowSelection)) {
     // getCheckboxProps需要特殊兼容原有的逻辑，特殊处理
     var isHasGetCheckboxProps = Reflect.ownKeys(returnRowSelection).includes('getCheckboxProps');
     if (isHasGetCheckboxProps) {
-      _set(rowSelection, 'getCheckboxProps', function (record) {
+      set(rowSelection, 'getCheckboxProps', function (record) {
         var _rowSelection$getChec;
         var passReturnObjects = (_rowSelection$getChec = rowSelection.getCheckboxProps(record)) !== null && _rowSelection$getChec !== void 0 ? _rowSelection$getChec : {};
         return _objectSpread({
@@ -491,7 +466,7 @@ function useAntdTable(service, options, useRequestOptions) {
       });
     }
   }
-  var selectedTip = allSelected && selectedRowKeys.length ? formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTable5 = locale.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.selectAll, {
+  var selectedTip = allSelected && selectedRowKeys.length ? formatMessage(locale === null || locale === void 0 || (_locale$ProTable5 = locale.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.selectAll, {
     total: allSelected ? total : selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length
   }) : null;
   var pagination = {
@@ -504,7 +479,7 @@ function useAntdTable(service, options, useRequestOptions) {
     showTotal: function showTotal(total) {
       var _locale$ProTable6;
       if (!total) return;
-      return formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTable6 = locale.ProTable) === null || _locale$ProTable6 === void 0 ? void 0 : _locale$ProTable6.total, {
+      return formatMessage(locale === null || locale === void 0 || (_locale$ProTable6 = locale.ProTable) === null || _locale$ProTable6 === void 0 ? void 0 : _locale$ProTable6.total, {
         total: total
       });
     },
@@ -514,7 +489,7 @@ function useAntdTable(service, options, useRequestOptions) {
   var useAntdTableProps = _objectSpread(_objectSpread({}, 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]) || {},
+    params: (result === null || result === 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,
@@ -546,7 +521,7 @@ function useAntdTable(service, options, useRequestOptions) {
     },
     handleSetStateCallback: handleSetStateCallback
   });
-  useAntdTableProps.tableProps.formTableProps = _objectSpread(_objectSpread({}, _omit(useAntdTableProps, 'tableProps')), {}, {
+  useAntdTableProps.tableProps.formTableProps = _objectSpread(_objectSpread({}, omit(useAntdTableProps, 'tableProps')), {}, {
     form: form
   });
   return useAntdTableProps;

package/es/ProTable/index.d.ts

@@ -16,8 +16,5 @@ declare const ProTable: {
         isView: boolean;
     };
     useAntdTable: typeof useAntdTable;
-    SELECTION_ALL: string;
-    CURRENT_PAGE: string;
-    UNCHECK_ALL: string;
 };
 export default ProTable;