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

package/es/ProForm/utils/transformNames.js

@@ -1,32 +1,31 @@
-import { union } from 'lodash';
+import _union from "lodash/union";
 import { transformValue } from "./transformValue";
-var transformNames = (formItem, form, names, fieldName, type) => {
-  var _ref = formItem || {},
-    normalize = _ref.normalize,
-    getValueProps = _ref.getValueProps,
-    _shouldUpdate2 = _ref.shouldUpdate;
-  if (!(names !== null && names !== void 0 && names.length)) {
+const transformNames = (formItem, form, names, fieldName, type) => {
+  const {
+    normalize,
+    getValueProps,
+    shouldUpdate
+  } = formItem || {};
+  if (!names?.length) {
     return {};
   }
 
   // 当在formList场景下，给transformValue函数的setFiledProps的name, 需要全namePath
-  var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? union(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
-  var _transformValue = transformValue(names, form, _fieldName, normalize, getValueProps),
-    _normalize = _transformValue.normalize,
-    _getValueProps = _transformValue.getValueProps,
-    _shouldUpdate = _transformValue.shouldUpdate;
+  const _fieldName = Array.isArray(formItem?.name) ? _union(formItem?.namePath, formItem?.name) : fieldName;
+  const {
+    normalize: _normalize,
+    getValueProps: _getValueProps,
+    shouldUpdate: _shouldUpdate
+  } = transformValue(names, form, _fieldName, normalize, getValueProps);
   return {
     name: fieldName,
     normalize: _normalize,
     getValueProps: _getValueProps,
-    shouldUpdate: function shouldUpdate() {
-      if (typeof _shouldUpdate2 === 'boolean') {
-        return _shouldUpdate2 || _shouldUpdate();
-      }
-      for (var _len = arguments.length, rest = new Array(_len), _key = 0; _key < _len; _key++) {
-        rest[_key] = arguments[_key];
+    shouldUpdate: (...rest) => {
+      if (typeof shouldUpdate === 'boolean') {
+        return shouldUpdate || _shouldUpdate();
       }
-      return (_shouldUpdate2 === null || _shouldUpdate2 === void 0 ? void 0 : _shouldUpdate2(...rest)) || _shouldUpdate(...rest);
+      return shouldUpdate?.(...rest) || _shouldUpdate(...rest);
     }
   };
 };

package/es/ProForm/utils/transformValue.js

@@ -1,63 +1,54 @@
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { set } from 'lodash';
+import _set from "lodash/set";
 import { diffField } from "../utils";
 import { isEmpty } from "../../utils";
-export var transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
+export const transformValue = function (names, form, fieldName, normalize, getValueProps) {
   return {
-    normalize: function normalize(value) {
-      var _value = value;
+    normalize: (value, ...res) => {
+      let _value = value;
 
       // 支持外部传入转换函数
-      if (_normalize) {
-        for (var _len = arguments.length, res = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-          res[_key - 1] = arguments[_key];
-        }
-        _value = _normalize(value, ...res);
+      if (normalize) {
+        _value = normalize(value, ...res);
       }
       names.forEach((name, index) => {
-        var _value2;
-        set(form.getFieldsValue(true), name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
+        _set(form.getFieldsValue(true), name, _value?.[index]);
       });
       return _value;
     },
     getValueProps: (value, isOrigin) => {
-      var _curValue;
-      var _value = [];
+      let _value = [];
       if (isOrigin) {
         _value = value;
       } else {
         // 非比对names场景
         names.forEach((name, index) => {
-          var value = form.getFieldValue(name);
+          const value = form.getFieldValue(name);
           _value[index] = value;
         });
       }
       // 支持外部传入转换函数
-      var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
+      const res = getValueProps?.(_value) || {
         value: _value
       };
 
       // 如果数组中值都为空, 则值置为空
-      var curValue = res === null || res === void 0 ? void 0 : res.value;
+      let curValue = res?.value;
 
       // @ts-ignore
-      if ((_curValue = curValue) !== null && _curValue !== void 0 && _curValue.every(item => isEmpty(item))) {
+      if (curValue?.every(item => isEmpty(item))) {
         curValue = undefined;
       }
 
       // 如果来源是比对且有names场景, 则不更新表单值
       if (!isOrigin) {
-        set(form.getFieldsValue(true), fieldName, curValue);
+        _set(form.getFieldsValue(true), fieldName, curValue);
       }
 
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
-      return _objectSpread(_objectSpread({}, res), {}, {
+      return {
+        ...res,
         value: curValue
-      });
+      };
     },
     shouldUpdate: (prevValues, curValues) => {
       return diffField(prevValues, curValues, names);

package/es/ProForm/utils/useDeepCompareMemo.js

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

package/es/ProForm/utils/useFieldProps.js

@@ -1,4 +1,4 @@
 import React, { useContext } from 'react';
-var FieldContext = /*#__PURE__*/React.createContext({});
-export var FieldProvider = FieldContext.Provider;
-export var useFieldProps = () => useContext(FieldContext);
+const FieldContext = /*#__PURE__*/React.createContext({});
+export const FieldProvider = FieldContext.Provider;
+export const useFieldProps = () => useContext(FieldContext);

package/es/ProForm/utils/useForm.js

@@ -1,42 +1,25 @@
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Form } from 'antd';
 import { useContext, useLayoutEffect } from 'react';
 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) {
+export const useForm = function (originForm, options) {
   // 如果没有form实例可以直接把options放在第一个参数位置
   // @ts-ignore
-  var _originForm = originForm !== null && originForm !== void 0 && originForm._init ? originForm : undefined;
-  var _options =
+  const _originForm = originForm?._init ? originForm : undefined;
+  const _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;
+  options || (originForm && !originForm?._init ? originForm : undefined);
+  const {
+    scrollToError = true,
+    optimize,
+    formKey,
+    source
+  } = _options || {};
 
   // formKey全局共享逻辑
-  var forms = useContext(FormsContext);
-  var _ref2 = Form.useForm(forms[formKey] || _originForm),
-    _ref3 = _slicedToArray(_ref2, 1),
-    form = _ref3[0];
+  const forms = useContext(FormsContext);
+  const [form] = Form.useForm(forms[formKey] || _originForm);
 
   // 使用 useLayoutEffect 在浏览器绘制前同步注册 form 实例，避免 React 19 StrictMode 警告
   useLayoutEffect(() => {
@@ -45,188 +28,121 @@ export var useForm = function useForm(originForm, options) {
       form.formKey = formKey;
     }
   }, [formKey, form, forms]);
-  var getFieldsValue = form.getFieldsValue,
-    validateFields = form.validateFields,
-    isModified = form.isModified,
-    setFields = form.setFields,
-    getFieldsError = form.getFieldsError,
-    setFieldsValue = form.setFieldsValue;
+  const {
+    getFieldsValue,
+    validateFields,
+    isModified,
+    setFields,
+    getFieldsError,
+    setFieldsValue
+  } = form;
   if (isModified) return [form];
 
   // @ts-ignore
-  var nextGetFieldsValue = (nameList, filterFunc) => {
+  const nextGetFieldsValue = (nameList, filterFunc) => {
     // 全部查询
     if (nameList !== true) {
-      var values = getFieldsValue(nameList || true, filterFunc);
+      const values = getFieldsValue(nameList || true, filterFunc);
       return filterInternalFields(values, optimize);
     }
     return getFieldsValue(nameList, filterFunc);
   };
-  var nextValidateFields = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().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 _regeneratorRuntime().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 = getFormFieldPaths(form); // 单独验证每个字段
-            // eslint-disable-next-line no-restricted-syntax
-            _iterator = _createForOfIteratorHelper(allFields);
-            _context.prev = 7;
-            _iterator.s();
-          case 9:
-            if ((_step = _iterator.n()).done) {
-              _context.next = 24;
-              break;
-            }
-            field = _step.value;
-            _context.prev = 11;
+  const nextValidateFields = async (nameList, ...rest) => {
+    try {
+      const isRecursive = rest?.[0]?.recursive;
+      const stopOnFirstError = form?.__INTERNAL_CONFIG__?.stopOnFirstError;
+
+      // 如果启用了 stopOnFirstError 且没有指定字段列表
+      if (stopOnFirstError && !nameList) {
+        // 获取所有表单字段
+        const allFields = getFormFieldPaths(form);
+        // 单独验证每个字段
+        // eslint-disable-next-line no-restricted-syntax
+        for (const field of allFields) {
+          try {
             // 创建不包含 stopOnFirstError 的选项
             // @ts-ignore
-            _options2 = rest !== null && rest !== void 0 && rest[0] ? _objectSpread({}, rest[0]) : {};
-            delete _options2.stopOnFirstError;
+            const options = rest?.[0] ? {
+              ...rest[0]
+            } : {};
+            delete options.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);
+            await validateFields([field], options);
+          } catch (error) {
             // 遇到错误，滚动到错误位置
-            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, {
+            if (scrollToError && error?.errorFields?.length) {
+              form.scrollToField(error.errorFields[0]?.name, {
                 block: 'center',
                 behavior: 'smooth'
               });
             }
             // 中止验证，抛出错误
-            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;
-            }
-            // @ts-ignore
-            _form$getInternalHook = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS'), getFields = _form$getInternalHook.getFields;
-            fieldsList = getFields(); // formList& proEditTable 特殊处理
-            if (Array.isArray(nameList) && isListForm(String(nameList))) {
-              fieldsNames = fieldsList.map(item => item.name);
-              validateNames = 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];
-            }
+            throw error;
+          }
+        }
+        // 全部验证通过，返回表单值
+        return form.getFieldsValue();
+      }
+      let validateNames = [];
+      // 前缀校验模式
+      if (isRecursive) {
+        // @ts-ignore
+        const {
+          getFields
+        } = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS');
+        const fieldsList = getFields();
 
-            // @ts-ignore
-            _context.next = 41;
-            return validateFields(validateNames, ...rest).then(values => {
-              return 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);
-              }
+        // formList& proEditTable 特殊处理
+        if (Array.isArray(nameList) && isListForm(String(nameList))) {
+          const fieldsNames = fieldsList.map(item => item.name);
+          validateNames = mergeNames(nameList, fieldsNames);
+        } else {
+          // 其他情况
+          fieldsList.forEach(item => {
+            if (nameList[0] === item.name?.[0] || item.name?.[0]?.startsWith(`${nameList[0]}_`)) {
+              validateNames.push(item.name);
             }
-            _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'
-              });
-            }
-            handleScrollToErrorProEditTable();
-            throw _context.t2;
-          case 53:
-          case "end":
-            return _context.stop();
+          });
+        }
+        if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
+          validateNames = [...nameList];
         }
-      }, _callee, null, [[0, 48], [7, 26, 29, 32], [11, 18]]);
-    }));
-    return function nextValidateFields(_x) {
-      return _ref4.apply(this, arguments);
-    };
-  }();
-  var nextSetFieldValue = (name, value, info) => {
+
+        // @ts-ignore
+        return await validateFields(validateNames, ...rest).then(values => {
+          return filterInternalFields(values, optimize);
+        });
+      }
+
+      // 解决，单个pro-edit-table的表单校验
+      if (nameList?.length && !nameList.join('-').includes(',')) {
+        const tablePagination = document && document?.querySelector(`#pro-edit-table-pagination-${nameList.join('-')}`);
+        if (tablePagination) {
+          tablePagination?.click?.();
+        }
+      }
+      return await validateFields(nameList, ...rest).then(values => {
+        return nameList ? values : nextGetFieldsValue();
+      });
+    } catch (error) {
+      if (scrollToError && error?.errorFields?.length && source === 'ProForm') {
+        form.scrollToField(error.errorFields[0]?.name, {
+          block: 'center',
+          behavior: 'smooth'
+        });
+      }
+      handleScrollToErrorProEditTable();
+      throw error;
+    }
+  };
+  const nextSetFieldValue = (name, value, info) => {
     if (info) {
-      setFields([_objectSpread({
+      setFields([{
         name,
-        value
-      }, info)]);
+        value,
+        ...info
+      }]);
     } else {
       setFields([{
         name,
@@ -236,9 +152,9 @@ export var useForm = function useForm(originForm, options) {
       }]);
     }
   };
-  var nextSetFieldsValue = values => {
-    var errors = getFieldsError();
-    var errorNames = errors.reduce((acc, entry) => {
+  const nextSetFieldsValue = values => {
+    const errors = getFieldsError();
+    const errorNames = errors.reduce((acc, entry) => {
       if (entry.errors.length > 0) {
         acc.push(entry.name[0]);
       }

package/es/ProForm/utils/useRules.js

@@ -1,35 +1,38 @@
+import _isString from "lodash/isString";
+import _isBoolean from "lodash/isBoolean";
 import { useEffect, useMemo } from 'react';
-import { isBoolean, isString } from 'lodash';
 import { rulesCreator } from "./rulesCreator";
 import { isNotFullArray, isNullArray } from "./index";
 import locale from "../../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 = 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);
+const useRules = props => {
+  const {
+    rules,
+    required,
+    isSelect,
+    label,
+    names,
+    labelRequired,
+    type
+  } = props;
+  const _label = _isString(label) ? label : '';
+  const requiredRule = Array.isArray(rules) && rules?.find(rule => rule.required === true);
+  const allRequired = required === true || Array.isArray(required) && required.every(item => item === true);
 
   // 根据 required 添加 rules, names 字段会添加数组的必填校验
-  var internalRule = useMemo(() => {
-    var result = {
+  const internalRule = useMemo(() => {
+    const result = {
       rules: rules || []
     };
     if (allRequired) {
       if (!requiredRule) {
-        var message = isSelect ? `${locale.ProForm.selectPlaceHolder}${_label}` : `${locale.ProForm.inputPlaceholder}${_label}`;
-        var rule = {
+        const message = isSelect ? `${locale.ProForm.selectPlaceHolder}${_label}` : `${locale.ProForm.inputPlaceholder}${_label}`;
+        const rule = {
           required: allRequired,
           message
         };
 
         // names字段的必填校验
-        if (names !== null && names !== void 0 && names.length) {
+        if (names?.length) {
           rule.validator = (_, value) => {
             if (!value || isNullArray(value)) {
               return Promise.reject(new Error(`${locale.ProForm.inputPlaceholder}${_label}`));
@@ -39,7 +42,7 @@ var useRules = props => {
         }
         result.rules = Array.isArray(rules) ? [...rules, rule] : [rule];
       }
-    } else if (requiredRule && names !== null && names !== void 0 && names.length) {
+    } else if (requiredRule && names?.length) {
       // names字段 修改必填规则校验
       requiredRule.validator = (_, value) => {
         if (!value || isNullArray(value)) {
@@ -61,8 +64,8 @@ var useRules = props => {
   });
   useEffect(() => {
     // 添加完整性校验
-    if (names && !isBoolean(labelRequired)) {
-      var customRequired = {
+    if (names && !_isBoolean(labelRequired)) {
+      const customRequired = {
         validator: (rules, value) => {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
           if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length, required)) {