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

package/es/ProTable/hooks/useAntdTable.js

@@ -1,23 +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 _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 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"];
-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); }
 import { useEffect, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect, usePrevious } from 'ahooks';
+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';
+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),
@@ -30,6 +24,9 @@ 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({
@@ -80,7 +77,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,
@@ -92,15 +89,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({
@@ -117,6 +115,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
@@ -131,20 +130,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,
@@ -152,11 +153,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]);
@@ -190,12 +192,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;
@@ -249,12 +253,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,
@@ -279,9 +285,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
@@ -312,23 +319,24 @@ function useAntdTable(service, options, useRequestOptions) {
     }
   };
   var handleRefresh = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.n) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
             setState({
               allSelected: false,
               selectedRecords: [],
               selectedRowKeys: []
             });
-            _context.n = 1;
+            _context.next = 3;
             return refreshAsync();
-          case 1:
-            res = _context.v;
+          case 3:
+            res = _context.sent;
             refreshPage(res);
-          case 2:
-            return _context.a(2);
+          case 5:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -336,6 +344,93 @@ function useAntdTable(service, options, useRequestOptions) {
       return _ref4.apply(this, arguments);
     };
   }();
+
+  // 内置选择下拉
+  var defaultSelections = [{
+    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;
+    }()
+  }];
+  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,
@@ -344,7 +439,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);
@@ -358,7 +453,7 @@ function useAntdTable(service, options, useRequestOptions) {
         }, {});
         setState({
           selectedRecords: newSelectedKeys === null || newSelectedKeys === void 0 ? void 0 : newSelectedKeys.map(function (item) {
-            return selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[item];
+            return selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[String(item)];
           }),
           selectedRowKeys: newSelectedKeys
         });
@@ -383,74 +478,14 @@ function useAntdTable(service, options, useRequestOptions) {
         className: allSelected && rowSelections ? 'checkbox-disabled' : ''
       };
     },
-    selections: rowSelections ? [{
-      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__*/_regenerator().m(function _callee2(changeableRowKeys) {
-          return _regenerator().w(function (_context2) {
-            while (1) switch (_context2.n) {
-              case 0:
-                setState({
-                  allSelected: true,
-                  selectedRecords: _toConsumableArray(data),
-                  selectedRowKeys: changeableRowKeys
-                });
-              case 1:
-                return _context2.a(2);
-            }
-          }, _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__*/_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);
-        }
-        return onSelect;
-      }()
-    }] : false
+    selections: selections
   };
-  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({
@@ -459,7 +494,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 = {
@@ -472,7 +507,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
       });
     },
@@ -482,7 +517,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,
@@ -514,7 +549,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

@@ -8,13 +8,9 @@ export declare const defaultPage: {
 };
 declare const ProTable: {
     (props: ProTableType): import("react/jsx-runtime").JSX.Element;
-    defaultProps: {
-        quickConfig: boolean;
-        stripe: boolean;
-        draggable: boolean;
-        disabled: boolean;
-        isView: boolean;
-    };
     useAntdTable: typeof useAntdTable;
+    SELECTION_ALL: string;
+    CURRENT_PAGE: string;
+    UNCHECK_ALL: string;
 };
 export default ProTable;