tdesign-react 0.30.1 → 0.31.0

package/dist/tdesign.js

@@ -1,5 +1,5 @@
 /**
- * tdesign v0.30.1
+ * tdesign v0.31.0
  * (c) 2022 tdesign
  * @license MIT
  */
@@ -78,7 +78,7 @@
     return _arr;
   }
 
-  function _arrayLikeToArray$4(arr, len) {
+  function _arrayLikeToArray$5(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$4(o, minLen) {
+  function _unsupportedIterableToArray$5(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray$4(o, minLen);
+    if (typeof o === "string") return _arrayLikeToArray$5(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$4(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$5(o, minLen);
   }
 
   function _nonIterableRest() {
@@ -102,7 +102,7 @@
   }
 
   function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray$4(arr, i) || _nonIterableRest();
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray$5(arr, i) || _nonIterableRest();
   }
 
   function _defineProperty$2(obj, key, value) {
@@ -2739,7 +2739,16 @@
       filterInputPlaceholder: "\u8BF7\u8F93\u5165\u5185\u5BB9\uFF08\u65E0\u9ED8\u8BA4\u503C\uFF09",
       sortAscendingOperationText: "\u70B9\u51FB\u5347\u5E8F",
       sortCancelOperationText: "\u70B9\u51FB\u53D6\u6D88\u6392\u5E8F",
-      sortDescendingOperationText: "\u70B9\u51FB\u964D\u5E8F"
+      sortDescendingOperationText: "\u70B9\u51FB\u964D\u5E8F",
+      clearFilterResultButtonText: "\u6E05\u7A7A\u7B5B\u9009",
+      columnConfigButtonText: "\u5217\u914D\u7F6E",
+      columnConfigTitleText: "\u8868\u683C\u5217\u914D\u7F6E",
+      columnConfigDescriptionText: "\u8BF7\u9009\u62E9\u9700\u8981\u5728\u8868\u683C\u4E2D\u663E\u793A\u7684\u6570\u636E\u5217",
+      confirmText: "\u786E\u8BA4",
+      cancelText: "\u53D6\u6D88",
+      resetText: "\u91CD\u7F6E",
+      selectAllText: "\u5168\u9009",
+      searchResultText: "\u641C\u7D22\u201C{result}\u201D\uFF0C\u627E\u5230 {count} \u6761\u7ED3\u679C"
     },
     select: {
       empty: "\u6682\u65E0\u6570\u636E",
@@ -3703,7 +3712,8 @@
   }
   var Portal = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var attach = props.attach,
-        children = props.children;
+        children = props.children,
+        triggerNode = props.triggerNode;
 
     var _useConfig = useConfig$1(),
         classPrefix = _useConfig.classPrefix;
@@ -3719,7 +3729,7 @@
       var el = null;
 
       if (typeof attach === "function") {
-        el = attach();
+        el = attach(triggerNode);
       } else if (typeof attach === "string") {
         el = document.querySelector(attach);
       }
@@ -3734,7 +3744,7 @@
 
         (_parentElement = parentElement) === null || _parentElement === void 0 ? void 0 : _parentElement.removeChild(container);
       };
-    }, [container, attach]);
+    }, [container, attach, triggerNode]);
     React.useImperativeHandle(ref, function () {
       return container;
     });
@@ -3987,6 +3997,8 @@
     }, commonContent()) : null;
   };
 
