tdesign-react 0.42.1-alpha.4 → 0.42.1-alpha.5

package/dist/tdesign.js

@@ -1,5 +1,5 @@
 /**
- * tdesign v0.42.1-alpha.3
+ * tdesign v0.42.1-alpha.4
  * (c) 2022 tdesign
  * @license MIT
  */
@@ -78,7 +78,7 @@
     return _arr;
   }
 
-  function _arrayLikeToArray$2(arr, len) {
+  function _arrayLikeToArray$3(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
 
     for (var i = 0, arr2 = new Array(len); i < len; i++) {
@@ -88,13 +88,13 @@
     return arr2;
   }
 
-  function _unsupportedIterableToArray$2(o, minLen) {
+  function _unsupportedIterableToArray$3(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray$2(o, minLen);
+    if (typeof o === "string") return _arrayLikeToArray$3(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$2(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$3(o, minLen);
   }
 
   function _nonIterableRest() {
@@ -102,7 +102,7 @@
   }
 
   function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray$2(arr, i) || _nonIterableRest();
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray$3(arr, i) || _nonIterableRest();
   }
 
   function _defineProperty$3(obj, key, value) {
@@ -3735,7 +3735,7 @@
   }
 
   function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray$2(arr);
+    if (Array.isArray(arr)) return _arrayLikeToArray$3(arr);
   }
 
   function _iterableToArray(iter) {
@@ -3747,7 +3747,7 @@
   }
 
   function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray$2(arr) || _nonIterableSpread();
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray$3(arr) || _nonIterableSpread();
   }
 
   function getIEVersion() {
@@ -9449,11 +9449,11 @@
     return domRef.current;
   }
 
-  function _createForOfIteratorHelper$1(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$1(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 _createForOfIteratorHelper$2(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$2(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 _unsupportedIterableToArray$1(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$1(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$1(o, minLen); }
+  function _unsupportedIterableToArray$2(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$2(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$2(o, minLen); }
 
-  function _arrayLikeToArray$1(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 _arrayLikeToArray$2(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 composeRefs() {
     for (var _len = arguments.length, refs = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -9461,7 +9461,7 @@
     }
 
     return function (instance) {
-      var _iterator = _createForOfIteratorHelper$1(refs),
+      var _iterator = _createForOfIteratorHelper$2(refs),
           _step;
 
       try {
@@ -40492,19 +40492,19 @@
 
   var Calendar = Calendar$1;
 
-  var _excluded$d = ["name"];
-
-  function ownKeys$12(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+  function _createForOfIteratorHelper$1(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$1(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 _objectSpread$12(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$12(Object(source), !0).forEach(function (key) { _defineProperty$3(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$12(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+  function _unsupportedIterableToArray$1(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$1(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$1(o, minLen); }
 
-  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 _arrayLikeToArray$1(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 _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 ownKeys$12(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-  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 _objectSpread$12(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$12(Object(source), !0).forEach(function (key) { _defineProperty$3(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$12(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
   function getMapValue(name, formMapRef) {
+    if (!formMapRef.current) return;
+
     var mapKeys = _toConsumableArray(formMapRef.current.keys());
 
     var key = mapKeys.find(function (key2) {
@@ -40512,9 +40512,18 @@
     });
     return formMapRef.current.get(key);
   }
+  function calcFieldValue(name, value) {
+    if (Array.isArray(name)) {
+      var fieldValue = name.reduceRight(function (prev, curr) {
+        return _defineProperty$3({}, curr, prev);
+      }, value);
+      return _objectSpread$12({}, fieldValue);
+    }
 
+    return _defineProperty$3({}, name, value);
+  }
   function travelMapFromObject(obj, formMapRef, callback) {
-    var _iterator = _createForOfIteratorHelper(formMapRef.current.entries()),
+    var _iterator = _createForOfIteratorHelper$1(formMapRef.current.entries()),
         _step;
 
     try {
@@ -40552,6 +40561,18 @@
     }
   }
 
+  var _excluded$d = ["name"];
+
+  function ownKeys$11(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+  function _objectSpread$11(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$11(Object(source), !0).forEach(function (key) { _defineProperty$3(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$11(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+  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 _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 needValidate(name, fields) {
     if (!fields || !Array.isArray(fields)) return true;
     return fields.indexOf(name) !== -1;
@@ -40572,9 +40593,7 @@
 
       if (result[key] && key.includes(",")) {
         var keyList = key.split(",");
-        var fieldValue = keyList.reduceRight(function (prev, curr) {
-          return _defineProperty$3({}, curr, prev);
-        }, result[key]);
+        var fieldValue = calcFieldValue(keyList, result[key]);
         merge_1(result, fieldValue);
         delete result[key];
       }
@@ -40642,17 +40661,17 @@
 
     function _validate() {
       _validate = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(param) {
-        var _ref4, fields, _ref4$trigger, trigger, showErrorMessage, list, validateList;
+        var _ref, fields, _ref$trigger, trigger, showErrorMessage, list, validateList;
 
         return regenerator.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _ref4 = param || {}, fields = _ref4.fields, _ref4$trigger = _ref4.trigger, trigger = _ref4$trigger === void 0 ? "all" : _ref4$trigger, showErrorMessage = _ref4.showErrorMessage;
+                _ref = param || {}, fields = _ref.fields, _ref$trigger = _ref.trigger, trigger = _ref$trigger === void 0 ? "all" : _ref$trigger, showErrorMessage = _ref.showErrorMessage;
                 list = _toConsumableArray(formMapRef.current.values()).filter(function (formItemRef) {
-                  var _formItemRef$current15, _formItemRef$current16;
+                  var _formItemRef$current13, _formItemRef$current14;
 
-                  return isFunction_1(formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current15 = formItemRef.current) === null || _formItemRef$current15 === void 0 ? void 0 : _formItemRef$current15.validate) && needValidate(formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current16 = formItemRef.current) === null || _formItemRef$current16 === void 0 ? void 0 : _formItemRef$current16.name, fields);
+                  return isFunction_1(formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current13 = formItemRef.current) === null || _formItemRef$current13 === void 0 ? void 0 : _formItemRef$current13.validate) && needValidate(formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current14 = formItemRef.current) === null || _formItemRef$current14 === void 0 ? void 0 : _formItemRef$current14.name, fields);
                 }).map(function (formItemRef) {
                   return formItemRef === null || formItemRef === void 0 ? void 0 : formItemRef.current.validate(trigger, showErrorMessage);
                 });
@@ -40679,21 +40698,21 @@
 
     function _validateOnly() {
       _validateOnly = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(param) {
-        var _ref5, fields, _ref5$trigger, trigger, list, validateList;
+        var _ref2, fields, _ref2$trigger, trigger, list, validateList;
 
         return regenerator.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref5 = param || {}, fields = _ref5.fields, _ref5$trigger = _ref5.trigger, trigger = _ref5$trigger === void 0 ? "all" : _ref5$trigger;
+                _ref2 = param || {}, fields = _ref2.fields, _ref2$trigger = _ref2.trigger, trigger = _ref2$trigger === void 0 ? "all" : _ref2$trigger;
                 list = _toConsumableArray(formMapRef.current.values()).filter(function (formItemRef) {
-                  var _formItemRef$current17, _formItemRef$current18;
+                  var _formItemRef$current15, _formItemRef$current16;
 
-                  return isFunction_1(formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current17 = formItemRef.current) === null || _formItemRef$current17 === void 0 ? void 0 : _formItemRef$current17.validateOnly) && needValidate(formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current18 = formItemRef.current) === null || _formItemRef$current18 === void 0 ? void 0 : _formItemRef$current18.name, fields);
+                  return isFunction_1(formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current15 = formItemRef.current) === null || _formItemRef$current15 === void 0 ? void 0 : _formItemRef$current15.validateOnly) && needValidate(formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current16 = formItemRef.current) === null || _formItemRef$current16 === void 0 ? void 0 : _formItemRef$current16.name, fields);
                 }).map(function (formItemRef) {
-                  var _formItemRef$current$6, _formItemRef$current19;
+                  var _formItemRef$current$4, _formItemRef$current17;
 
-                  return formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current$6 = (_formItemRef$current19 = formItemRef.current).validateOnly) === null || _formItemRef$current$6 === void 0 ? void 0 : _formItemRef$current$6.call(_formItemRef$current19, trigger);
+                  return formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current$4 = (_formItemRef$current17 = formItemRef.current).validateOnly) === null || _formItemRef$current$4 === void 0 ? void 0 : _formItemRef$current$4.call(_formItemRef$current17, trigger);
                 });
                 _context2.next = 4;
                 return Promise.all(list);
@@ -40724,51 +40743,38 @@
       var fieldsValue = {};
 
       if (nameList === true) {
-        var _iterator2 = _createForOfIteratorHelper(formMapRef.current.entries()),
-            _step2;
+        var _iterator = _createForOfIteratorHelper(formMapRef.current.entries()),
+            _step;
 
         try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var _step2$value = _slicedToArray(_step2.value, 2),
-                name = _step2$value[0],
-                formItemRef = _step2$value[1];
-
-            if (Array.isArray(name)) {
-              var _formItemRef$current$2, _formItemRef$current2;
-
-              var fieldValue = name.reduceRight(function (prev, curr) {
-                return _defineProperty$3({}, curr, prev);
-              }, formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current$2 = (_formItemRef$current2 = formItemRef.current).getValue) === null || _formItemRef$current$2 === void 0 ? void 0 : _formItemRef$current$2.call(_formItemRef$current2));
-              merge_1(fieldsValue, fieldValue);
-            } else {
-              var _formItemRef$current$3, _formItemRef$current3;
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var _formItemRef$current$2, _formItemRef$current2;
 
-              fieldsValue[name] = formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current$3 = (_formItemRef$current3 = formItemRef.current).getValue) === null || _formItemRef$current$3 === void 0 ? void 0 : _formItemRef$current$3.call(_formItemRef$current3);
-            }
+            var _step$value = _slicedToArray(_step.value, 2),
+                name = _step$value[0],
+                formItemRef = _step$value[1];
+
+            var fieldValue = calcFieldValue(name, formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current$2 = (_formItemRef$current2 = formItemRef.current).getValue) === null || _formItemRef$current$2 === void 0 ? void 0 : _formItemRef$current$2.call(_formItemRef$current2));
+            merge_1(fieldsValue, fieldValue);
           }
         } catch (err) {
-          _iterator2.e(err);
+          _iterator.e(err);
         } finally {
-          _iterator2.f();
+          _iterator.f();
         }
       } else {
-        if (!Array.isArray(nameList)) throw new Error("getFieldsValue \u53C2\u6570\u9700\u8981 Array \u7C7B\u578B");
-        nameList.forEach(function (name) {
-          var formItemRef = getMapValue(name, formMapRef);
-
-          if (Array.isArray(name)) {
-            var _formItemRef$current$4, _formItemRef$current4;
-
-            var _fieldValue = name.reduceRight(function (prev, curr) {
-              return _defineProperty$3({}, curr, prev);
-            }, formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current$4 = (_formItemRef$current4 = formItemRef.current).getValue) === null || _formItemRef$current$4 === void 0 ? void 0 : _formItemRef$current$4.call(_formItemRef$current4));
+        if (!Array.isArray(nameList)) {
+          log.error("Form", "`getFieldsValue` \u53C2\u6570\u9700\u8981 Array \u7C7B\u578B");
+          return {};
+        }
 
-            merge_1(fieldsValue, _fieldValue);
-          } else {
-            var _formItemRef$current$5, _formItemRef$current5;
+        nameList.forEach(function (name) {
+          var _formItemRef$current$3, _formItemRef$current3;
 
-            formItemRef && (fieldsValue[name] = formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current$5 = (_formItemRef$current5 = formItemRef.current).getValue) === null || _formItemRef$current$5 === void 0 ? void 0 : _formItemRef$current$5.call(_formItemRef$current5));
-          }
+          var formItemRef = getMapValue(name, formMapRef);
+          if (!formItemRef) return;
+          var fieldValue = calcFieldValue(name, formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current$3 = (_formItemRef$current3 = formItemRef.current).getValue) === null || _formItemRef$current$3 === void 0 ? void 0 : _formItemRef$current$3.call(_formItemRef$current3));
+          merge_1(fieldsValue, fieldValue);
         });
       }
 
@@ -40778,9 +40784,9 @@
     function setFieldsValue() {
       var fields = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       travelMapFromObject(fields, formMapRef, function (formItemRef, fieldValue) {
-        var _formItemRef$current6, _formItemRef$current7;
+        var _formItemRef$current4, _formItemRef$current5;
 
-        formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current6 = formItemRef.current) === null || _formItemRef$current6 === void 0 ? void 0 : (_formItemRef$current7 = _formItemRef$current6.setValue) === null || _formItemRef$current7 === void 0 ? void 0 : _formItemRef$current7.call(_formItemRef$current6, fieldValue);
+        formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current4 = formItemRef.current) === null || _formItemRef$current4 === void 0 ? void 0 : (_formItemRef$current5 = _formItemRef$current4.setValue) === null || _formItemRef$current5 === void 0 ? void 0 : _formItemRef$current5.call(_formItemRef$current4, fieldValue);
       });
     }
 
@@ -40788,22 +40794,22 @@
       var fields = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       if (!Array.isArray(fields)) throw new Error("setFields \u53C2\u6570\u9700\u8981 Array \u7C7B\u578B");
       fields.forEach(function (field) {
-        var _formItemRef$current8;
+        var _formItemRef$current6;
 
         var name = field.name,
             restFields = _objectWithoutProperties$2(field, _excluded$d);
 
         var formItemRef = getMapValue(name, formMapRef);
-        formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current8 = formItemRef.current) === null || _formItemRef$current8 === void 0 ? void 0 : _formItemRef$current8.setField(_objectSpread$12({}, restFields));
+        formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current6 = formItemRef.current) === null || _formItemRef$current6 === void 0 ? void 0 : _formItemRef$current6.setField(_objectSpread$11({}, restFields));
       });
     }
 
     function reset(params) {
       if (typeof params === "undefined") {
         _toConsumableArray(formMapRef.current.values()).forEach(function (formItemRef) {
-          var _formItemRef$current9;
+          var _formItemRef$current7;
 
-          formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current9 = formItemRef.current) === null || _formItemRef$current9 === void 0 ? void 0 : _formItemRef$current9.resetField();
+          formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current7 = formItemRef.current) === null || _formItemRef$current7 === void 0 ? void 0 : _formItemRef$current7.resetField();
         });
       } else {
         var _params$type = params.type,
@@ -40811,10 +40817,10 @@
             _params$fields = params.fields,
             fields = _params$fields === void 0 ? [] : _params$fields;
         fields.forEach(function (name) {
-          var _formItemRef$current10;
+          var _formItemRef$current8;
 
           var formItemRef = getMapValue(name, formMapRef);
-          formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current10 = formItemRef.current) === null || _formItemRef$current10 === void 0 ? void 0 : _formItemRef$current10.resetField(type);
+          formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current8 = formItemRef.current) === null || _formItemRef$current8 === void 0 ? void 0 : _formItemRef$current8.resetField(type);
         });
       }
     }
@@ -40822,26 +40828,26 @@
     function clearValidate(fields) {
       if (typeof fields === "undefined") {
         _toConsumableArray(formMapRef.current.values()).forEach(function (formItemRef) {
-          var _formItemRef$current11;
+          var _formItemRef$current9;
 
-          formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current11 = formItemRef.current) === null || _formItemRef$current11 === void 0 ? void 0 : _formItemRef$current11.resetValidate();
+          formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current9 = formItemRef.current) === null || _formItemRef$current9 === void 0 ? void 0 : _formItemRef$current9.resetValidate();
         });
       } else {
         if (!Array.isArray(fields)) throw new Error("clearValidate \u53C2\u6570\u9700\u8981 Array \u7C7B\u578B");
         fields.forEach(function (name) {
-          var _formItemRef$current12;
+          var _formItemRef$current10;
 
           var formItemRef = getMapValue(name, formMapRef);
-          formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current12 = formItemRef.current) === null || _formItemRef$current12 === void 0 ? void 0 : _formItemRef$current12.resetValidate();
+          formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current10 = formItemRef.current) === null || _formItemRef$current10 === void 0 ? void 0 : _formItemRef$current10.resetValidate();
         });
       }
     }
 
     function setValidateMessage(message) {
       travelMapFromObject(message, formMapRef, function (formItemRef, fieldValue) {
-        var _formItemRef$current13, _formItemRef$current14;
+        var _formItemRef$current11, _formItemRef$current12;
 
-        formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current13 = formItemRef.current) === null || _formItemRef$current13 === void 0 ? void 0 : (_formItemRef$current14 = _formItemRef$current13.setValidateMessage) === null || _formItemRef$current14 === void 0 ? void 0 : _formItemRef$current14.call(_formItemRef$current13, fieldValue);
+        formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current11 = formItemRef.current) === null || _formItemRef$current11 === void 0 ? void 0 : (_formItemRef$current12 = _formItemRef$current11.setValidateMessage) === null || _formItemRef$current12 === void 0 ? void 0 : _formItemRef$current12.call(_formItemRef$current11, fieldValue);
       });
     }
 
@@ -40955,7 +40961,7 @@
     return [formRef.current];
   }
 
-  function useWatch(fields, form) {
+  function useWatch(name, form) {
     var _useState = React.useState(),
         _useState2 = _slicedToArray(_useState, 2),
         value = _useState2[0],
@@ -40968,14 +40974,15 @@
     var isValidForm = form && form._init;
     React.useEffect(function () {
       if (!isValidForm) return;
-      var getFieldValue = form.getFieldValue,
+      var getFieldsValue = form.getFieldsValue,
           getInternalHooks = form.getInternalHooks;
 
       var _getInternalHooks = getInternalHooks(HOOK_MARK),
           registerWatch = _getInternalHooks.registerWatch;
 
       var cancelRegister = registerWatch(function (store) {
-        var newValue = getFieldValue(fields);
+        var allFieldsValue2 = getFieldsValue(true);
+        var newValue = get_1(allFieldsValue2, name);
         var nextValueStr = JSON.stringify(newValue);
 
         if (valueStrRef.current !== nextValueStr) {
@@ -40983,7 +40990,8 @@
           setValue(newValue);
         }
       });
-      var initialValue = getFieldValue(fields);
+      var allFieldsValue = getFieldsValue(true);
+      var initialValue = get_1(allFieldsValue, name);
       setValue(initialValue);
       return cancelRegister;
     }, []);
@@ -40991,6 +40999,7 @@
   }
 
   var FormContext = /*#__PURE__*/React__default["default"].createContext({
+    form: {},
     labelWidth: "100px",
     labelAlign: "right",
     layout: "vertical",
@@ -41582,20 +41591,6 @@
 
   var template_1 = template;
 
-  function ownKeys$11(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-  function _objectSpread$11(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$11(Object(source), !0).forEach(function (key) { _defineProperty$3(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$11(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-  function calcFieldValue(name, value) {
-    if (Array.isArray(name)) {
-      var fieldValue = name.reduceRight(function (prev, curr) {
-        return _defineProperty$3({}, curr, prev);
-      }, value);
-      return _objectSpread$11({}, fieldValue);
-    }
-
-    return _defineProperty$3({}, name, value);
-  }
-
   var ValidateStatus = /* @__PURE__ */function (ValidateStatus2) {
     ValidateStatus2["SUCCESS"] = "success";
     ValidateStatus2["WARNING"] = "warning";
@@ -41716,6 +41711,7 @@
     submitWithWarningMessage: false
   };
   var formItemDefaultProps = {
+    shouldUpdate: false,
     successBorder: false
   };
 
@@ -44777,7 +44773,7 @@
   ImageFlowList.displayName = "ImageFlowList";
 
   function _toArray(arr) {
-    return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray$2(arr) || _nonIterableRest();
+    return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray$3(arr) || _nonIterableRest();
   }
 
   function ownKeys$W(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -49350,7 +49346,7 @@
 
       var val;
       var formattedVal;
-      var scrollTop = (_colsRef$current$idx = colsRef.current[idx]) === null || _colsRef$current$idx === void 0 ? void 0 : _colsRef$current$idx.scrollTop;
+      var scrollTop = ((_colsRef$current$idx = colsRef.current[idx]) === null || _colsRef$current$idx === void 0 ? void 0 : _colsRef$current$idx.scrollTop) + panelOffset.top;
 
       var _getItemHeight2 = getItemHeight(),
           offsetHeight = _getItemHeight2.offsetHeight,
@@ -51264,6 +51260,7 @@
         ErrorCircleFilledIcon$1 = _useGlobalIcon.ErrorCircleFilledIcon;
 
     var _useFormContext = useFormContext(),
+        form = _useFormContext.form,
         colon = _useFormContext.colon,
         layout = _useFormContext.layout,
         initialDataFromContext = _useFormContext.initialData,
@@ -51305,46 +51302,50 @@
         _props$requiredMark = props.requiredMark,
         requiredMark = _props$requiredMark === void 0 ? requiredMarkFromContext : _props$requiredMark;
 
-    var _useState = React.useState(void 0),
+    var _useState = React.useState({}),
         _useState2 = _slicedToArray(_useState, 2),
-        freeShowErrorMessage = _useState2[0],
-        setFreeShowErrorMessage = _useState2[1];
+        forceUpdate = _useState2[1];
 
-    var _useState3 = React.useState([]),
+    var _useState3 = React.useState(void 0),
         _useState4 = _slicedToArray(_useState3, 2),
-        errorList = _useState4[0],
-        setErrorList = _useState4[1];
+        freeShowErrorMessage = _useState4[0],
+        setFreeShowErrorMessage = _useState4[1];
 
     var _useState5 = React.useState([]),
         _useState6 = _slicedToArray(_useState5, 2),
-        successList = _useState6[0],
-        setSuccessList = _useState6[1];
+        errorList = _useState6[0],
+        setErrorList = _useState6[1];
 
-    var _useState7 = React.useState("validating"),
+    var _useState7 = React.useState([]),
         _useState8 = _slicedToArray(_useState7, 2),
-        verifyStatus = _useState8[0],
-        setVerifyStatus = _useState8[1];
+        successList = _useState8[0],
+        setSuccessList = _useState8[1];
 
-    var _useState9 = React.useState(false),
+    var _useState9 = React.useState("validating"),
         _useState10 = _slicedToArray(_useState9, 2),
-        resetValidating = _useState10[0],
-        setResetValidating = _useState10[1];
+        verifyStatus = _useState10[0],
+        setVerifyStatus = _useState10[1];
 
     var _useState11 = React.useState(false),
         _useState12 = _slicedToArray(_useState11, 2),
-        needResetField = _useState12[0],
-        setNeedResetField = _useState12[1];
+        resetValidating = _useState12[0],
+        setResetValidating = _useState12[1];
 
-    var _useState13 = React.useState(getDefaultInitialData({
+    var _useState13 = React.useState(false),
+        _useState14 = _slicedToArray(_useState13, 2),
+        needResetField = _useState14[0],
+        setNeedResetField = _useState14[1];
+
+    var _useState15 = React.useState(getDefaultInitialData({
       name: name,
       formListName: formListName,
       children: children,
       initialData: initialData,
       initialDataFromContext: initialDataFromContext
     })),
-        _useState14 = _slicedToArray(_useState13, 2),
-        formValue = _useState14[0],
-        setFormValue = _useState14[1];
+        _useState16 = _slicedToArray(_useState15, 2),
+        formValue = _useState16[0],
+        setFormValue = _useState16[1];
 
     var currentFormItemRef = React.useRef();
     var innerFormItemsRef = React.useRef([]);
@@ -51395,12 +51396,7 @@
 
     function getInnerRules(name2, formRules, formListName2, formListRules2) {
       if (Array.isArray(name2)) {
-        var _formRules$formListNa;
-
-        var _name = _slicedToArray(name2, 2),
-            itemKey = _name[1];
-
-        return (formRules === null || formRules === void 0 ? void 0 : (_formRules$formListNa = formRules[formListName2]) === null || _formRules$formListNa === void 0 ? void 0 : _formRules$formListNa[itemKey]) || (formListRules2 === null || formListRules2 === void 0 ? void 0 : formListRules2[itemKey]) || [];
+        return get_1(formRules === null || formRules === void 0 ? void 0 : formRules[formListName2], name2) || get_1(formListRules2, name2) || [];
       }
 
       return (formRules === null || formRules === void 0 ? void 0 : formRules[name2]) || formListRules2 || [];
@@ -51728,18 +51724,7 @@
 
       if (typeof name !== "undefined") {
         if (formListName) {
-          var formListValue = [];
-
-          if (Array.isArray(name)) {
-            var _name2 = _slicedToArray(name, 2),
-                index = _name2[0],
-                itemKey = _name2[1];
-
-            formListValue[index] = _defineProperty$3({}, itemKey, formValue);
-          } else {
-            formListValue[name] = formValue;
-          }
-
+          var formListValue = merge_1([], calcFieldValue(name, formValue));
           var fieldValue = calcFieldValue(formListName, formListValue);
           onFormItemValueChange === null || onFormItemValueChange === void 0 ? void 0 : onFormItemValueChange(_objectSpread$E({}, fieldValue), name);
         } else {
@@ -51784,7 +51769,11 @@
       validateOnly: validateOnly,
       resetField: resetField,
       setValidateMessage: setValidateMessage,
-      resetValidate: resetHandler
+      resetValidate: resetHandler,
+      shouldUpdate: props.shouldUpdate,
+      update: function update() {
+        return forceUpdate({});
+      }
     };
     React.useImperativeHandle(ref, function () {
       return instance;
@@ -51792,6 +51781,7 @@
     React.useImperativeHandle(currentFormItemRef, function () {
       return instance;
     });
+    if (typeof children === "function") return children(form);
     return /* @__PURE__ */React__default["default"].createElement("div", {
       className: formItemClass,
       style: style
@@ -52085,20 +52075,7 @@
         setValidateMessage: function setValidateMessage(fieldData) {
           _toConsumableArray(formListMapRef.current.values()).forEach(function (formItemRef) {
             var name2 = formItemRef.current.name;
-            var data;
-
-            if (Array.isArray(name2)) {
-              var _fieldData$index2;
-
-              var _name3 = _slicedToArray(name2, 2),
-                  index = _name3[0],
-                  itemKey = _name3[1];
-
-              data = fieldData === null || fieldData === void 0 ? void 0 : (_fieldData$index2 = fieldData[index]) === null || _fieldData$index2 === void 0 ? void 0 : _fieldData$index2[itemKey];
-            } else {
-              data = fieldData === null || fieldData === void 0 ? void 0 : fieldData[name2];
-            }
-
+            var data = get_1(fieldData, name2);
             formItemRef.current.setValidateMessage(data);
           });
         },
@@ -52136,7 +52113,6 @@
 
     var style = props.style,
         className = props.className,
-        form = props.form,
         labelWidth = props.labelWidth,
         statusIcon = props.statusIcon,
         labelAlign = props.labelAlign,
@@ -52158,13 +52134,18 @@
         _props$onValuesChange = props.onValuesChange,
         onValuesChange = _props$onValuesChange === void 0 ? noop$1 : _props$onValuesChange;
     var formClass = classNames$1("".concat(classPrefix, "-form"), className, _defineProperty$3({}, "".concat(classPrefix, "-form-inline"), layout === "inline"));
+
+    var _useForm = useForm(props.form),
+        _useForm2 = _slicedToArray(_useForm, 1),
+        form = _useForm2[0];
+
     var formRef = React.useRef();
     var formMapRef = React.useRef( /* @__PURE__ */new Map());
     var formInstance = useInstance(props, formRef, formMapRef);
     React.useImperativeHandle(ref, function () {
       return formInstance;
     });
-    form && Object.assign(form, _objectSpread$C({}, formInstance));
+    Object.assign(form, _objectSpread$C({}, formInstance));
 
     function onResetHandler(e) {
       var _form$getInternalHook, _form$getInternalHook2, _form$getInternalHook3;
@@ -52200,6 +52181,7 @@
 
     return /* @__PURE__ */React__default["default"].createElement(FormContext.Provider, {
       value: {
+        form: form,
         labelWidth: labelWidth,
         statusIcon: statusIcon,
         labelAlign: labelAlign,