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

package/lib/ProForm/utils/useForm.js

@@ -1,140 +1,252 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProForm/utils/useForm.ts
-var useForm_exports = {};
-__export(useForm_exports, {
-  useForm: () => useForm
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(useForm_exports);
-var import_antd = require("antd");
-var import_react = require("react");
-var import_index = require("./index");
-var import_tools = require("../../ProEditTable/utils/tools");
-var import_FormsProvider = require("../../FormsProvider");
-var useForm = function(originForm, options) {
-  const _originForm = (originForm == null ? void 0 : originForm._init) ? originForm : void 0;
-  const _options = (
-    // @ts-ignore
-    options || (originForm && !(originForm == null ? void 0 : originForm._init) ? originForm : void 0)
-  );
-  const { scrollToError = true, optimize, formKey, source } = _options || {};
-  const forms = (0, import_react.useContext)(import_FormsProvider.FormsContext);
-  const [form] = import_antd.Form.useForm(forms[formKey] || _originForm);
+exports.useForm = void 0;
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+require("antd/es/form/style");
+var _form = _interopRequireDefault(require("antd/es/form"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _index = require("./index");
+var _tools = require("../../ProEditTable/utils/tools");
+var _FormsProvider = require("../../FormsProvider");
+var useForm = exports.useForm = function useForm(originForm, options) {
+  // 如果没有form实例可以直接把options放在第一个参数位置
+  // @ts-ignore
+  var _originForm = originForm !== null && originForm !== void 0 && originForm._init ? originForm : undefined;
+  var _options =
+  // @ts-ignore
+  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 = (0, _react.useContext)(_FormsProvider.FormsContext);
+  var _ref2 = _form.default.useForm(forms[formKey] || _originForm),
+    _ref3 = (0, _slicedToArray2.default)(_ref2, 1),
+    form = _ref3[0];
   if (formKey && forms[formKey] !== form) {
     forms[formKey] = form;
     form.formKey = formKey;
   }
-  const { getFieldsValue, validateFields, isModified, setFields, getFieldsError, setFieldsValue } = form;
-  if (isModified)
-    return [form];
-  const nextGetFieldsValue = (nameList, filterFunc) => {
+  var getFieldsValue = form.getFieldsValue,
+    validateFields = form.validateFields,
+    isModified = form.isModified,
+    setFields = form.setFields,
+    getFieldsError = form.getFieldsError,
+    setFieldsValue = form.setFieldsValue;
+  if (isModified) return [form];
+
+  // @ts-ignore
+  var nextGetFieldsValue = (nameList, filterFunc) => {
+    // 全部查询
     if (nameList !== true) {
-      const values = getFieldsValue(nameList || true, filterFunc);
-      return (0, import_index.filterInternalFields)(values, optimize);
+      var values = getFieldsValue(nameList || true, filterFunc);
+      return (0, _index.filterInternalFields)(values, optimize);
     }
     return getFieldsValue(nameList, filterFunc);
   };
-  const nextValidateFields = async (nameList, ...rest) => {
-    var _a, _b, _c, _d, _e, _f, _g;
-    try {
-      const isRecursive = (_a = rest == null ? void 0 : rest[0]) == null ? void 0 : _a.recursive;
-      const stopOnFirstError = (_b = form == null ? void 0 : form.__INTERNAL_CONFIG__) == null ? void 0 : _b.stopOnFirstError;
-      if (stopOnFirstError && !nameList) {
-        const allFields = (0, import_index.getFormFieldPaths)(form);
-        for (const field of allFields) {
-          try {
-            const options2 = (rest == null ? void 0 : rest[0]) ? { ...rest[0] } : {};
-            delete options2.stopOnFirstError;
-            await validateFields([field], options2);
-          } catch (error) {
-            if (scrollToError && ((_c = error == null ? void 0 : error.errorFields) == null ? void 0 : _c.length)) {
-              form.scrollToField((_d = error.errorFields[0]) == null ? void 0 : _d.name, {
-                block: "center",
-                behavior: "smooth"
+  var nextValidateFields = /*#__PURE__*/function () {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
+      var _rest$,
+        _form$__INTERNAL_CONF,
+        _len,
+        rest,
+        _key,
+        isRecursive,
+        stopOnFirstError,
+        allFields,
+        _iterator,
+        _step,
+        field,
+        _options2,
+        _error$errorFields,
+        _error$errorFields$,
+        validateNames,
+        _form$getInternalHook,
+        getFields,
+        fieldsList,
+        fieldsNames,
+        _document,
+        tablePagination,
+        _tablePagination$clic,
+        _error$errorFields2,
+        _error$errorFields$2,
+        _args = arguments;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 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 || (_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.next = 33;
+              break;
+            }
+            // 获取所有表单字段
+            allFields = (0, _index.getFormFieldPaths)(form); // 单独验证每个字段
+            // eslint-disable-next-line no-restricted-syntax
+            _iterator = (0, _createForOfIteratorHelper2.default)(allFields);
+            _context.prev = 7;
+            _iterator.s();
+          case 9:
+            if ((_step = _iterator.n()).done) {
+              _context.next = 24;
+              break;
+            }
+            field = _step.value;
+            _context.prev = 11;
+            // 创建不包含 stopOnFirstError 的选项
+            // @ts-ignore
+            _options2 = rest !== null && rest !== void 0 && rest[0] ? (0, _objectSpread2.default)({}, rest[0]) : {};
+            delete _options2.stopOnFirstError;
+            // 验证单个字段
+            // eslint-disable-next-line no-await-in-loop
+            _context.next = 16;
+            return validateFields([field], _options2);
+          case 16:
+            _context.next = 22;
+            break;
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](11);
+            // 遇到错误，滚动到错误位置
+            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 error;
-          }
-        }
-        return form.getFieldsValue();
-      }
-      let validateNames = [];
-      if (isRecursive) {
-        const { getFields } = form.getInternalHooks("RC_FORM_INTERNAL_HOOKS");
-        const fieldsList = getFields();
-        if (Array.isArray(nameList) && (0, import_index.isListForm)(String(nameList))) {
-          const fieldsNames = fieldsList.map((item) => item.name);
-          validateNames = (0, import_index.mergeNames)(nameList, fieldsNames);
-        } else {
-          fieldsList.forEach((item) => {
-            var _a2, _b2, _c2;
-            if (nameList[0] === ((_a2 = item.name) == null ? void 0 : _a2[0]) || ((_c2 = (_b2 = item.name) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.startsWith(`${nameList[0]}_`))) {
-              validateNames.push(item.name);
+            // 中止验证，抛出错误
+            throw _context.t0;
+          case 22:
+            _context.next = 9;
+            break;
+          case 24:
+            _context.next = 29;
+            break;
+          case 26:
+            _context.prev = 26;
+            _context.t1 = _context["catch"](7);
+            _iterator.e(_context.t1);
+          case 29:
+            _context.prev = 29;
+            _iterator.f();
+            return _context.finish(29);
+          case 32:
+            return _context.abrupt("return", form.getFieldsValue());
+          case 33:
+            validateNames = []; // 前缀校验模式
+            if (!isRecursive) {
+              _context.next = 42;
+              break;
             }
-          });
-        }
-        if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
-          validateNames = [...nameList];
-        }
-        return await validateFields(validateNames, ...rest).then((values) => {
-          return (0, import_index.filterInternalFields)(values, optimize);
-        });
-      }
-      if ((nameList == null ? void 0 : nameList.length) && !nameList.join("-").includes(",")) {
-        const tablePagination = document && (document == null ? void 0 : document.querySelector(`#pro-edit-table-pagination-${nameList.join("-")}`));
-        if (tablePagination) {
-          (_e = tablePagination == null ? void 0 : tablePagination.click) == null ? void 0 : _e.call(tablePagination);
+            // @ts-ignore
+            _form$getInternalHook = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS'), getFields = _form$getInternalHook.getFields;
+            fieldsList = getFields(); // formList& proEditTable 特殊处理
+            if (Array.isArray(nameList) && (0, _index.isListForm)(String(nameList))) {
+              fieldsNames = fieldsList.map(item => item.name);
+              validateNames = (0, _index.mergeNames)(nameList, fieldsNames);
+            } else {
+              // 其他情况
+              fieldsList.forEach(item => {
+                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(`${nameList[0]}_`)) {
+                  validateNames.push(item.name);
+                }
+              });
+            }
+            if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
+              validateNames = [...nameList];
+            }
+
+            // @ts-ignore
+            _context.next = 41;
+            return validateFields(validateNames, ...rest).then(values => {
+              return (0, _index.filterInternalFields)(values, optimize);
+            });
+          case 41:
+            return _context.abrupt("return", _context.sent);
+          case 42:
+            // 解决，单个pro-edit-table的表单校验
+            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-${nameList.join('-')}`));
+              if (tablePagination) {
+                tablePagination === null || tablePagination === void 0 || (_tablePagination$clic = tablePagination.click) === null || _tablePagination$clic === void 0 || _tablePagination$clic.call(tablePagination);
+              }
+            }
+            _context.next = 45;
+            return validateFields(nameList, ...rest).then(values => {
+              return nameList ? values : nextGetFieldsValue();
+            });
+          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'
+              });
+            }
+            (0, _tools.handleScrollToError)();
+            throw _context.t2;
+          case 53:
+          case "end":
+            return _context.stop();
         }
-      }
-      return await validateFields(nameList, ...rest).then((values) => {
-        return nameList ? values : nextGetFieldsValue();
-      });
-    } catch (error) {
-      if (scrollToError && ((_f = error == null ? void 0 : error.errorFields) == null ? void 0 : _f.length) && source === "ProForm") {
-        form.scrollToField((_g = error.errorFields[0]) == null ? void 0 : _g.name, {
-          block: "center",
-          behavior: "smooth"
-        });
-      }
-      (0, import_tools.handleScrollToError)();
-      throw error;
-    }
-  };
-  const nextSetFieldValue = (name, value, info) => {
+      }, _callee, null, [[0, 48], [7, 26, 29, 32], [11, 18]]);
+    }));
+    return function nextValidateFields(_x) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var nextSetFieldValue = (name, value, info) => {
     if (info) {
-      setFields([{ name, value, ...info }]);
+      setFields([(0, _objectSpread2.default)({
+        name,
+        value
+      }, info)]);
     } else {
-      setFields([{ name, value, errors: [], warnings: [] }]);
+      setFields([{
+        name,
+        value,
+        errors: [],
+        warnings: []
+      }]);
     }
   };
-  const nextSetFieldsValue = (values) => {
-    const errors = getFieldsError();
-    const errorNames = errors.reduce((acc, entry) => {
+  var nextSetFieldsValue = values => {
+    var errors = getFieldsError();
+    var errorNames = errors.reduce((acc, entry) => {
       if (entry.errors.length > 0) {
         acc.push(entry.name[0]);
       }
       return acc;
     }, []) || [];
     if (errorNames.length) {
-      errorNames.forEach((errorName) => {
-        if (errorName.includes("-")) {
-          setFields([{ name: errorName, errors: [], warnings: [] }]);
+      errorNames.forEach(errorName => {
+        // 只处理names的报错
+        if (errorName.includes('-')) {
+          setFields([{
+            name: errorName,
+            errors: [],
+            warnings: []
+          }]);
         }
       });
       setFieldsValue(values);
@@ -149,8 +261,4 @@ var useForm = function(originForm, options) {
   form.isModified = true;
   form.__INTERNAL_CONFIG__ = {};
   return [form];
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  useForm
-});
+};

package/lib/ProForm/utils/useRules.js

@@ -1,89 +1,79 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProForm/utils/useRules.ts
-var useRules_exports = {};
-__export(useRules_exports, {
-  default: () => useRules_default
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(useRules_exports);
-var import_react = require("react");
-var import_lodash = require("lodash");
-var import_rulesCreator = require("./rulesCreator");
-var import_index = require("./index");
-var import_locale = __toESM(require("../../locale"));
-var useRules = (props) => {
-  const { rules, required, isSelect, label, names, labelRequired, type } = props;
-  const _label = (0, import_lodash.isString)(label) ? label : "";
-  const requiredRule = Array.isArray(rules) && (rules == null ? void 0 : rules.find((rule) => rule.required === true));
-  const allRequired = required === true || Array.isArray(required) && required.every((item) => item === true);
-  const internalRule = (0, import_react.useMemo)(() => {
-    const result = { rules: rules || [] };
+exports.default = void 0;
+var _react = require("react");
+var _lodash = require("lodash");
+var _rulesCreator = require("./rulesCreator");
+var _index = require("./index");
+var _locale = _interopRequireDefault(require("../../locale"));
+var useRules = props => {
+  var rules = props.rules,
+    required = props.required,
+    isSelect = props.isSelect,
+    label = props.label,
+    names = props.names,
+    labelRequired = props.labelRequired,
+    type = props.type;
+  var _label = (0, _lodash.isString)(label) ? label : '';
+  var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(rule => rule.required === true));
+  var allRequired = required === true || Array.isArray(required) && required.every(item => item === true);
+
+  // 根据 required 添加 rules, names 字段会添加数组的必填校验
+  var internalRule = (0, _react.useMemo)(() => {
+    var result = {
+      rules: rules || []
+    };
     if (allRequired) {
       if (!requiredRule) {
-        const message = isSelect ? `${import_locale.default.ProForm.selectPlaceHolder}${_label}` : `${import_locale.default.ProForm.inputPlaceholder}${_label}`;
-        const rule = {
+        var message = isSelect ? `${_locale.default.ProForm.selectPlaceHolder}${_label}` : `${_locale.default.ProForm.inputPlaceholder}${_label}`;
+        var rule = {
           required: allRequired,
           message
         };
-        if (names == null ? void 0 : names.length) {
+
+        // names字段的必填校验
+        if (names !== null && names !== void 0 && names.length) {
           rule.validator = (_, value) => {
-            if (!value || (0, import_index.isNullArray)(value)) {
-              return Promise.reject(new Error(`${import_locale.default.ProForm.inputPlaceholder}${_label}`));
+            if (!value || (0, _index.isNullArray)(value)) {
+              return Promise.reject(new Error(`${_locale.default.ProForm.inputPlaceholder}${_label}`));
             }
             return Promise.resolve();
           };
         }
         result.rules = Array.isArray(rules) ? [...rules, rule] : [rule];
       }
-    } else if (requiredRule && (names == null ? void 0 : names.length)) {
+    } else if (requiredRule && names !== null && names !== void 0 && names.length) {
+      // names字段 修改必填规则校验
       requiredRule.validator = (_, value) => {
-        if (!value || (0, import_index.isNullArray)(value)) {
-          return Promise.reject(new Error(`${import_locale.default.ProForm.inputPlaceholder}${_label}`));
+        if (!value || (0, _index.isNullArray)(value)) {
+          return Promise.reject(new Error(`${_locale.default.ProForm.inputPlaceholder}${_label}`));
         }
         return Promise.resolve();
       };
     }
     return result;
   }, [rules, required]);
-  internalRule.rules = internalRule.rules && (0, import_rulesCreator.rulesCreator)({
+
+  // type转换为内置rules
+  internalRule.rules = internalRule.rules && (0, _rulesCreator.rulesCreator)({
     rules: internalRule.rules,
     label: _label,
     isSelect,
     names,
     required
   });
-  (0, import_react.useEffect)(() => {
-    if (names && !(0, import_lodash.isBoolean)(labelRequired)) {
-      const customRequired = {
-        validator: (rules2, value) => {
-          if (Array.isArray(value) && !(0, import_index.isNullArray)(value) && (0, import_index.isNotFullArray)(value, names.length, required)) {
-            return Promise.reject(new Error(`${import_locale.default.ProForm.completeText}${_label}`));
+  (0, _react.useEffect)(() => {
+    // 添加完整性校验
+    if (names && !(0, _lodash.isBoolean)(labelRequired)) {
+      var customRequired = {
+        validator: (rules, value) => {
+          // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
+          if (Array.isArray(value) && !(0, _index.isNullArray)(value) && (0, _index.isNotFullArray)(value, names.length, required)) {
+            return Promise.reject(new Error(`${_locale.default.ProForm.completeText}${_label}`));
           }
           return Promise.resolve();
         }
@@ -93,4 +83,4 @@ var useRules = (props) => {
   }, [internalRule]);
   return internalRule;
 };
-var useRules_default = useRules;
+var _default = exports.default = useRules;

package/lib/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>;