+  Loading$1.displayName = "Loading";
+
   function ownKeys$25(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$25(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$25(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$25(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -8792,11 +8804,11 @@
     };
   }
 
-  function _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(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$4(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$4(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$3(o, minLen) { if (!o) return; 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$3(o, minLen); }
+  function _unsupportedIterableToArray$4(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$4(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$4(o, minLen); }
 
-  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++) { arr2[i] = arr[i]; } return arr2; }
+  function _arrayLikeToArray$4(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++) {
@@ -8804,7 +8816,7 @@
     }
 
     return function (instance) {
-      var _iterator = _createForOfIteratorHelper$3(refs),
+      var _iterator = _createForOfIteratorHelper$4(refs),
           _step;
 
       try {
@@ -8850,17 +8862,19 @@
     }, [refs, handler]);
   }
 
-  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 _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(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$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 _unsupportedIterableToArray$3(o, minLen) { if (!o) return; 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$3(o, minLen); }
 
-  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 _arrayLikeToArray$3(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; }
   var ESC_KEY = "Escape";
   function useTriggerProps(ref, triggerNode, triggers, visible, setVisible) {
     var disabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
     var originTrigger = arguments.length > 6 ? arguments[6] : undefined;
     var triggerProps = {};
     var popupProps = {};
+    var hasPopupMouseDown = React.useRef(false);
+    var mouseDownTimer = React.useRef();
 
     var toggle = function toggle(e, trigger) {
       return setVisible(!visible, {
@@ -8884,13 +8898,13 @@
     };
 
     useClickOutside([ref, triggerNode], function (e) {
-      if (visible && (triggers.includes("click") || triggers.includes("context-menu"))) {
+      if (visible && (triggers.includes("click") || triggers.includes("context-menu")) && !hasPopupMouseDown.current) {
         hide(e, "trigger-element-blur");
       }
     });
     if (disabled) return [triggerProps, popupProps];
 
-    var _iterator = _createForOfIteratorHelper$2(triggers),
+    var _iterator = _createForOfIteratorHelper$3(triggers),
         _step;
 
     try {
@@ -8900,6 +8914,7 @@
             onClick = _originTrigger$props.onClick,
             onMouseEnter = _originTrigger$props.onMouseEnter,
             onMouseLeave = _originTrigger$props.onMouseLeave,
+            onMouseDown = _originTrigger$props.onMouseDown,
             onFocus = _originTrigger$props.onFocus,
             onBlur = _originTrigger$props.onBlur,
             onContextMenu = _originTrigger$props.onContextMenu,
@@ -8951,6 +8966,15 @@
           };
         }
 
+        popupProps.onMouseDown = function (e) {
+          clearTimeout(mouseDownTimer.current);
+          hasPopupMouseDown.current = true;
+          mouseDownTimer.current = window.setTimeout(function () {
+            hasPopupMouseDown.current = false;
+          });
+          onMouseDown === null || onMouseDown === void 0 ? void 0 : onMouseDown(e);
+        };
+
         triggerProps.onKeyDown = function (e) {
           if (e.key === ESC_KEY) hide(e, "keydown-esc");
           onKeyDown && onKeyDown(e);
@@ -9487,15 +9511,15 @@
       var referenceElmBottom = window.innerHeight - bottom;
       var referenceElmRight = window.innerWidth - right;
       var _contentRef$current = contentRef.current,
-          contentScrollHeight = _contentRef$current.scrollHeight,
+          contentOffsetHeight = _contentRef$current.offsetHeight,
           contentOffsetWidth = _contentRef$current.offsetWidth;
       var newPlacement = state.options.placement;
 
-      if (referenceElmBottom < contentScrollHeight && referenceElmTop >= contentScrollHeight) {
+      if (referenceElmBottom < contentOffsetHeight && referenceElmTop >= contentOffsetHeight) {
         newPlacement = state.options.placement.replace("bottom", "top");
       }
 
-      if (referenceElmTop < contentScrollHeight && referenceElmBottom >= contentScrollHeight) {
+      if (referenceElmTop < contentOffsetHeight && referenceElmBottom >= contentOffsetHeight) {
         newPlacement = state.options.placement.replace("top", "bottom");
       }
 
@@ -9522,7 +9546,7 @@
     var defaultStyles = React.useMemo(function () {
       if (triggerRef && typeof overlayStyle === "function") return _objectSpread$24({}, overlayStyle(triggerRef, overlayRef));
       return _objectSpread$24({}, overlayStyle);
-    }, [overlayStyle, triggerRef, overlayRef]);
+    }, [overlayStyle, triggerRef, overlayRef, visible]);
     var overlayVisibleStyle = defaultStyles;
     var triggerNodeTemp = React.useMemo(function () {
       var _React$Children$toArr = React__default["default"].Children.toArray(children),
@@ -9582,6 +9606,7 @@
       onEnter: handleEnter,
       onExited: handleExited
     }, /* @__PURE__ */React__default["default"].createElement(Portal, {
+      triggerNode: triggerRef,
       attach: attach,
       ref: portalRef
     }, /* @__PURE__ */React__default["default"].createElement(CSSTransition$1, _objectSpread$24({
@@ -13005,11 +13030,11 @@
         globalConfig = _React$useContext.globalConfig;
 
     function transformLocale(pattern, placement) {
-      var REGX = /\{\s*([\w-]+)\s*\}/g;
+      var REGEXP = /\{\s*([\w-]+)\s*\}/g;
 
       if (typeof pattern === "string") {
-        if (!placement || !REGX.test(pattern)) return pattern;
-        var translated = pattern.replace(REGX, function (_, key) {
+        if (!placement || !REGEXP.test(pattern)) return pattern;
+        var translated = pattern.replace(REGEXP, function (_, key) {
           if (placement) return String(placement[key]);
           return "";
         });
@@ -13018,7 +13043,7 @@
 
       if (Array.isArray(pattern)) {
         return pattern.map(function (p, index) {
-          var translated = p.replace(REGX, function (_, key) {
+          var translated = p.replace(REGEXP, function (_, key) {
             if (placement) return String(placement[index][key]);
             return "";
           });
@@ -15381,7 +15406,7 @@
   var get_1 = get$1;
 
   function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray$4(arr);
+    if (Array.isArray(arr)) return _arrayLikeToArray$5(arr);
   }
 
   function _iterableToArray(iter) {
@@ -15393,7 +15418,7 @@
   }
 
   function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray$4(arr) || _nonIterableSpread();
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray$5(arr) || _nonIterableSpread();
   }
 
   function ownKeys$1e(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; }
@@ -26891,8 +26916,8 @@
     };
 
     var handleInputChange = function handleInputChange(value2) {
-      if (selectedLabel === value2) return;
       onInputChange(value2);
+      if (selectedLabel === value2) return;
 
       if (isFunction_1(onSearch)) {
         onSearch(value2);
@@ -27432,6 +27457,19 @@
     return direction;
   };
 
+  function percentPxToNumber(a) {
+    if (typeof a === "undefined") return 0;
+    if (/%/.test(a)) return Number(a.replace("%", "")) * 0.01;
+    return Number(a.replace("px", ""));
+  }
+
+  var getStyleHeight = function getStyleHeight(height) {
+    return isNaN(Number(height)) ? height : "".concat(Number(height), "px");
+  };
+  var calHeight = function calHeight(height) {
+    return isNaN(Number(height)) ? percentPxToNumber(height) : Number(height);
+  };
+
   function TableEmptyBody$1(props) {
     var _useConfig = useConfig$1(),
         classPrefix = _useConfig.classPrefix;
@@ -28387,7 +28425,7 @@
         scrollBarWidth = _useState6[0],
         setScrollBarWidth = _useState6[1];
 
-    var fixedHeader = height > 0 || maxHeight > 0;
+    var fixedHeader = calHeight(height) > 0 || calHeight(maxHeight) > 0;
     var hasFixedColumns = columns.some(function (_ref) {
       var fixed = _ref.fixed;
       return ["left", "right"].includes(fixed);
@@ -28507,8 +28545,7 @@
       return /* @__PURE__ */React__default["default"].createElement("table", {
         ref: tableRef,
         style: {
-          tableLayout: tableLayout,
-          height: "100%"
+          tableLayout: tableLayout
         }
       }, /* @__PURE__ */React__default["default"].createElement(TableColGroup, {
         columns: columns
@@ -28553,8 +28590,8 @@
         ref: scrollBodyRef,
         className: "".concat(classPrefix, "-table__body"),
         style: {
-          height: isNaN(Number(height)) ? height : "".concat(Number(height), "px"),
-          maxHeight: isNaN(Number(maxHeight)) ? maxHeight : "".concat(Number(maxHeight), "px"),
+          height: getStyleHeight(height),
+          maxHeight: getStyleHeight(maxHeight),
           width: hasFixedColumns ? "100%" : void 0
         }
       }, hasFixedColumns ? {
@@ -28833,11 +28870,11 @@
     }, renderSortIcons()));
   };
 
-  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 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; }
 
@@ -29046,7 +29083,7 @@
 
   function comparer(sorts) {
     return function (a, b) {
-      var _iterator = _createForOfIteratorHelper$1(sorts),
+      var _iterator = _createForOfIteratorHelper$2(sorts),
           _step;
 
       try {
@@ -31489,6 +31526,7 @@
     MenuBlockType2["MenuItem"] = "MenuItem";
     MenuBlockType2["SubMenu"] = "SubMenu";
     MenuBlockType2["MenuItemGroup"] = "MenuItemGroup";
+    MenuBlockType2["MenuGroup"] = "MenuGroup";
     return MenuBlockType2;
   }(MenuBlockType || {});
 
@@ -31594,6 +31632,10 @@
     var displayName = child.type.displayName;
     return displayName === MenuBlockType.MenuItem;
   };
+  var checkIsMenuGroup = function checkIsMenuGroup(child) {
+    var displayName = child.type.displayName;
+    return displayName === MenuBlockType.MenuGroup;
+  };
 
   var checkSubMenuChildrenActive = function checkSubMenuChildrenActive(children, active) {
     var activeFlag = false;
@@ -31681,7 +31723,7 @@
   var getSubMenuChildCount = function getSubMenuChildCount(children) {
     var count = 0;
     React__default["default"].Children.forEach(children, function (child) {
-      if (child.type.displayName === MenuBlockType.SubMenu) {
+      if (checkIsSubMenu(child) || checkIsMenuGroup(child)) {
         count += getSubMenuChildCount(child.props.children) + 1;
       } else {
         count += 1;
@@ -31839,7 +31881,9 @@
     var fakeArrowStyle = level > 1 ? {
       transform: "rotate(-90deg)"
     } : {};
-    var popupMaxHeight = ((_popRef$current = popRef.current) === null || _popRef$current === void 0 ? void 0 : _popRef$current.getBoundingClientRect().height) || getSubMenuMaxHeight(children);
+    var submenuMaxHeight = getSubMenuMaxHeight(children);
+    var popupMaxHeight = ((_popRef$current = popRef.current) === null || _popRef$current === void 0 ? void 0 : _popRef$current.getBoundingClientRect().height) || submenuMaxHeight;
+    var showPopup = isPopUp && submenuMaxHeight > 0;
     return /* @__PURE__ */React__default["default"].createElement("li", {
       className: classNames$1(className, "".concat(classPrefix, "-submenu"), _defineProperty$2({}, "".concat(classPrefix, "-is-opened"), open)),
       onMouseEnter: function onMouseEnter() {
@@ -31853,10 +31897,10 @@
       className: classNames$1("".concat(classPrefix, "-menu__item"), (_classNames6 = {}, _defineProperty$2(_classNames6, "".concat(classPrefix, "-is-active"), isActive), _defineProperty$2(_classNames6, "".concat(classPrefix, "-is-opened"), open), _classNames6)),
       onClick: handleClick,
       style: style
-    }, /* @__PURE__ */React__default["default"].createElement("span", null, title), isPopUp && /* @__PURE__ */React__default["default"].createElement(FakeArrow, {
+    }, /* @__PURE__ */React__default["default"].createElement("span", null, title), showPopup && /* @__PURE__ */React__default["default"].createElement(FakeArrow, {
       style: fakeArrowStyle,
       isActive: open
-    })), isPopUp && /* @__PURE__ */React__default["default"].createElement("div", {
+    })), showPopup && /* @__PURE__ */React__default["default"].createElement("div", {
       className: classNames$1("".concat(classPrefix, "-menu__popup"), _defineProperty$2({}, "".concat(classPrefix, "-is-opened"), open)),
       style: {
         "--popup-max-height": "".concat(popupMaxHeight, "px")
@@ -31874,10 +31918,28 @@
     var children = props.children,
         _props$level2 = props.level,
         level = _props$level2 === void 0 ? 1 : _props$level2;
+
+    var changeItemLevel = function changeItemLevel(item) {
+      if (checkIsSubMenu(item)) {
+        return /*#__PURE__*/React__default["default"].cloneElement(item, {
+          level: level + 1
+        });
+      }
+
+      if (checkIsMenuGroup(item)) {
+        var groupChidren = React__default["default"].Children.map(item.props.children, function (item2) {
+          return changeItemLevel(item2);
+        });
+        return /*#__PURE__*/React__default["default"].cloneElement(item, {
+          level: level + 1
+        }, groupChidren);
+      }
+
+      return item;
+    };
+
     var childElement = React__default["default"].Children.map(children, function (item) {
-      return checkIsSubMenu(item) ? /*#__PURE__*/React__default["default"].cloneElement(item, {
-        level: level + 1
-      }) : item;
+      return changeItemLevel(item);
     });
     if (mode === "accordion") return /* @__PURE__ */React__default["default"].createElement(SubAccordion, _objectSpread$I({}, props), childElement);
     if (mode === "title") return /* @__PURE__ */React__default["default"].createElement(SubTitleMenu, _objectSpread$I({}, props), childElement);
@@ -31949,18 +32011,27 @@
 
   var MenuGroup = function MenuGroup(_ref) {
     var title = _ref.title,
-        children = _ref.children;
+        children = _ref.children,
+        _ref$level = _ref.level,
+        level = _ref$level === void 0 ? 1 : _ref$level;
 
     var _useConfig = useConfig$1(),
         classPrefix = _useConfig.classPrefix;
 
+    var itemAndGroupPaddingBias = 28;
+    var menuPaddingLeft = cacularPaddingLeft(level - 1) - itemAndGroupPaddingBias;
     return /* @__PURE__ */React__default["default"].createElement("div", {
       className: classNames$1("".concat(classPrefix, "-menu-group"))
     }, /* @__PURE__ */React__default["default"].createElement("div", {
-      className: classNames$1("".concat(classPrefix, "-menu-group__title"))
+      className: classNames$1("".concat(classPrefix, "-menu-group__title")),
+      style: {
+        paddingLeft: "".concat(menuPaddingLeft, "px")
+      }
     }, title), children);
   };
 
+  MenuGroup.displayName = "MenuGroup";
+
   function ownKeys$G(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$G(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$G(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$G(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -32066,7 +32137,7 @@
     document.documentElement.addEventListener("click", getClickPosition, true);
   }
 
-  var RenderDialog = function RenderDialog(props) {
+  var RenderDialog = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var prefixCls = props.prefixCls,
         attach = props.attach,
         visible = props.visible,
@@ -32088,16 +32159,22 @@
         _props$closeOnEscKeyd = props.closeOnEscKeydown,
         closeOnEscKeydown = _props$closeOnEscKeyd === void 0 ? true : _props$closeOnEscKeyd,
         _props$closeOnOverlay = props.closeOnOverlayClick,
-        closeOnOverlayClick = _props$closeOnOverlay === void 0 ? true : _props$closeOnOverlay;
+        closeOnOverlayClick = _props$closeOnOverlay === void 0 ? true : _props$closeOnOverlay,
+        _props$destroyOnClose = props.destroyOnClose,
+        destroyOnClose = _props$destroyOnClose === void 0 ? false : _props$destroyOnClose;
     var wrap = React.useRef();
     var dialog = React.useRef();
     var maskRef = React.useRef();
+    var domRef = React.useRef();
     var bodyOverflow = React.useRef();
     var bodyCssTextRef = React.useRef();
     var isModal = mode === "modal";
     var canDraggable = props.draggable && mode === "modeless";
     var dialogOpenClass = "".concat(prefixCls, "__open");
     useDialogEsc(visible, wrap);
+    React.useImperativeHandle(ref, function () {
+      return domRef.current;
+    });
     useIsomorphicLayoutEffect(function () {
       bodyOverflow.current = document.body.style.overflow;
       bodyCssTextRef.current = document.body.style.cssText;
@@ -32163,6 +32240,12 @@
         style.top = "50%";
       }
 
+      if (destroyOnClose) {
+        var _domRef$current, _domRef$current$paren;
+
+        (_domRef$current = domRef.current) === null || _domRef$current === void 0 ? void 0 : (_domRef$current$paren = _domRef$current.parentNode) === null || _domRef$current$paren === void 0 ? void 0 : _domRef$current$paren.removeChild(domRef.current);
+      }
+
       onClosed && onClosed();
     };
 
@@ -32299,7 +32382,7 @@
         "in": props.visible,
         appear: true,
         mountOnEnter: true,
-        unmountOnExit: props.destroyOnClose,
+        unmountOnExit: destroyOnClose,
         timeout: transitionTime,
         classNames: "".concat(prefixCls, "-zoom"),
         onEntered: props.onOpened,
@@ -32355,9 +32438,11 @@
       if (visible || wrap.current) {
         if (!attach) {
           dom = dialog2;
+          domRef.current = dom;
         } else {
           dom = /* @__PURE__ */React__default["default"].createElement(Portal, {
-            attach: attach
+            attach: attach,
+            ref: domRef
           }, dialog2);
         }
       }
@@ -32366,7 +32451,7 @@
     };
 
     return render();
-  };
+  });
 
   function ownKeys$E(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; }
 
@@ -32397,11 +32482,12 @@
   function ownKeys$D(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$D(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$D(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$D(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-  var Dialog$1 = function Dialog(props, ref) {
+  var Dialog$1 = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var _useConfig = useConfig$1(),
         classPrefix = _useConfig.classPrefix;
 
+    var dialogDom = React.useRef();
+
     var _useSetState = useSetState(_objectSpread$D({
       width: 520,
       visible: false,
@@ -32480,7 +32566,12 @@
             visible: false
           });
         },
-        destroy: noop$1,
+        destroy: function destroy() {
+          setState({
+            visible: false,
+            destroyOnClose: true
+          });
+        },
         update: function update(newOptions) {
           setState(function (prevState) {
             return _objectSpread$D(_objectSpread$D({}, prevState), newOptions);
@@ -32564,11 +32655,11 @@
       closeBtn: renderCloseIcon(),
       classPrefix: classPrefix,
       onClose: onClose,
-      footer: footer === void 0 ? defaultFooter() : footer
+      footer: footer === void 0 ? defaultFooter() : footer,
+      ref: dialogDom
     }));
-  };
-
-  var _Dialog = /*#__PURE__*/React.forwardRef(Dialog$1);
+  });
+  Dialog$1.displayName = "Dialog";
 
   function ownKeys$C(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; }
 
@@ -32580,7 +32671,7 @@
     var options = _objectSpread$C({}, props);
 
     var div = document.createElement("div");
-    ReactDOM__default["default"].render( /* @__PURE__ */React__default["default"].createElement(_Dialog, _objectSpread$C(_objectSpread$C({}, options), {}, {
+    ReactDOM__default["default"].render( /* @__PURE__ */React__default["default"].createElement(Dialog$1, _objectSpread$C(_objectSpread$C({}, options), {}, {
       visible: true,
       ref: dialogRef,
       isPlugin: true
@@ -32599,11 +32690,13 @@
       show: function show() {
         var _dialogRef$current;
 
+        container.appendChild(div);
         (_dialogRef$current = dialogRef.current) === null || _dialogRef$current === void 0 ? void 0 : _dialogRef$current.show();
       },
       hide: function hide() {
-        var _dialogRef$current2;
+        var _div$parentNode, _dialogRef$current2;
 
+        div === null || div === void 0 ? void 0 : (_div$parentNode = div.parentNode) === null || _div$parentNode === void 0 ? void 0 : _div$parentNode.removeChild(div);
         (_dialogRef$current2 = dialogRef.current) === null || _dialogRef$current2 === void 0 ? void 0 : _dialogRef$current2.hide();
       },
       update: function update(updateOptions) {
@@ -32612,7 +32705,10 @@
         (_dialogRef$current3 = dialogRef.current) === null || _dialogRef$current3 === void 0 ? void 0 : _dialogRef$current3.update(updateOptions);
       },
       destroy: function destroy() {
-        container.contains(div) && container.removeChild(div);
+        var _dialogRef$current4, _div$parentNode2;
+
+        (_dialogRef$current4 = dialogRef.current) === null || _dialogRef$current4 === void 0 ? void 0 : _dialogRef$current4.destroy();
+        div === null || div === void 0 ? void 0 : (_div$parentNode2 = div.parentNode) === null || _div$parentNode2 === void 0 ? void 0 : _div$parentNode2.removeChild(div);
       }
     };
     return dialogNode;
@@ -32633,7 +32729,7 @@
   createDialog.confirm = confirm;
   var DialogPlugin$1 = createDialog;
 
-  var Dialog = _Dialog;
+  var Dialog = Dialog$1;
   var dialog = DialogPlugin$1;
   var DialogPlugin = DialogPlugin$1;
 
@@ -40320,10 +40416,12 @@
 
   var Calendar = Calendar$1;
 
-  function ownKeys$o(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$o(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$o(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$o(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-  function useInstance(props, formRef, formItemsRef) {
+  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 _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 useInstance(props, formRef, formMapRef) {
     var _useConfig = useConfig$1(),
         classPrefix = _useConfig.classPrefix;
 
@@ -40333,20 +40431,6 @@
         preventSubmitDefault = _props$preventSubmitD === void 0 ? true : _props$preventSubmitD,
         onSubmit = props.onSubmit;
 
-    function getFormItemsMap() {
-      var formItemsMap = formItemsRef.current.reduce(function (acc, _ref) {
-        var currItem = _ref.current;
-
-        if (currItem !== null && currItem !== void 0 && currItem.name) {
-          var name = currItem.name;
-          return _objectSpread$o(_objectSpread$o({}, acc), {}, _defineProperty$2({}, name, currItem));
-        }
-
-        return acc;
-      }, {});
-      return formItemsMap;
-    }
-
     function getFirstError(r) {
       var _r$firstKey$;
 
@@ -40395,18 +40479,21 @@
         return fields2.indexOf(name) !== -1;
       }
 
-      var _ref2 = param || {},
-          fields = _ref2.fields,
-          _ref2$trigger = _ref2.trigger,
-          trigger = _ref2$trigger === void 0 ? "all" : _ref2$trigger;
+      var _ref = param || {},
+          fields = _ref.fields,
+          _ref$trigger = _ref.trigger,
+          trigger = _ref$trigger === void 0 ? "all" : _ref$trigger;
 
-      var list = formItemsRef.current.filter(function (_ref3) {
-        var formItemRef = _ref3.current;
-        return formItemRef && isFunction_1(formItemRef.validate) && needValidate(formItemRef.name, fields);
-      }).map(function (_ref4) {
-        var formItemRef = _ref4.current;
-        return formItemRef.validate(trigger);
+      var list = _toConsumableArray(formMapRef.current.values()).filter(function (formItemRef) {
+        var _formItemRef$current, _formItemRef$current2;
+
+        return isFunction_1((_formItemRef$current = formItemRef.current) === null || _formItemRef$current === void 0 ? void 0 : _formItemRef$current.validate) && needValidate((_formItemRef$current2 = formItemRef.current) === null || _formItemRef$current2 === void 0 ? void 0 : _formItemRef$current2.name, fields);
+      }).map(function (formItemRef) {
+        var _formItemRef$current3;
+
+        return (_formItemRef$current3 = formItemRef.current) === null || _formItemRef$current3 === void 0 ? void 0 : _formItemRef$current3.validate(trigger);
       });
+
       return new Promise(function (resolve) {
         Promise.all(flatten_1(list)).then(function (arr) {
           var r = arr.reduce(function (r2, err) {
@@ -40427,32 +40514,36 @@
     }
 
     function getFieldValue(name) {
-      var _target$current;
-
       if (!name) return null;
-      var target = formItemsRef.current.find(function (_ref5) {
-        var formItemRef = _ref5.current;
-        return (formItemRef === null || formItemRef === void 0 ? void 0 : formItemRef.name) === name;
-      });
-      return (_target$current = target.current) === null || _target$current === void 0 ? void 0 : _target$current.value;
+      var formItemRef = formMapRef.current.get(name);
+      return formItemRef.current.value;
     }
 
     function getFieldsValue(nameList) {
       var fieldsValue = {};
-      var formItemsMap = getFormItemsMap();
 
       if (nameList === true) {
-        formItemsRef.current.forEach(function (_ref6) {
-          var formItemRef = _ref6.current;
+        var _iterator = _createForOfIteratorHelper$1(formMapRef.current.entries()),
+            _step;
+
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var _step$value = _slicedToArray(_step.value, 2),
+                name = _step$value[0],
+                formItemRef = _step$value[1];
 
-          if (formItemRef !== null && formItemRef !== void 0 && formItemRef.name) {
-            fieldsValue[formItemRef.name] = formItemRef.value;
+            fieldsValue[name] = formItemRef.current.value;
           }
-        });
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
       } else {
         if (!Array.isArray(nameList)) throw new Error("getFieldsValue \u53C2\u6570\u9700\u8981 Array \u7C7B\u578B");
         nameList.forEach(function (name) {
-          if (formItemsMap[name]) fieldsValue[name] = formItemsMap[name].value;
+          var formItemRef = formMapRef.current.get(name);
+          if (formItemRef) fieldsValue[name] = formItemRef.current.value;
         });
       }
 
@@ -40461,25 +40552,25 @@
 
     function setFieldsValue() {
       var fields = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var formItemsMap = getFormItemsMap();
       Object.keys(fields).forEach(function (key) {
-        var _formItemsMap$key;
+        var _formItemRef$current4, _formItemRef$current5;
 
-        (_formItemsMap$key = formItemsMap[key]) === null || _formItemsMap$key === void 0 ? void 0 : _formItemsMap$key.setValue(fields[key]);
+        var formItemRef = formMapRef.current.get(key);
+        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, fields[key]);
       });
     }
 
     function setFields() {
       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");
-      var formItemsMap = getFormItemsMap();
       fields.forEach(function (field) {
-        var _formItemsMap$name;
+        var _formItemRef$current6;
 
         var name = field.name,
             value = field.value,
             status = field.status;
-        (_formItemsMap$name = formItemsMap[name]) === null || _formItemsMap$name === void 0 ? void 0 : _formItemsMap$name.setField({
+        var formItemRef = formMapRef.current.get(name);
+        formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current6 = formItemRef.current) === null || _formItemRef$current6 === void 0 ? void 0 : _formItemRef$current6.setField({
           value: value,
           status: status
         });
@@ -40488,45 +40579,49 @@
 
     function reset(params) {
       if (typeof params === "undefined") {
-        formItemsRef.current.forEach(function (_ref7) {
-          var formItemRef = _ref7.current;
-          formItemRef && (formItemRef === null || formItemRef === void 0 ? void 0 : formItemRef.resetField());
+        _toConsumableArray(formMapRef.current.values()).forEach(function (formItemRef) {
+          var _formItemRef$current7;
+
+          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,
             type = _params$type === void 0 ? "initial" : _params$type,
             _params$fields = params.fields,
             fields = _params$fields === void 0 ? [] : _params$fields;
-        var formItemsMap = getFormItemsMap();
         fields.forEach(function (name) {
-          var _formItemsMap$name2;
+          var _formItemRef$current8;
 
-          (_formItemsMap$name2 = formItemsMap[name]) === null || _formItemsMap$name2 === void 0 ? void 0 : _formItemsMap$name2.resetField(type);
+          var formItemRef = formMapRef.current.get(name);
+          formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current8 = formItemRef.current) === null || _formItemRef$current8 === void 0 ? void 0 : _formItemRef$current8.resetField(type);
         });
       }
     }
 
     function clearValidate(fields) {
       if (typeof fields === "undefined") {
-        formItemsRef.current.forEach(function (_ref8) {
-          var formItemRef = _ref8.current;
-          formItemRef && (formItemRef === null || formItemRef === void 0 ? void 0 : formItemRef.resetValidate());
+        _toConsumableArray(formMapRef.current.values()).forEach(function (formItemRef) {
+          var _formItemRef$current9;
+
+          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");
-        var formItemsMap = getFormItemsMap();
         fields.forEach(function (name) {
-          var _formItemsMap$name3;
+          var _formItemRef$current10;
 
-          (_formItemsMap$name3 = formItemsMap[name]) === null || _formItemsMap$name3 === void 0 ? void 0 : _formItemsMap$name3.resetValidate();
+          var formItemRef = formMapRef.current.get(name);
+          (_formItemRef$current10 = formItemRef.current) === null || _formItemRef$current10 === void 0 ? void 0 : _formItemRef$current10.resetValidate();
         });
       }
     }
 
     function setValidateMessage(message) {
-      var formItemsMap = getFormItemsMap();
       Object.keys(message).forEach(function (name) {
-        formItemsMap[name].setValidateMessage(message[name]);
+        var _formItemRef$current11;
+
+        var formItemRef = formMapRef.current.get(name);
+        formItemRef === null || formItemRef === void 0 ? void 0 : (_formItemRef$current11 = formItemRef.current) === null || _formItemRef$current11 === void 0 ? void 0 : _formItemRef$current11.setValidateMessage(message[name]);
       });
     }
 
@@ -40544,10 +40639,9 @@
   }
 
   var FormContext = /*#__PURE__*/React__default["default"].createContext({
-    labelWidth: "calc(1 / 12 * 100%)",
+    labelWidth: "100px",
     labelAlign: "right",
     layout: "vertical",
-    size: "medium",
     colon: false,
     requiredMark: true,
     scrollToFirstError: void 0,
@@ -40558,11 +40652,19 @@
     errorMessage: void 0,
     statusIcon: false,
     onFormItemValueChange: void 0,
-    formItemsRef: null
+    formMapRef: void 0
   });
   var useFormContext = function useFormContext() {
     return React__default["default"].useContext(FormContext);
   };
+  var FormListContext = /*#__PURE__*/React__default["default"].createContext({
+    name: void 0,
+    rules: void 0,
+    formListMapRef: void 0
+  });
+  var useFormListContext = function useFormListContext() {
+    return React__default["default"].useContext(FormListContext);
+  };
 
   var copyObject$1 = _copyObject,
       createAssigner = _createAssigner,
@@ -42637,7 +42739,7 @@
       }, /* @__PURE__ */React__default["default"].createElement(Loading, {
         loading: true,
         size: "medium"
-      }), /* @__PURE__ */React__default["default"].createElement("p", null, t(locale.progress.uploadingText), " ", Math.min(files[0].percent, 99), "%"))));
+      }), /* @__PURE__ */React__default["default"].createElement("p", null, t(locale.progress.uploadingText), " ", Math.min(files[index].percent, 99), "%"))));
     })), /* @__PURE__ */React__default["default"].createElement(BooleanRender, {
       boolExpression: showTrigger
     }, /* @__PURE__ */React__default["default"].createElement("li", {
@@ -42906,9 +43008,9 @@
 
   var _excluded$6 = ["value", "defaultFiles", "files", "onChange"];
 
-  function ownKeys$n(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 ownKeys$o(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$n(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$n(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$n(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+  function _objectSpread$o(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$o(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$o(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
   function useDefaultValue(props, defaultDefaultValue) {
     var value = props.value,
         defaultFiles = props.defaultFiles,
@@ -42927,7 +43029,7 @@
         finalValue = _useDefault2[0],
         finalOnChange = _useDefault2[1];
 
-    return _objectSpread$n({
+    return _objectSpread$o({
       files: finalValue,
       onChange: finalOnChange
     }, restProps);
@@ -42986,9 +43088,9 @@
 
   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 ownKeys$m(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 ownKeys$n(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$m(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$m(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$m(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+  function _objectSpread$n(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$n(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$n(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
   var Upload$1 = function Upload(props, ref) {
     var _useDefaultValue = useDefaultValue(props, []),
@@ -43210,7 +43312,7 @@
           _ref3$type = _ref3.type,
           type = _ref3$type === void 0 ? "mock" : _ref3$type;
 
-      var tmpFile = _objectSpread$m({}, file);
+      var tmpFile = _objectSpread$n({}, file);
 
       tmpFile.percent = percent;
       var progressCtx = {
@@ -43245,7 +43347,7 @@
           var r = res.response || {};
           onError({
             file: file,
-            response: _objectSpread$m(_objectSpread$m({}, r), {}, {
+            response: _objectSpread$n(_objectSpread$n({}, r), {}, {
               error: res.error
             })
           });
@@ -43259,7 +43361,7 @@
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                file = _objectSpread$m({}, uploadFile);
+                file = _objectSpread$n({}, uploadFile);
 
                 if (!(file.status !== "waiting")) {
                   _context.next = 3;
@@ -43345,7 +43447,7 @@
 
         var file = typeof format === "function" ? format(fileRaw) : fileRaw;
 
-        var uploadFile = _objectSpread$m({
+        var uploadFile = _objectSpread$n({
           raw: fileRaw,
           lastModified: fileRaw.lastModified,
           name: fileRaw.name,
@@ -44638,9 +44740,9 @@
 
   var isURL = /*@__PURE__*/getDefaultExportFromCjs(isURL$1.exports);
 
-  function ownKeys$l(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 ownKeys$m(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$l(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$l(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$l(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+  function _objectSpread$m(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$m(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$m(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
   function isValueEmpty(val) {
     var type = Object.prototype.toString.call(val);
     var typeMap = {
@@ -44769,7 +44871,7 @@
                 break;
               }
 
-              return _context.abrupt("return", _objectSpread$l(_objectSpread$l({}, rule), {}, {
+              return _context.abrupt("return", _objectSpread$m(_objectSpread$m({}, rule), {}, {
                 result: validateResult
               }));
 
@@ -44825,10 +44927,87 @@
     return _validate.apply(this, arguments);
   }
 
-  function ownKeys$k(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 useFormItemStyle(props) {
+    var _classNames, _classNames2;
 
-  function _objectSpread$k(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$k(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$k(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+    var _useConfig = useConfig$1(),
+        classPrefix = _useConfig.classPrefix;
+
+    var className = props.className,
+        help = props.help,
+        name = props.name,
+        successBorder = props.successBorder,
+        errorList = props.errorList,
+        layout = props.layout,
+        verifyStatus = props.verifyStatus,
+        colon = props.colon,
+        label = props.label,
+        labelWidth = props.labelWidth,
+        labelAlign = props.labelAlign,
+        requiredMark = props.requiredMark,
+        showErrorMessage = props.showErrorMessage,
+        innerRules = props.innerRules,
+        renderTipsInfo = props.renderTipsInfo;
+    var renderName = Array.isArray(name) ? name.join("-") : name;
+    var formItemClass = classNames$1(className, "".concat(classPrefix, "-form__item"), (_classNames = {}, _defineProperty$2(_classNames, "".concat(classPrefix, "-form-item__").concat(renderName), renderName), _defineProperty$2(_classNames, "".concat(classPrefix, "-form__item-with-help"), help), _defineProperty$2(_classNames, "".concat(classPrefix, "-form__item-with-extra"), renderTipsInfo()), _classNames));
+    var formItemLabelClass = classNames$1("".concat(classPrefix, "-form__label"), (_classNames2 = {}, _defineProperty$2(_classNames2, "".concat(classPrefix, "-form__label--required"), requiredMark && innerRules.filter(function (rule) {
+      return rule.required;
+    }).length > 0), _defineProperty$2(_classNames2, "".concat(classPrefix, "-form__label--colon"), colon && label), _defineProperty$2(_classNames2, "".concat(classPrefix, "-form__label--top"), labelAlign === "top" || !labelWidth), _defineProperty$2(_classNames2, "".concat(classPrefix, "-form__label--left"), labelAlign === "left" && labelWidth), _defineProperty$2(_classNames2, "".concat(classPrefix, "-form__label--right"), labelAlign === "right" && labelWidth), _classNames2));
+
+    var contentClass = function contentClass() {
+      var _classNames4;
+
+      var controlCls = "".concat(classPrefix, "-form__controls");
+      if (!showErrorMessage) return controlCls;
+      var isSuccess = verifyStatus === VALIDATE_STATUS.SUCCESS;
+
+      if (isSuccess) {
+        return classNames$1(controlCls, "".concat(classPrefix, "-is-success"), _defineProperty$2({}, "".concat(classPrefix, "-form--success-border"), successBorder));
+      }
+
+      var firstErrorType = errorList.length && (errorList[0].type || "error");
+      return classNames$1(controlCls, (_classNames4 = {}, _defineProperty$2(_classNames4, "".concat(classPrefix, "-is-warning"), firstErrorType === "warning"), _defineProperty$2(_classNames4, "".concat(classPrefix, "-is-error"), firstErrorType === "error"), _classNames4));
+    };
+
+    var labelStyle = {};
+    var contentStyle = {};
+
+    if (label && labelWidth && labelAlign !== "top") {
+      if (typeof labelWidth === "number") {
+        labelStyle = {
+          width: "".concat(labelWidth, "px")
+        };
+        contentStyle = {
+          marginLeft: layout !== "inline" ? "".concat(labelWidth, "px") : ""
+        };
+      } else {
+        labelStyle = {
+          width: labelWidth
+        };
+        contentStyle = {
+          marginLeft: layout !== "inline" ? labelWidth : ""
+        };
+      }
+    }
 
+    return {
+      formItemClass: formItemClass,
+      formItemLabelClass: formItemLabelClass,
+      contentClass: contentClass,
+      labelStyle: labelStyle,
+      contentStyle: contentStyle
+    };
+  }
+
+  function ownKeys$l(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$l(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$l(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$l(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+  var VALIDATE_STATUS = /* @__PURE__ */function (VALIDATE_STATUS2) {
+    VALIDATE_STATUS2["TO_BE_VALIDATED"] = "not";
+    VALIDATE_STATUS2["SUCCESS"] = "success";
+    VALIDATE_STATUS2["FAIL"] = "fail";
+    return VALIDATE_STATUS2;
+  }(VALIDATE_STATUS || {});
   var ctrlKeyMap = /* @__PURE__ */new Map();
   ctrlKeyMap.set(Checkbox, "checked");
   ctrlKeyMap.set(Tag.CheckTag, "checked");
@@ -44850,8 +45029,6 @@
   }
 
   var FormItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
-    var _classNames, _classNames2;
-
     var _useConfig = useConfig$1(),
         classPrefix = _useConfig.classPrefix;
 
@@ -44867,9 +45044,14 @@
         rulesFromContext = _useFormContext.rules,
         statusIconFromContext = _useFormContext.statusIcon,
         errorMessage = _useFormContext.errorMessage,
-        formItemsRef = _useFormContext.formItemsRef,
+        formMapRef = _useFormContext.formMapRef,
         onFormItemValueChange = _useFormContext.onFormItemValueChange;
 
+    var _useFormListContext = useFormListContext(),
+        formListName = _useFormListContext.name,
+        formListRules = _useFormListContext.rules,
+        formListMapRef = _useFormListContext.formListMapRef;
+
     var children = props.children,
         style = props.style,
         label = props.label,
@@ -44881,7 +45063,7 @@
         _props$statusIcon = props.statusIcon,
         statusIcon = _props$statusIcon === void 0 ? statusIconFromContext : _props$statusIcon,
         _props$rules = props.rules,
-        innerRules = _props$rules === void 0 ? (rulesFromContext === null || rulesFromContext === void 0 ? void 0 : rulesFromContext[name]) || [] : _props$rules,
+        innerRules = _props$rules === void 0 ? getInnerRules(name, rulesFromContext, formListName, formListRules) : _props$rules,
         _props$labelWidth = props.labelWidth,
         labelWidth = _props$labelWidth === void 0 ? labelWidthFromContext : _props$labelWidth,
         _props$labelAlign = props.labelAlign,
@@ -44927,64 +45109,60 @@
     var innerFormItemsRef = React.useRef([]);
     var shouldValidate = React.useRef(null);
     var isMounted = React.useRef(false);
-    var formItemClass = classNames$1(className, "".concat(classPrefix, "-form__item"), (_classNames = {}, _defineProperty$2(_classNames, "".concat(classPrefix, "-form-item__").concat(name), name), _defineProperty$2(_classNames, "".concat(classPrefix, "-form__item-with-help"), help), _defineProperty$2(_classNames, "".concat(classPrefix, "-form__item-with-extra"), renderTipsInfo()), _classNames));
-    var formItemLabelClass = classNames$1("".concat(classPrefix, "-form__label"), (_classNames2 = {}, _defineProperty$2(_classNames2, "".concat(classPrefix, "-form__label--required"), requiredMark && innerRules.filter(function (rule) {
-      return rule.required;
-    }).length > 0), _defineProperty$2(_classNames2, "".concat(classPrefix, "-form__label--colon"), colon && label), _defineProperty$2(_classNames2, "".concat(classPrefix, "-form__label--top"), labelAlign === "top" || !labelWidth), _defineProperty$2(_classNames2, "".concat(classPrefix, "-form__label--left"), labelAlign === "left" && labelWidth), _defineProperty$2(_classNames2, "".concat(classPrefix, "-form__label--right"), labelAlign === "right" && labelWidth), _classNames2));
-
-    var contentClass = function contentClass() {
-      var _classNames4;
-
-      var controlCls = "".concat(classPrefix, "-form__controls");
-      if (!showErrorMessage) return controlCls;
-      var isSuccess = verifyStatus === "success"
-      /* SUCCESS */
-      ;
 
-      if (isSuccess) {
-        return classNames$1(controlCls, "".concat(classPrefix, "-is-success"), _defineProperty$2({}, "".concat(classPrefix, "-form--success-border"), successBorder));
-      }
+    var _useFormItemStyle = useFormItemStyle({
+      className: className,
+      help: help,
+      name: name,
+      successBorder: successBorder,
+      errorList: errorList,
+      layout: layout,
+      verifyStatus: verifyStatus,
+      colon: colon,
+      label: label,
+      labelWidth: labelWidth,
+      labelAlign: labelAlign,
+      requiredMark: requiredMark,
+      showErrorMessage: showErrorMessage,
+      innerRules: innerRules,
+      renderTipsInfo: renderTipsInfo
+    }),
+        formItemClass = _useFormItemStyle.formItemClass,
+        formItemLabelClass = _useFormItemStyle.formItemLabelClass,
+        contentClass = _useFormItemStyle.contentClass,
+        labelStyle = _useFormItemStyle.labelStyle,
+        contentStyle = _useFormItemStyle.contentStyle;
 
-      var firstErrorType = errorList.length && (errorList[0].type || "error");
-      return classNames$1(controlCls, (_classNames4 = {}, _defineProperty$2(_classNames4, "".concat(classPrefix, "-is-warning"), firstErrorType === "warning"), _defineProperty$2(_classNames4, "".concat(classPrefix, "-is-error"), firstErrorType === "error"), _classNames4));
-    };
+    function getInnerRules(name2, formRules, formListName2, formListRules2) {
+      if (Array.isArray(name2)) {
+        var _formRules$formListNa;
 
-    var labelStyle = {};
-    var contentStyle = {};
+        var _name = _slicedToArray(name2, 2),
+            itemKey = _name[1];
 
-    if (label && labelWidth && labelAlign !== "top") {
-      if (typeof labelWidth === "number") {
-        labelStyle = {
-          width: "".concat(labelWidth, "px")
-        };
-        contentStyle = {
-          marginLeft: layout !== "inline" ? "".concat(labelWidth, "px") : ""
-        };
-      } else {
-        labelStyle = {
-          width: labelWidth
-        };
-        contentStyle = {
-          marginLeft: layout !== "inline" ? labelWidth : ""
-        };
+        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 (formRules === null || formRules === void 0 ? void 0 : formRules[name2]) || formListRules2 || [];
     }
 
     function renderTipsInfo() {
-      var helpNode = null;
+      var helpNode = name ? /* @__PURE__ */React__default["default"].createElement("div", {
+        className: "".concat(classPrefix, "-input__extra")
+      }) : "";
       if (help) helpNode = /* @__PURE__ */React__default["default"].createElement("div", {
-        className: "".concat(classPrefix, "-form__help")
+        className: "".concat(classPrefix, "-input__extra")
       }, renderTNode(help));
       var list = errorList;
 
       if (showErrorMessage && list && list[0] && list[0].message) {
-        return /* @__PURE__ */React__default["default"].createElement("p", {
+        return /* @__PURE__ */React__default["default"].createElement("div", {
           className: "".concat(classPrefix, "-input__extra")
         }, list[0].message);
       }
 
       if (successList.length) {
-        return /* @__PURE__ */React__default["default"].createElement("p", {
+        return /* @__PURE__ */React__default["default"].createElement("div", {
           className: "".concat(classPrefix, "-input__extra")
         }, successList[0].message);
       }
@@ -45029,7 +45207,7 @@
       };
 
       if ( /*#__PURE__*/React__default["default"].isValidElement(statusIcon)) {
-        return resultIcon( /*#__PURE__*/React__default["default"].cloneElement(statusIcon, _objectSpread$k({
+        return resultIcon( /*#__PURE__*/React__default["default"].cloneElement(statusIcon, _objectSpread$l({
           style: {
             color: "unset"
           }
@@ -45120,7 +45298,7 @@
     }
 
     function resetField(type) {
-      if (!name) return;
+      if (typeof name === "undefined") return;
       var resetType = type || resetTypeFromContext;
       var resetValue = getResetValue(resetType);
 
@@ -45181,50 +45359,72 @@
     }
 
     React.useEffect(function () {
-      if (isMounted.current) {
-        name && onFormItemValueChange(_defineProperty$2({}, name, formValue));
-      }
-
       if (!shouldValidate.current || !isMounted.current) {
         isMounted.current = true;
         shouldValidate.current = true;
         return;
       }
 
+      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$2({}, itemKey, formValue);
+          } else {
+            formListValue[name] = formValue;
+          }
+
+          onFormItemValueChange === null || onFormItemValueChange === void 0 ? void 0 : onFormItemValueChange(_defineProperty$2({}, formListName, formListValue));
+        } else {
+          onFormItemValueChange === null || onFormItemValueChange === void 0 ? void 0 : onFormItemValueChange(_defineProperty$2({}, name, formValue));
+        }
+      }
+
       var filterRules = innerRules.filter(function (item) {
         return (item.trigger || "change") === "change";
       });
       filterRules.length && validate$1("change");
     }, [formValue]);
     React.useEffect(function () {
-      if (!name) return;
-      formItemsRef.current.push(currentFormItemRef);
-      return function () {
-        var index = formItemsRef.current.indexOf(currentFormItemRef);
+      if (typeof name === "undefined") return;
 
-        if (index !== -1) {
-          var _formItemsRef$current;
+      if (formListName) {
+        formListMapRef.current.set(name, currentFormItemRef);
+        return function () {
+          formListMapRef.current["delete"](name);
+        };
+      }
 
-          (_formItemsRef$current = formItemsRef.current) === null || _formItemsRef$current === void 0 ? void 0 : _formItemsRef$current.splice(index, 1);
-        }
+      if (!formMapRef) return;
+      formMapRef.current.set(name, currentFormItemRef);
+      return function () {
+        formMapRef.current["delete"](name);
       };
-    }, [name]);
+    }, [name, formListName]);
+    var instance = {
+      name: name,
+      value: formValue,
+      setValue: setFormValue,
+      setField: setField,
+      validate: validate$1,
+      resetField: resetField,
+      setValidateMessage: setValidateMessage,
+      resetValidate: resetHandler
+    };
+    React.useImperativeHandle(ref, function () {
+      return instance;
+    });
     React.useImperativeHandle(currentFormItemRef, function () {
-      return {
-        name: name,
-        value: formValue,
-        setValue: setFormValue,
-        setField: setField,
-        validate: validate$1,
-        resetField: resetField,
-        setValidateMessage: setValidateMessage,
-        resetValidate: resetHandler
-      };
+      return instance;
     });
     return /* @__PURE__ */React__default["default"].createElement("div", {
       className: formItemClass,
-      style: style,
-      ref: ref
+      style: style
     }, label && /* @__PURE__ */React__default["default"].createElement("div", {
       className: formItemLabelClass,
       style: labelStyle
@@ -45272,7 +45472,7 @@
           ctrlKey = ctrlKeyMap.get(child.type) || "value";
         }
 
-        return /*#__PURE__*/React__default["default"].cloneElement(child, _objectSpread$k(_objectSpread$k({
+        return /*#__PURE__*/React__default["default"].cloneElement(child, _objectSpread$l(_objectSpread$l({
           disabled: disabledFromContext
         }, child.props), {}, (_objectSpread2 = {}, _defineProperty$2(_objectSpread2, ctrlKey, formValue), _defineProperty$2(_objectSpread2, "onChange", function onChange(value) {
           onChangeFromProps.call(null, value);
@@ -45286,6 +45486,272 @@
       return child;
     }), renderSuffixIcon()), renderTipsInfo()));
   });
+  FormItem.displayName = "FormItem";
+
+  function ownKeys$k(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$k(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$k(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$k(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+  var key = 0;
+
+  var FormList = function FormList(props) {
+    var _useFormContext = useFormContext(),
+        formMapRef = _useFormContext.formMapRef;
+
+    var name = props.name,
+        _props$initialData = props.initialData,
+        initialData = _props$initialData === void 0 ? [] : _props$initialData,
+        rules = props.rules,
+        children = props.children;
+
+    var _useState = React.useState(initialData),
+        _useState2 = _slicedToArray(_useState, 2),
+        initialValue = _useState2[0],
+        setInitialValue = _useState2[1];
+
+    var _useState3 = React.useState([]),
+        _useState4 = _slicedToArray(_useState3, 2),
+        fields = _useState4[0],
+        setFields = _useState4[1];
+
+    var formListMapRef = React.useRef( /* @__PURE__ */new Map());
+    var formListRef = React.useRef();
+    var operation = {
+      add: function add(defaultValue, insertIndex) {
+        var cloneFields = _toConsumableArray(fields);
+
+        var index = insertIndex !== null && insertIndex !== void 0 ? insertIndex : cloneFields.length;
+        cloneFields.splice(index, 0, {
+          key: key += 1,
+          name: index,
+          isListField: true
+        });
+        cloneFields.forEach(function (field, index2) {
+          return Object.assign(field, {
+            name: index2
+          });
+        });
+        setFields(cloneFields);
+
+        if (typeof defaultValue !== "undefined") {
+          var nextInitialValue = _toConsumableArray(initialValue);
+
+          nextInitialValue[index] = defaultValue;
+          setInitialValue(nextInitialValue);
+        }
+      },
+      remove: function remove(index) {
+        var nextFields = fields.filter(function (_, i) {
+          if (Array.isArray(index)) return !index.includes(i);
+          return i !== index;
+        }).map(function (field, index2) {
+          return Object.assign(field, {
+            name: index2
+          });
+        });
+        setFields(nextFields);
+      },
+      move: function move(from, to) {
+        var cloneFields = _toConsumableArray(fields);
+
+        var fromItem = _objectSpread$k({}, cloneFields[from]);
+
+        var toItem = _objectSpread$k({}, cloneFields[to]);
+
+        cloneFields[to] = fromItem;
+        cloneFields[from] = toItem;
+        setFields(cloneFields);
+      }
+    };
+    React.useEffect(function () {
+      _toConsumableArray(formListMapRef.current.values()).forEach(function (formItemRef) {
+        var _formItemRef$current = formItemRef.current,
+            name2 = _formItemRef$current.name,
+            value = _formItemRef$current.value;
+        if (value) return;
+        var data;
+
+        if (Array.isArray(name2)) {
+          var _initialValue$index;
+
+          var _name = _slicedToArray(name2, 2),
+              index = _name[0],
+              itemKey = _name[1];
+
+          data = initialValue === null || initialValue === void 0 ? void 0 : (_initialValue$index = initialValue[index]) === null || _initialValue$index === void 0 ? void 0 : _initialValue$index[itemKey];
+        } else {
+          data = initialValue === null || initialValue === void 0 ? void 0 : initialValue[name2];
+        }
+
+        formItemRef.current.setField({
+          value: data,
+          status: "not"
+        });
+      });
+    }, [fields, initialValue]);
+    React.useEffect(function () {
+      if (!name || !formMapRef) return;
+      formMapRef.current.set(name, formListRef);
+      return function () {
+        formMapRef.current["delete"](name);
+      };
+    }, [name]);
+    React.useImperativeHandle(formListRef, function () {
+      return {
+        name: name,
+
+        get value() {
+          var formListValue = [];
+
+          _toConsumableArray(formListMapRef.current.values()).forEach(function (formItemRef) {
+            var _formItemRef$current2 = formItemRef.current,
+                name2 = _formItemRef$current2.name,
+                value = _formItemRef$current2.value;
+
+            if (Array.isArray(name2)) {
+              var _name2 = _slicedToArray(name2, 2),
+                  index = _name2[0],
+                  itemKey = _name2[1];
+
+              if (!formListValue[index]) {
+                formListValue[index] = _defineProperty$2({}, itemKey, value);
+              } else {
+                formListValue[index][itemKey] = value;
+              }
+            } else {
+              formListValue[name2] = value;
+            }
+          });
+
+          return formListValue;
+        },
+
+        validate: function validate() {
+          var trigger = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "all";
+          var resultList = [];
+
+          var validates = _toConsumableArray(formListMapRef.current.values()).map(function (formItemRef) {
+            return formItemRef.current.validate(trigger);
+          });
+
+          return new Promise(function (resolve) {
+            Promise.all(validates).then(function (validateResult) {
+              validateResult.forEach(function (result) {
+                var errorKey = Object.keys(result)[0];
+                var errorValue = Object.values(result)[0];
+
+                var _errorKey$split = errorKey.split(","),
+                    _errorKey$split2 = _slicedToArray(_errorKey$split, 2),
+                    index = _errorKey$split2[0],
+                    itemKey = _errorKey$split2[1];
+
+                if (itemKey) {
+                  resultList[index] = _defineProperty$2({}, itemKey, errorValue);
+                } else {
+                  resultList[index] = errorValue;
+                }
+              });
+              var errorItems = validateResult.filter(function (item) {
+                return Object.values(item)[0] !== true;
+              });
+
+              if (errorItems.length) {
+                resolve(_defineProperty$2({}, name, resultList));
+              } else {
+                resolve(_defineProperty$2({}, name, true));
+              }
+            });
+          });
+        },
+        setValue: function setValue(fieldData) {
+          _toConsumableArray(formListMapRef.current.values()).forEach(function (formItemRef) {
+            var name2 = formItemRef.current.name;
+            var data;
+
+            if (Array.isArray(name2)) {
+              var _fieldData$index;
+
+              var _name3 = _slicedToArray(name2, 2),
+                  index = _name3[0],
+                  itemKey = _name3[1];
+
+              data = fieldData === null || fieldData === void 0 ? void 0 : (_fieldData$index = fieldData[index]) === null || _fieldData$index === void 0 ? void 0 : _fieldData$index[itemKey];
+            } else {
+              data = fieldData === null || fieldData === void 0 ? void 0 : fieldData[name2];
+            }
+
+            formItemRef.current.setValue(data);
+          });
+        },
+        setField: function setField(fieldData) {
+          _toConsumableArray(formListMapRef.current.values()).forEach(function (formItemRef) {
+            var name2 = formItemRef.current.name;
+            var data;
+
+            if (Array.isArray(name2)) {
+              var _fieldData$index2;
+
+              var _name4 = _slicedToArray(name2, 2),
+                  index = _name4[0],
+                  itemKey = _name4[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];
+            }
+
+            formItemRef.current.setField(data);
+          });
+        },
+        resetField: function resetField() {
+          _toConsumableArray(formListMapRef.current.values()).forEach(function (formItemRef) {
+            formItemRef.current.resetField();
+          });
+
+          setInitialValue([]);
+        },
+        setValidateMessage: function setValidateMessage(fieldData) {
+          _toConsumableArray(formListMapRef.current.values()).forEach(function (formItemRef) {
+            var name2 = formItemRef.current.name;
+            var data;
+
+            if (Array.isArray(name2)) {
+              var _fieldData$index3;
+
+              var _name5 = _slicedToArray(name2, 2),
+                  index = _name5[0],
+                  itemKey = _name5[1];
+
+              data = fieldData === null || fieldData === void 0 ? void 0 : (_fieldData$index3 = fieldData[index]) === null || _fieldData$index3 === void 0 ? void 0 : _fieldData$index3[itemKey];
+            } else {
+              data = fieldData === null || fieldData === void 0 ? void 0 : fieldData[name2];
+            }
+
+            formItemRef.current.setValidateMessage(data);
+          });
+        },
+        resetValidate: function resetValidate() {
+          _toConsumableArray(formListMapRef.current.values()).forEach(function (formItemRef) {
+            formItemRef.current.resetValidate();
+          });
+        }
+      };
+    });
+
+    if (typeof children !== "function") {
+      console.error("FormList's children must be a function!");
+      return null;
+    }
+
+    return /* @__PURE__ */React__default["default"].createElement(FormListContext.Provider, {
+      value: {
+        name: name,
+        rules: rules,
+        formListMapRef: formListMapRef
+      }
+    }, children(fields, operation));
+  };
+
+  FormList.displayName = "FormList";
 
   var Form$1 = forwardRefWithStatics(function (props, ref) {
     var _useConfig = useConfig$1(),
@@ -45301,8 +45767,6 @@
         labelAlign = _props$labelAlign === void 0 ? "right" : _props$labelAlign,
         _props$layout = props.layout,
         layout = _props$layout === void 0 ? "vertical" : _props$layout,
-        _props$size = props.size,
-        size = _props$size === void 0 ? "medium" : _props$size,
         _props$colon = props.colon,
         colon = _props$colon === void 0 ? false : _props$colon,
         _props$requiredMark = props.requiredMark,
@@ -45324,9 +45788,9 @@
         onValuesChange = _props$onValuesChange === void 0 ? noop$1 : _props$onValuesChange;
     var formClass = classNames$1(className, "".concat(classPrefix, "-form"), _defineProperty$2({}, "".concat(classPrefix, "-form-inline"), layout === "inline"));
     var formRef = React.useRef();
-    var formItemsRef = React.useRef([]);
+    var formMapRef = React.useRef( /* @__PURE__ */new Map());
 
-    var _useInstance = useInstance(props, formRef, formItemsRef),
+    var _useInstance = useInstance(props, formRef, formMapRef),
         submit = _useInstance.submit,
         reset = _useInstance.reset,
         getFieldValue = _useInstance.getFieldValue,
@@ -45360,10 +45824,10 @@
         (_e$stopPropagation = e.stopPropagation) === null || _e$stopPropagation === void 0 ? void 0 : _e$stopPropagation.call(e);
       }
 
-      formItemsRef.current.forEach(function (_ref) {
-        var formItemRef = _ref.current;
-        formItemRef && (formItemRef === null || formItemRef === void 0 ? void 0 : formItemRef.resetField());
+      _toConsumableArray(formMapRef.current.values()).forEach(function (formItemRef) {
+        formItemRef === null || formItemRef === void 0 ? void 0 : formItemRef.current.resetField();
       });
+
       onReset === null || onReset === void 0 ? void 0 : onReset({
         e: e
       });
@@ -45389,7 +45853,6 @@
         statusIcon: statusIcon,
         labelAlign: labelAlign,
         layout: layout,
-        size: size,
         colon: colon,
         requiredMark: requiredMark,
         errorMessage: errorMessage,
@@ -45398,7 +45861,7 @@
         resetType: resetType,
         rules: rules,
         disabled: disabled,
-        formItemsRef: formItemsRef,
+        formMapRef: formMapRef,
         onFormItemValueChange: onFormItemValueChange
       }
     }, /* @__PURE__ */React__default["default"].createElement("form", {
@@ -45410,7 +45873,8 @@
       onKeyDown: onKeyDownHandler
     }, children));
   }, {
-    FormItem: FormItem
+    FormItem: FormItem,
+    FormList: FormList
   });
   Form$1.displayName = "Form";
 
@@ -45987,7 +46451,7 @@
 
   function _objectSpread$i(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$i(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$i(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-  var PopContent = function PopContent(props) {
+  var Popcontent = function Popcontent(props) {
     var content = props.content,
         cancelBtn = props.cancelBtn,
         confirmBtn = props.confirmBtn,
@@ -46125,12 +46589,12 @@
     }, renderConfirm())));
   };
 
-  PopContent.displayName = "PopContent";
+  Popcontent.displayName = "Popcontent";
 
   function ownKeys$h(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$h(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$h(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$h(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-  var PopConfirm$1 = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var Popconfirm$1 = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var _useConfig = useConfig$1(),
         classPrefix = _useConfig.classPrefix;
 
@@ -46158,7 +46622,7 @@
         return setVisible(visible2);
       },
       overlayClassName: classNames$1("".concat(classPrefix, "-popconfirm")),
-      content: /* @__PURE__ */React__default["default"].createElement(PopContent, _objectSpread$h(_objectSpread$h({
+      content: /* @__PURE__ */React__default["default"].createElement(Popcontent, _objectSpread$h(_objectSpread$h({
         cancelBtn: cancelBtn,
         confirmBtn: confirmBtn
       }, props), {}, {
@@ -46168,8 +46632,8 @@
       }))
     }, props.popupProps));
   });
-  PopConfirm$1.displayName = "PopConfirm";
-  PopConfirm$1.defaultProps = {
+  Popconfirm$1.displayName = "Popconfirm";
+  Popconfirm$1.defaultProps = {
     destroyOnClose: true,
     showArrow: true,
     onCancel: noop$1,
@@ -46177,7 +46641,7 @@
     theme: "default"
   };
 
-  var PopConfirm = PopConfirm$1;
+  var Popconfirm = Popconfirm$1;
 
   var TEXTAREA_STYLE = "\n  min-height:0 !important;\n  max-height:none !important;\n  height:0 !important;\n  visibility:hidden !important;\n  overflow:hidden !important;\n  position:absolute !important;\n  z-index:-1000 !important;\n  top:0 !important;\n  right:0 !important\n";
   var hiddenTextarea;
@@ -46403,22 +46867,18 @@
 
   var BreadcrumbContext = /*#__PURE__*/React.createContext({
     maxItemWidthInContext: "",
-    theme: "light"
+    theme: "light",
+    separator: null
   });
 
-  var _excluded$3 = ["children", "separator", "disabled", "maxItemWidth", "maxWidth", "href", "to", "target", "router", "replace"];
+  var _excluded$3 = ["children", "separator", "disabled", "maxItemWidth", "maxWidth", "href", "to", "target", "router", "replace", "className"];
 
   function ownKeys$f(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$f(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$f(Object(source), !0).forEach(function (key) { _defineProperty$2(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$f(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
   var BreadcrumbItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var children = props.children,
-        _props$separator = props.separator,
-        separator = _props$separator === void 0 ? /* @__PURE__ */React__default["default"].createElement(ChevronRightIcon, {
-      style: {
-        color: "rgba(0,0,0,.3)"
-      }
-    }) : _props$separator,
+        separator = props.separator,
         disabled = props.disabled,
         maxItemWidth = props.maxItemWidth,
         maxWidth = props.maxWidth,
@@ -46427,11 +46887,13 @@
         target = props.target,
         router = props.router,
         replace = props.replace,
+        className = props.className,
         restProps = _objectWithoutProperties$1(props, _excluded$3);
 
     var _useContext = React.useContext(BreadcrumbContext),
         maxItemWidthInContext = _useContext.maxItemWidthInContext,
-        theme = _useContext.theme;
+        theme = _useContext.theme,
+        separatorInContext = _useContext.separator;
 
     var _useConfig = useConfig$1(),
         classPrefix = _useConfig.classPrefix;
@@ -46469,9 +46931,14 @@
       }, textContent);
     }
 
-    var separatorContent = typeof separator === "function" ? separator() : separator;
+    var separatorInProps = typeof separator === "function" ? separator() : separator;
+    var separatorContent = separatorInProps || separatorInContext || /* @__PURE__ */React__default["default"].createElement(ChevronRightIcon, {
+      style: {
+        color: "rgba(0,0,0,.3)"
+      }
+    });
     return /* @__PURE__ */React__default["default"].createElement("div", _objectSpread$f({
-      className: classNames$1(breadcrumbItemClassNames, theme),
+      className: classNames$1(breadcrumbItemClassNames, theme, className),
       ref: ref
     }, restProps), itemContent, /* @__PURE__ */React__default["default"].createElement("span", {
       className: separatorClassName
@@ -46479,7 +46946,7 @@
   });
   BreadcrumbItem.displayName = "BreadcrumbItem";
 
-  var _excluded$2 = ["children", "options", "separator", "maxItemWidth", "theme"];
+  var _excluded$2 = ["children", "options", "separator", "maxItemWidth", "theme", "className"];
 
   function ownKeys$e(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; }
 
@@ -46490,6 +46957,7 @@
         separator = props.separator,
         maxItemWidth = props.maxItemWidth,
         theme = props.theme,
+        className = props.className,
         restProps = _objectWithoutProperties$1(props, _excluded$2);
 
     var _useConfig = useConfig$1(),
@@ -46517,11 +46985,12 @@
     return /* @__PURE__ */React__default["default"].createElement(BreadcrumbContext.Provider, {
       value: {
         maxItemWidthInContext: maxItemWidth,
-        theme: theme
+        theme: theme,
+        separator: separator
       }
     }, /* @__PURE__ */React__default["default"].createElement("div", _objectSpread$e({
       ref: ref,
-      className: "".concat(classPrefix, "-breadcrumb")
+      className: classNames$1("".concat(classPrefix, "-breadcrumb"), className)
     }, restProps), content));
   }, {
     BreadcrumbItem: BreadcrumbItem
@@ -47066,43 +47535,31 @@
     }, toolTipProps), handleNode);
   };
 
-  function accAdd(arg1, arg2) {
-    var r1 = 0;
-    var r2 = 0;
-    var newArg1 = arg1;
-    var newArg2 = arg2;
-
-    try {
-      r1 = arg1.toString().split(".")[1].length;
-    } catch (e) {
-      r1 = 0;
-    }
-
-    try {
-      r2 = arg2.toString().split(".")[1].length;
-    } catch (e) {
-      r2 = 0;
-    }
+  function accAdd(num1, num2) {
+    var isFloat = function isFloat(n) {
+      return typeof n === "number" && !Number.isInteger(n);
+    };
 
-    var c = Math.abs(r1 - r2);
-    var m = Math.pow(10, Math.max(r1, r2));
+    if (isFloat(num1) && isFloat(num2)) {
+      var _String$split = String(num1).split("."),
+          _String$split2 = _slicedToArray(_String$split, 2),
+          integer1 = _String$split2[0],
+          precision1 = _String$split2[1];
 
-    if (c > 0) {
-      var cm = Math.pow(10, c);
+      var _String$split3 = String(num2).split("."),
+          _String$split4 = _slicedToArray(_String$split3, 2),
+          integer2 = _String$split4[0],
+          precision2 = _String$split4[1];
 
-      if (r1 > r2) {
-        newArg1 = Number(arg1.toString().replace(".", ""));
-        newArg2 = Number(arg2.toString().replace(".", "")) * cm;
-      } else {
-        newArg1 = Number(arg1.toString().replace(".", "")) * cm;
-        newArg2 = Number(arg2.toString().replace(".", ""));
-      }
-    } else {
-      newArg1 = Number(arg1.toString().replace(".", ""));
-      newArg2 = Number(arg2.toString().replace(".", ""));
+      var maxPrecisionLen = Math.max(precision1.length, precision2.length);
+      var wholePrecision1 = Number(precision1.padEnd(maxPrecisionLen, "0"));
+      var wholePrecision2 = Number(precision2.padEnd(maxPrecisionLen, "0"));
+      var precisionVal = (wholePrecision1 + wholePrecision2) / Math.pow(10, maxPrecisionLen);
+      var integerVal = Number(integer1) + Number(integer2);
+      return integerVal + precisionVal;
     }
 
-    return (newArg1 + newArg2) / m;
+    return num1 + num2;
   }
 
   function ownKeys$b(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; }
@@ -47128,7 +47585,8 @@
         _ref$step = _ref.step,
         step = _ref$step === void 0 ? 1 : _ref$step,
         tooltipProps = _ref.tooltipProps,
-        propsValue = _ref.value,
+        _ref$value = _ref.value,
+        propsValue = _ref$value === void 0 ? min : _ref$value,
         defaultValue = _ref.defaultValue,
         onChange = _ref.onChange,
         className = _ref.className,
@@ -47458,13 +47916,13 @@
     setValue(checked, "check", node.getModel());
   }
 
-  function getLabelIsEllipsis(node, size) {
+  function getLabelIsEllipsis(label, size) {
     var sizeMap = {
       small: 11,
       medium: 9,
       large: 8
     };
-    return sizeMap[size] < node.label.length;
+    return sizeMap[size] < label.length;
   }
   function getNodeStatusClass(node, CLASSNAMES, cascaderContext) {
     var _ref;
@@ -47515,6 +47973,9 @@
 
     return treeValue;
   };
+  function isInPage(node) {
+    return node === document.body ? false : document.body.contains(node);
+  }
 
   function ownKeys$a(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; }
 
@@ -47524,6 +47985,13 @@
     var filterActive = cascaderContext.filterActive,
         inputVal = cascaderContext.inputVal;
     var labelText = filterActive ? getFullPathLabel(node) : node.label;
+    var isEllipsis = getLabelIsEllipsis(labelText, cascaderContext.size);
+    var EllipsisNode = isEllipsis ? /* @__PURE__ */React__default["default"].createElement("div", {
+      className: "".concat(name, "-label--ellipsis")
+    }, /* @__PURE__ */React__default["default"].createElement(Tooltip$1, {
+      content: labelText,
+      placement: "top-left"
+    })) : null;
 
     if (filterActive) {
       var texts = labelText.split(inputVal);
@@ -47540,10 +48008,10 @@
         }, inputVal));
       }
 
-      return doms;
+      return /* @__PURE__ */React__default["default"].createElement(React__default["default"].Fragment, null, doms, EllipsisNode);
     }
 
-    return labelText;
+    return /* @__PURE__ */React__default["default"].createElement(React__default["default"].Fragment, null, labelText, EllipsisNode);
   };
 
   var RenderLabelContent = function RenderLabelContent(node, cascaderContext) {
@@ -47552,22 +48020,9 @@
 
     var name = "".concat(prefix, "-cascader__item");
     var label = RenderLabelInner(name, node, cascaderContext);
-    var isEllipsis = getLabelIsEllipsis(node, cascaderContext.size);
-
-    if (isEllipsis) {
-      return /* @__PURE__ */React__default["default"].createElement("span", {
-        className: "".concat(name, "-label"),
-        role: "label"
-      }, label, /* @__PURE__ */React__default["default"].createElement("div", {
-        className: "".concat(name, "-label--ellipsis")
-      }, /* @__PURE__ */React__default["default"].createElement(Tooltip$1, {
-        content: node.label,
-        placement: "top-left"
-      })));
-    }
-
     return /* @__PURE__ */React__default["default"].createElement("span", {
-      className: "".concat(name, "-label")
+      className: "".concat(name, "-label"),
+      role: "label"
     }, label);
   };
 
@@ -47808,14 +48263,9 @@
   function outerClickListenerEffect(ref, cascaderContext, event) {
     var visible = cascaderContext.visible,
         setVisible = cascaderContext.setVisible;
-
-    if (!ref || ref.contains(event.target)) {
-      return;
-    }
-
-    if (visible) {
-      setVisible(false);
-    }
+    var target = event.target;
+    if (!visible || !ref || ref.contains(target) || !isInPage(target)) return;
+    setVisible(false);
   }
   function closeIconClickEffect(cascaderContext) {
     var setVisible = cascaderContext.setVisible,
@@ -48247,7 +48697,8 @@
     var disabled = props.disabled,
         _props$options = props.options,
         options = _props$options === void 0 ? [] : _props$options,
-        keys = props.keys,
+        _props$keys = props.keys,
+        keys = _props$keys === void 0 ? {} : _props$keys,
         _props$checkStrictly2 = props.checkStrictly,
         checkStrictly = _props$checkStrictly2 === void 0 ? false : _props$checkStrictly2,
         _props$lazy2 = props.lazy,
@@ -48260,9 +48711,14 @@
 
       if (!treeStore) {
         var createStore = function createStore(onLoad) {
+          var treePropsKeys = _objectSpread$9(_objectSpread$9({}, keys), {}, {
+            children: typeof keys.children === "string" ? keys.children : "children"
+          });
+
           var treeProps = {
             onLoad: onLoad,
-            options: options
+            options: options,
+            keys: treePropsKeys
           };
           var store2 = new TreeStore(treeProps);
           store2.append(options);
@@ -48281,7 +48737,7 @@
         treeStoreExpendEffect(treeStore, value, []);
         treeNodesEffect(inputVal, treeStore, setTreeNodes);
       }
-    }, [inputVal, options, value, treeStore]);
+    }, [inputVal, options, value, treeStore, keys]);
     React.useEffect(function () {
       if (!treeStore) return;
       var treeProps = {
@@ -50194,7 +50650,17 @@
     var _num = num;
     if (num < 0) _num = 0;
     var newDate = new Date(date);
-    newDate.setMonth(date.getMonth() + _num);
+    var year = date.getFullYear();
+
+    var month = date.getMonth() + _num;
+
+    var day = newDate.getDate();
+    newDate.setDate(1);
+    newDate.setMonth(month);
+    newDate.setDate(Math.min(day, getDaysInMonth({
+      year: year,
+      month: month
+    })));
     return newDate;
   }
   function getWeeks(_ref5, _ref6) {
@@ -53069,7 +53535,7 @@
   exports.Notification = Notification;
   exports.NotificationPlugin = NotificationPlugin;
   exports.Pagination = Pagination;
-  exports.PopConfirm = PopConfirm;
+  exports.Popconfirm = Popconfirm;
   exports.Popup = Popup;
   exports.Progress = Progress;
   exports.Radio = Radio;