@nutui/nutui-react-taro 2.0.0-alpha.15 → 2.0.0-alpha.17

package/dist/nutui.react.umd.js

@@ -8,7 +8,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v2.0.0-alpha.15 Wed Jun 07 2023 16:24:05 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.0.0-alpha.17 Wed Jun 14 2023 16:32:58 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -1883,7 +1883,7 @@ var __publicField = (obj, key, value) => {
         fill,
         loading,
         disabled,
-        type,
+        type: type2,
         size,
         block,
         icon,
@@ -1929,7 +1929,7 @@ var __publicField = (obj, key, value) => {
             className: classNames(
               prefixCls,
               className,
-              props.type ? `${prefixCls}--${type}` : null,
+              props.type ? `${prefixCls}--${type2}` : null,
               props.fill ? `${prefixCls}--${fill}` : null,
               {
                 [`${prefixCls}--${size}`]: size,
@@ -2243,30 +2243,30 @@ var __publicField = (obj, key, value) => {
   var freeGlobal = typeof commonjsGlobal == "object" && commonjsGlobal && commonjsGlobal.Object === Object && commonjsGlobal;
   var freeSelf = typeof self == "object" && self && self.Object === Object && self;
   var root = freeGlobal || freeSelf || Function("return this")();
-  function arrayReduce(array, iteratee, accumulator, initAccum) {
-    var index = -1, length = array ? array.length : 0;
+  function arrayReduce(array2, iteratee, accumulator, initAccum) {
+    var index = -1, length = array2 ? array2.length : 0;
     if (initAccum && length) {
-      accumulator = array[++index];
+      accumulator = array2[++index];
     }
     while (++index < length) {
-      accumulator = iteratee(accumulator, array[index], index, array);
+      accumulator = iteratee(accumulator, array2[index], index, array2);
     }
     return accumulator;
   }
-  function asciiWords(string) {
-    return string.match(reAsciiWord) || [];
+  function asciiWords(string2) {
+    return string2.match(reAsciiWord) || [];
   }
-  function basePropertyOf(object) {
+  function basePropertyOf(object2) {
     return function(key) {
-      return object == null ? void 0 : object[key];
+      return object2 == null ? void 0 : object2[key];
     };
   }
   var deburrLetter = basePropertyOf(deburredLetters);
-  function hasUnicodeWord(string) {
-    return reHasUnicodeWord.test(string);
+  function hasUnicodeWord(string2) {
+    return reHasUnicodeWord.test(string2);
   }
-  function unicodeWords(string) {
-    return string.match(reUnicodeWord) || [];
+  function unicodeWords(string2) {
+    return string2.match(reUnicodeWord) || [];
   }
   var objectProto = Object.prototype;
   var objectToString = objectProto.toString;
@@ -2283,8 +2283,8 @@ var __publicField = (obj, key, value) => {
     return result == "0" && 1 / value == -INFINITY ? "-0" : result;
   }
   function createCompounder(callback) {
-    return function(string) {
-      return arrayReduce(words(deburr(string).replace(reApos, "")), callback, "");
+    return function(string2) {
+      return arrayReduce(words(deburr(string2).replace(reApos, "")), callback, "");
     };
   }
   function isObjectLike(value) {
@@ -2296,20 +2296,20 @@ var __publicField = (obj, key, value) => {
   function toString(value) {
     return value == null ? "" : baseToString(value);
   }
-  function deburr(string) {
-    string = toString(string);
-    return string && string.replace(reLatin, deburrLetter).replace(reComboMark, "");
+  function deburr(string2) {
+    string2 = toString(string2);
+    return string2 && string2.replace(reLatin, deburrLetter).replace(reComboMark, "");
   }
   var kebabCase = createCompounder(function(result, word, index) {
     return result + (index ? "-" : "") + word.toLowerCase();
   });
-  function words(string, pattern, guard) {
-    string = toString(string);
-    pattern = guard ? void 0 : pattern;
-    if (pattern === void 0) {
-      return hasUnicodeWord(string) ? unicodeWords(string) : asciiWords(string);
+  function words(string2, pattern2, guard) {
+    string2 = toString(string2);
+    pattern2 = guard ? void 0 : pattern2;
+    if (pattern2 === void 0) {
+      return hasUnicodeWord(string2) ? unicodeWords(string2) : asciiWords(string2);
     }
-    return string.match(pattern) || [];
+    return string2.match(pattern2) || [];
   }
   var lodash_kebabcase = kebabCase;
   const zhCN = {
@@ -2905,7 +2905,7 @@ var __publicField = (obj, key, value) => {
       className,
       style,
       children,
-      type,
+      type: type2,
       justify,
       align,
       wrap,
@@ -2915,14 +2915,14 @@ var __publicField = (obj, key, value) => {
       ...defaultProps$1j,
       ...props
     };
-    const getClass = (prefix, type2) => {
-      const classType = type2 ? `nut-row-${prefix}-${type2}` : "";
-      const className2 = prefix ? classType : `nut-row-${type2}`;
+    const getClass = (prefix, type22) => {
+      const classType = type22 ? `nut-row-${prefix}-${type22}` : "";
+      const className2 = prefix ? classType : `nut-row-${type22}`;
       return className2;
     };
     const getClasses = () => {
       return `
-    ${getClass("", type)}
+    ${getClass("", type2)}
     ${getClass("justify", justify)}
     ${getClass("align", align)}
     ${getClass("flex", wrap)}
@@ -3464,7 +3464,7 @@ var __publicField = (obj, key, value) => {
       position,
       onChange,
       onSelect,
-      type,
+      type: type2,
       children,
       style,
       content,
@@ -3478,7 +3478,7 @@ var __publicField = (obj, key, value) => {
       {
         active: visible
       },
-      type,
+      type2,
       className,
       classPrefix2
     );
@@ -3586,8 +3586,8 @@ var __publicField = (obj, key, value) => {
   };
   NavBar.defaultProps = defaultProps$1e;
   NavBar.displayName = "NutNavBar";
-  function _extends() {
-    _extends = Object.assign ? Object.assign.bind() : function(target) {
+  function _extends$1() {
+    _extends$1 = Object.assign ? Object.assign.bind() : function(target) {
       for (var i = 1; i < arguments.length; i++) {
         var source = arguments[i];
         for (var key in source) {
@@ -3598,7 +3598,7 @@ var __publicField = (obj, key, value) => {
       }
       return target;
     };
-    return _extends.apply(this, arguments);
+    return _extends$1.apply(this, arguments);
   }
   function _objectWithoutPropertiesLoose(source, excluded) {
     if (source == null)
@@ -3614,17 +3614,17 @@ var __publicField = (obj, key, value) => {
     }
     return target;
   }
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf2(o2, p2) {
+  function _setPrototypeOf$1(o, p) {
+    _setPrototypeOf$1 = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf2(o2, p2) {
       o2.__proto__ = p2;
       return o2;
     };
-    return _setPrototypeOf(o, p);
+    return _setPrototypeOf$1(o, p);
   }
-  function _inheritsLoose(subClass, superClass) {
+  function _inheritsLoose$1(subClass, superClass) {
     subClass.prototype = Object.create(superClass.prototype);
     subClass.prototype.constructor = subClass;
-    _setPrototypeOf(subClass, superClass);
+    _setPrototypeOf$1(subClass, superClass);
   }
   var propTypesExports = {};
   var propTypes = {
@@ -3783,26 +3783,26 @@ var __publicField = (obj, key, value) => {
         var REACT_FUNDAMENTAL_TYPE = hasSymbol ? Symbol.for("react.fundamental") : 60117;
         var REACT_RESPONDER_TYPE = hasSymbol ? Symbol.for("react.responder") : 60118;
         var REACT_SCOPE_TYPE = hasSymbol ? Symbol.for("react.scope") : 60119;
-        function isValidElementType(type) {
-          return typeof type === "string" || typeof type === "function" || // Note: its typeof might be other than 'symbol' or 'number' if it's a polyfill.
-          type === REACT_FRAGMENT_TYPE || type === REACT_CONCURRENT_MODE_TYPE || type === REACT_PROFILER_TYPE || type === REACT_STRICT_MODE_TYPE || type === REACT_SUSPENSE_TYPE || type === REACT_SUSPENSE_LIST_TYPE || typeof type === "object" && type !== null && (type.$$typeof === REACT_LAZY_TYPE || type.$$typeof === REACT_MEMO_TYPE || type.$$typeof === REACT_PROVIDER_TYPE || type.$$typeof === REACT_CONTEXT_TYPE || type.$$typeof === REACT_FORWARD_REF_TYPE || type.$$typeof === REACT_FUNDAMENTAL_TYPE || type.$$typeof === REACT_RESPONDER_TYPE || type.$$typeof === REACT_SCOPE_TYPE || type.$$typeof === REACT_BLOCK_TYPE);
+        function isValidElementType(type2) {
+          return typeof type2 === "string" || typeof type2 === "function" || // Note: its typeof might be other than 'symbol' or 'number' if it's a polyfill.
+          type2 === REACT_FRAGMENT_TYPE || type2 === REACT_CONCURRENT_MODE_TYPE || type2 === REACT_PROFILER_TYPE || type2 === REACT_STRICT_MODE_TYPE || type2 === REACT_SUSPENSE_TYPE || type2 === REACT_SUSPENSE_LIST_TYPE || typeof type2 === "object" && type2 !== null && (type2.$$typeof === REACT_LAZY_TYPE || type2.$$typeof === REACT_MEMO_TYPE || type2.$$typeof === REACT_PROVIDER_TYPE || type2.$$typeof === REACT_CONTEXT_TYPE || type2.$$typeof === REACT_FORWARD_REF_TYPE || type2.$$typeof === REACT_FUNDAMENTAL_TYPE || type2.$$typeof === REACT_RESPONDER_TYPE || type2.$$typeof === REACT_SCOPE_TYPE || type2.$$typeof === REACT_BLOCK_TYPE);
         }
-        function typeOf(object) {
-          if (typeof object === "object" && object !== null) {
-            var $$typeof = object.$$typeof;
+        function typeOf(object2) {
+          if (typeof object2 === "object" && object2 !== null) {
+            var $$typeof = object2.$$typeof;
             switch ($$typeof) {
               case REACT_ELEMENT_TYPE:
-                var type = object.type;
-                switch (type) {
+                var type2 = object2.type;
+                switch (type2) {
                   case REACT_ASYNC_MODE_TYPE:
                   case REACT_CONCURRENT_MODE_TYPE:
                   case REACT_FRAGMENT_TYPE:
                   case REACT_PROFILER_TYPE:
                   case REACT_STRICT_MODE_TYPE:
                   case REACT_SUSPENSE_TYPE:
-                    return type;
+                    return type2;
                   default:
-                    var $$typeofType = type && type.$$typeof;
+                    var $$typeofType = type2 && type2.$$typeof;
                     switch ($$typeofType) {
                       case REACT_CONTEXT_TYPE:
                       case REACT_FORWARD_REF_TYPE:
@@ -3834,50 +3834,50 @@ var __publicField = (obj, key, value) => {
         var StrictMode = REACT_STRICT_MODE_TYPE;
         var Suspense = REACT_SUSPENSE_TYPE;
         var hasWarnedAboutDeprecatedIsAsyncMode = false;
-        function isAsyncMode(object) {
+        function isAsyncMode(object2) {
           {
             if (!hasWarnedAboutDeprecatedIsAsyncMode) {
               hasWarnedAboutDeprecatedIsAsyncMode = true;
               console["warn"]("The ReactIs.isAsyncMode() alias has been deprecated, and will be removed in React 17+. Update your code to use ReactIs.isConcurrentMode() instead. It has the exact same API.");
             }
           }
-          return isConcurrentMode(object) || typeOf(object) === REACT_ASYNC_MODE_TYPE;
+          return isConcurrentMode(object2) || typeOf(object2) === REACT_ASYNC_MODE_TYPE;
         }
-        function isConcurrentMode(object) {
-          return typeOf(object) === REACT_CONCURRENT_MODE_TYPE;
+        function isConcurrentMode(object2) {
+          return typeOf(object2) === REACT_CONCURRENT_MODE_TYPE;
         }
-        function isContextConsumer(object) {
-          return typeOf(object) === REACT_CONTEXT_TYPE;
+        function isContextConsumer(object2) {
+          return typeOf(object2) === REACT_CONTEXT_TYPE;
         }
-        function isContextProvider(object) {
-          return typeOf(object) === REACT_PROVIDER_TYPE;
+        function isContextProvider(object2) {
+          return typeOf(object2) === REACT_PROVIDER_TYPE;
         }
-        function isElement2(object) {
-          return typeof object === "object" && object !== null && object.$$typeof === REACT_ELEMENT_TYPE;
+        function isElement2(object2) {
+          return typeof object2 === "object" && object2 !== null && object2.$$typeof === REACT_ELEMENT_TYPE;
         }
-        function isForwardRef(object) {
-          return typeOf(object) === REACT_FORWARD_REF_TYPE;
+        function isForwardRef(object2) {
+          return typeOf(object2) === REACT_FORWARD_REF_TYPE;
         }
-        function isFragment(object) {
-          return typeOf(object) === REACT_FRAGMENT_TYPE;
+        function isFragment(object2) {
+          return typeOf(object2) === REACT_FRAGMENT_TYPE;
         }
-        function isLazy(object) {
-          return typeOf(object) === REACT_LAZY_TYPE;
+        function isLazy(object2) {
+          return typeOf(object2) === REACT_LAZY_TYPE;
         }
-        function isMemo(object) {
-          return typeOf(object) === REACT_MEMO_TYPE;
+        function isMemo(object2) {
+          return typeOf(object2) === REACT_MEMO_TYPE;
         }
-        function isPortal(object) {
-          return typeOf(object) === REACT_PORTAL_TYPE;
+        function isPortal(object2) {
+          return typeOf(object2) === REACT_PORTAL_TYPE;
         }
-        function isProfiler(object) {
-          return typeOf(object) === REACT_PROFILER_TYPE;
+        function isProfiler(object2) {
+          return typeOf(object2) === REACT_PROFILER_TYPE;
         }
-        function isStrictMode(object) {
-          return typeOf(object) === REACT_STRICT_MODE_TYPE;
+        function isStrictMode(object2) {
+          return typeOf(object2) === REACT_STRICT_MODE_TYPE;
         }
-        function isSuspense(object) {
-          return typeOf(object) === REACT_SUSPENSE_TYPE;
+        function isSuspense(object2) {
+          return typeOf(object2) === REACT_SUSPENSE_TYPE;
         }
         reactIs_development.AsyncMode = AsyncMode;
         reactIs_development.ConcurrentMode = ConcurrentMode;
@@ -4291,8 +4291,8 @@ var __publicField = (obj, key, value) => {
             }
           }
           var valuesString = JSON.stringify(expectedValues, function replacer(key, value) {
-            var type = getPreciseType(value);
-            if (type === "symbol") {
+            var type2 = getPreciseType(value);
+            if (type2 === "symbol") {
               return String(value);
             }
             return value;
@@ -4363,9 +4363,9 @@ var __publicField = (obj, key, value) => {
         }
         return createChainableTypeChecker(validate);
       }
-      function invalidValidatorError(componentName, location, propFullName, key, type) {
+      function invalidValidatorError(componentName, location, propFullName, key, type2) {
         return new PropTypeError(
-          (componentName || "React class") + ": " + location + " type `" + propFullName + "." + key + "` is invalid; it must be a function, usually from the `prop-types` package, but received `" + type + "`."
+          (componentName || "React class") + ": " + location + " type `" + propFullName + "." + key + "` is invalid; it must be a function, usually from the `prop-types` package, but received `" + type2 + "`."
         );
       }
       function createShapeTypeChecker(shapeTypes) {
@@ -4502,17 +4502,17 @@ var __publicField = (obj, key, value) => {
         return propType;
       }
       function getPostfixForTypeWarning(value) {
-        var type = getPreciseType(value);
-        switch (type) {
+        var type2 = getPreciseType(value);
+        switch (type2) {
           case "array":
           case "object":
-            return "an " + type;
+            return "an " + type2;
           case "boolean":
           case "date":
           case "regexp":
-            return "a " + type;
+            return "a " + type2;
           default:
-            return type;
+            return type2;
         }
       }
       function getClassName(propValue) {
@@ -4646,7 +4646,7 @@ var __publicField = (obj, key, value) => {
   var ENTERED = "entered";
   var EXITING = "exiting";
   var Transition = /* @__PURE__ */ function(_React$Component) {
-    _inheritsLoose(Transition2, _React$Component);
+    _inheritsLoose$1(Transition2, _React$Component);
     function Transition2(props, context) {
       var _this;
       _this = _React$Component.call(this, props, context) || this;
@@ -5076,7 +5076,7 @@ var __publicField = (obj, key, value) => {
     });
   };
   var CSSTransition = /* @__PURE__ */ function(_React$Component) {
-    _inheritsLoose(CSSTransition2, _React$Component);
+    _inheritsLoose$1(CSSTransition2, _React$Component);
     function CSSTransition2() {
       var _this;
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -5098,17 +5098,17 @@ var __publicField = (obj, key, value) => {
       };
       _this.onEntering = function(maybeNode, maybeAppearing) {
         var _this$resolveArgument2 = _this.resolveArguments(maybeNode, maybeAppearing), node = _this$resolveArgument2[0], appearing = _this$resolveArgument2[1];
-        var type = appearing ? "appear" : "enter";
-        _this.addClass(node, type, "active");
+        var type2 = appearing ? "appear" : "enter";
+        _this.addClass(node, type2, "active");
         if (_this.props.onEntering) {
           _this.props.onEntering(maybeNode, maybeAppearing);
         }
       };
       _this.onEntered = function(maybeNode, maybeAppearing) {
         var _this$resolveArgument3 = _this.resolveArguments(maybeNode, maybeAppearing), node = _this$resolveArgument3[0], appearing = _this$resolveArgument3[1];
-        var type = appearing ? "appear" : "enter";
-        _this.removeClasses(node, type);
-        _this.addClass(node, type, "done");
+        var type2 = appearing ? "appear" : "enter";
+        _this.removeClasses(node, type2);
+        _this.addClass(node, type2, "done");
         if (_this.props.onEntered) {
           _this.props.onEntered(maybeNode, maybeAppearing);
         }
@@ -5140,13 +5140,13 @@ var __publicField = (obj, key, value) => {
       _this.resolveArguments = function(maybeNode, maybeAppearing) {
         return _this.props.nodeRef ? [_this.props.nodeRef.current, maybeNode] : [maybeNode, maybeAppearing];
       };
-      _this.getClassNames = function(type) {
+      _this.getClassNames = function(type2) {
         var classNames2 = _this.props.classNames;
         var isStringClassNames = typeof classNames2 === "string";
         var prefix = isStringClassNames && classNames2 ? classNames2 + "-" : "";
-        var baseClassName = isStringClassNames ? "" + prefix + type : classNames2[type];
-        var activeClassName = isStringClassNames ? baseClassName + "-active" : classNames2[type + "Active"];
-        var doneClassName = isStringClassNames ? baseClassName + "-done" : classNames2[type + "Done"];
+        var baseClassName = isStringClassNames ? "" + prefix + type2 : classNames2[type2];
+        var activeClassName = isStringClassNames ? baseClassName + "-active" : classNames2[type2 + "Active"];
+        var doneClassName = isStringClassNames ? baseClassName + "-done" : classNames2[type2 + "Done"];
         return {
           baseClassName,
           activeClassName,
@@ -5156,10 +5156,10 @@ var __publicField = (obj, key, value) => {
       return _this;
     }
     var _proto = CSSTransition2.prototype;
-    _proto.addClass = function addClass2(node, type, phase) {
-      var className = this.getClassNames(type)[phase + "ClassName"];
+    _proto.addClass = function addClass2(node, type2, phase) {
+      var className = this.getClassNames(type2)[phase + "ClassName"];
       var _this$getClassNames = this.getClassNames("enter"), doneClassName = _this$getClassNames.doneClassName;
-      if (type === "appear" && phase === "done" && doneClassName) {
+      if (type2 === "appear" && phase === "done" && doneClassName) {
         className += " " + doneClassName;
       }
       if (phase === "active") {
@@ -5167,13 +5167,13 @@ var __publicField = (obj, key, value) => {
           forceReflow(node);
       }
       if (className) {
-        this.appliedClasses[type][phase] = className;
+        this.appliedClasses[type2][phase] = className;
         _addClass(node, className);
       }
     };
-    _proto.removeClasses = function removeClasses(node, type) {
-      var _this$appliedClasses$ = this.appliedClasses[type], baseClassName = _this$appliedClasses$.base, activeClassName = _this$appliedClasses$.active, doneClassName = _this$appliedClasses$.done;
-      this.appliedClasses[type] = {};
+    _proto.removeClasses = function removeClasses(node, type2) {
+      var _this$appliedClasses$ = this.appliedClasses[type2], baseClassName = _this$appliedClasses$.base, activeClassName = _this$appliedClasses$.active, doneClassName = _this$appliedClasses$.done;
+      this.appliedClasses[type2] = {};
       if (baseClassName) {
         removeClass(node, baseClassName);
       }
@@ -5188,7 +5188,7 @@ var __publicField = (obj, key, value) => {
       var _this$props = this.props;
       _this$props.classNames;
       var props = _objectWithoutPropertiesLoose(_this$props, ["classNames"]);
-      return /* @__PURE__ */ React.createElement(Transition$1, _extends({}, props, {
+      return /* @__PURE__ */ React.createElement(Transition$1, _extends$1({}, props, {
         onEnter: this.onEnter,
         onEntered: this.onEntered,
         onEntering: this.onEntering,
@@ -5202,7 +5202,7 @@ var __publicField = (obj, key, value) => {
   CSSTransition.defaultProps = {
     classNames: ""
   };
-  CSSTransition.propTypes = process.env.NODE_ENV !== "production" ? _extends({}, Transition$1.propTypes, {
+  CSSTransition.propTypes = process.env.NODE_ENV !== "production" ? _extends$1({}, Transition$1.propTypes, {
     /**
      * The animation classNames applied to the component as it appears, enters,
      * exits or has finished the transition. A single name can be provided, which
@@ -5427,6 +5427,7 @@ var __publicField = (obj, key, value) => {
       }
     };
     const onHandleClickOverlay = (e) => {
+      e.stopPropagation();
       if (closeOnOverlayClick) {
         const closed = onClickOverlay && onClickOverlay(e);
         closed && close();
@@ -6157,7 +6158,7 @@ var __publicField = (obj, key, value) => {
     const { locale } = useConfig();
     const {
       children,
-      type,
+      type: type2,
       existAddress,
       selectedIcon,
       defaultIcon,
@@ -6189,7 +6190,7 @@ var __publicField = (obj, key, value) => {
       onSelected && onSelected(prevExistAdd, item, copyExistAdd);
     };
     const onSwitch = () => {
-      onSwitchModule && onSwitchModule({ type: type === "exist" ? "custom" : "exist" });
+      onSwitchModule && onSwitchModule({ type: type2 === "exist" ? "custom" : "exist" });
     };
     React.useEffect(() => {
     }, [existAddress]);
@@ -6210,7 +6211,7 @@ var __publicField = (obj, key, value) => {
     const { locale } = useConfig$1();
     const {
       children,
-      type,
+      type: type2,
       modelValue,
       height,
       province,
@@ -6226,7 +6227,7 @@ var __publicField = (obj, key, value) => {
       ...props
     };
     const b2 = cn("address");
-    const [privateType] = React.useState(type);
+    const [privateType] = React.useState(type2);
     const [tabIndex, setTabIndex] = React.useState(0);
     const [tabName] = React.useState(["province", "city", "country", "town"]);
     React.useRef(null);
@@ -6235,7 +6236,7 @@ var __publicField = (obj, key, value) => {
     React.useRef(null);
     const regionLine = React.useRef(null);
     const isCustom2 = () => {
-      return type === "custom2";
+      return type2 === "custom2";
     };
     const transformData = (data) => {
       if (!Array.isArray(data))
@@ -6497,7 +6498,7 @@ var __publicField = (obj, key, value) => {
       modelValue,
       modelSelect,
       children,
-      type,
+      type: type2,
       height,
       customAddressTitle,
       existAddress,
@@ -6526,7 +6527,7 @@ var __publicField = (obj, key, value) => {
       ...props
     };
     const b2 = cn("address");
-    const [privateType, setPrivateType] = React.useState(type);
+    const [privateType, setPrivateType] = React.useState(type2);
     const [tabName] = React.useState(["province", "city", "country", "town"]);
     const [showPopup, setShowPopup] = React.useState(modelValue);
     const [selectedRegion, setSelectedRegion] = React.useState({
@@ -6652,8 +6653,8 @@ var __publicField = (obj, key, value) => {
             onNextArea: (cal) => {
               nextAreaList && nextAreaList(cal);
             },
-            onTabClick: (type2) => {
-              onTabChecked && onTabChecked(type2);
+            onTabClick: (type22) => {
+              onTabChecked && onTabChecked(type22);
             },
             onClose: handClose
           }
@@ -6689,8 +6690,8 @@ var __publicField = (obj, key, value) => {
      * @return {String}
      */
     getWhatDay(year, month, day) {
-      const date = /* @__PURE__ */ new Date(`${year}/${month}/${day}`);
-      const index = date.getDay();
+      const date2 = /* @__PURE__ */ new Date(`${year}/${month}/${day}`);
+      const index = date2.getDay();
       const dayNames = [
         "星期日",
         "星期一",
@@ -6707,8 +6708,8 @@ var __publicField = (obj, key, value) => {
      * @return {Number}
      */
     getMonthPreDay(year, month) {
-      const date = /* @__PURE__ */ new Date(`${year}/${month}/01`);
-      let day = date.getDay();
+      const date2 = /* @__PURE__ */ new Date(`${year}/${month}/01`);
+      let day = date2.getDay();
       if (day == 0) {
         day = 7;
       }
@@ -6750,11 +6751,11 @@ var __publicField = (obj, key, value) => {
      * 日期对象转成字符串
      * @return {string}
      */
-    date2Str(date, split) {
+    date2Str(date2, split) {
       split = split || "-";
-      const y2 = date.getFullYear();
-      const m = this.getNumTwoBit(date.getMonth() + 1);
-      const d = this.getNumTwoBit(date.getDate());
+      const y2 = date2.getFullYear();
+      const m = this.getNumTwoBit(date2.getMonth() + 1);
+      const d = this.getNumTwoBit(date2.getDate());
       return [y2, m, d].join(split);
     },
     /**
@@ -6764,10 +6765,10 @@ var __publicField = (obj, key, value) => {
      */
     getDay(i) {
       i = i || 0;
-      let date = /* @__PURE__ */ new Date();
+      let date2 = /* @__PURE__ */ new Date();
       const diff = i * (1e3 * 60 * 60 * 24);
-      date = new Date(date.getTime() + diff);
-      return this.date2Str(date);
+      date2 = new Date(date2.getTime() + diff);
+      return this.date2Str(date2);
     },
     /**
      * 时间比较
@@ -6839,7 +6840,7 @@ var __publicField = (obj, key, value) => {
   const CalendarItem = React.forwardRef((props, ref) => {
     const { locale } = useConfig$1();
     const {
-      type,
+      type: type2,
       isAutoBackFill,
       poppable,
       title,
@@ -6913,10 +6914,10 @@ var __publicField = (obj, key, value) => {
     });
     const monthitemclasses = classNames({
       "calendar-month-item": true,
-      [`${type === "range" ? "month-item-range" : ""}`]: true
+      [`${type2 === "range" ? "month-item-range" : ""}`]: true
     });
-    const splitDate = (date) => {
-      return date.split("-");
+    const splitDate = (date2) => {
+      return date2.split("-");
     };
     const isStart = (currDate) => {
       return Utils.isEqual(state.currDate[0], currDate);
@@ -6940,13 +6941,13 @@ var __publicField = (obj, key, value) => {
     const getClass = (day, month) => {
       const currDate = getCurrDate(day, month);
       if (day.type === "curr") {
-        if (Utils.isEqual(state.currDate, currDate) || type === "range" && (isStart(currDate) || isEnd(currDate)) || type === "multiple" && isMultiple(currDate)) {
+        if (Utils.isEqual(state.currDate, currDate) || type2 === "range" && (isStart(currDate) || isEnd(currDate)) || type2 === "multiple" && isMultiple(currDate)) {
           return `${state.dayPrefix}-active`;
         }
         if (state.propStartDate && Utils.compareDate(currDate, state.propStartDate) || state.propEndDate && Utils.compareDate(state.propEndDate, currDate)) {
           return `${state.dayPrefix}-disabled`;
         }
-        if (type === "range" && Array.isArray(state.currDate) && Object.values(state.currDate).length === 2 && Utils.compareDate(state.currDate[0], currDate) && Utils.compareDate(currDate, state.currDate[1])) {
+        if (type2 === "range" && Array.isArray(state.currDate) && Object.values(state.currDate).length === 2 && Utils.compareDate(state.currDate[0], currDate) && Utils.compareDate(currDate, state.currDate[1])) {
           return `${state.dayPrefix}-choose`;
         }
         return null;
@@ -6957,12 +6958,12 @@ var __publicField = (obj, key, value) => {
       return state.isRange && day.type === "curr" && getClass(day, month) === "calendar-month-day-active";
     };
     const isCurrDay = (month, day) => {
-      const date = `${month.curData[0]}-${month.curData[1]}-${day}`;
-      return Utils.isEqual(date, Utils.date2Str(/* @__PURE__ */ new Date()));
+      const date2 = `${month.curData[0]}-${month.curData[1]}-${day}`;
+      return Utils.isEqual(date2, Utils.date2Str(/* @__PURE__ */ new Date()));
     };
     const confirm = () => {
-      const { type: type2 } = props;
-      if (type2 === "range" && state.chooseData.length === 2 || type2 !== "range") {
+      const { type: type22 } = props;
+      if (type22 === "range" && state.chooseData.length === 2 || type22 !== "range") {
         const chooseData = state.chooseData.slice(0);
         onChoose && onChoose(chooseData);
         if (poppable) {
@@ -6972,12 +6973,12 @@ var __publicField = (obj, key, value) => {
     };
     const chooseDay = (day, month, isFirst) => {
       if (getClass(day, month) !== `${state.dayPrefix}-disabled`) {
-        const { type: type2 } = props;
+        const { type: type22 } = props;
         const days = [...month.curData];
         days[2] = typeof day.day === "number" ? Utils.getNumTwoBit(day.day) : day.day;
         days[3] = `${days[0]}-${days[1]}-${days[2]}`;
         days[4] = Utils.getWhatDay(+days[0], +days[1], +days[2]);
-        if (type2 === "multiple") {
+        if (type22 === "multiple") {
           if (state.currDate.length > 0) {
             let hasIndex = "";
             state.currDate.forEach((item, index) => {
@@ -6998,7 +6999,7 @@ var __publicField = (obj, key, value) => {
             state.currDate = [days[3]];
             state.chooseData = [[...days]];
           }
-        } else if (type2 === "range") {
+        } else if (type22 === "range") {
           const curDataLength = Object.values(state.currDate).length;
           if (curDataLength === 2 || curDataLength === 0) {
             state.currDate = [days[3]];
@@ -7042,11 +7043,11 @@ var __publicField = (obj, key, value) => {
       }
       return false;
     };
-    const getCurrData = (type2) => {
-      const monthData = type2 === "prev" ? state.monthsData[0] : state.monthsData[state.monthsData.length - 1];
+    const getCurrData = (type22) => {
+      const monthData = type22 === "prev" ? state.monthsData[0] : state.monthsData[state.monthsData.length - 1];
       let year = parseInt(monthData.curData[0]);
       let month = parseInt(monthData.curData[1].toString().replace(/^0/, ""));
-      switch (type2) {
+      switch (type22) {
         case "prev":
           month === 1 && (year -= 1);
           month = month === 1 ? 12 : --month;
@@ -7062,36 +7063,36 @@ var __publicField = (obj, key, value) => {
         Utils.getMonthDays(String(year), String(month))
       ];
     };
-    const getDaysStatus = (days, type2, dateInfo) => {
+    const getDaysStatus = (days, type22, dateInfo) => {
       const { year, month } = dateInfo;
-      if (type2 === "prev" && days >= 7) {
+      if (type22 === "prev" && days >= 7) {
         days -= 7;
       }
       return Array.from(Array(days), (v, k) => {
         return {
           day: k + 1,
-          type: type2,
+          type: type22,
           year,
           month
         };
       });
     };
-    const getPreDaysStatus = (days, type2, dateInfo, preCurrMonthDays) => {
+    const getPreDaysStatus = (days, type22, dateInfo, preCurrMonthDays) => {
       const { year, month } = dateInfo;
-      if (type2 === "prev" && days >= 7) {
+      if (type22 === "prev" && days >= 7) {
         days -= 7;
       }
       const months2 = Array.from(Array(preCurrMonthDays), (v, k) => {
         return {
           day: k + 1,
-          type: type2,
+          type: type22,
           year,
           month
         };
       });
       return months2.slice(preCurrMonthDays - days);
     };
-    const getMonth = (curData, type2) => {
+    const getMonth = (curData, type22) => {
       const preMonthDays = Utils.getMonthPreDay(+curData[0], +curData[1]);
       let preMonth = +curData[1] - 1;
       let preYear = curData[0];
@@ -7124,7 +7125,7 @@ var __publicField = (obj, key, value) => {
         cssScrollHeight = state.monthsData[state.monthsData.length - 1].cssScrollHeight + state.monthsData[state.monthsData.length - 1].cssHeight;
       }
       monthInfo.cssScrollHeight = cssScrollHeight;
-      if (type2 === "next") {
+      if (type22 === "next") {
         if (!state.endData || !Utils.compareDate(
           `${state.endData[0]}-${state.endData[1]}-${Utils.getMonthDays(
             state.endData[0],
@@ -7238,7 +7239,7 @@ var __publicField = (obj, key, value) => {
         getMonth(getCurrData("next"), "next");
       } while (i++ < monthsNum);
       state.monthsNum = monthsNum;
-      if (type === "range" && Array.isArray(state.currDate)) {
+      if (type2 === "range" && Array.isArray(state.currDate)) {
         if (state.currDate.length > 0) {
           if (propStartDate && Utils.compareDate(state.currDate[0], propStartDate)) {
             state.currDate.splice(0, 1, propStartDate);
@@ -7307,7 +7308,7 @@ var __publicField = (obj, key, value) => {
       state.currentIndex = current;
       setReachedYearMonthInfo();
       if (state.defaultData.length > 0) {
-        if (type === "range") {
+        if (type2 === "range") {
           chooseDay(
             { day: state.defaultData[2], type: "curr" },
             state.monthsData[state.currentIndex],
@@ -7318,7 +7319,7 @@ var __publicField = (obj, key, value) => {
             state.monthsData[lastCurrent],
             true
           );
-        } else if (type === "multiple") {
+        } else if (type2 === "multiple") {
           [...state.currDate].forEach((item) => {
             const dateArr = splitDate(item);
             let current2 = state.currentIndex;
@@ -7358,13 +7359,13 @@ var __publicField = (obj, key, value) => {
       state.monthsData.splice(0);
       initData();
     };
-    const scrollToDate = (date) => {
-      if (Utils.compareDate(date, state.propStartDate)) {
-        date = state.propStartDate;
-      } else if (!Utils.compareDate(date, state.propEndDate)) {
-        date = state.propEndDate;
+    const scrollToDate = (date2) => {
+      if (Utils.compareDate(date2, state.propStartDate)) {
+        date2 = state.propStartDate;
+      } else if (!Utils.compareDate(date2, state.propEndDate)) {
+        date2 = state.propEndDate;
       }
-      const dateArr = splitDate(date);
+      const dateArr = splitDate(date2);
       state.monthsData.forEach((item, index) => {
         if (item.title === locale.calendaritem.monthTitle(dateArr[0], dateArr[1])) {
           if (months.current) {
@@ -7487,7 +7488,7 @@ var __publicField = (obj, key, value) => {
       children,
       poppable,
       visible,
-      type,
+      type: type2,
       isAutoBackFill,
       title,
       defaultValue,
@@ -7523,9 +7524,9 @@ var __publicField = (obj, key, value) => {
     const select = (param) => {
       onSelected && onSelected(param);
     };
-    const scrollToDate = (date) => {
+    const scrollToDate = (date2) => {
       var _a;
-      (_a = calendarRef.current) == null ? void 0 : _a.scrollToDate(date);
+      (_a = calendarRef.current) == null ? void 0 : _a.scrollToDate(date2);
     };
     const yearMonthChange = (param) => {
       onYearMonthChange && onYearMonthChange(param);
@@ -7538,7 +7539,7 @@ var __publicField = (obj, key, value) => {
         CalendarItem,
         {
           ref: calendarRef,
-          type,
+          type: type2,
           isAutoBackFill,
           poppable,
           title: title || locale.calendaritem.title,
@@ -7811,7 +7812,7 @@ var __publicField = (obj, key, value) => {
       defaultValue,
       title,
       optionKey,
-      format,
+      format: format2,
       closeable,
       closeIconPosition,
       closeIcon,
@@ -7851,7 +7852,7 @@ var __publicField = (obj, key, value) => {
         lazy,
         onLoad,
         optionKey,
-        format
+        format: format2
       },
       lazyLoadMap: /* @__PURE__ */ new Map()
     });
@@ -7861,7 +7862,7 @@ var __publicField = (obj, key, value) => {
     });
     React.useEffect(() => {
       initData();
-    }, [options, format]);
+    }, [options, format2]);
     React.useEffect(() => {
       if (defaultValue && defaultValue !== innerValue) {
         setInnerValue(defaultValue);
@@ -7869,10 +7870,10 @@ var __publicField = (obj, key, value) => {
     }, [defaultValue]);
     const initData = async () => {
       state.lazyLoadMap.clear();
-      if (format && Object.keys(format).length > 0) {
+      if (format2 && Object.keys(format2).length > 0) {
         state.optionsData = convertListToOptions(
           options,
-          format
+          format2
         );
       } else {
         state.optionsData = options;
@@ -7978,15 +7979,15 @@ var __publicField = (obj, key, value) => {
     const closePopup = () => {
       close();
     };
-    const chooseItem = async (node, type) => {
-      if (!type && node.disabled || !state.panes[state.tabsCursor]) {
+    const chooseItem = async (node, type2) => {
+      if (!type2 && node.disabled || !state.panes[state.tabsCursor]) {
         return;
       }
       if (state.tree.isLeaf(node, isLazy())) {
         node.leaf = true;
         state.panes[state.tabsCursor].selectedNode = node;
         state.panes = state.panes.slice(0, node.level + 1);
-        if (!type) {
+        if (!type2) {
           const pathNodes = state.panes.map((item) => item.selectedNode);
           const optionParams = pathNodes.map((item) => item.value);
           onChange(optionParams, pathNodes);
@@ -8009,7 +8010,7 @@ var __publicField = (obj, key, value) => {
         });
         setOptionsData(state.panes);
         setTabvalue(`c${state.tabsCursor + 1}`);
-        if (!type) {
+        if (!type2) {
           const pathNodes = state.panes.map((item) => item.selectedNode);
           const optionParams = pathNodes.map((item) => item == null ? void 0 : item.value);
           onPathChange(optionParams, pathNodes);
@@ -8023,7 +8024,7 @@ var __publicField = (obj, key, value) => {
       await invokeLazyLoad(node);
       if (state.currentProcessNode === node) {
         state.panes[state.tabsCursor].selectedNode = node;
-        chooseItem(node, type);
+        chooseItem(node, type2);
       }
       setOptionsData(state.panes);
     };
@@ -8085,7 +8086,7 @@ var __publicField = (obj, key, value) => {
   Cascader.defaultProps = defaultProps$$;
   Cascader.displayName = "NutCascader";
   const CheckboxGroupContext = React.createContext(null);
-  const Context = CheckboxGroupContext;
+  const Context$1 = CheckboxGroupContext;
   const defaultProps$_ = {
     max: void 0,
     labelPosition: "right",
@@ -8156,7 +8157,7 @@ var __publicField = (obj, key, value) => {
         });
       }, [options, max]);
       return /* @__PURE__ */ React.createElement(
-        Context.Provider,
+        Context$1.Provider,
         {
           value: {
             labelPosition: labelPosition || "right",
@@ -8219,7 +8220,7 @@ var __publicField = (obj, key, value) => {
       ...others
     } = props;
     let { labelPosition, ...rest } = others;
-    const ctx = React.useContext(Context);
+    const ctx = React.useContext(Context$1);
     let [innerChecked, setChecked] = usePropsValue({
       value: props.checked,
       defaultValue: props.defaultChecked,
@@ -8419,18 +8420,18 @@ var __publicField = (obj, key, value) => {
       }
       return false;
     };
-    const setTransform = (translateY = 0, type, time = DEFAULT_DURATION, deg) => {
+    const setTransform = (translateY = 0, type2, time = DEFAULT_DURATION, deg) => {
       let nTime = time;
-      if (type !== "end") {
+      if (type2 !== "end") {
         nTime = 0;
       }
       setTouchTime(nTime);
       setTouchDeg(deg);
       setScrollDistance(translateY);
     };
-    const setMove = (move, type, time) => {
+    const setMove = (move, type2, time) => {
       let updateMove = move + transformY.current;
-      if (type === "end") {
+      if (type2 === "end") {
         if (updateMove > 0) {
           updateMove = 0;
         }
@@ -8439,7 +8440,7 @@ var __publicField = (obj, key, value) => {
         }
         const endMove = Math.round(updateMove / lineSpacing.current) * lineSpacing.current;
         const deg = `${(Math.abs(Math.round(endMove / lineSpacing.current)) + 1) * rotation}deg`;
-        setTransform(endMove, type, time, deg);
+        setTransform(endMove, type2, time, deg);
         setCurrIndex(Math.abs(Math.round(endMove / lineSpacing.current)) + 1);
       } else {
         let deg = 0;
@@ -8492,7 +8493,7 @@ var __publicField = (obj, key, value) => {
       nDistance = speed / 3e-3 * (nDistance < 0 ? -1 : 1);
       return nDistance;
     };
-    const modifyStatus = (type, val) => {
+    const modifyStatus = (type2, val) => {
       const value = val || defaultValue;
       let index = -1;
       if (value) {
@@ -8512,7 +8513,7 @@ var __publicField = (obj, key, value) => {
       }
       setCurrIndex(index === -1 ? 1 : index + 1);
       const move = index === -1 ? 0 : index * lineSpacing.current;
-      type && setChooseValue(-move);
+      type2 && setChooseValue(-move);
       setMove(-move);
     };
     const stopMomentum = () => {
@@ -8670,6 +8671,11 @@ var __publicField = (obj, key, value) => {
         (_a = props.onConfirm) == null ? void 0 : _a.call(props, setSelectedOptions(), val);
       }
     });
+    const [innerVisible, setInnerVisible] = usePropsValue({
+      value: props.visible,
+      defaultValue: false,
+      finalValue: false
+    });
     const [innerValue, setInnerValue] = React.useState(selectedValue);
     const [currentValue, setCurrentValue] = React.useState([]);
     const [columnIndex, setColumnIndex] = React.useState(0);
@@ -8677,6 +8683,15 @@ var __publicField = (obj, key, value) => {
     const [refs, setRefs] = useRefs();
     const [columnsList, setColumnsList] = React.useState([]);
     const isConfirmEvent = React.useRef(false);
+    const actions = {
+      open: () => {
+        setInnerVisible(true);
+      },
+      close: () => {
+        setInnerVisible(false);
+      }
+    };
+    React.useImperativeHandle(ref, () => actions);
     const formatCascade = (columns, values) => {
       const formatted = [];
       let columnOptions = {
@@ -8712,8 +8727,8 @@ var __publicField = (obj, key, value) => {
       return "single";
     };
     const normalListData = (innerValue2) => {
-      const type = columnsType();
-      switch (type) {
+      const type2 = columnsType();
+      switch (type2) {
         case "multiple":
           return options;
         case "cascade":
@@ -8738,19 +8753,19 @@ var __publicField = (obj, key, value) => {
     };
     React.useEffect(() => {
       setInnerValue(innerValue !== selectedValue ? selectedValue : innerValue);
-    }, [visible]);
+    }, [innerVisible]);
     React.useEffect(() => {
-      if (visible) {
+      if (innerVisible) {
         init();
       }
-    }, [options, visible]);
+    }, [options, innerVisible]);
     React.useEffect(() => {
-      if (!visible) {
+      if (!innerVisible) {
         return;
       }
       Taro.getEnv() !== "WEB" && setCurrentValue(defaultValuesConvert());
       onChange && onChange(setSelectedOptions(), innerValue, columnIndex);
-    }, [innerValue, columnsList, visible]);
+    }, [innerValue, columnsList, innerVisible]);
     const setSelectedOptions = () => {
       const options2 = [];
       let currOptions = [];
@@ -8832,6 +8847,7 @@ var __publicField = (obj, key, value) => {
       if (moving) {
         isConfirmEvent.current = true;
       } else {
+        console.log("picker confirmed", innerValue);
         setSelectedValue(innerValue);
         closePicker();
       }
@@ -8840,6 +8856,7 @@ var __publicField = (obj, key, value) => {
       }, 0);
     };
     const closePicker = () => {
+      setInnerVisible(false);
       onClose && onClose(setSelectedOptions(), innerValue);
       afterClose && afterClose(setSelectedOptions(), innerValue, pickerRef);
     };
@@ -8848,10 +8865,23 @@ var __publicField = (obj, key, value) => {
         "span",
         {
           className: `${classPrefix2}__cancel-btn`,
-          onClick: () => closePicker()
+          onClick: (e) => {
+            e.stopPropagation();
+            closePicker();
+          }
         },
         locale.cancel
-      ), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__title` }, title || ""), /* @__PURE__ */ React.createElement("span", { className: `${classPrefix2}__confirm-btn`, onClick: confirm }, locale.confirm));
+      ), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__title` }, title || ""), /* @__PURE__ */ React.createElement(
+        "span",
+        {
+          className: `${classPrefix2}__confirm-btn`,
+          onClick: (e) => {
+            e.stopPropagation();
+            confirm();
+          }
+        },
+        locale.confirm
+      ));
     };
     const [, setPickingStatus] = React.useState(false);
     const pickerStart = () => {
@@ -8875,16 +8905,16 @@ var __publicField = (obj, key, value) => {
         changeIndex
       );
     };
-    return /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, typeof children === "function" && children(selectedValue), /* @__PURE__ */ React.createElement(
       Popup,
       {
-        visible,
+        visible: innerVisible,
         position: "bottom",
-        onClose: () => {
+        afterClose: () => {
           closePicker();
         }
       },
-      /* @__PURE__ */ React.createElement(components.View, { className: classes, style, ...rest, catchMove: true }, renderTitleBar(), children, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__panel`, ref: pickerRef }, Taro.getEnv() === "WEB" ? columnsList == null ? void 0 : columnsList.map((item, index) => {
+      /* @__PURE__ */ React.createElement(components.View, { className: classes, style, ...rest, catchMove: true }, renderTitleBar(), typeof children !== "function" && children, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__panel`, ref: pickerRef }, Taro.getEnv() === "WEB" ? columnsList == null ? void 0 : columnsList.map((item, index) => {
         return /* @__PURE__ */ React.createElement(
           PickerPanel$1,
           {
@@ -8923,35 +8953,35 @@ var __publicField = (obj, key, value) => {
           }));
         })
       )))
-    );
+    ));
   };
   const Picker = React.forwardRef(InternalPicker);
   const Picker$1 = Picker;
   const currentYear = (/* @__PURE__ */ new Date()).getFullYear();
   const defaultProps$X = {
-    modelValue: null,
+    ...ComponentDefaults,
     visible: false,
     title: "",
     type: "date",
-    isShowChinese: false,
+    showChinese: false,
     threeDimensional: true,
     minuteStep: 1,
-    minDate: new Date(currentYear - 10, 0, 1),
-    maxDate: new Date(currentYear + 10, 11, 31)
+    startDate: new Date(currentYear - 10, 0, 1),
+    endDate: new Date(currentYear + 10, 11, 31)
   };
   const DatePicker = (props) => {
     const {
-      minDate,
-      maxDate,
-      type,
-      isShowChinese,
+      startDate,
+      endDate,
+      type: type2,
+      showChinese,
       minuteStep,
-      modelValue,
       visible,
       title,
+      defaultValue,
       formatter,
-      onCloseDatePicker,
-      onConfirmDatePicker,
+      onClose,
+      onConfirm,
       filter,
       onChange,
       threeDimensional,
@@ -8963,14 +8993,6 @@ var __publicField = (obj, key, value) => {
       ...props
     };
     const { locale } = useConfig$1();
-    const [show, setShow] = React.useState(false);
-    const [currentDate, setCurrentDate] = React.useState(modelValue);
-    const [defaultValue, setDefaultValue] = React.useState([]);
-    const [options, setListData] = React.useState([]);
-    const pickerRef = React.useRef(null);
-    const isDate = (val) => {
-      return Object.prototype.toString.call(val) === "[object Date]" && !Number.isNaN(val.getTime());
-    };
     const datepickerLang = locale.datepicker;
     const zhCNType = {
       day: datepickerLang.day,
@@ -8980,28 +9002,40 @@ var __publicField = (obj, key, value) => {
       minute: datepickerLang.min,
       seconds: datepickerLang.seconds
     };
+    const [defaultValueOfPicker, setDefaultValueOfPicker] = React.useState([]);
+    const [options, setOptions] = React.useState([]);
+    const isDate = (val) => {
+      return Object.prototype.toString.call(val) === "[object Date]" && !Number.isNaN(val.getTime());
+    };
     const formatValue = (value) => {
       let cvalue = value;
       if (!cvalue || cvalue && !isDate(cvalue)) {
-        cvalue = minDate;
+        cvalue = startDate;
       }
-      let timestmp = Math.max(cvalue.getTime(), minDate.getTime());
-      timestmp = Math.min(timestmp, maxDate.getTime());
+      let timestmp = Math.max(cvalue.getTime(), startDate.getTime());
+      timestmp = Math.min(timestmp, endDate.getTime());
       return new Date(timestmp);
     };
+    const [currentDate, setCurrentDate] = usePropsValue({
+      value: props.value && formatValue(props.value),
+      defaultValue: formatValue(props.defaultValue || null),
+      finalValue: null,
+      onChange: (val) => {
+      }
+    });
     function getMonthEndDay(year, month) {
       return new Date(year, month, 0).getDate();
     }
-    const getBoundary = (type2, value) => {
-      const boundary = type2 === "min" ? minDate : maxDate;
+    const getBoundary = (type22, value) => {
+      const boundary = type22 === "min" ? startDate : endDate;
       const year = boundary.getFullYear();
       let month = 1;
-      let date = 1;
+      let date2 = 1;
       let hour = 0;
       let minute = 0;
-      if (type2 === "max") {
+      if (type22 === "max") {
         month = 12;
-        date = getMonthEndDay(value.getFullYear(), value.getMonth() + 1);
+        date2 = getMonthEndDay(value.getFullYear(), value.getMonth() + 1);
         hour = 23;
         minute = 59;
       }
@@ -9009,8 +9043,8 @@ var __publicField = (obj, key, value) => {
       if (value.getFullYear() === year) {
         month = boundary.getMonth() + 1;
         if (value.getMonth() + 1 === month) {
-          date = boundary.getDate();
-          if (value.getDate() === date) {
+          date2 = boundary.getDate();
+          if (value.getDate() === date2) {
             hour = boundary.getHours();
             if (value.getHours() === hour) {
               minute = boundary.getMinutes();
@@ -9019,20 +9053,20 @@ var __publicField = (obj, key, value) => {
         }
       }
       return {
-        [`${type2}Year`]: year,
-        [`${type2}Month`]: month,
-        [`${type2}Date`]: date,
-        [`${type2}Hour`]: hour,
-        [`${type2}Minute`]: minute,
-        [`${type2}Seconds`]: seconds
+        [`${type22}Year`]: year,
+        [`${type22}Month`]: month,
+        [`${type22}Date`]: date2,
+        [`${type22}Hour`]: hour,
+        [`${type22}Minute`]: minute,
+        [`${type22}Seconds`]: seconds
       };
     };
-    const ranges = (date) => {
-      const curDate = date || currentDate;
+    const ranges = () => {
+      const curDate = currentDate;
       if (!curDate)
         return [];
-      const { maxYear, maxDate: maxDate2, maxMonth, maxHour, maxMinute, maxSeconds } = getBoundary("max", curDate);
-      const { minYear, minDate: minDate2, minMonth, minHour, minMinute, minSeconds } = getBoundary("min", curDate);
+      const { maxYear, maxDate, maxMonth, maxHour, maxMinute, maxSeconds } = getBoundary("max", curDate);
+      const { minYear, minDate, minMonth, minHour, minMinute, minSeconds } = getBoundary("min", curDate);
       let result = [
         {
           type: "year",
@@ -9044,7 +9078,7 @@ var __publicField = (obj, key, value) => {
         },
         {
           type: "day",
-          range: [minDate2, maxDate2]
+          range: [minDate, maxDate]
         },
         {
           type: "hour",
@@ -9059,7 +9093,7 @@ var __publicField = (obj, key, value) => {
           range: [minSeconds, maxSeconds]
         }
       ];
-      switch (type.toLocaleLowerCase()) {
+      switch (type2.toLocaleLowerCase()) {
         case "date":
           result = result.slice(0, 3);
           break;
@@ -9084,21 +9118,23 @@ var __publicField = (obj, key, value) => {
       }
       return result;
     };
-    const updateChooseValueCustmer = (cacheValueData, selectedValue, index) => {
+    const updateChooseValueCustmer = (selectedOptions, selectedValue, index) => {
       if (["date", "datetime", "datehour", "month-day", "year-month"].includes(
-        type.toLocaleLowerCase()
+        type2.toLocaleLowerCase()
       )) {
         const formatDate = [];
         selectedValue.forEach((item) => {
           formatDate.push(item);
         });
-        if (type.toLocaleLowerCase() === "month-day" && formatDate.length < 3) {
+        if (type2.toLocaleLowerCase() === "month-day" && formatDate.length < 3) {
           formatDate.unshift(
-            new Date(modelValue || minDate || maxDate).getFullYear()
+            new Date(defaultValue || startDate || endDate).getFullYear()
           );
         }
-        if (type.toLocaleLowerCase() === "year-month" && formatDate.length < 3) {
-          formatDate.push(new Date(modelValue || minDate || maxDate).getDate());
+        if (type2.toLocaleLowerCase() === "year-month" && formatDate.length < 3) {
+          formatDate.push(
+            new Date(defaultValue || startDate || endDate).getDate()
+          );
         }
         const year = Number(formatDate[0]);
         const month = Number(formatDate[1]) - 1;
@@ -9106,24 +9142,24 @@ var __publicField = (obj, key, value) => {
           Number(formatDate[2]),
           getMonthEndDay(Number(formatDate[0]), Number(formatDate[1]))
         );
-        let date = null;
-        if (type.toLocaleLowerCase() === "date" || type.toLocaleLowerCase() === "month-day" || type.toLocaleLowerCase() === "year-month") {
-          date = new Date(year, month, day);
-        } else if (type.toLocaleLowerCase() === "datetime") {
-          date = new Date(
+        let date2 = null;
+        if (type2.toLocaleLowerCase() === "date" || type2.toLocaleLowerCase() === "month-day" || type2.toLocaleLowerCase() === "year-month") {
+          date2 = new Date(year, month, day);
+        } else if (type2.toLocaleLowerCase() === "datetime") {
+          date2 = new Date(
             year,
             month,
             day,
             Number(formatDate[3]),
             Number(formatDate[4])
           );
-        } else if (type.toLocaleLowerCase() === "datehour") {
-          date = new Date(year, month, day, Number(formatDate[3]));
+        } else if (type2.toLocaleLowerCase() === "datehour") {
+          date2 = new Date(year, month, day, Number(formatDate[3]));
         }
-        const isEqual = (currentDate == null ? void 0 : currentDate.getTime()) === (date == null ? void 0 : date.getTime());
-        date && isDate(date) && !isEqual && setCurrentDate(formatValue(date));
+        const isEqual = (currentDate == null ? void 0 : currentDate.getTime()) === (date2 == null ? void 0 : date2.getTime());
+        date2 && isDate(date2) && !isEqual && setCurrentDate(formatValue(date2));
       }
-      props.onChange && props.onChange(cacheValueData, selectedValue, index);
+      props.onChange && props.onChange(selectedOptions, selectedValue, index);
     };
     const padZero = (num, targetLength = 2) => {
       let str = `${num}`;
@@ -9132,27 +9168,28 @@ var __publicField = (obj, key, value) => {
       }
       return str;
     };
-    const formatterOption = (type2, value) => {
+    const formatterOption = (type22, value) => {
       let fOption = null;
       if (formatter) {
-        fOption = formatter(type2, {
+        fOption = formatter(type22, {
           text: padZero(value, 2),
           value: padZero(value, 2)
         });
       } else {
         const padMin = padZero(value, 2);
-        const fatter = isShowChinese ? zhCNType[type2] : "";
+        const fatter = showChinese ? zhCNType[type22] : "";
         fOption = { text: padMin + fatter, value: padMin };
       }
       return fOption;
     };
-    const generateValue = (min, max, val, type2, columnIndex) => {
+    const generateValue = (min, max, val, type22, columnIndex) => {
+      var _a;
       let cmin = min;
       const arr = [];
       let index = 0;
       while (cmin <= max) {
-        arr.push(formatterOption(type2, cmin));
-        if (type2 === "minute") {
+        arr.push(formatterOption(type22, cmin));
+        if (type22 === "minute") {
           cmin += minuteStep;
         } else {
           cmin++;
@@ -9161,34 +9198,34 @@ var __publicField = (obj, key, value) => {
           index++;
         }
       }
-      defaultValue[columnIndex] = arr[index].value;
-      setDefaultValue([...defaultValue]);
-      if (props.filter && props.filter(type2, arr)) {
-        return props.filter(type2, arr);
+      defaultValueOfPicker[columnIndex] = (_a = arr[index]) == null ? void 0 : _a.value;
+      setDefaultValueOfPicker([...defaultValueOfPicker]);
+      if (props.filter && props.filter(type22, arr)) {
+        return props.filter(type22, arr);
       }
       return arr;
     };
-    const getDateIndex = (type2) => {
+    const getDateIndex = (type22) => {
       if (!currentDate)
         return 0;
       let d = 0;
-      if (type2 === "year") {
+      if (type22 === "year") {
         d = currentDate.getFullYear();
-      } else if (type2 === "month") {
+      } else if (type22 === "month") {
         d = currentDate.getMonth() + 1;
-      } else if (type2 === "day") {
+      } else if (type22 === "day") {
         d = currentDate.getDate();
-      } else if (type2 === "hour") {
+      } else if (type22 === "hour") {
         d = currentDate.getHours();
-      } else if (type2 === "minute") {
+      } else if (type22 === "minute") {
         d = currentDate.getMinutes();
-      } else if (type2 === "seconds") {
+      } else if (type22 === "seconds") {
         d = currentDate.getSeconds();
       }
       return d;
     };
-    const columns = (date) => {
-      const val = ranges(date).map((res, columnIndex) => {
+    const columns = () => {
+      const val = ranges().map((res, columnIndex) => {
         return generateValue(
           res.range[0],
           res.range[1],
@@ -9199,251 +9236,1218 @@ var __publicField = (obj, key, value) => {
       });
       return val || [];
     };
-    React.useEffect(() => {
-      setCurrentDate(formatValue(modelValue));
-    }, []);
-    React.useEffect(() => {
-      setCurrentDate(formatValue(modelValue));
-    }, [modelValue]);
-    React.useEffect(() => {
-      setShow(visible);
-    }, [visible]);
     React.useEffect(() => {
       if (currentDate) {
-        setListData(columns());
+        setOptions(columns());
       }
-    }, [currentDate]);
+    }, []);
     return /* @__PURE__ */ React.createElement(
       components.View,
       {
-        className: `nut-datepicker ${className || ""}`,
+        className: `nut-datepicker ${className}`,
         style,
         catchMove: true,
         ...rest
       },
-      options.length > 0 && /* @__PURE__ */ React.createElement(
+      options.length && /* @__PURE__ */ React.createElement(
         Picker$1,
         {
           title,
-          visible: show,
+          visible,
           options,
-          onClose: onCloseDatePicker,
-          defaultValue,
-          onConfirm: (options2, values) => onConfirmDatePicker && onConfirmDatePicker(options2, values),
-          onChange: (list, value, index) => updateChooseValueCustmer(list, value, index),
-          threeDimensional,
-          ref: pickerRef
+          onClose,
+          defaultValue: defaultValueOfPicker,
+          onConfirm: (options2, value) => onConfirm && onConfirm(options2, value),
+          onChange: (options2, value, index) => updateChooseValueCustmer(options2, value, index),
+          threeDimensional
         }
       )
     );
   };
   DatePicker.defaultProps = defaultProps$X;
   DatePicker.displayName = "NutDatePicker";
-  const FormItemContext = React.createContext({});
-  const defaultProps$W = {
-    ...ComponentDefaults,
-    name: "",
-    label: "",
-    className: "",
-    rules: [{ required: false, message: "" }],
-    disabled: false,
-    labelWidth: 90,
-    errorMessageAlign: "left",
-    showErrorLine: true,
-    showErrorMessage: true
-  };
-  class FormItem extends React.Component {
-    constructor() {
-      super(...arguments);
-      __publicField(this, "cancelRegister");
-      // children添加value属性和onChange事件
-      __publicField(this, "getControlled", (children) => {
-        const { getFieldValue, setFieldsValue } = this.context;
-        const { name } = this.props;
-        const type = children.type.NAME;
-        return {
-          value: getFieldValue(name),
-          onChange: (event) => {
-            let newValue = event;
-            switch (type) {
-              case "checkbox":
-                newValue = event.target.value;
-                break;
-            }
-            setFieldsValue({ [name]: newValue });
+  const Context = React.createContext({});
+  function _extends() {
+    _extends = Object.assign ? Object.assign.bind() : function(target) {
+      for (var i = 1; i < arguments.length; i++) {
+        var source = arguments[i];
+        for (var key in source) {
+          if (Object.prototype.hasOwnProperty.call(source, key)) {
+            target[key] = source[key];
           }
-        };
-      });
-      __publicField(this, "onStoreChange", () => {
-        this.forceUpdate();
+        }
+      }
+      return target;
+    };
+    return _extends.apply(this, arguments);
+  }
+  function _inheritsLoose(subClass, superClass) {
+    subClass.prototype = Object.create(superClass.prototype);
+    subClass.prototype.constructor = subClass;
+    _setPrototypeOf(subClass, superClass);
+  }
+  function _getPrototypeOf(o) {
+    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf2(o2) {
+      return o2.__proto__ || Object.getPrototypeOf(o2);
+    };
+    return _getPrototypeOf(o);
+  }
+  function _setPrototypeOf(o, p) {
+    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf2(o2, p2) {
+      o2.__proto__ = p2;
+      return o2;
+    };
+    return _setPrototypeOf(o, p);
+  }
+  function _isNativeReflectConstruct() {
+    if (typeof Reflect === "undefined" || !Reflect.construct)
+      return false;
+    if (Reflect.construct.sham)
+      return false;
+    if (typeof Proxy === "function")
+      return true;
+    try {
+      Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {
+      }));
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+  function _construct(Parent, args, Class) {
+    if (_isNativeReflectConstruct()) {
+      _construct = Reflect.construct.bind();
+    } else {
+      _construct = function _construct2(Parent2, args2, Class2) {
+        var a2 = [null];
+        a2.push.apply(a2, args2);
+        var Constructor = Function.bind.apply(Parent2, a2);
+        var instance = new Constructor();
+        if (Class2)
+          _setPrototypeOf(instance, Class2.prototype);
+        return instance;
+      };
+    }
+    return _construct.apply(null, arguments);
+  }
+  function _isNativeFunction(fn) {
+    return Function.toString.call(fn).indexOf("[native code]") !== -1;
+  }
+  function _wrapNativeSuper(Class) {
+    var _cache = typeof Map === "function" ? /* @__PURE__ */ new Map() : void 0;
+    _wrapNativeSuper = function _wrapNativeSuper2(Class2) {
+      if (Class2 === null || !_isNativeFunction(Class2))
+        return Class2;
+      if (typeof Class2 !== "function") {
+        throw new TypeError("Super expression must either be null or a function");
+      }
+      if (typeof _cache !== "undefined") {
+        if (_cache.has(Class2))
+          return _cache.get(Class2);
+        _cache.set(Class2, Wrapper);
+      }
+      function Wrapper() {
+        return _construct(Class2, arguments, _getPrototypeOf(this).constructor);
+      }
+      Wrapper.prototype = Object.create(Class2.prototype, {
+        constructor: {
+          value: Wrapper,
+          enumerable: false,
+          writable: true,
+          configurable: true
+        }
       });
-      __publicField(this, "renderLayout", (childNode) => {
-        var _a, _b;
-        const {
-          label,
-          name,
-          rules = [{ required: false, message: "" }],
-          className,
-          labelWidth,
-          errorMessageAlign,
-          showErrorLine,
-          showErrorMessage
-        } = {
-          ...defaultProps$W,
-          ...this.props
-        };
-        const item = ((_a = this.context.errList) == null ? void 0 : _a.length) > 0 && ((_b = this.context.errList) == null ? void 0 : _b.filter((item2) => {
-          return item2.field === name;
-        }));
-        const { starPositon } = this.context;
-        const renderStar = rules.length > 0 && rules[0].required && /* @__PURE__ */ React.createElement("i", { className: "required" });
-        const renderLabel = starPositon === "Right" ? /* @__PURE__ */ React.createElement(React.Fragment, null, label, renderStar) : /* @__PURE__ */ React.createElement(React.Fragment, null, renderStar, label);
-        return /* @__PURE__ */ React.createElement(Cell, { className: `nut-form-item ${className}` }, label ? /* @__PURE__ */ React.createElement(
-          "div",
-          {
-            className: "nut-cell__title nut-form-item__label",
-            style: {
-              width: this.pxCheck(labelWidth)
+      return _setPrototypeOf(Wrapper, Class2);
+    };
+    return _wrapNativeSuper(Class);
+  }
+  var formatRegExp = /%[sdj%]/g;
+  var warning = function warning2() {
+  };
+  if (typeof process !== "undefined" && process.env && process.env.NODE_ENV !== "production" && typeof window !== "undefined" && typeof document !== "undefined") {
+    warning = function warning2(type2, errors) {
+      if (typeof console !== "undefined" && console.warn && typeof ASYNC_VALIDATOR_NO_WARNING === "undefined") {
+        if (errors.every(function(e) {
+          return typeof e === "string";
+        })) {
+          console.warn(type2, errors);
+        }
+      }
+    };
+  }
+  function convertFieldsError(errors) {
+    if (!errors || !errors.length)
+      return null;
+    var fields = {};
+    errors.forEach(function(error) {
+      var field = error.field;
+      fields[field] = fields[field] || [];
+      fields[field].push(error);
+    });
+    return fields;
+  }
+  function format(template) {
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
+    }
+    var i = 0;
+    var len = args.length;
+    if (typeof template === "function") {
+      return template.apply(null, args);
+    }
+    if (typeof template === "string") {
+      var str = template.replace(formatRegExp, function(x) {
+        if (x === "%%") {
+          return "%";
+        }
+        if (i >= len) {
+          return x;
+        }
+        switch (x) {
+          case "%s":
+            return String(args[i++]);
+          case "%d":
+            return Number(args[i++]);
+          case "%j":
+            try {
+              return JSON.stringify(args[i++]);
+            } catch (_) {
+              return "[Circular]";
             }
-          },
-          renderLabel
-        ) : null, /* @__PURE__ */ React.createElement("div", { className: "nut-cell__value nut-form-item__body" }, /* @__PURE__ */ React.createElement("div", { className: "nut-form-item__body__slots" }, childNode), item.length > 0 && /* @__PURE__ */ React.createElement(
-          "div",
-          {
-            className: "nut-form-item__body__tips",
-            style: { textAlign: errorMessageAlign }
-          },
-          item[0].message
-        )));
-      });
-      __publicField(this, "pxCheck", (value) => {
-        return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
+            break;
+          default:
+            return x;
+        }
       });
+      return str;
     }
-    componentDidMount() {
-      this.cancelRegister = this.context.registerField(this);
+    return template;
+  }
+  function isNativeStringType(type2) {
+    return type2 === "string" || type2 === "url" || type2 === "hex" || type2 === "email" || type2 === "date" || type2 === "pattern";
+  }
+  function isEmptyValue(value, type2) {
+    if (value === void 0 || value === null) {
+      return true;
     }
-    componentWillUnmount() {
-      if (this.cancelRegister) {
-        this.cancelRegister();
+    if (type2 === "array" && Array.isArray(value) && !value.length) {
+      return true;
+    }
+    if (isNativeStringType(type2) && typeof value === "string" && !value) {
+      return true;
+    }
+    return false;
+  }
+  function asyncParallelArray(arr, func, callback) {
+    var results = [];
+    var total = 0;
+    var arrLength = arr.length;
+    function count(errors) {
+      results.push.apply(results, errors || []);
+      total++;
+      if (total === arrLength) {
+        callback(results);
       }
     }
-    render() {
-      const { children } = this.props;
-      const c = Array.isArray(children) ? children[0] : children;
-      const returnChildNode = React.cloneElement(
-        c,
-        this.getControlled(c)
-      );
-      return this.renderLayout(returnChildNode);
+    arr.forEach(function(a2) {
+      func(a2, count);
+    });
+  }
+  function asyncSerialArray(arr, func, callback) {
+    var index = 0;
+    var arrLength = arr.length;
+    function next(errors) {
+      if (errors && errors.length) {
+        callback(errors);
+        return;
+      }
+      var original = index;
+      index = index + 1;
+      if (original < arrLength) {
+        func(arr[original], next);
+      } else {
+        callback([]);
+      }
     }
+    next([]);
   }
-  __publicField(FormItem, "defaultProps", defaultProps$W);
-  __publicField(FormItem, "contextType", FormItemContext);
-  class FormStore {
-    constructor() {
-      __publicField(this, "store", {});
-      // 存放表单中所有的数据 eg. {password: "ddd",username: "123"}
-      __publicField(this, "fieldEntities", []);
-      // 所有的组件实例
-      // 成功和失败的回调
-      __publicField(this, "callbacks", {});
-      __publicField(this, "errList", []);
-      /**
-       * 注册组件实例
-       * @param field
-       */
-      __publicField(this, "registerField", (field) => {
-        this.fieldEntities.push(field);
-        return () => {
-          this.fieldEntities = this.fieldEntities.filter((item) => item != field);
-          delete this.store[field.props.name];
-        };
-      });
-      __publicField(this, "getFieldValue", (name) => {
-        return this.store[name];
-      });
-      /**
-       * 存储组件数据
-       * @param newStore { [name]: newValue }
-       */
-      __publicField(this, "setFieldsValue", (newStore) => {
-        this.store = {
-          ...this.store,
-          ...newStore
+  function flattenObjArr(objArr) {
+    var ret = [];
+    Object.keys(objArr).forEach(function(k) {
+      ret.push.apply(ret, objArr[k] || []);
+    });
+    return ret;
+  }
+  var AsyncValidationError = /* @__PURE__ */ function(_Error) {
+    _inheritsLoose(AsyncValidationError2, _Error);
+    function AsyncValidationError2(errors, fields) {
+      var _this;
+      _this = _Error.call(this, "Async Validation Error") || this;
+      _this.errors = errors;
+      _this.fields = fields;
+      return _this;
+    }
+    return AsyncValidationError2;
+  }(/* @__PURE__ */ _wrapNativeSuper(Error));
+  function asyncMap(objArr, option, func, callback, source) {
+    if (option.first) {
+      var _pending = new Promise(function(resolve, reject) {
+        var next = function next2(errors) {
+          callback(errors);
+          return errors.length ? reject(new AsyncValidationError(errors, convertFieldsError(errors))) : resolve(source);
         };
-        this.fieldEntities.forEach((enetity) => {
-          const { name } = enetity.props;
-          Object.keys(newStore).forEach((key) => {
-            if (key === name) {
-              enetity.onStoreChange();
-            }
-          });
-        });
-      });
-      /**
-       * 表单校验
-       * rules: { required: true, message: '' }
-       * descriptor: {
-       *    username: {
-       *      type: 'string',
-       *      required: true,
-       *      validator: (rule, value) => {
-       *        return /^[a-zA-Z0-9]+$/.test(value)
-       *      },
-       *    },
-       *  }
-       */
-      __publicField(this, "validate", () => {
-        const err = [];
-        this.errList.length = 0;
-        this.fieldEntities.forEach((entity) => {
-          const { name, rules = [] } = entity.props;
-          const descriptor = {};
-          if (rules.length) {
-            if (rules.length > 1) {
-              descriptor[name] = [];
-              rules.map((v) => {
-                descriptor[name].push(v);
-              });
-            } else {
-              descriptor[name] = rules[0];
-            }
-          }
-        });
-        return err;
+        var flattenArr = flattenObjArr(objArr);
+        asyncSerialArray(flattenArr, func, next);
       });
-      __publicField(this, "setCallback", (callback) => {
-        this.callbacks = {
-          ...this.callbacks,
-          ...callback
-        };
+      _pending["catch"](function(e) {
+        return e;
       });
-      __publicField(this, "submit", () => {
-        var _a, _b, _c, _d;
-        const err = this.validate();
-        if (err.length === 0) {
-          (_b = (_a = this.callbacks).onFinish) == null ? void 0 : _b.call(_a, this.store);
-        } else if (err.length > 0) {
-          (_d = (_c = this.callbacks).onFinishFailed) == null ? void 0 : _d.call(_c, err);
+      return _pending;
+    }
+    var firstFields = option.firstFields === true ? Object.keys(objArr) : option.firstFields || [];
+    var objArrKeys = Object.keys(objArr);
+    var objArrLength = objArrKeys.length;
+    var total = 0;
+    var results = [];
+    var pending = new Promise(function(resolve, reject) {
+      var next = function next2(errors) {
+        results.push.apply(results, errors);
+        total++;
+        if (total === objArrLength) {
+          callback(results);
+          return results.length ? reject(new AsyncValidationError(results, convertFieldsError(results))) : resolve(source);
         }
-      });
-      __publicField(this, "resetFields", () => {
+      };
+      if (!objArrKeys.length) {
+        callback(results);
+        resolve(source);
+      }
+      objArrKeys.forEach(function(key) {
+        var arr = objArr[key];
+        if (firstFields.indexOf(key) !== -1) {
+          asyncSerialArray(arr, func, next);
+        } else {
+          asyncParallelArray(arr, func, next);
+        }
+      });
+    });
+    pending["catch"](function(e) {
+      return e;
+    });
+    return pending;
+  }
+  function isErrorObj(obj) {
+    return !!(obj && obj.message !== void 0);
+  }
+  function getValue(value, path) {
+    var v = value;
+    for (var i = 0; i < path.length; i++) {
+      if (v == void 0) {
+        return v;
+      }
+      v = v[path[i]];
+    }
+    return v;
+  }
+  function complementError(rule, source) {
+    return function(oe) {
+      var fieldValue;
+      if (rule.fullFields) {
+        fieldValue = getValue(source, rule.fullFields);
+      } else {
+        fieldValue = source[oe.field || rule.fullField];
+      }
+      if (isErrorObj(oe)) {
+        oe.field = oe.field || rule.fullField;
+        oe.fieldValue = fieldValue;
+        return oe;
+      }
+      return {
+        message: typeof oe === "function" ? oe() : oe,
+        fieldValue,
+        field: oe.field || rule.fullField
+      };
+    };
+  }
+  function deepMerge(target, source) {
+    if (source) {
+      for (var s in source) {
+        if (source.hasOwnProperty(s)) {
+          var value = source[s];
+          if (typeof value === "object" && typeof target[s] === "object") {
+            target[s] = _extends({}, target[s], value);
+          } else {
+            target[s] = value;
+          }
+        }
+      }
+    }
+    return target;
+  }
+  var required$1 = function required2(rule, value, source, errors, options, type2) {
+    if (rule.required && (!source.hasOwnProperty(rule.field) || isEmptyValue(value, type2 || rule.type))) {
+      errors.push(format(options.messages.required, rule.fullField));
+    }
+  };
+  var whitespace = function whitespace2(rule, value, source, errors, options) {
+    if (/^\s+$/.test(value) || value === "") {
+      errors.push(format(options.messages.whitespace, rule.fullField));
+    }
+  };
+  var urlReg;
+  var getUrlRegex = function() {
+    if (urlReg) {
+      return urlReg;
+    }
+    var word = "[a-fA-F\\d:]";
+    var b2 = function b3(options) {
+      return options && options.includeBoundaries ? "(?:(?<=\\s|^)(?=" + word + ")|(?<=" + word + ")(?=\\s|$))" : "";
+    };
+    var v4 = "(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}";
+    var v6seg = "[a-fA-F\\d]{1,4}";
+    var v6 = ("\n(?:\n(?:" + v6seg + ":){7}(?:" + v6seg + "|:)|                                    // 1:2:3:4:5:6:7::  1:2:3:4:5:6:7:8\n(?:" + v6seg + ":){6}(?:" + v4 + "|:" + v6seg + "|:)|                             // 1:2:3:4:5:6::    1:2:3:4:5:6::8   1:2:3:4:5:6::8  1:2:3:4:5:6::1.2.3.4\n(?:" + v6seg + ":){5}(?::" + v4 + "|(?::" + v6seg + "){1,2}|:)|                   // 1:2:3:4:5::      1:2:3:4:5::7:8   1:2:3:4:5::8    1:2:3:4:5::7:1.2.3.4\n(?:" + v6seg + ":){4}(?:(?::" + v6seg + "){0,1}:" + v4 + "|(?::" + v6seg + "){1,3}|:)| // 1:2:3:4::        1:2:3:4::6:7:8   1:2:3:4::8      1:2:3:4::6:7:1.2.3.4\n(?:" + v6seg + ":){3}(?:(?::" + v6seg + "){0,2}:" + v4 + "|(?::" + v6seg + "){1,4}|:)| // 1:2:3::          1:2:3::5:6:7:8   1:2:3::8        1:2:3::5:6:7:1.2.3.4\n(?:" + v6seg + ":){2}(?:(?::" + v6seg + "){0,3}:" + v4 + "|(?::" + v6seg + "){1,5}|:)| // 1:2::            1:2::4:5:6:7:8   1:2::8          1:2::4:5:6:7:1.2.3.4\n(?:" + v6seg + ":){1}(?:(?::" + v6seg + "){0,4}:" + v4 + "|(?::" + v6seg + "){1,6}|:)| // 1::              1::3:4:5:6:7:8   1::8            1::3:4:5:6:7:1.2.3.4\n(?::(?:(?::" + v6seg + "){0,5}:" + v4 + "|(?::" + v6seg + "){1,7}|:))             // ::2:3:4:5:6:7:8  ::2:3:4:5:6:7:8  ::8             ::1.2.3.4\n)(?:%[0-9a-zA-Z]{1,})?                                             // %eth0            %1\n").replace(/\s*\/\/.*$/gm, "").replace(/\n/g, "").trim();
+    var v46Exact = new RegExp("(?:^" + v4 + "$)|(?:^" + v6 + "$)");
+    var v4exact = new RegExp("^" + v4 + "$");
+    var v6exact = new RegExp("^" + v6 + "$");
+    var ip = function ip2(options) {
+      return options && options.exact ? v46Exact : new RegExp("(?:" + b2(options) + v4 + b2(options) + ")|(?:" + b2(options) + v6 + b2(options) + ")", "g");
+    };
+    ip.v4 = function(options) {
+      return options && options.exact ? v4exact : new RegExp("" + b2(options) + v4 + b2(options), "g");
+    };
+    ip.v6 = function(options) {
+      return options && options.exact ? v6exact : new RegExp("" + b2(options) + v6 + b2(options), "g");
+    };
+    var protocol = "(?:(?:[a-z]+:)?//)";
+    var auth = "(?:\\S+(?::\\S*)?@)?";
+    var ipv4 = ip.v4().source;
+    var ipv6 = ip.v6().source;
+    var host = "(?:(?:[a-z\\u00a1-\\uffff0-9][-_]*)*[a-z\\u00a1-\\uffff0-9]+)";
+    var domain = "(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*";
+    var tld = "(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))";
+    var port = "(?::\\d{2,5})?";
+    var path = '(?:[/?#][^\\s"]*)?';
+    var regex = "(?:" + protocol + "|www\\.)" + auth + "(?:localhost|" + ipv4 + "|" + ipv6 + "|" + host + domain + tld + ")" + port + path;
+    urlReg = new RegExp("(?:^" + regex + "$)", "i");
+    return urlReg;
+  };
+  var pattern$2 = {
+    // http://emailregex.com/
+    email: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+\.)+[a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]{2,}))$/,
+    // url: new RegExp(
+    //   '^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$',
+    //   'i',
+    // ),
+    hex: /^#?([a-f0-9]{6}|[a-f0-9]{3})$/i
+  };
+  var types = {
+    integer: function integer2(value) {
+      return types.number(value) && parseInt(value, 10) === value;
+    },
+    "float": function float(value) {
+      return types.number(value) && !types.integer(value);
+    },
+    array: function array2(value) {
+      return Array.isArray(value);
+    },
+    regexp: function regexp2(value) {
+      if (value instanceof RegExp) {
+        return true;
+      }
+      try {
+        return !!new RegExp(value);
+      } catch (e) {
+        return false;
+      }
+    },
+    date: function date2(value) {
+      return typeof value.getTime === "function" && typeof value.getMonth === "function" && typeof value.getYear === "function" && !isNaN(value.getTime());
+    },
+    number: function number2(value) {
+      if (isNaN(value)) {
+        return false;
+      }
+      return typeof value === "number";
+    },
+    object: function object2(value) {
+      return typeof value === "object" && !types.array(value);
+    },
+    method: function method2(value) {
+      return typeof value === "function";
+    },
+    email: function email(value) {
+      return typeof value === "string" && value.length <= 320 && !!value.match(pattern$2.email);
+    },
+    url: function url(value) {
+      return typeof value === "string" && value.length <= 2048 && !!value.match(getUrlRegex());
+    },
+    hex: function hex(value) {
+      return typeof value === "string" && !!value.match(pattern$2.hex);
+    }
+  };
+  var type$1 = function type2(rule, value, source, errors, options) {
+    if (rule.required && value === void 0) {
+      required$1(rule, value, source, errors, options);
+      return;
+    }
+    var custom = ["integer", "float", "array", "regexp", "object", "method", "email", "number", "date", "url", "hex"];
+    var ruleType = rule.type;
+    if (custom.indexOf(ruleType) > -1) {
+      if (!types[ruleType](value)) {
+        errors.push(format(options.messages.types[ruleType], rule.fullField, rule.type));
+      }
+    } else if (ruleType && typeof value !== rule.type) {
+      errors.push(format(options.messages.types[ruleType], rule.fullField, rule.type));
+    }
+  };
+  var range = function range2(rule, value, source, errors, options) {
+    var len = typeof rule.len === "number";
+    var min = typeof rule.min === "number";
+    var max = typeof rule.max === "number";
+    var spRegexp = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
+    var val = value;
+    var key = null;
+    var num = typeof value === "number";
+    var str = typeof value === "string";
+    var arr = Array.isArray(value);
+    if (num) {
+      key = "number";
+    } else if (str) {
+      key = "string";
+    } else if (arr) {
+      key = "array";
+    }
+    if (!key) {
+      return false;
+    }
+    if (arr) {
+      val = value.length;
+    }
+    if (str) {
+      val = value.replace(spRegexp, "_").length;
+    }
+    if (len) {
+      if (val !== rule.len) {
+        errors.push(format(options.messages[key].len, rule.fullField, rule.len));
+      }
+    } else if (min && !max && val < rule.min) {
+      errors.push(format(options.messages[key].min, rule.fullField, rule.min));
+    } else if (max && !min && val > rule.max) {
+      errors.push(format(options.messages[key].max, rule.fullField, rule.max));
+    } else if (min && max && (val < rule.min || val > rule.max)) {
+      errors.push(format(options.messages[key].range, rule.fullField, rule.min, rule.max));
+    }
+  };
+  var ENUM$1 = "enum";
+  var enumerable$1 = function enumerable2(rule, value, source, errors, options) {
+    rule[ENUM$1] = Array.isArray(rule[ENUM$1]) ? rule[ENUM$1] : [];
+    if (rule[ENUM$1].indexOf(value) === -1) {
+      errors.push(format(options.messages[ENUM$1], rule.fullField, rule[ENUM$1].join(", ")));
+    }
+  };
+  var pattern$1 = function pattern2(rule, value, source, errors, options) {
+    if (rule.pattern) {
+      if (rule.pattern instanceof RegExp) {
+        rule.pattern.lastIndex = 0;
+        if (!rule.pattern.test(value)) {
+          errors.push(format(options.messages.pattern.mismatch, rule.fullField, value, rule.pattern));
+        }
+      } else if (typeof rule.pattern === "string") {
+        var _pattern = new RegExp(rule.pattern);
+        if (!_pattern.test(value)) {
+          errors.push(format(options.messages.pattern.mismatch, rule.fullField, value, rule.pattern));
+        }
+      }
+    }
+  };
+  var rules = {
+    required: required$1,
+    whitespace,
+    type: type$1,
+    range,
+    "enum": enumerable$1,
+    pattern: pattern$1
+  };
+  var string = function string2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (isEmptyValue(value, "string") && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options, "string");
+      if (!isEmptyValue(value, "string")) {
+        rules.type(rule, value, source, errors, options);
+        rules.range(rule, value, source, errors, options);
+        rules.pattern(rule, value, source, errors, options);
+        if (rule.whitespace === true) {
+          rules.whitespace(rule, value, source, errors, options);
+        }
+      }
+    }
+    callback(errors);
+  };
+  var method = function method2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (isEmptyValue(value) && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options);
+      if (value !== void 0) {
+        rules.type(rule, value, source, errors, options);
+      }
+    }
+    callback(errors);
+  };
+  var number = function number2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (value === "") {
+        value = void 0;
+      }
+      if (isEmptyValue(value) && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options);
+      if (value !== void 0) {
+        rules.type(rule, value, source, errors, options);
+        rules.range(rule, value, source, errors, options);
+      }
+    }
+    callback(errors);
+  };
+  var _boolean = function _boolean2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (isEmptyValue(value) && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options);
+      if (value !== void 0) {
+        rules.type(rule, value, source, errors, options);
+      }
+    }
+    callback(errors);
+  };
+  var regexp = function regexp2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (isEmptyValue(value) && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options);
+      if (!isEmptyValue(value)) {
+        rules.type(rule, value, source, errors, options);
+      }
+    }
+    callback(errors);
+  };
+  var integer = function integer2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (isEmptyValue(value) && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options);
+      if (value !== void 0) {
+        rules.type(rule, value, source, errors, options);
+        rules.range(rule, value, source, errors, options);
+      }
+    }
+    callback(errors);
+  };
+  var floatFn = function floatFn2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (isEmptyValue(value) && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options);
+      if (value !== void 0) {
+        rules.type(rule, value, source, errors, options);
+        rules.range(rule, value, source, errors, options);
+      }
+    }
+    callback(errors);
+  };
+  var array = function array2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if ((value === void 0 || value === null) && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options, "array");
+      if (value !== void 0 && value !== null) {
+        rules.type(rule, value, source, errors, options);
+        rules.range(rule, value, source, errors, options);
+      }
+    }
+    callback(errors);
+  };
+  var object = function object2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (isEmptyValue(value) && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options);
+      if (value !== void 0) {
+        rules.type(rule, value, source, errors, options);
+      }
+    }
+    callback(errors);
+  };
+  var ENUM = "enum";
+  var enumerable = function enumerable2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (isEmptyValue(value) && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options);
+      if (value !== void 0) {
+        rules[ENUM](rule, value, source, errors, options);
+      }
+    }
+    callback(errors);
+  };
+  var pattern = function pattern2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (isEmptyValue(value, "string") && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options);
+      if (!isEmptyValue(value, "string")) {
+        rules.pattern(rule, value, source, errors, options);
+      }
+    }
+    callback(errors);
+  };
+  var date = function date2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (isEmptyValue(value, "date") && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options);
+      if (!isEmptyValue(value, "date")) {
+        var dateObject;
+        if (value instanceof Date) {
+          dateObject = value;
+        } else {
+          dateObject = new Date(value);
+        }
+        rules.type(rule, dateObject, source, errors, options);
+        if (dateObject) {
+          rules.range(rule, dateObject.getTime(), source, errors, options);
+        }
+      }
+    }
+    callback(errors);
+  };
+  var required = function required2(rule, value, callback, source, options) {
+    var errors = [];
+    var type2 = Array.isArray(value) ? "array" : typeof value;
+    rules.required(rule, value, source, errors, options, type2);
+    callback(errors);
+  };
+  var type = function type2(rule, value, callback, source, options) {
+    var ruleType = rule.type;
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (isEmptyValue(value, ruleType) && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options, ruleType);
+      if (!isEmptyValue(value, ruleType)) {
+        rules.type(rule, value, source, errors, options);
+      }
+    }
+    callback(errors);
+  };
+  var any = function any2(rule, value, callback, source, options) {
+    var errors = [];
+    var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+    if (validate) {
+      if (isEmptyValue(value) && !rule.required) {
+        return callback();
+      }
+      rules.required(rule, value, source, errors, options);
+    }
+    callback(errors);
+  };
+  var validators = {
+    string,
+    method,
+    number,
+    "boolean": _boolean,
+    regexp,
+    integer,
+    "float": floatFn,
+    array,
+    object,
+    "enum": enumerable,
+    pattern,
+    date,
+    url: type,
+    hex: type,
+    email: type,
+    required,
+    any
+  };
+  function newMessages() {
+    return {
+      "default": "Validation error on field %s",
+      required: "%s is required",
+      "enum": "%s must be one of %s",
+      whitespace: "%s cannot be empty",
+      date: {
+        format: "%s date %s is invalid for format %s",
+        parse: "%s date could not be parsed, %s is invalid ",
+        invalid: "%s date %s is invalid"
+      },
+      types: {
+        string: "%s is not a %s",
+        method: "%s is not a %s (function)",
+        array: "%s is not an %s",
+        object: "%s is not an %s",
+        number: "%s is not a %s",
+        date: "%s is not a %s",
+        "boolean": "%s is not a %s",
+        integer: "%s is not an %s",
+        "float": "%s is not a %s",
+        regexp: "%s is not a valid %s",
+        email: "%s is not a valid %s",
+        url: "%s is not a valid %s",
+        hex: "%s is not a valid %s"
+      },
+      string: {
+        len: "%s must be exactly %s characters",
+        min: "%s must be at least %s characters",
+        max: "%s cannot be longer than %s characters",
+        range: "%s must be between %s and %s characters"
+      },
+      number: {
+        len: "%s must equal %s",
+        min: "%s cannot be less than %s",
+        max: "%s cannot be greater than %s",
+        range: "%s must be between %s and %s"
+      },
+      array: {
+        len: "%s must be exactly %s in length",
+        min: "%s cannot be less than %s in length",
+        max: "%s cannot be greater than %s in length",
+        range: "%s must be between %s and %s in length"
+      },
+      pattern: {
+        mismatch: "%s value %s does not match pattern %s"
+      },
+      clone: function clone() {
+        var cloned = JSON.parse(JSON.stringify(this));
+        cloned.clone = this.clone;
+        return cloned;
+      }
+    };
+  }
+  var messages = newMessages();
+  var Schema = /* @__PURE__ */ function() {
+    function Schema2(descriptor) {
+      this.rules = null;
+      this._messages = messages;
+      this.define(descriptor);
+    }
+    var _proto = Schema2.prototype;
+    _proto.define = function define2(rules2) {
+      var _this = this;
+      if (!rules2) {
+        throw new Error("Cannot configure a schema with no rules");
+      }
+      if (typeof rules2 !== "object" || Array.isArray(rules2)) {
+        throw new Error("Rules must be an object");
+      }
+      this.rules = {};
+      Object.keys(rules2).forEach(function(name) {
+        var item = rules2[name];
+        _this.rules[name] = Array.isArray(item) ? item : [item];
+      });
+    };
+    _proto.messages = function messages2(_messages) {
+      if (_messages) {
+        this._messages = deepMerge(newMessages(), _messages);
+      }
+      return this._messages;
+    };
+    _proto.validate = function validate(source_, o, oc) {
+      var _this2 = this;
+      if (o === void 0) {
+        o = {};
+      }
+      if (oc === void 0) {
+        oc = function oc2() {
+        };
+      }
+      var source = source_;
+      var options = o;
+      var callback = oc;
+      if (typeof options === "function") {
+        callback = options;
+        options = {};
+      }
+      if (!this.rules || Object.keys(this.rules).length === 0) {
+        if (callback) {
+          callback(null, source);
+        }
+        return Promise.resolve(source);
+      }
+      function complete(results) {
+        var errors = [];
+        var fields = {};
+        function add(e) {
+          if (Array.isArray(e)) {
+            var _errors;
+            errors = (_errors = errors).concat.apply(_errors, e);
+          } else {
+            errors.push(e);
+          }
+        }
+        for (var i = 0; i < results.length; i++) {
+          add(results[i]);
+        }
+        if (!errors.length) {
+          callback(null, source);
+        } else {
+          fields = convertFieldsError(errors);
+          callback(errors, fields);
+        }
+      }
+      if (options.messages) {
+        var messages$1 = this.messages();
+        if (messages$1 === messages) {
+          messages$1 = newMessages();
+        }
+        deepMerge(messages$1, options.messages);
+        options.messages = messages$1;
+      } else {
+        options.messages = this.messages();
+      }
+      var series = {};
+      var keys = options.keys || Object.keys(this.rules);
+      keys.forEach(function(z) {
+        var arr = _this2.rules[z];
+        var value = source[z];
+        arr.forEach(function(r2) {
+          var rule = r2;
+          if (typeof rule.transform === "function") {
+            if (source === source_) {
+              source = _extends({}, source);
+            }
+            value = source[z] = rule.transform(value);
+          }
+          if (typeof rule === "function") {
+            rule = {
+              validator: rule
+            };
+          } else {
+            rule = _extends({}, rule);
+          }
+          rule.validator = _this2.getValidationMethod(rule);
+          if (!rule.validator) {
+            return;
+          }
+          rule.field = z;
+          rule.fullField = rule.fullField || z;
+          rule.type = _this2.getType(rule);
+          series[z] = series[z] || [];
+          series[z].push({
+            rule,
+            value,
+            source,
+            field: z
+          });
+        });
+      });
+      var errorFields = {};
+      return asyncMap(series, options, function(data, doIt) {
+        var rule = data.rule;
+        var deep = (rule.type === "object" || rule.type === "array") && (typeof rule.fields === "object" || typeof rule.defaultField === "object");
+        deep = deep && (rule.required || !rule.required && data.value);
+        rule.field = data.field;
+        function addFullField(key, schema) {
+          return _extends({}, schema, {
+            fullField: rule.fullField + "." + key,
+            fullFields: rule.fullFields ? [].concat(rule.fullFields, [key]) : [key]
+          });
+        }
+        function cb(e) {
+          if (e === void 0) {
+            e = [];
+          }
+          var errorList = Array.isArray(e) ? e : [e];
+          if (!options.suppressWarning && errorList.length) {
+            Schema2.warning("async-validator:", errorList);
+          }
+          if (errorList.length && rule.message !== void 0) {
+            errorList = [].concat(rule.message);
+          }
+          var filledErrors = errorList.map(complementError(rule, source));
+          if (options.first && filledErrors.length) {
+            errorFields[rule.field] = 1;
+            return doIt(filledErrors);
+          }
+          if (!deep) {
+            doIt(filledErrors);
+          } else {
+            if (rule.required && !data.value) {
+              if (rule.message !== void 0) {
+                filledErrors = [].concat(rule.message).map(complementError(rule, source));
+              } else if (options.error) {
+                filledErrors = [options.error(rule, format(options.messages.required, rule.field))];
+              }
+              return doIt(filledErrors);
+            }
+            var fieldsSchema = {};
+            if (rule.defaultField) {
+              Object.keys(data.value).map(function(key) {
+                fieldsSchema[key] = rule.defaultField;
+              });
+            }
+            fieldsSchema = _extends({}, fieldsSchema, data.rule.fields);
+            var paredFieldsSchema = {};
+            Object.keys(fieldsSchema).forEach(function(field) {
+              var fieldSchema = fieldsSchema[field];
+              var fieldSchemaList = Array.isArray(fieldSchema) ? fieldSchema : [fieldSchema];
+              paredFieldsSchema[field] = fieldSchemaList.map(addFullField.bind(null, field));
+            });
+            var schema = new Schema2(paredFieldsSchema);
+            schema.messages(options.messages);
+            if (data.rule.options) {
+              data.rule.options.messages = options.messages;
+              data.rule.options.error = options.error;
+            }
+            schema.validate(data.value, data.rule.options || options, function(errs) {
+              var finalErrors = [];
+              if (filledErrors && filledErrors.length) {
+                finalErrors.push.apply(finalErrors, filledErrors);
+              }
+              if (errs && errs.length) {
+                finalErrors.push.apply(finalErrors, errs);
+              }
+              doIt(finalErrors.length ? finalErrors : null);
+            });
+          }
+        }
+        var res;
+        if (rule.asyncValidator) {
+          res = rule.asyncValidator(rule, data.value, cb, data.source, options);
+        } else if (rule.validator) {
+          try {
+            res = rule.validator(rule, data.value, cb, data.source, options);
+          } catch (error) {
+            console.error == null ? void 0 : console.error(error);
+            if (!options.suppressValidatorError) {
+              setTimeout(function() {
+                throw error;
+              }, 0);
+            }
+            cb(error.message);
+          }
+          if (res === true) {
+            cb();
+          } else if (res === false) {
+            cb(typeof rule.message === "function" ? rule.message(rule.fullField || rule.field) : rule.message || (rule.fullField || rule.field) + " fails");
+          } else if (res instanceof Array) {
+            cb(res);
+          } else if (res instanceof Error) {
+            cb(res.message);
+          }
+        }
+        if (res && res.then) {
+          res.then(function() {
+            return cb();
+          }, function(e) {
+            return cb(e);
+          });
+        }
+      }, function(results) {
+        complete(results);
+      }, source);
+    };
+    _proto.getType = function getType(rule) {
+      if (rule.type === void 0 && rule.pattern instanceof RegExp) {
+        rule.type = "pattern";
+      }
+      if (typeof rule.validator !== "function" && rule.type && !validators.hasOwnProperty(rule.type)) {
+        throw new Error(format("Unknown rule type %s", rule.type));
+      }
+      return rule.type || "string";
+    };
+    _proto.getValidationMethod = function getValidationMethod(rule) {
+      if (typeof rule.validator === "function") {
+        return rule.validator;
+      }
+      var keys = Object.keys(rule);
+      var messageIndex = keys.indexOf("message");
+      if (messageIndex !== -1) {
+        keys.splice(messageIndex, 1);
+      }
+      if (keys.length === 1 && keys[0] === "required") {
+        return validators.required;
+      }
+      return validators[this.getType(rule)] || void 0;
+    };
+    return Schema2;
+  }();
+  Schema.register = function register(type2, validator) {
+    if (typeof validator !== "function") {
+      throw new Error("Cannot register a validator by type, validator is not a function");
+    }
+    validators[type2] = validator;
+  };
+  Schema.warning = warning;
+  Schema.messages = messages;
+  Schema.validators = validators;
+  class FormStore {
+    constructor() {
+      // 初始化数据
+      __publicField(this, "initialValues", {});
+      // 存放表单中所有的数据 eg. {password: "ddd",username: "123"}
+      __publicField(this, "store", {});
+      // 所有的组件实例
+      __publicField(this, "fieldEntities", []);
+      // 校验成功或失败的回调，onFinish、onFinishFailed
+      __publicField(this, "callbacks", {});
+      __publicField(this, "errors", []);
+      /**
+       * 注册组件实例
+       * @param field
+       */
+      __publicField(this, "registerField", (field) => {
+        this.fieldEntities.push(field);
+        return () => {
+          this.fieldEntities = this.fieldEntities.filter((item) => item != field);
+          if (this.store) {
+            delete this.store[field.props.name];
+          }
+        };
+      });
+      /**
+       * 获取 formItem 的值
+       * @param name
+       */
+      __publicField(this, "getFieldValue", (name) => {
+        var _a;
+        return (_a = this.store) == null ? void 0 : _a[name];
+      });
+      /**
+       * 设置 form 的初始值，之后在 reset 的时候使用
+       * @param values
+       * @param init
+       */
+      __publicField(this, "setInitialValues", (values, init) => {
+        if (init) {
+          this.initialValues = values;
+          this.store = values;
+        }
+      });
+      /**
+       * 存储组件数据
+       * @param newStore { [name]: newValue }
+       */
+      __publicField(this, "setFieldsValue", (newStore) => {
+        this.store = {
+          ...this.store,
+          ...newStore
+        };
+        this.fieldEntities.forEach((enetity) => {
+          const { name } = enetity.props;
+          Object.keys(newStore).forEach((key) => {
+            if (key === name) {
+              enetity.onStoreChange("update");
+            }
+          });
+        });
+      });
+      __publicField(this, "setCallback", (callback) => {
+        this.callbacks = {
+          ...this.callbacks,
+          ...callback
+        };
+      });
+      __publicField(this, "validate", () => {
+        const err = [];
+        this.errors.length = 0;
+        this.fieldEntities.forEach((entity) => {
+          var _a;
+          const { name, rules: rules2 = [] } = entity.props;
+          const descriptor = {};
+          if (rules2.length) {
+            if (rules2.length > 1) {
+              descriptor[name] = [];
+              rules2.forEach((v) => {
+                descriptor[name].push(v);
+              });
+            } else {
+              descriptor[name] = rules2[0];
+            }
+          }
+          const validator = new Schema(descriptor);
+          validator.messages();
+          validator.validate({ [name]: (_a = this.store) == null ? void 0 : _a[name] }, (errors) => {
+            if (errors) {
+              err.push(...errors);
+              this.errors.push(...errors);
+            }
+            entity.onStoreChange("validate");
+          });
+        });
+        return err;
+      });
+      __publicField(this, "submit", () => {
+        var _a, _b, _c, _d;
+        const errors = this.validate();
+        if (errors.length === 0) {
+          (_b = (_a = this.callbacks).onFinish) == null ? void 0 : _b.call(_a, this.store);
+        } else if (errors.length > 0) {
+          (_d = (_c = this.callbacks).onFinishFailed) == null ? void 0 : _d.call(_c, this.store, errors);
+        }
+      });
+      __publicField(this, "resetFields", () => {
+        this.errors.length = 0;
+        this.store = this.initialValues;
+        this.fieldEntities.forEach((entity) => {
+          entity.onStoreChange("reset");
+        });
       });
       __publicField(this, "getForm", () => {
         return {
+          setInitialValues: this.setInitialValues,
           setCallback: this.setCallback,
           registerField: this.registerField,
           getFieldValue: this.getFieldValue,
           setFieldsValue: this.setFieldsValue,
+          resetFields: this.resetFields,
           submit: this.submit,
           store: this.store,
-          errList: this.errList,
+          errors: this.errors,
           fieldEntities: this.fieldEntities
         };
       });
       this.callbacks = {
-        onFinish: (value) => {
+        onFinish: () => {
         },
         onFinishFailed: () => {
         }
@@ -9462,60 +10466,209 @@ var __publicField = (obj, key, value) => {
     }
     return [formRef.current];
   };
+  function isForwardRefComponent(component) {
+    return component.type && component.type.$$typeof && // eslint-disable-next-line react/display-name
+    React.forwardRef(
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      () => {
+      }
+    ).$$typeof === component.type.$$typeof;
+  }
+  const defaultProps$W = {
+    ...ComponentDefaults,
+    required: false,
+    name: "",
+    label: "",
+    rules: [{ required: false, message: "" }],
+    errorMessageAlign: "left"
+  };
+  class FormItem extends React.Component {
+    constructor(props) {
+      super(props);
+      __publicField(this, "cancelRegister");
+      __publicField(this, "componentRef");
+      // children添加value属性和onChange事件
+      __publicField(this, "getControlled", (children) => {
+        var _a;
+        const { setFieldsValue, getFieldValue } = this.context;
+        const { name } = this.props;
+        if ((_a = children == null ? void 0 : children.props) == null ? void 0 : _a.defaultValue) {
+          console.warn("通过 initialValue 设置初始值");
+        }
+        const controlled = {
+          ...children.props,
+          [this.props.valuePropName || "value"]: getFieldValue(name) || this.props.initialValue,
+          [this.props.trigger || "onChange"]: (...args) => {
+            const originOnChange = children.props[this.props.trigger || "onChange"];
+            if (originOnChange) {
+              originOnChange(...args);
+            }
+            let [next] = args;
+            if (this.props.getValueFromEvent) {
+              next = this.props.getValueFromEvent(...args);
+            }
+            setFieldsValue({ [name]: next });
+          }
+        };
+        if (isForwardRefComponent(children)) {
+          controlled.ref = (componentInstance) => {
+            const originRef = children.ref;
+            if (originRef) {
+              if (typeof originRef === "function") {
+                originRef(componentInstance);
+              }
+              if ("current" in originRef) {
+                originRef.current = componentInstance;
+              }
+            }
+            this.componentRef = componentInstance;
+          };
+        }
+        return controlled;
+      });
+      __publicField(this, "refresh", () => {
+        this.setState(({ resetCount }) => ({
+          resetCount: resetCount + 1
+        }));
+      });
+      __publicField(this, "onStoreChange", (type2) => {
+        if (type2 === "reset") {
+          this.refresh();
+        } else {
+          this.forceUpdate();
+        }
+      });
+      __publicField(this, "renderLayout", (childNode) => {
+        var _a, _b;
+        const { label, name, required: required2, className, style, errorMessageAlign } = {
+          ...defaultProps$W,
+          ...this.props
+        };
+        const item = ((_a = this.context.errors) == null ? void 0 : _a.length) > 0 && ((_b = this.context.errors) == null ? void 0 : _b.filter((item2) => {
+          return item2.field === name;
+        }));
+        const { starPosition } = this.context;
+        const renderStar = required2 && /* @__PURE__ */ React.createElement("i", { className: "required" });
+        const renderLabel = /* @__PURE__ */ React.createElement(React.Fragment, null, starPosition === "left" ? renderStar : null, label, starPosition === "right" ? renderStar : null);
+        return /* @__PURE__ */ React.createElement(
+          Cell,
+          {
+            className: `nut-form-item ${className}`,
+            style,
+            onClick: (e) => this.props.onClick && this.props.onClick(e, this.componentRef)
+          },
+          label ? /* @__PURE__ */ React.createElement("div", { className: "nut-cell__title nut-form-item__label" }, renderLabel) : null,
+          /* @__PURE__ */ React.createElement("div", { className: "nut-cell__value nut-form-item__body" }, /* @__PURE__ */ React.createElement("div", { className: "nut-form-item__body__slots" }, childNode), item.length > 0 && /* @__PURE__ */ React.createElement(
+            "div",
+            {
+              className: "nut-form-item__body__tips",
+              style: { textAlign: errorMessageAlign }
+            },
+            item[0].message
+          ))
+        );
+      });
+      this.componentRef = React.createRef();
+      this.state = {
+        resetCount: 1
+      };
+    }
+    componentDidMount() {
+      this.cancelRegister = this.context.registerField(this);
+    }
+    componentWillUnmount() {
+      if (this.cancelRegister) {
+        this.cancelRegister();
+      }
+    }
+    render() {
+      const { children } = this.props;
+      const child = Array.isArray(children) ? children[0] : children;
+      const returnChildNode = React.cloneElement(
+        child,
+        this.getControlled(child)
+      );
+      return /* @__PURE__ */ React.createElement(React.Fragment, { key: this.state.resetCount }, this.renderLayout(returnChildNode));
+    }
+  }
+  __publicField(FormItem, "defaultProps", defaultProps$W);
+  __publicField(FormItem, "contextType", Context);
   const defaultProps$V = {
     ...ComponentDefaults,
-    className: "",
-    style: void 0,
-    form: {},
-    labelPosition: "Right",
-    formGroupTitle: "",
-    onFinish: (obj) => {
-    },
-    onFinishFailed: (value) => {
+    labelPosition: "right",
+    starPosition: "left",
+    onFinish: (values) => {
     },
-    starPositon: "Left"
+    onFinishFailed: (values, errorFields) => {
+    }
   };
   const PositionInfo = {
-    Top: "form-layout-top",
-    Left: "form-layout-left",
-    Right: "form-layout-right"
+    top: "form-layout-top",
+    left: "form-layout-left",
+    right: "form-layout-right"
   };
   const Form = (props) => {
+    const classPrefix2 = "nut-form";
     const {
+      className,
+      style,
+      footer,
       children,
+      initialValues,
       onFinish,
       onFinishFailed,
       labelPosition,
-      starPositon,
-      ...rest
+      starPosition,
+      form
     } = {
       ...defaultProps$V,
       ...props
     };
-    console.log("46 dddd");
-    const [formInstance] = useForm();
-    formInstance.starPositon = starPositon;
-    const { setCallback, submit } = formInstance;
+    let formInstance;
+    if (form !== void 0) {
+      formInstance = form;
+    } else {
+      [formInstance] = useForm();
+    }
+    formInstance.starPosition = starPosition;
+    const { setCallback, submit, resetFields, setInitialValues } = formInstance;
     setCallback({
       onFinish,
       onFinishFailed
     });
+    const mountRef = React.useRef(false);
+    setInitialValues(initialValues, !mountRef.current);
+    if (!mountRef.current) {
+      mountRef.current = true;
+    }
     return /* @__PURE__ */ React.createElement(
       "form",
       {
-        className: `nut-form ${PositionInfo[labelPosition]} ${props.className}`,
-        style: props.style,
+        className: classNames(
+          classPrefix2,
+          className,
+          PositionInfo[labelPosition]
+        ),
+        style,
         onSubmit: (e) => {
           e.preventDefault();
+          e.stopPropagation();
           submit();
+        },
+        onReset: (e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          resetFields();
         }
       },
-      /* @__PURE__ */ React.createElement(CellGroup, null, /* @__PURE__ */ React.createElement(FormItemContext.Provider, { value: formInstance }, children))
+      /* @__PURE__ */ React.createElement(CellGroup, null, /* @__PURE__ */ React.createElement(Context.Provider, { value: formInstance }, children), footer ? /* @__PURE__ */ React.createElement(Cell, null, footer) : null)
     );
   };
   Form.defaultProps = defaultProps$V;
   Form.displayName = "NutForm";
   Form.Item = FormItem;
+  Form.useForm = useForm;
   function trimExtraChar(value, char, regExp) {
     const index = value.indexOf(char);
     if (index === -1) {
@@ -9560,7 +10713,7 @@ var __publicField = (obj, key, value) => {
     (props, ref) => {
       const { locale } = useConfig$1();
       const {
-        type,
+        type: type2,
         name,
         placeholder,
         align,
@@ -9622,10 +10775,10 @@ var __publicField = (obj, key, value) => {
       const updateValue = (value2, trigger = "onChange") => {
         let val = value2;
         if (Taro.getEnv() === Taro.ENV_TYPE.WEB) {
-          if (type === "number") {
+          if (type2 === "number") {
             val = formatNumber(val, false, true);
           }
-          if (type === "digit") {
+          if (type2 === "digit") {
             val = formatNumber(val, true, true);
           }
         }
@@ -9654,18 +10807,18 @@ var __publicField = (obj, key, value) => {
           setActive(false);
         }, 50);
       };
-      const inputType = (type2) => {
+      const inputType = (type22) => {
         if (Taro.getEnv() === Taro.ENV_TYPE.WEB) {
-          if (type2 === "digit") {
+          if (type22 === "digit") {
             return "text";
           }
-          if (type2 === "number") {
+          if (type22 === "number") {
             return "tel";
           }
-        } else if (type2 === "password") {
+        } else if (type22 === "password") {
           return "text";
         }
-        return type2;
+        return type22;
       };
       return /* @__PURE__ */ React.createElement(
         components.View,
@@ -9684,8 +10837,8 @@ var __publicField = (obj, key, value) => {
             className: "nut-input-native",
             ref: inputRef,
             style: { textAlign: align },
-            type: inputType(type),
-            password: type === "password",
+            type: inputType(type2),
+            password: type2 === "password",
             maxlength: maxLength,
             placeholder: placeholder || locale.placeholder,
             disabled: disabled || readOnly,
@@ -9732,7 +10885,7 @@ var __publicField = (obj, key, value) => {
     disabled: false,
     min: 1,
     max: 9999,
-    readonly: false,
+    readOnly: false,
     allowEmpty: false,
     defaultValue: 0,
     step: 1,
@@ -9746,7 +10899,7 @@ var __publicField = (obj, key, value) => {
       disabled,
       min,
       max,
-      readonly,
+      readOnly,
       value,
       defaultValue,
       allowEmpty,
@@ -9901,14 +11054,14 @@ var __publicField = (obj, key, value) => {
     const focusValue = (e) => {
       if (disabled)
         return;
-      if (readonly)
+      if (readOnly)
         return;
       onFocus && onFocus(e);
     };
     const burValue = (e) => {
       if (disabled)
         return;
-      if (readonly)
+      if (readOnly)
         return;
       const input = e.target;
       let value2 = +input.value;
@@ -9930,7 +11083,7 @@ var __publicField = (obj, key, value) => {
         min,
         max,
         disabled,
-        readOnly: readonly,
+        readOnly,
         value: _checked,
         onInput: changeFormatValue,
         onBlur: burFormatValue,
@@ -9943,7 +11096,7 @@ var __publicField = (obj, key, value) => {
         min,
         max,
         disabled,
-        readOnly: readonly,
+        readOnly,
         value: _checked,
         onInput: changeValue,
         onBlur: burValue,
@@ -10174,103 +11327,115 @@ var __publicField = (obj, key, value) => {
       return { display: "none" };
     };
     const getPosition = () => {
-      return direction === "down" ? { top: `${position.top + position.height}px` } : {
-        bottom: `${Taro.getSystemInfoSync().windowHeight - position.top}px`,
-        top: "auto"
+      return direction === "down" ? { position: "absolute", height: `${window.innerHeight}px` } : {
+        position: "absolute",
+        bottom: "100%",
+        top: "auto",
+        height: `${window.innerHeight}px`
       };
     };
     const placeholderStyle = () => {
       if (direction === "down") {
         return {
           height: `${position.top + position.height}px`,
-          top: 0,
+          top: "auto",
+          bottom: "-100%",
           ...isShow()
         };
       }
       return {
         height: `${Taro.getSystemInfoSync().windowHeight - position.top}px`,
-        bottom: `0px`,
-        top: "auto",
+        bottom: `auto`,
+        top: "0",
         ...isShow()
       };
     };
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, closeOnClickAway ? /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ React.createElement(
       "div",
       {
-        className: `placeholder-element ${classNames({
-          up: direction === "up"
-        })}`,
-        style: placeholderStyle(),
-        onClick: () => parent.toggleMenuItem(index)
-      }
-    ) : null, /* @__PURE__ */ React.createElement(
-      Overlay$1,
-      {
-        className: "nut-menu__overlay",
-        style: getPosition(),
-        lockScroll: parent.lockScroll,
-        visible: _showPopup,
-        closeOnOverlayClick: parent.closeOnOverlayClick,
-        onClick: () => {
-          parent.closeOnOverlayClick && parent.toggleMenuItem(index);
+        className: "nut-menu-item-container",
+        style: { position: "absolute", left: 0, right: 0 }
+      },
+      closeOnClickAway ? /* @__PURE__ */ React.createElement(
+        "div",
+        {
+          className: `placeholder-element ${classNames({
+            up: direction === "up"
+          })}`,
+          style: placeholderStyle(),
+          onClick: () => parent.toggleMenuItem(index)
         }
-      }
-    ), /* @__PURE__ */ React.createElement(
-      "div",
-      {
-        className: classNames(className, {
-          "nut-menu-item__wrap": direction === "down",
-          "nut-menu-item__wrap-up": direction !== "down"
-        }),
-        style: {
-          ...style,
-          ...isShow()
+      ) : null,
+      /* @__PURE__ */ React.createElement(
+        Overlay$1,
+        {
+          className: "nut-menu__overlay",
+          style: getPosition(),
+          lockScroll: parent.lockScroll,
+          visible: _showPopup,
+          closeOnOverlayClick: parent.closeOnOverlayClick,
+          onClick: () => {
+            parent.closeOnOverlayClick && parent.toggleMenuItem(index);
+          }
         }
-      },
+      ),
       /* @__PURE__ */ React.createElement(
-        CSSTransition$1,
+        "div",
         {
-          in: _showPopup,
-          timeout: 100,
-          classNames: direction === "down" ? "menu-item" : "menu-item-up"
+          className: classNames(className, {
+            "nut-menu-item__wrap": direction === "down",
+            "nut-menu-item__wrap-up": direction !== "down"
+          }),
+          style: {
+            ...style,
+            ...isShow()
+          }
         },
-        /* @__PURE__ */ React.createElement("div", { className: "nut-menu-item__content" }, options == null ? void 0 : options.map((item, index2) => {
-          return /* @__PURE__ */ React.createElement(
-            "div",
-            {
-              className: `nut-menu-item__option ${classNames({
-                active: item.value === _value
-              })}`,
-              key: item.text,
-              style: {
-                flexBasis: `${100 / columns}%`
-              },
-              onClick: () => {
-                handleClick(item);
-              }
-            },
-            item.value === _value ? /* @__PURE__ */ React.createElement(React.Fragment, null, icon || /* @__PURE__ */ React.createElement(
-              a$t,
-              {
-                color: activeColor,
-                size: 10,
-                className: getIconCName(item.value, value)
-              }
-            )) : null,
-            /* @__PURE__ */ React.createElement(
+        /* @__PURE__ */ React.createElement(
+          CSSTransition$1,
+          {
+            in: _showPopup,
+            timeout: 100,
+            classNames: direction === "down" ? "menu-item" : "menu-item-up"
+          },
+          /* @__PURE__ */ React.createElement("div", { className: "nut-menu-item__content" }, options == null ? void 0 : options.map((item, index2) => {
+            return /* @__PURE__ */ React.createElement(
               "div",
               {
-                className: getIconCName(item.value, value),
+                className: `nut-menu-item__option ${classNames({
+                  active: item.value === _value
+                })}`,
+                key: item.text,
                 style: {
-                  color: `${item.value === _value ? activeColor : ""}`
+                  flexBasis: `${100 / columns}%`
+                },
+                onClick: () => {
+                  handleClick(item);
                 }
               },
-              item.text
-            )
-          );
-        }), children)
+              item.value === _value ? /* @__PURE__ */ React.createElement(React.Fragment, null, icon || /* @__PURE__ */ React.createElement(
+                a$t,
+                {
+                  color: activeColor,
+                  size: 10,
+                  className: getIconCName(item.value, value)
+                }
+              )) : null,
+              /* @__PURE__ */ React.createElement(
+                "div",
+                {
+                  className: getIconCName(item.value, value),
+                  style: {
+                    color: `${item.value === _value ? activeColor : ""}`
+                  }
+                },
+                item.text
+              )
+            );
+          }), children)
+        )
       )
-    ));
+    );
   });
   MenuItem.defaultProps = defaultProps$R;
   MenuItem.displayName = "NutMenuItem";
@@ -10289,7 +11454,7 @@ var __publicField = (obj, key, value) => {
       title,
       confirmText,
       visible,
-      type,
+      type: type2,
       custom,
       random,
       style,
@@ -10328,7 +11493,7 @@ var __publicField = (obj, key, value) => {
     };
     const keysList = React.useMemo(() => {
       return [...getBasicKeys(), ...getCustomKeys()];
-    }, [type, random, custom]);
+    }, [type2, random, custom]);
     const DeleteIcon = () => {
       const style2 = {
         background: `url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAnCAYAAABJ0cukAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozOUNBQTQ0MkY3RTMxMUVBQjIzNEJCQkYxNDZGQjg5OCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozOUNBQTQ0M0Y3RTMxMUVBQjIzNEJCQkYxNDZGQjg5OCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjM5Q0FBNDQwRjdFMzExRUFCMjM0QkJCRjE0NkZCODk4IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjM5Q0FBNDQxRjdFMzExRUFCMjM0QkJCRjE0NkZCODk4Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+T12ahwAABClJREFUeNrUWVtIFFEY3pkdrbaCiAINK81VW3d2102pjKLtoXoJrNAswoeEXoyilx7sJXvIh6CHAoMg6yEfSpdECIqE0jCMbMm9qCVYUmR5S8huXmZO39nWOI7mzsy6uzqgM/vvzNnv+y/n/84ZjhBiWMwHF+kA+fn5y0ZHRzNwuTomgDnui9/vfzMvBJxWa7bE87W4tMbY8S8MhNz0BQLVugnY7fZdGORZPNNHJmSPUSf47QD/PN75z3NcpqD1IVEU8wC+dZojDIajyMu6WAG322zBmQf/7LzGnHeAdRtjmuAIKYoleMWxQnUEHA6HVZLldsb0m3oehdQQzzQSVILPJLIcYEw/4HkK/kG86yAsAZvNtgng3059hte/Gf56/uFCaGR8mIJdj3m2hzGNGAkpRM4vCPBzErBYLMko2A//DIQMoQ0WtgcCjWFnCVGswEzxCecqLc0y9Nyww2ariYhAbm7umgRB6GNM/QTgfT7fEzWD4t7dOK0D4TKAcrtcLkENeNx/gUoSpOnx4Gc9BHJyclZNjI8PMqY+judp2jSr1iuENDPi5fDX4WG32WxeogL81NGRIEk3NBNAh10uS9IIY/oIbxR6vd4WLXmJAq9Ayl1kTAUmk8mNyJrUgDfK8hFPV9dnTQSCHiLkO/Ndb8jzrXqKawYJQg4gsu6srKyV4cC/7ujo1CqneRSPxNh74PligPdE3PYVIDHuY6PRWCxPTp7VC35KSvwjwBpwdPP4gXYc86ZdZnr6Pf7S9HqexUs9z0qBLprz8wn+PzWRFknaKGsgjwlvCdLGH42GQ0lg+dqkMP+Enj+lF/yMWYgnJD1qEhhphOWgS2E2yQZDJWa/lEgIvGIa0D2HKJZGA7yiBgaZqO9AermdFstGXQR8fn+BootW4wfPRBE8zXmXoia2SYLgpsJRVwqBBJ2N+pnueRVhPR8l8MGCnaWw8wDCDSWQoasGQCKJnpjGcwkkKqMBfo7ZyQklQCOxWVcRg4QDXmhkSJRjsGvRAD8HCTuNhNPpXKtLzHn9/n0orBqm052GvL2lcfepTMs8PwsJqyRJRbrlNFpBCUBcYWaKE2h4tampqUtV6pP60HNtapuUksTY2NidiLcWUQPnMOhlxvQoITGxxOPxDIVdR2dnb/V2dr7Umn50/Q31261JC4UhUQYSVUxdtPCCUAK10RuvZeQ0LRQ2tD7fddxdyuT3TijJehATF/yinqmJ2wB+jCGRA11TH9xiXAwEQpG4i0gcZHLPjHSqF0Vx76IgEIpEA9a7+3H5K2RK4jnuPvTToXgR0LW9Htpap71iAzPVNsUIMH0XMdXkfLrfD9BdanifksiKW/5w3Emj3mcHBgb6kpKTn6KYzfBCehzg10H6lHPzMdIWq9U8znEpsXE6N4rTO9TjSGgPanG/pfwjwABn1PZcM5XI0AAAAABJRU5ErkJggg0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLTkwMjA5MzIyMjIxMzkzMzc2NzAwNjg0MC0tDQo=') no-repeat center`,
@@ -10389,7 +11554,7 @@ var __publicField = (obj, key, value) => {
         overlayStyle: { backgroundColor: "rgba(0, 0, 0, 0)" },
         ...rest
       },
-      /* @__PURE__ */ React.createElement("div", { className: classNames(classPrefix2, className), style }, title && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__header` }, /* @__PURE__ */ React.createElement("h3", { className: `${classPrefix2}__header__title` }, title), type === "default" && /* @__PURE__ */ React.createElement(
+      /* @__PURE__ */ React.createElement("div", { className: classNames(classPrefix2, className), style }, title && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__header` }, /* @__PURE__ */ React.createElement("h3", { className: `${classPrefix2}__header__title` }, title), type2 === "default" && /* @__PURE__ */ React.createElement(
         "span",
         {
           className: `${classPrefix2}__header__close`,
@@ -10398,7 +11563,7 @@ var __publicField = (obj, key, value) => {
         locale.done
       )), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__body` }, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__body__keys` }, keysList == null ? void 0 : keysList.map((item) => {
         return /* @__PURE__ */ React.createElement(NumberKeyboardKey, { key: item.id, item });
-      })), type === "rightColumn" && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__sidebar` }, /* @__PURE__ */ React.createElement(
+      })), type2 === "rightColumn" && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__sidebar` }, /* @__PURE__ */ React.createElement(
         NumberKeyboardKey,
         {
           key: "delete",
@@ -10634,7 +11799,7 @@ var __publicField = (obj, key, value) => {
   const Range = (props) => {
     const {
       className,
-      range,
+      range: range2,
       disabled,
       button,
       vertical,
@@ -10692,7 +11857,7 @@ var __publicField = (obj, key, value) => {
         const classPrefix22 = "nut-range-mark";
         let lowerBound = min;
         let upperBound = max;
-        if (range && Array.isArray(current)) {
+        if (range2 && Array.isArray(current)) {
           lowerBound = current[0];
           upperBound = current[1];
         } else {
@@ -10704,10 +11869,10 @@ var __publicField = (obj, key, value) => {
           `${isActive ? `${classPrefix22}-text-active` : ""}`
         ].join(" ");
       },
-      [range, current, min, max]
+      [range2, current, min, max]
     );
     const isRange = (val) => {
-      return !!range && Array.isArray(val);
+      return !!range2 && Array.isArray(val);
     };
     const calcMainAxis = () => {
       const modelVal = current;
@@ -10749,12 +11914,12 @@ var __publicField = (obj, key, value) => {
       return style;
     };
     const tickClass = (mark) => {
-      if (range && Array.isArray(current)) {
+      if (range2 && Array.isArray(current)) {
         return mark <= current[1] && mark >= current[0];
       }
       return mark <= current;
     };
-    const format = (value2) => {
+    const format2 = (value2) => {
       value2 = Math.max(+min, Math.min(value2, +max));
       return Math.round(value2 / +step) * +step;
     };
@@ -10769,9 +11934,9 @@ var __publicField = (obj, key, value) => {
     };
     const updateValue = (value2, end) => {
       if (isRange(value2)) {
-        value2 = handleOverlap(value2).map(format);
+        value2 = handleOverlap(value2).map(format2);
       } else {
-        value2 = format(value2);
+        value2 = format2(value2);
       }
       if (!isSameValue(value2, current)) {
         setCurrent(value2);
@@ -10811,9 +11976,9 @@ var __publicField = (obj, key, value) => {
       touch.start(event);
       setEaxctValue(current);
       if (isRange(current)) {
-        setStartValue(current.map(format));
+        setStartValue(current.map(format2));
       } else {
-        setStartValue(format(current));
+        setStartValue(format2(current));
       }
       setDragStatus("start");
     };
@@ -10880,7 +12045,7 @@ var __publicField = (obj, key, value) => {
           }
         )
       );
-    })), /* @__PURE__ */ React.createElement("div", { className: "nut-range-bar", style: barStyle() }, range ? [0, 1].map((item, index) => {
+    })), /* @__PURE__ */ React.createElement("div", { className: "nut-range-bar", style: barStyle() }, range2 ? [0, 1].map((item, index) => {
       return /* @__PURE__ */ React.createElement(
         "div",
         {
@@ -11098,7 +12263,7 @@ var __publicField = (obj, key, value) => {
       return /* @__PURE__ */ React.createElement(
         "input",
         {
-          className: `${classPrefix2}__input ${shape === "round" ? `${classPrefix2}__round` : ""} ${clearable ? `${classPrefix2}__input-clear` : ""}`,
+          className: `${classPrefix2}__input ${clearable ? `${classPrefix2}__input-clear` : ""}`,
           ref: searchRef,
           style: { ...props.style },
           value: value || "",
@@ -11170,7 +12335,16 @@ var __publicField = (obj, key, value) => {
         style: { ...props.style }
       },
       renderLeft(),
-      /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__content` }, renderLeftIn(), /* @__PURE__ */ React.createElement("div", { className: "nut-searchbar__input-box" }, renderField()), renderRightIn(), clearable && value && handleClear()),
+      /* @__PURE__ */ React.createElement(
+        "div",
+        {
+          className: `${classPrefix2}__content ${shape === "round" ? `${classPrefix2}__round` : ""}`
+        },
+        renderLeftIn(),
+        /* @__PURE__ */ React.createElement("div", { className: "nut-searchbar__input-box" }, renderField()),
+        renderRightIn(),
+        clearable && value && handleClear()
+      ),
       renderRight()
     );
   };
@@ -11220,7 +12394,7 @@ var __publicField = (obj, key, value) => {
     const comLen = React.useMemo(() => {
       return Math.min(Math.max(4, length || 4), 6);
     }, [length]);
-    const format = (val) => {
+    const format2 = (val) => {
       return val.slice(0, comLen);
     };
     const [inputValue, setInputValue] = usePropsValue({ value, onChange });
@@ -11230,11 +12404,11 @@ var __publicField = (obj, key, value) => {
       }
     }, [visible]);
     React.useEffect(() => {
-      const val = format(value);
+      const val = format2(value);
       if (val.length >= comLen) {
         onComplete && onComplete(val);
       }
-      setInputValue(format(value));
+      setInputValue(format2(value));
     }, [value]);
     const sure = () => {
       onConfirm && onConfirm(inputValue);
@@ -11282,7 +12456,7 @@ var __publicField = (obj, key, value) => {
   const InternalSignature = (props, ref) => {
     const {
       canvasId,
-      type,
+      type: type2,
       lineWidth,
       strokeStyle,
       className,
@@ -11510,7 +12684,7 @@ var __publicField = (obj, key, value) => {
     } = { ...defaultProps$H, ...props };
     const classPrefix2 = "nut-textarea";
     const compositionRef = React.useRef(false);
-    const format = (value2) => {
+    const format2 = (value2) => {
       if (maxLength !== void 0 && value2.length > maxLength) {
         return value2.substring(0, maxLength);
       }
@@ -11519,14 +12693,14 @@ var __publicField = (obj, key, value) => {
     const [inputValue, setInputValue] = usePropsValue({
       value,
       defaultValue,
-      finalValue: format(defaultValue),
+      finalValue: format2(defaultValue),
       onChange
     });
     const handleChange = (event) => {
       var _a;
       const text = (_a = event == null ? void 0 : event.detail) == null ? void 0 : _a.value;
       if (text) {
-        const value2 = compositionRef.current ? text : format(text);
+        const value2 = compositionRef.current ? text : format2(text);
         setInputValue(value2);
       } else {
         setInputValue("");
@@ -11873,7 +13047,7 @@ var __publicField = (obj, key, value) => {
       previewUrl,
       headers,
       timeout,
-      method,
+      method: method2,
       xhrState,
       data,
       preview,
@@ -11989,7 +13163,7 @@ var __publicField = (obj, key, value) => {
       uploadOption.fileType = fileItem.type;
       uploadOption.formData = fileItem.formData;
       uploadOption.timeout = timeout * 1;
-      uploadOption.method = method;
+      uploadOption.method = method2;
       uploadOption.xhrState = xhrState;
       uploadOption.headers = headers;
       uploadOption.taroFilePath = fileItem.path;
@@ -13094,7 +14268,7 @@ var __publicField = (obj, key, value) => {
     const getActive = (pace) => {
       if (pace) {
         const _active = active + pace;
-        return range(_active, -1, childCount);
+        return range2(_active, -1, childCount);
       }
       return active;
     };
@@ -13106,7 +14280,7 @@ var __publicField = (obj, key, value) => {
     const requestFrame = (fn) => {
       window.requestAnimationFrame.call(window, fn);
     };
-    const range = (num, min, max) => {
+    const range2 = (num, min, max) => {
       return Math.min(Math.max(num, min), max);
     };
     const resettPosition = () => {
@@ -13122,7 +14296,7 @@ var __publicField = (obj, key, value) => {
       "nut-noticebar-page": true,
       withicon: closeable,
       close: closeable,
-      wrap
+      wrapable: wrap
     });
     React.useEffect(() => {
       return () => {
@@ -13211,7 +14385,7 @@ var __publicField = (obj, key, value) => {
       id,
       children,
       style,
-      type,
+      type: type2,
       className,
       position,
       visible,
@@ -13259,7 +14433,7 @@ var __publicField = (obj, key, value) => {
       [`${classPrefix$b}--popup-top`]: position === "top",
       [`${classPrefix$b}--popup-bottom`]: position === "bottom",
       [`${classPrefix$b}`]: true,
-      [`${classPrefix$b}--${type}`]: true
+      [`${classPrefix$b}--${type2}`]: true
     });
     return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
       CSSTransition$1,
@@ -13358,7 +14532,7 @@ var __publicField = (obj, key, value) => {
     const getContentWidth = async () => {
       let rect;
       if (targetId) {
-        if (Taro.getEnv() == Taro.ENV_TYPE.WEB) {
+        if (Taro.getEnv() === Taro.ENV_TYPE.WEB) {
           rect = getRect(document.querySelector(`#${targetId}`));
         } else {
           rect = await getRectTaro(targetId);
@@ -13381,13 +14555,13 @@ var __publicField = (obj, key, value) => {
       return new Promise((resolve) => {
         const query = Taro.createSelectorQuery();
         query.select(`#${targetId2}`) && query.select(`#${targetId2}`).boundingClientRect();
-        query.exec(function(res) {
+        query.exec((res) => {
           resolve(res[0]);
         });
       });
     };
     const getPopoverContentW = async () => {
-      let rectContent = await getRectByTaro(popoverContentRef.current);
+      const rectContent = await getRectByTaro(popoverContentRef.current);
       setElWidth(rectContent.width);
       setElHeight(rectContent.height);
     };
@@ -13429,7 +14603,7 @@ var __publicField = (obj, key, value) => {
       return styles;
     };
     const getRootPosition = () => {
-      let styles = {};
+      const styles = {};
       if (!rootPosition) {
         styles.visibility = "hidden";
         return styles;
@@ -13441,34 +14615,34 @@ var __publicField = (obj, key, value) => {
       const skew = location.split("-")[1];
       let cross = 0;
       let parallel = 0;
-      if (Array.isArray(offset) && offset.length == 2) {
+      if (Array.isArray(offset) && offset.length === 2) {
         cross += +offset[1];
         parallel += +offset[0];
       }
       if (width) {
         if (["bottom", "top"].includes(direction)) {
-          const h = direction == "bottom" ? height + cross : -(contentHeight + cross);
+          const h = direction === "bottom" ? height + cross : -(contentHeight + cross);
           styles.top = `${top + h}px`;
           if (!skew) {
             styles.left = `${-(contentWidth - width) / 2 + left + parallel}px`;
           }
-          if (skew == "start") {
+          if (skew === "start") {
             styles.left = `${left + parallel}px`;
           }
-          if (skew == "end") {
+          if (skew === "end") {
             styles.left = `${right + parallel}px`;
           }
         }
         if (["left", "right"].includes(direction)) {
-          const contentW = direction == "left" ? -(contentWidth + cross) : width + cross;
+          const contentW = direction === "left" ? -(contentWidth + cross) : width + cross;
           styles.left = `${left + contentW}px`;
           if (!skew) {
             styles.top = `${top - contentHeight / 2 + height / 2 - 4 + parallel}px`;
           }
-          if (skew == "start") {
+          if (skew === "start") {
             styles.top = `${top + parallel}px`;
           }
-          if (skew == "end") {
+          if (skew === "end") {
             styles.top = `${top + height + parallel}px`;
           }
         }
@@ -13876,10 +15050,11 @@ var __publicField = (obj, key, value) => {
     }
   }
   const defaultProps$t = {
+    ...ComponentDefaults,
     name: ""
   };
   const Swipe = React.forwardRef((props, instanceRef) => {
-    const swipeBem = cn("swipe");
+    const classPrefix2 = "nut-swipe";
     const touch = useTouch();
     Taro.useReady(() => {
       const getWidth = async () => {
@@ -14001,7 +15176,7 @@ var __publicField = (obj, key, value) => {
           {
             id: "left",
             ref: side === "left" ? leftWrapper : rightWrapper,
-            className: `${swipeBem(side)}`,
+            className: `${classPrefix2}__${side}`,
             onClick: (e) => handleOperate(e, side)
           },
           props[`${side}Action`]
@@ -14041,13 +15216,13 @@ var __publicField = (obj, key, value) => {
       "div",
       {
         ref: root2,
-        className: classNames(swipeBem(), className),
+        className: classNames(classPrefix2, className),
         onTouchStart: (e) => onTouchStart(e),
         onTouchMove: (e) => onTouchMove(e),
         onTouchEnd: (e) => onTouchEnd(e),
         style
       },
-      /* @__PURE__ */ React.createElement("div", { className: `${swipeBem("wrapper")}`, style: wrapperStyle }, renderActionContent("left"), children, renderActionContent("right"))
+      /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__wrapper`, style: wrapperStyle }, renderActionContent("left"), children, renderActionContent("right"))
     );
   });
   Swipe.defaultProps = defaultProps$t;
@@ -14166,7 +15341,7 @@ var __publicField = (obj, key, value) => {
       iconSize,
       msg,
       duration,
-      type,
+      type: type2,
       title,
       closeOnOverlayClick,
       contentClassName,
@@ -14211,7 +15386,7 @@ var __publicField = (obj, key, value) => {
       }
     };
     const hasIcon = () => {
-      if (type !== "text") {
+      if (type2 !== "text") {
         return true;
       }
       return !!icon;
@@ -14225,7 +15400,7 @@ var __publicField = (obj, key, value) => {
         fail: /* @__PURE__ */ React.createElement(a$m, { color: "#ffffff", width: iconSize, height: iconSize }),
         warn: /* @__PURE__ */ React.createElement(a$3, { color: "#ffffff", width: iconSize, height: iconSize }),
         loading: /* @__PURE__ */ React.createElement(r$g, { color: "#ffffff", width: iconSize, height: iconSize })
-      }[type];
+      }[type2];
     };
     const classes = classNames({
       "nut-toast-has-icon": icon,
@@ -14266,14 +15441,14 @@ var __publicField = (obj, key, value) => {
   };
   const classPrefix$7 = `nut-animate`;
   const Animate = (props) => {
-    const { className, type, action, loop, onClick, children, ...rest } = {
+    const { className, type: type2, action, loop, onClick, children, ...rest } = {
       ...defaultProps$r,
       ...props
     };
     const [clicked, setClicked] = React.useState(false);
     const classes = classNames({
       "nut-ani-container": true,
-      [`${classPrefix$7}-${type}`]: action === "initial" || clicked ? type : false,
+      [`${classPrefix$7}-${type2}`]: action === "initial" || clicked ? type2 : false,
       loop
     });
     const cls = classNames(classes, className);
@@ -14376,8 +15551,8 @@ var __publicField = (obj, key, value) => {
             className: `${classPrefix2}__number`,
             style: numberEaseStyle(idx)
           },
-          [...numbers, ...numbers].map((number, subidx) => {
-            return /* @__PURE__ */ React.createElement("span", { key: subidx }, number);
+          [...numbers, ...numbers].map((number2, subidx) => {
+            return /* @__PURE__ */ React.createElement("span", { key: subidx }, number2);
           })
         ) : /* @__PURE__ */ React.createElement("span", { className: `${classPrefix2}__separator` }, item)
       );
@@ -14432,7 +15607,7 @@ var __publicField = (obj, key, value) => {
       style,
       autoplay,
       loop,
-      type,
+      type: type2,
       onFastBack,
       onForward,
       onPause,
@@ -14588,7 +15763,7 @@ var __publicField = (obj, key, value) => {
       return /* @__PURE__ */ React.createElement("div", { className: b("none-container"), onClick: handleStatusChange }, children);
     };
     const renderAudio = () => {
-      switch (type) {
+      switch (type2) {
         case "icon":
           return renderIcon();
         case "progress":
@@ -14702,7 +15877,7 @@ var __publicField = (obj, key, value) => {
     const transColor = (color2) => {
       return color2 && color2.replace("#", "%23");
     };
-    const format = (progress) => Math.min(Math.max(+progress, 0), 100);
+    const format2 = (progress) => Math.min(Math.max(+progress, 0), 100);
     const circleStyle = () => {
       const stopArr = stop();
       const stopDom = [];
@@ -14717,7 +15892,7 @@ var __publicField = (obj, key, value) => {
       }
       const perimeter = 283;
       const progress = +oldValue;
-      const offset = perimeter * Number(format(parseFloat(progress.toFixed(1)))) / 100;
+      const offset = perimeter * Number(format2(parseFloat(progress.toFixed(1)))) / 100;
       const isWise = props.clockwise ? 1 : 0;
       const color2 = isObject(props.color) ? `url(%23${refRandomId})` : transColor(props.color);
       const d = `M 50 50 m 0 -45 a 45 45 0 1 ${isWise} 0 90 a 45 45 0 1, ${isWise} 0 -90`;
@@ -14976,7 +16151,7 @@ var __publicField = (obj, key, value) => {
       endTime,
       remainingTime,
       millisecond,
-      format,
+      format: format2,
       autoStart,
       time,
       destroy,
@@ -15045,7 +16220,7 @@ var __publicField = (obj, key, value) => {
         }
       });
     };
-    const formatRemainTime = (t, type) => {
+    const formatRemainTime = (t, type2) => {
       const ts = t;
       const rest2 = {
         d: 0,
@@ -15065,12 +16240,12 @@ var __publicField = (obj, key, value) => {
         rest2.s = Math.floor(ts % MINUTE / SECOND);
         rest2.ms = Math.floor(ts % SECOND);
       }
-      return type === "custom" ? rest2 : parseFormat({ ...rest2 });
+      return type2 === "custom" ? rest2 : parseFormat({ ...rest2 });
     };
     const parseFormat = (time2) => {
       const { d } = time2;
       let { h, m, s, ms } = time2;
-      let formatCache = format;
+      let formatCache = format2;
       if (formatCache.includes("DD")) {
         formatCache = formatCache.replace("DD", padZero(d));
       } else {
@@ -15376,9 +16551,9 @@ var __publicField = (obj, key, value) => {
       const newContent = `${((_a2 = ellipsis.current) == null ? void 0 : _a2.leading) || ""}${((_b2 = ellipsis.current) == null ? void 0 : _b2.leading) ? symbol : ""}${expandText || ""}${((_c2 = ellipsis.current) == null ? void 0 : _c2.tailing) ? symbol : ""}${((_d2 = ellipsis.current) == null ? void 0 : _d2.tailing) || ""}`;
       setContentCopy(newContent);
     };
-    const tailorContent = (left, right, type = "") => {
+    const tailorContent = (left, right, type2 = "") => {
       const threeDotWidth = symbolTextWidth;
-      const direc = direction === "middle" && type ? type : direction;
+      const direc = direction === "middle" && type2 ? type2 : direction;
       setExceeded(true);
       let widthPart = -1;
       const start = left;
@@ -15421,8 +16596,8 @@ var __publicField = (obj, key, value) => {
       const match = value.match(/^\d*(\.\d*)?/);
       return match ? Number(match[0]) : 0;
     };
-    const clickHandle = (type) => {
-      if (type === 1) {
+    const clickHandle = (type2) => {
+      if (type2 === 1) {
         setExpanded(true);
         onChange && onChange("expand");
       } else {
@@ -16579,7 +17754,7 @@ var __publicField = (obj, key, value) => {
       style,
       background,
       plain,
-      type,
+      type: type2,
       round,
       children,
       mark,
@@ -16598,7 +17773,7 @@ var __publicField = (obj, key, value) => {
     const classes = () => {
       return classNames({
         [classPrefix2]: true,
-        [`${classPrefix2}--${type}`]: type,
+        [`${classPrefix2}--${type2}`]: type2,
         [`${classPrefix2}--plain`]: plain,
         [`${classPrefix2}--round`]: round,
         [`${classPrefix2}--mark`]: mark,
@@ -16608,7 +17783,7 @@ var __publicField = (obj, key, value) => {
     };
     React.useEffect(() => {
       setTagClass(classes());
-    }, [type, background, color, plain, round, mark, closeable, className]);
+    }, [type2, background, color, plain, round, mark, closeable, className]);
     const handleClick = (e) => {
       onClick && onClick(e);
     };
@@ -16886,11 +18061,11 @@ var __publicField = (obj, key, value) => {
     }, [options, optionKey, activeDate]);
     const isActive = React.useCallback(
       (timeKey) => {
-        const date = activeTime.find((item) => {
+        const date2 = activeTime.find((item) => {
           return item[optionKey.valueKey] === activeDate;
         });
-        if (date == null ? void 0 : date[optionKey.childrenKey]) {
-          const time = date == null ? void 0 : date[optionKey.childrenKey].find((time2) => {
+        if (date2 == null ? void 0 : date2[optionKey.childrenKey]) {
+          const time = date2 == null ? void 0 : date2[optionKey.childrenKey].find((time2) => {
             return time2[optionKey.valueKey] === timeKey;
           });
           return time;
@@ -16962,23 +18137,23 @@ var __publicField = (obj, key, value) => {
     };
     const handleSelectTime = (selectTime) => {
       let newActiveTime = [...activeTime];
-      const date = newActiveTime.find((item) => {
+      const date2 = newActiveTime.find((item) => {
         return item[optionKey.valueKey] === activeDate;
       });
-      if (date) {
-        const timeIndex = date[optionKey.childrenKey].findIndex(
+      if (date2) {
+        const timeIndex = date2[optionKey.childrenKey].findIndex(
           (time) => {
             return time[optionKey.valueKey] === selectTime[optionKey.valueKey];
           }
         );
         if (timeIndex > -1) {
           if (multiple) {
-            date[optionKey.childrenKey].splice(timeIndex, 1);
+            date2[optionKey.childrenKey].splice(timeIndex, 1);
           } else {
             newActiveTime = [];
           }
         } else if (multiple) {
-          date[optionKey.childrenKey].push({ ...selectTime });
+          date2[optionKey.childrenKey].push({ ...selectTime });
         } else {
           newActiveTime = [
             {
@@ -17007,9 +18182,9 @@ var __publicField = (obj, key, value) => {
       setActiveTime(newActiveTime);
       onTimeChange && onTimeChange(selectTime, newActiveTime);
     };
-    const handleChange = (date) => {
-      setActiveDate(date[optionKey.valueKey]);
-      onDateChange && onDateChange(date, activeTime);
+    const handleChange = (date2) => {
+      setActiveDate(date2[optionKey.valueKey]);
+      onDateChange && onDateChange(date2, activeTime);
     };
     return /* @__PURE__ */ React.createElement(
       Popup,