@zat-design/sisyphus-react 3.13.13 → 3.13.14-beta.3

package/es/ProForm/components/FormFooter/index.js

@@ -51,8 +51,9 @@ var FormFooter = function FormFooter(props) {
       // 使用自定义验证逻辑
       form.validateFields().then(function () {
         onOk();
-      }).catch(function () {
+      }).catch(function (error) {
         // 验证失败，不执行 onOk
+        console.log('校验失败', error);
       });
     } else {
       onOk();

package/es/ProForm/utils/index.js

@@ -145,7 +145,7 @@ var _filterInternalFields = function filterInternalFields(values, optimize) {
   if (_isObject(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      if (key.includes('-')) return;
+      if (key.includes('-') || key.startsWith('__')) return;
       result[key] = _filterInternalFields(nextValues[key]);
     });
     return result;

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

@@ -1,4 +1,7 @@
 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

@@ -32,6 +32,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({
@@ -339,6 +342,92 @@ 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,
@@ -386,69 +475,7 @@ 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__*/_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;
-      }()
-    }] : false
+    selections: selections
   };
   var rowSelection = _isObject(returnRowSelection) ? _merge(_rowSelection, returnRowSelection) : _rowSelection;
   if (_isObject(returnRowSelection) && !_isEqual(rowSelection, _rowSelection)) {

package/es/ProTable/index.d.ts

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

package/es/ProTable/index.js

@@ -19,7 +19,7 @@ import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { useProConfig } from '../index';
 import { RenderTableHeader, RenderFooter, RenderTabs } from './components';
-import useAntdTable from './hooks/useAntdTable';
+import useAntdTable, { CURRENT_PAGE, SELECTION_ALL, UNCHECK_ALL } from './hooks/useAntdTable';
 import { BaseTable, DraggableTable } from './components/RcTable';
 import { formatColumn } from './components/FormatColumn';
 import empty from '../assets/empty.png';
@@ -469,4 +469,7 @@ ProTable.defaultProps = {
   isView: false
 };
 ProTable.useAntdTable = useAntdTable;
+ProTable.SELECTION_ALL = SELECTION_ALL;
+ProTable.CURRENT_PAGE = CURRENT_PAGE;
+ProTable.UNCHECK_ALL = UNCHECK_ALL;
 export default ProTable;

package/es/ProTable/propsType.d.ts

@@ -609,7 +609,7 @@ export interface ProTableRequestOptionsType<T, R> {
      * @description 启用选择当前页、选择全部、取消选择下拉菜单
      * @default false
      */
-    rowSelections?: boolean;
+    rowSelections?: boolean | object[];
     /**
      * 额外参数
      * @description 无法通过搜索表单设置的值,此值变更时也会重新发起请求,重置表单不会被清空

package/lib/ProForm/components/FormFooter/index.js

@@ -58,8 +58,9 @@ var FormFooter = function FormFooter(props) {
       // 使用自定义验证逻辑
       form.validateFields().then(function () {
         onOk();
-      }).catch(function () {
+      }).catch(function (error) {
         // 验证失败，不执行 onOk
+        console.log('校验失败', error);
       });
     } else {
       onOk();

package/lib/ProForm/utils/index.js

@@ -161,7 +161,7 @@ var _filterInternalFields = exports.filterInternalFields = function filterIntern
   if ((0, _isObject2.default)(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      if (key.includes('-')) return;
+      if (key.includes('-') || key.startsWith('__')) return;
       result[key] = _filterInternalFields(nextValues[key]);
     });
     return result;

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

@@ -1,4 +1,7 @@
 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/lib/ProTable/hooks/useAntdTable.js

@@ -5,7 +5,7 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.UNCHECK_ALL = exports.SELECTION_ALL = exports.CURRENT_PAGE = void 0;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -40,6 +40,9 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var previousSearchValues = null;
+var SELECTION_ALL = exports.SELECTION_ALL = 'SELECTION_ALL';
+var CURRENT_PAGE = exports.CURRENT_PAGE = 'CURRENT_PAGE';
+var UNCHECK_ALL = exports.UNCHECK_ALL = 'UNCHECK_ALL';
 function useAntdTable(service, options, useRequestOptions) {
   var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params, _form$getFieldsValue3;
   var _useSetState = (0, _ahooks.useSetState)({
@@ -347,6 +350,92 @@ function useAntdTable(service, options, useRequestOptions) {
       return _ref4.apply(this, arguments);
     };
   }();
+  // 内置选择下拉
+  var defaultSelections = [{
+    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__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(changeableRowKeys) {
+        return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              setState({
+                allSelected: true,
+                selectedRecords: (0, _toConsumableArray2.default)(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.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__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+        return (0, _regeneratorRuntime2.default)().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 = (0, _react.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,
@@ -394,69 +483,7 @@ function useAntdTable(service, options, useRequestOptions) {
         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__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(changeableRowKeys) {
-          return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
-              case 0:
-                setState({
-                  allSelected: true,
-                  selectedRecords: (0, _toConsumableArray2.default)(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.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__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
-          return (0, _regeneratorRuntime2.default)().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
+    selections: selections
   };
   var rowSelection = (0, _isObject2.default)(returnRowSelection) ? (0, _merge2.default)(_rowSelection, returnRowSelection) : _rowSelection;
   if ((0, _isObject2.default)(returnRowSelection) && !(0, _isEqual2.default)(rowSelection, _rowSelection)) {

package/lib/ProTable/index.d.ts

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

package/lib/ProTable/index.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -24,7 +25,7 @@ var _ahooks = require("ahooks");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _index = require("../index");
 var _components = require("./components");
-var _useAntdTable = _interopRequireDefault(require("./hooks/useAntdTable"));
+var _useAntdTable = _interopRequireWildcard(require("./hooks/useAntdTable"));
 var _RcTable = require("./components/RcTable");
 var _FormatColumn = require("./components/FormatColumn");
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
@@ -476,4 +477,7 @@ ProTable.defaultProps = {
   isView: false
 };
 ProTable.useAntdTable = _useAntdTable.default;
+ProTable.SELECTION_ALL = _useAntdTable.SELECTION_ALL;
+ProTable.CURRENT_PAGE = _useAntdTable.CURRENT_PAGE;
+ProTable.UNCHECK_ALL = _useAntdTable.UNCHECK_ALL;
 var _default = exports.default = ProTable;

package/lib/ProTable/propsType.d.ts

@@ -609,7 +609,7 @@ export interface ProTableRequestOptionsType<T, R> {
      * @description 启用选择当前页、选择全部、取消选择下拉菜单
      * @default false
      */
-    rowSelections?: boolean;
+    rowSelections?: boolean | object[];
     /**
      * 额外参数
      * @description 无法通过搜索表单设置的值,此值变更时也会重新发起请求,重置表单不会被清空

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.13",
+  "version": "3.13.14-beta.3",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -82,8 +82,7 @@
   "peerDependencies": {
     "antd": "^4.24.8",
     "react": "^17.0.0 || ^18.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0",
-    "react-router-dom": "^5.1.7"
+    "react-dom": "^17.0.0 || ^18.0.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^12.1.1",