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

package/es/ProForm/utils/transformValue.js

@@ -1,11 +1,12 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _set from "lodash/set";
-import { diffField } from '../utils';
-import { isEmpty } from '../../utils';
+import { set } from 'lodash';
+import { diffField } from "../utils";
+import { isEmpty } from "../../utils";
 export var transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
   return {
     normalize: function normalize(value) {
       var _value = value;
+
       // 支持外部传入转换函数
       if (_normalize) {
         for (var _len = arguments.length, res = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -15,7 +16,7 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       }
       names.forEach(function (name, index) {
         var _value2;
-        _set(form.getFieldsValue(true), name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
+        set(form.getFieldsValue(true), name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
       });
       return _value;
     },
@@ -35,18 +36,22 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
         value: _value
       };
+
       // 如果数组中值都为空, 则值置为空
       var curValue = res === null || res === void 0 ? void 0 : res.value;
+
       // @ts-ignore
-      if ((_curValue = curValue) === null || _curValue === void 0 ? void 0 : _curValue.every(function (item) {
+      if ((_curValue = curValue) !== null && _curValue !== void 0 && _curValue.every(function (item) {
         return isEmpty(item);
       })) {
         curValue = undefined;
       }
+
       // 如果来源是比对且有names场景, 则不更新表单值
       if (!isOrigin) {
-        _set(form.getFieldsValue(true), fieldName, curValue);
+        set(form.getFieldsValue(true), fieldName, curValue);
       }
+
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
       return _objectSpread(_objectSpread({}, res), {}, {
         value: curValue

package/es/ProForm/utils/useDeepCompareMemo.js

@@ -1,13 +1,15 @@
-import _isEqualWith from "lodash/isEqualWith";
 import { useRef } from 'react';
-import { customEqualForFunction } from '../../utils';
+import { isEqualWith } from 'lodash';
+import { customEqualForFunction } from "../../utils";
+
 /** 深度比较依赖变化memo */
 export var useDeepCompareMemo = function useDeepCompareMemo(fun, changedCb, depList) {
   var lastDependency = useRef({}); // 上一次的依赖
   var lastRes = useRef({}); // 上一次的结果
-  if (!_isEqualWith(depList, lastDependency === null || lastDependency === void 0 ? void 0 : lastDependency.current, customEqualForFunction)) {
+
+  if (!isEqualWith(depList, lastDependency === null || lastDependency === void 0 ? void 0 : lastDependency.current, customEqualForFunction)) {
     var res = fun();
-    changedCb === null || changedCb === void 0 ? void 0 : changedCb(lastRes.current, res);
+    changedCb === null || changedCb === void 0 || changedCb(lastRes.current, res);
     lastRes.current = res;
   }
   lastDependency.current = depList;

package/es/ProForm/utils/useForm.js

@@ -1,33 +1,33 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-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 { Form } from 'antd';
 import { useContext } from 'react';
-import { filterInternalFields, getFormFieldPaths, mergeNames, isListForm } from './index';
-import { handleScrollToError as handleScrollToErrorProEditTable } from '../../ProEditTable/utils/tools';
-import { FormsContext } from '../../FormsProvider';
+import { filterInternalFields, getFormFieldPaths, mergeNames, isListForm } from "./index";
+import { handleScrollToError as handleScrollToErrorProEditTable } from "../../ProEditTable/utils/tools";
+import { FormsContext } from "../../FormsProvider";
 export var useForm = function useForm(originForm, options) {
   // 如果没有form实例可以直接把options放在第一个参数位置
   // @ts-ignore
-  var _originForm = (originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined;
+  var _originForm = originForm !== null && originForm !== void 0 && originForm._init ? originForm : undefined;
   var _options =
   // @ts-ignore
-  options || (originForm && !(originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined);
+  options || (originForm && !(originForm !== null && originForm !== void 0 && originForm._init) ? originForm : undefined);
   var _ref = _options || {},
     _ref$scrollToError = _ref.scrollToError,
     scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError,
     optimize = _ref.optimize,
     formKey = _ref.formKey,
     source = _ref.source;
+
   // formKey全局共享逻辑
   var forms = useContext(FormsContext);
-  var _Form$useForm = Form.useForm(forms[formKey] || _originForm),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
+  var _ref2 = Form.useForm(forms[formKey] || _originForm),
+    _ref3 = _slicedToArray(_ref2, 1),
+    form = _ref3[0];
   if (formKey && forms[formKey] !== form) {
     forms[formKey] = form;
     form.formKey = formKey;
@@ -39,6 +39,7 @@ export var useForm = function useForm(originForm, options) {
     getFieldsError = form.getFieldsError,
     setFieldsValue = form.setFieldsValue;
   if (isModified) return [form];
+
   // @ts-ignore
   var nextGetFieldsValue = function nextGetFieldsValue(nameList, filterFunc) {
     // 全部查询
@@ -49,7 +50,7 @@ export var useForm = function useForm(originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   var nextValidateFields = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(nameList) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
       var _rest$,
         _form$__INTERNAL_CONF,
         _len,
@@ -74,79 +75,76 @@ export var useForm = function useForm(originForm, options) {
         _tablePagination$clic,
         _error$errorFields2,
         _error$errorFields$2,
-        _args = arguments,
-        _t,
-        _t2,
-        _t3;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.p = _context.n) {
+        _args = arguments;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.p = 0;
+            _context.prev = 0;
             for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               rest[_key - 1] = _args[_key];
             }
-            isRecursive = rest === null || rest === void 0 ? void 0 : (_rest$ = rest[0]) === null || _rest$ === void 0 ? void 0 : _rest$.recursive;
-            stopOnFirstError = form === null || form === void 0 ? void 0 : (_form$__INTERNAL_CONF = form.__INTERNAL_CONFIG__) === null || _form$__INTERNAL_CONF === void 0 ? void 0 : _form$__INTERNAL_CONF.stopOnFirstError; // 如果启用了 stopOnFirstError 且没有指定字段列表
+            isRecursive = rest === null || rest === void 0 || (_rest$ = rest[0]) === null || _rest$ === void 0 ? void 0 : _rest$.recursive;
+            stopOnFirstError = form === null || form === void 0 || (_form$__INTERNAL_CONF = form.__INTERNAL_CONFIG__) === null || _form$__INTERNAL_CONF === void 0 ? void 0 : _form$__INTERNAL_CONF.stopOnFirstError; // 如果启用了 stopOnFirstError 且没有指定字段列表
             if (!(stopOnFirstError && !nameList)) {
-              _context.n = 11;
+              _context.next = 33;
               break;
             }
             // 获取所有表单字段
             allFields = getFormFieldPaths(form); // 单独验证每个字段
             // eslint-disable-next-line no-restricted-syntax
             _iterator = _createForOfIteratorHelper(allFields);
-            _context.p = 1;
+            _context.prev = 7;
             _iterator.s();
-          case 2:
+          case 9:
             if ((_step = _iterator.n()).done) {
-              _context.n = 7;
+              _context.next = 24;
               break;
             }
             field = _step.value;
-            _context.p = 3;
+            _context.prev = 11;
             // 创建不包含 stopOnFirstError 的选项
             // @ts-ignore
-            _options2 = (rest === null || rest === void 0 ? void 0 : rest[0]) ? _objectSpread({}, rest[0]) : {};
+            _options2 = rest !== null && rest !== void 0 && rest[0] ? _objectSpread({}, rest[0]) : {};
             delete _options2.stopOnFirstError;
             // 验证单个字段
             // eslint-disable-next-line no-await-in-loop
-            _context.n = 4;
+            _context.next = 16;
             return validateFields([field], _options2);
-          case 4:
-            _context.n = 6;
+          case 16:
+            _context.next = 22;
             break;
-          case 5:
-            _context.p = 5;
-            _t = _context.v;
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](11);
             // 遇到错误，滚动到错误位置
-            if (scrollToError && (_t === null || _t === void 0 ? void 0 : (_error$errorFields = _t.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
-              form.scrollToField((_error$errorFields$ = _t.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
+            if (scrollToError && _context.t0 !== null && _context.t0 !== void 0 && (_error$errorFields = _context.t0.errorFields) !== null && _error$errorFields !== void 0 && _error$errorFields.length) {
+              form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'
               });
             }
             // 中止验证，抛出错误
-            throw _t;
-          case 6:
-            _context.n = 2;
+            throw _context.t0;
+          case 22:
+            _context.next = 9;
             break;
-          case 7:
-            _context.n = 9;
+          case 24:
+            _context.next = 29;
             break;
-          case 8:
-            _context.p = 8;
-            _t2 = _context.v;
-            _iterator.e(_t2);
-          case 9:
-            _context.p = 9;
+          case 26:
+            _context.prev = 26;
+            _context.t1 = _context["catch"](7);
+            _iterator.e(_context.t1);
+          case 29:
+            _context.prev = 29;
             _iterator.f();
-            return _context.f(9);
-          case 10:
-            return _context.a(2, form.getFieldsValue());
-          case 11:
+            return _context.finish(29);
+          case 32:
+            return _context.abrupt("return", form.getFieldsValue());
+          case 33:
             validateNames = []; // 前缀校验模式
             if (!isRecursive) {
-              _context.n = 13;
+              _context.next = 42;
               break;
             }
             // @ts-ignore
@@ -160,8 +158,8 @@ export var useForm = function useForm(originForm, options) {
             } else {
               // 其他情况
               fieldsList.forEach(function (item) {
-                var _item$name, _item$name2, _item$name2$;
-                if (nameList[0] === ((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name[0]) || ((_item$name2 = item.name) === null || _item$name2 === void 0 ? void 0 : (_item$name2$ = _item$name2[0]) === null || _item$name2$ === void 0 ? void 0 : _item$name2$.startsWith("".concat(nameList[0], "_")))) {
+                var _item$name, _item$name2;
+                if (nameList[0] === ((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name[0]) || (_item$name2 = item.name) !== null && _item$name2 !== void 0 && (_item$name2 = _item$name2[0]) !== null && _item$name2 !== void 0 && _item$name2.startsWith("".concat(nameList[0], "_"))) {
                   validateNames.push(item.name);
                 }
               });
@@ -169,45 +167,47 @@ export var useForm = function useForm(originForm, options) {
             if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
               validateNames = _toConsumableArray(nameList);
             }
+
             // @ts-ignore
-            _context.n = 12;
+            _context.next = 41;
             return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
               return filterInternalFields(values, optimize);
             });
-          case 12:
-            return _context.a(2, _context.v);
-          case 13:
+          case 41:
+            return _context.abrupt("return", _context.sent);
+          case 42:
             // 解决，单个pro-edit-table的表单校验
-            if ((nameList === null || nameList === void 0 ? void 0 : nameList.length) && !nameList.join('-').includes(',')) {
+            if (nameList !== null && nameList !== void 0 && nameList.length && !nameList.join('-').includes(',')) {
               tablePagination = document && ((_document = document) === null || _document === void 0 ? void 0 : _document.querySelector("#pro-edit-table-pagination-".concat(nameList.join('-'))));
               if (tablePagination) {
-                tablePagination === null || tablePagination === void 0 ? void 0 : (_tablePagination$clic = tablePagination.click) === null || _tablePagination$clic === void 0 ? void 0 : _tablePagination$clic.call(tablePagination);
+                tablePagination === null || tablePagination === void 0 || (_tablePagination$clic = tablePagination.click) === null || _tablePagination$clic === void 0 || _tablePagination$clic.call(tablePagination);
               }
             }
-            _context.n = 14;
+            _context.next = 45;
             return validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
               return nameList ? values : nextGetFieldsValue();
             });
-          case 14:
-            return _context.a(2, _context.v);
-          case 15:
-            _context.p = 15;
-            _t3 = _context.v;
-            if (scrollToError && (_t3 === null || _t3 === void 0 ? void 0 : (_error$errorFields2 = _t3.errorFields) === null || _error$errorFields2 === void 0 ? void 0 : _error$errorFields2.length) && source === 'ProForm') {
-              form.scrollToField((_error$errorFields$2 = _t3.errorFields[0]) === null || _error$errorFields$2 === void 0 ? void 0 : _error$errorFields$2.name, {
+          case 45:
+            return _context.abrupt("return", _context.sent);
+          case 48:
+            _context.prev = 48;
+            _context.t2 = _context["catch"](0);
+            if (scrollToError && _context.t2 !== null && _context.t2 !== void 0 && (_error$errorFields2 = _context.t2.errorFields) !== null && _error$errorFields2 !== void 0 && _error$errorFields2.length && source === 'ProForm') {
+              form.scrollToField((_error$errorFields$2 = _context.t2.errorFields[0]) === null || _error$errorFields$2 === void 0 ? void 0 : _error$errorFields$2.name, {
                 block: 'center',
                 behavior: 'smooth'
               });
             }
             handleScrollToErrorProEditTable();
-            throw _t3;
-          case 16:
-            return _context.a(2);
+            throw _context.t2;
+          case 53:
+          case "end":
+            return _context.stop();
         }
-      }, _callee, null, [[3, 5], [1, 8, 9, 10], [0, 15]]);
+      }, _callee, null, [[0, 48], [7, 26, 29, 32], [11, 18]]);
     }));
     return function nextValidateFields(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var nextSetFieldValue = function nextSetFieldValue(name, value, info) {

package/es/ProForm/utils/useRules.js

@@ -1,10 +1,9 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _isString from "lodash/isString";
-import _isBoolean from "lodash/isBoolean";
 import { useEffect, useMemo } from 'react';
-import { rulesCreator } from './rulesCreator';
-import { isNotFullArray, isNullArray } from './index';
-import locale from '../../locale';
+import { isBoolean, isString } from 'lodash';
+import { rulesCreator } from "./rulesCreator";
+import { isNotFullArray, isNullArray } from "./index";
+import locale from "../../locale";
 var useRules = function useRules(props) {
   var rules = props.rules,
     required = props.required,
@@ -13,13 +12,14 @@ var useRules = function useRules(props) {
     names = props.names,
     labelRequired = props.labelRequired,
     type = props.type;
-  var _label = _isString(label) ? label : '';
+  var _label = isString(label) ? label : '';
   var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
     return rule.required === true;
   }));
   var allRequired = required === true || Array.isArray(required) && required.every(function (item) {
     return item === true;
   });
+
   // 根据 required 添加 rules, names 字段会添加数组的必填校验
   var internalRule = useMemo(function () {
     var result = {
@@ -32,8 +32,9 @@ var useRules = function useRules(props) {
           required: allRequired,
           message: message
         };
+
         // names字段的必填校验
-        if (names === null || names === void 0 ? void 0 : names.length) {
+        if (names !== null && names !== void 0 && names.length) {
           rule.validator = function (_, value) {
             if (!value || isNullArray(value)) {
               return Promise.reject(new Error("".concat(locale.ProForm.inputPlaceholder).concat(_label)));
@@ -43,7 +44,7 @@ var useRules = function useRules(props) {
         }
         result.rules = Array.isArray(rules) ? [].concat(_toConsumableArray(rules), [rule]) : [rule];
       }
-    } else if (requiredRule && (names === null || names === void 0 ? void 0 : names.length)) {
+    } else if (requiredRule && names !== null && names !== void 0 && names.length) {
       // names字段 修改必填规则校验
       requiredRule.validator = function (_, value) {
         if (!value || isNullArray(value)) {
@@ -54,6 +55,7 @@ var useRules = function useRules(props) {
     }
     return result;
   }, [rules, required]);
+
   // type转换为内置rules
   internalRule.rules = internalRule.rules && rulesCreator({
     rules: internalRule.rules,
@@ -64,7 +66,7 @@ var useRules = function useRules(props) {
   });
   useEffect(function () {
     // 添加完整性校验
-    if (names && !_isBoolean(labelRequired)) {
+    if (names && !isBoolean(labelRequired)) {
       var customRequired = {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过

package/es/ProForm/utils/useShouldUpdate.d.ts

@@ -19,6 +19,7 @@ interface UseShouldUpdateProps<Values> {
     rules?: ProRule[];
     required?: boolean;
     type: string;
+    shouldUpdateDebounce?: number;
     [key: string]: any;
 }
 type HookShouldUpdate<Values = any> = (props: UseShouldUpdateProps<Values>) => Result<Values>;