npm - @nutui/nutui-react-taro - Versions diffs - 2.0.0-alpha.16 → 2.0.0-alpha.17 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (139) hide show

package/dist/nutui.react.es.js CHANGED Viewed

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v2.0.0-alpha.16 Fri Jun 09 2023 18:38:16 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 @@ const Button = React.forwardRef(
       fill,
       loading,
       disabled,
-      type,
+      type: type4,
       size,
       block,
       icon,
@@ -1929,7 +1929,7 @@ const Button = React.forwardRef(
           className: classNames(
             prefixCls,
             className,
-            props.type ? `${prefixCls}--${type}` : null,
+            props.type ? `${prefixCls}--${type4}` : null,
             props.fill ? `${prefixCls}--${fill}` : null,
             {
               [`${prefixCls}--${size}`]: size,
@@ -2243,30 +2243,30 @@ var deburredLetters = {
 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(array4, iteratee, accumulator, initAccum) {
+  var index = -1, length = array4 ? array4.length : 0;
   if (initAccum && length) {
-    accumulator = array[++index];
+    accumulator = array4[++index];
   }
   while (++index < length) {
-    accumulator = iteratee(accumulator, array[index], index, array);
+    accumulator = iteratee(accumulator, array4[index], index, array4);
   }
   return accumulator;
 }
-function asciiWords(string) {
-  return string.match(reAsciiWord) || [];
+function asciiWords(string3) {
+  return string3.match(reAsciiWord) || [];
 }
-function basePropertyOf(object) {
+function basePropertyOf(object4) {
   return function(key) {
-    return object == null ? void 0 : object[key];
+    return object4 == null ? void 0 : object4[key];
   };
 }
 var deburrLetter = basePropertyOf(deburredLetters);
-function hasUnicodeWord(string) {
-  return reHasUnicodeWord.test(string);
+function hasUnicodeWord(string3) {
+  return reHasUnicodeWord.test(string3);
 }
-function unicodeWords(string) {
-  return string.match(reUnicodeWord) || [];
+function unicodeWords(string3) {
+  return string3.match(reUnicodeWord) || [];
 }
 var objectProto = Object.prototype;
 var objectToString = objectProto.toString;
@@ -2283,8 +2283,8 @@ function baseToString(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(string3) {
+    return arrayReduce(words(deburr(string3).replace(reApos, "")), callback, "");
   };
 }
 function isObjectLike(value) {
@@ -2296,20 +2296,20 @@ function isSymbol(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(string3) {
+  string3 = toString(string3);
+  return string3 && string3.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(string3, pattern4, guard) {
+  string3 = toString(string3);
+  pattern4 = guard ? void 0 : pattern4;
+  if (pattern4 === void 0) {
+    return hasUnicodeWord(string3) ? unicodeWords(string3) : asciiWords(string3);
   }
-  return string.match(pattern) || [];
+  return string3.match(pattern4) || [];
 }
 var lodash_kebabcase = kebabCase;
 const zhCN = {
@@ -2905,7 +2905,7 @@ const Row = (props) => {
     className,
     style,
     children,
-    type,
+    type: type4,
     justify,
     align,
     wrap,
@@ -2915,14 +2915,14 @@ const Row = (props) => {
     ...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("", type4)}
     ${getClass("justify", justify)}
     ${getClass("align", align)}
     ${getClass("flex", wrap)}
@@ -3464,7 +3464,7 @@ const FixedNav = (props) => {
     position,
     onChange,
     onSelect,
-    type,
+    type: type4,
     children,
     style,
     content,
@@ -3478,7 +3478,7 @@ const FixedNav = (props) => {
     {
       active: visible
     },
-    type,
+    type4,
     className,
     classPrefix2
   );
@@ -3586,8 +3586,8 @@ const NavBar = (props) => {
 };
 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 @@ function _extends() {
     }
     return target;
   };
-  return _extends.apply(this, arguments);
+  return _extends$1.apply(this, arguments);
 }
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null)
@@ -3614,17 +3614,17 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   }
   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 @@ function requireReactIs_development() {
       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(type4) {
+        return typeof type4 === "string" || typeof type4 === "function" || // Note: its typeof might be other than 'symbol' or 'number' if it's a polyfill.
+        type4 === REACT_FRAGMENT_TYPE || type4 === REACT_CONCURRENT_MODE_TYPE || type4 === REACT_PROFILER_TYPE || type4 === REACT_STRICT_MODE_TYPE || type4 === REACT_SUSPENSE_TYPE || type4 === REACT_SUSPENSE_LIST_TYPE || typeof type4 === "object" && type4 !== null && (type4.$$typeof === REACT_LAZY_TYPE || type4.$$typeof === REACT_MEMO_TYPE || type4.$$typeof === REACT_PROVIDER_TYPE || type4.$$typeof === REACT_CONTEXT_TYPE || type4.$$typeof === REACT_FORWARD_REF_TYPE || type4.$$typeof === REACT_FUNDAMENTAL_TYPE || type4.$$typeof === REACT_RESPONDER_TYPE || type4.$$typeof === REACT_SCOPE_TYPE || type4.$$typeof === REACT_BLOCK_TYPE);
       }
-      function typeOf(object) {
-        if (typeof object === "object" && object !== null) {
-          var $$typeof = object.$$typeof;
+      function typeOf(object4) {
+        if (typeof object4 === "object" && object4 !== null) {
+          var $$typeof = object4.$$typeof;
           switch ($$typeof) {
             case REACT_ELEMENT_TYPE:
-              var type = object.type;
-              switch (type) {
+              var type4 = object4.type;
+              switch (type4) {
                 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 type4;
                 default:
-                  var $$typeofType = type && type.$$typeof;
+                  var $$typeofType = type4 && type4.$$typeof;
                   switch ($$typeofType) {
                     case REACT_CONTEXT_TYPE:
                     case REACT_FORWARD_REF_TYPE:
@@ -3834,50 +3834,50 @@ function requireReactIs_development() {
       var StrictMode = REACT_STRICT_MODE_TYPE;
       var Suspense = REACT_SUSPENSE_TYPE;
       var hasWarnedAboutDeprecatedIsAsyncMode = false;
-      function isAsyncMode(object) {
+      function isAsyncMode(object4) {
         {
           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(object4) || typeOf(object4) === REACT_ASYNC_MODE_TYPE;
       }
-      function isConcurrentMode(object) {
-        return typeOf(object) === REACT_CONCURRENT_MODE_TYPE;
+      function isConcurrentMode(object4) {
+        return typeOf(object4) === REACT_CONCURRENT_MODE_TYPE;
       }
-      function isContextConsumer(object) {
-        return typeOf(object) === REACT_CONTEXT_TYPE;
+      function isContextConsumer(object4) {
+        return typeOf(object4) === REACT_CONTEXT_TYPE;
       }
-      function isContextProvider(object) {
-        return typeOf(object) === REACT_PROVIDER_TYPE;
+      function isContextProvider(object4) {
+        return typeOf(object4) === REACT_PROVIDER_TYPE;
       }
-      function isElement2(object) {
-        return typeof object === "object" && object !== null && object.$$typeof === REACT_ELEMENT_TYPE;
+      function isElement2(object4) {
+        return typeof object4 === "object" && object4 !== null && object4.$$typeof === REACT_ELEMENT_TYPE;
       }
-      function isForwardRef(object) {
-        return typeOf(object) === REACT_FORWARD_REF_TYPE;
+      function isForwardRef(object4) {
+        return typeOf(object4) === REACT_FORWARD_REF_TYPE;
       }
-      function isFragment(object) {
-        return typeOf(object) === REACT_FRAGMENT_TYPE;
+      function isFragment(object4) {
+        return typeOf(object4) === REACT_FRAGMENT_TYPE;
       }
-      function isLazy(object) {
-        return typeOf(object) === REACT_LAZY_TYPE;
+      function isLazy(object4) {
+        return typeOf(object4) === REACT_LAZY_TYPE;
       }
-      function isMemo(object) {
-        return typeOf(object) === REACT_MEMO_TYPE;
+      function isMemo(object4) {
+        return typeOf(object4) === REACT_MEMO_TYPE;
       }
-      function isPortal(object) {
-        return typeOf(object) === REACT_PORTAL_TYPE;
+      function isPortal(object4) {
+        return typeOf(object4) === REACT_PORTAL_TYPE;
       }
-      function isProfiler(object) {
-        return typeOf(object) === REACT_PROFILER_TYPE;
+      function isProfiler(object4) {
+        return typeOf(object4) === REACT_PROFILER_TYPE;
       }
-      function isStrictMode(object) {
-        return typeOf(object) === REACT_STRICT_MODE_TYPE;
+      function isStrictMode(object4) {
+        return typeOf(object4) === REACT_STRICT_MODE_TYPE;
       }
-      function isSuspense(object) {
-        return typeOf(object) === REACT_SUSPENSE_TYPE;
+      function isSuspense(object4) {
+        return typeOf(object4) === REACT_SUSPENSE_TYPE;
       }
       reactIs_development.AsyncMode = AsyncMode;
       reactIs_development.ConcurrentMode = ConcurrentMode;
@@ -4291,8 +4291,8 @@ function requireFactoryWithTypeCheckers() {
           }
         }
         var valuesString = JSON.stringify(expectedValues, function replacer(key, value) {
-          var type = getPreciseType(value);
-          if (type === "symbol") {
+          var type4 = getPreciseType(value);
+          if (type4 === "symbol") {
             return String(value);
           }
           return value;
@@ -4363,9 +4363,9 @@ function requireFactoryWithTypeCheckers() {
       }
       return createChainableTypeChecker(validate);
     }
-    function invalidValidatorError(componentName, location, propFullName, key, type) {
+    function invalidValidatorError(componentName, location, propFullName, key, type4) {
       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 `" + type4 + "`."
       );
     }
     function createShapeTypeChecker(shapeTypes) {
@@ -4502,17 +4502,17 @@ function requireFactoryWithTypeCheckers() {
       return propType;
     }
     function getPostfixForTypeWarning(value) {
-      var type = getPreciseType(value);
-      switch (type) {
+      var type4 = getPreciseType(value);
+      switch (type4) {
         case "array":
         case "object":
-          return "an " + type;
+          return "an " + type4;
         case "boolean":
         case "date":
         case "regexp":
-          return "a " + type;
+          return "a " + type4;
         default:
-          return type;
+          return type4;
       }
     }
     function getClassName(propValue) {
@@ -4646,7 +4646,7 @@ var ENTERING = "entering";
 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 removeClass = function removeClass2(node, classes) {
   });
 };
 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 CSSTransition = /* @__PURE__ */ function(_React$Component) {
     };
     _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 type4 = appearing ? "appear" : "enter";
+      _this.addClass(node, type4, "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 type4 = appearing ? "appear" : "enter";
+      _this.removeClasses(node, type4);
+      _this.addClass(node, type4, "done");
       if (_this.props.onEntered) {
         _this.props.onEntered(maybeNode, maybeAppearing);
       }
@@ -5140,13 +5140,13 @@ var CSSTransition = /* @__PURE__ */ function(_React$Component) {
     _this.resolveArguments = function(maybeNode, maybeAppearing) {
       return _this.props.nodeRef ? [_this.props.nodeRef.current, maybeNode] : [maybeNode, maybeAppearing];
     };
-    _this.getClassNames = function(type) {
+    _this.getClassNames = function(type4) {
       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 + type4 : classNames2[type4];
+      var activeClassName = isStringClassNames ? baseClassName + "-active" : classNames2[type4 + "Active"];
+      var doneClassName = isStringClassNames ? baseClassName + "-done" : classNames2[type4 + "Done"];
       return {
         baseClassName,
         activeClassName,
@@ -5156,10 +5156,10 @@ var CSSTransition = /* @__PURE__ */ function(_React$Component) {
     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, type4, phase) {
+    var className = this.getClassNames(type4)[phase + "ClassName"];
     var _this$getClassNames = this.getClassNames("enter"), doneClassName = _this$getClassNames.doneClassName;
-    if (type === "appear" && phase === "done" && doneClassName) {
+    if (type4 === "appear" && phase === "done" && doneClassName) {
       className += " " + doneClassName;
     }
     if (phase === "active") {
@@ -5167,13 +5167,13 @@ var CSSTransition = /* @__PURE__ */ function(_React$Component) {
         forceReflow(node);
     }
     if (className) {
-      this.appliedClasses[type][phase] = className;
+      this.appliedClasses[type4][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, type4) {
+    var _this$appliedClasses$ = this.appliedClasses[type4], baseClassName = _this$appliedClasses$.base, activeClassName = _this$appliedClasses$.active, doneClassName = _this$appliedClasses$.done;
+    this.appliedClasses[type4] = {};
     if (baseClassName) {
       removeClass(node, baseClassName);
     }
@@ -5188,7 +5188,7 @@ var CSSTransition = /* @__PURE__ */ function(_React$Component) {
     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 CSSTransition = /* @__PURE__ */ function(_React$Component) {
 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 @@ const Popup = (props) => {
     }
   };
   const onHandleClickOverlay = (e) => {
+    e.stopPropagation();
     if (closeOnOverlayClick) {
       const closed = onClickOverlay && onClickOverlay(e);
       closed && close();
@@ -6157,7 +6158,7 @@ const ExistRender = (props) => {
   const { locale } = useConfig();
   const {
     children,
-    type,
+    type: type4,
     existAddress,
     selectedIcon,
     defaultIcon,
@@ -6189,7 +6190,7 @@ const ExistRender = (props) => {
     onSelected && onSelected(prevExistAdd, item, copyExistAdd);
   };
   const onSwitch = () => {
-    onSwitchModule && onSwitchModule({ type: type === "exist" ? "custom" : "exist" });
+    onSwitchModule && onSwitchModule({ type: type4 === "exist" ? "custom" : "exist" });
   };
   useEffect(() => {
   }, [existAddress]);
@@ -6210,7 +6211,7 @@ const CustomRender = (props) => {
   const { locale } = useConfig$1();
   const {
     children,
-    type,
+    type: type4,
     modelValue,
     height,
     province,
@@ -6226,7 +6227,7 @@ const CustomRender = (props) => {
     ...props
   };
   const b2 = cn("address");
-  const [privateType] = useState(type);
+  const [privateType] = useState(type4);
   const [tabIndex, setTabIndex] = useState(0);
   const [tabName] = useState(["province", "city", "country", "town"]);
   useRef(null);
@@ -6235,7 +6236,7 @@ const CustomRender = (props) => {
   useRef(null);
   const regionLine = useRef(null);
   const isCustom2 = () => {
-    return type === "custom2";
+    return type4 === "custom2";
   };
   const transformData = (data) => {
     if (!Array.isArray(data))
@@ -6497,7 +6498,7 @@ const Address = (props) => {
     modelValue,
     modelSelect,
     children,
-    type,
+    type: type4,
     height,
     customAddressTitle,
     existAddress,
@@ -6526,7 +6527,7 @@ const Address = (props) => {
     ...props
   };
   const b2 = cn("address");
-  const [privateType, setPrivateType] = useState(type);
+  const [privateType, setPrivateType] = useState(type4);
   const [tabName] = useState(["province", "city", "country", "town"]);
   const [showPopup, setShowPopup] = useState(modelValue);
   const [selectedRegion, setSelectedRegion] = useState({
@@ -6652,8 +6653,8 @@ const Address = (props) => {
           onNextArea: (cal) => {
             nextAreaList && nextAreaList(cal);
           },
-          onTabClick: (type2) => {
-            onTabChecked && onTabChecked(type2);
+          onTabClick: (type22) => {
+            onTabChecked && onTabChecked(type22);
           },
           onClose: handClose
         }
@@ -6689,8 +6690,8 @@ const Utils = {
    * @return {String}
    */
   getWhatDay(year, month, day) {
-    const date = /* @__PURE__ */ new Date(`${year}/${month}/${day}`);
-    const index = date.getDay();
+    const date4 = /* @__PURE__ */ new Date(`${year}/${month}/${day}`);
+    const index = date4.getDay();
     const dayNames = [
       "星期日",
       "星期一",
@@ -6707,8 +6708,8 @@ const Utils = {
    * @return {Number}
    */
   getMonthPreDay(year, month) {
-    const date = /* @__PURE__ */ new Date(`${year}/${month}/01`);
-    let day = date.getDay();
+    const date4 = /* @__PURE__ */ new Date(`${year}/${month}/01`);
+    let day = date4.getDay();
     if (day == 0) {
       day = 7;
     }
@@ -6750,11 +6751,11 @@ const Utils = {
    * 日期对象转成字符串
    * @return {string}
    */
-  date2Str(date, split) {
+  date2Str(date4, split) {
     split = split || "-";
-    const y2 = date.getFullYear();
-    const m = this.getNumTwoBit(date.getMonth() + 1);
-    const d = this.getNumTwoBit(date.getDate());
+    const y2 = date4.getFullYear();
+    const m = this.getNumTwoBit(date4.getMonth() + 1);
+    const d = this.getNumTwoBit(date4.getDate());
     return [y2, m, d].join(split);
   },
   /**
@@ -6764,18 +6765,18 @@ const Utils = {
    */
   getDay(i) {
     i = i || 0;
-    let date = /* @__PURE__ */ new Date();
+    let date4 = /* @__PURE__ */ new Date();
     const diff = i * (1e3 * 60 * 60 * 24);
-    date = new Date(date.getTime() + diff);
-    return this.date2Str(date);
+    date4 = new Date(date4.getTime() + diff);
+    return this.date2Str(date4);
   },
   /**
    * 时间比较
    * @return {Boolean}
    */
-  compareDate(date1, date2) {
+  compareDate(date1, date22) {
     const startTime = new Date(date1.replace("-", "/").replace("-", "/"));
-    const endTime = new Date(date2.replace("-", "/").replace("-", "/"));
+    const endTime = new Date(date22.replace("-", "/").replace("-", "/"));
     if (startTime >= endTime) {
       return false;
     }
@@ -6785,9 +6786,9 @@ const Utils = {
    * 时间是否相等
    * @return {Boolean}
    */
-  isEqual(date1, date2) {
+  isEqual(date1, date22) {
     const startTime = new Date(date1).getTime();
-    const endTime = new Date(date2).getTime();
+    const endTime = new Date(date22).getTime();
     if (startTime == endTime) {
       return true;
     }
@@ -6839,7 +6840,7 @@ const defaultProps$12 = {
 const CalendarItem = React.forwardRef((props, ref) => {
   const { locale } = useConfig$1();
   const {
-    type,
+    type: type4,
     isAutoBackFill,
     poppable,
     title,
@@ -6913,10 +6914,10 @@ const CalendarItem = React.forwardRef((props, ref) => {
   });
   const monthitemclasses = classNames({
     "calendar-month-item": true,
-    [`${type === "range" ? "month-item-range" : ""}`]: true
+    [`${type4 === "range" ? "month-item-range" : ""}`]: true
   });
-  const splitDate = (date) => {
-    return date.split("-");
+  const splitDate = (date4) => {
+    return date4.split("-");
   };
   const isStart = (currDate) => {
     return Utils.isEqual(state.currDate[0], currDate);
@@ -6940,13 +6941,13 @@ const CalendarItem = React.forwardRef((props, ref) => {
   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) || type4 === "range" && (isStart(currDate) || isEnd(currDate)) || type4 === "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 (type4 === "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 @@ const CalendarItem = React.forwardRef((props, ref) => {
     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 date4 = `${month.curData[0]}-${month.curData[1]}-${day}`;
+    return Utils.isEqual(date4, 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 @@ const CalendarItem = React.forwardRef((props, ref) => {
   };
   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 @@ const CalendarItem = React.forwardRef((props, ref) => {
           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 @@ const CalendarItem = React.forwardRef((props, ref) => {
     }
     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 @@ const CalendarItem = React.forwardRef((props, ref) => {
       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 @@ const CalendarItem = React.forwardRef((props, ref) => {
       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 @@ const CalendarItem = React.forwardRef((props, ref) => {
       getMonth(getCurrData("next"), "next");
     } while (i++ < monthsNum);
     state.monthsNum = monthsNum;
-    if (type === "range" && Array.isArray(state.currDate)) {
+    if (type4 === "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 @@ const CalendarItem = React.forwardRef((props, ref) => {
     state.currentIndex = current;
     setReachedYearMonthInfo();
     if (state.defaultData.length > 0) {
-      if (type === "range") {
+      if (type4 === "range") {
         chooseDay(
           { day: state.defaultData[2], type: "curr" },
           state.monthsData[state.currentIndex],
@@ -7318,7 +7319,7 @@ const CalendarItem = React.forwardRef((props, ref) => {
           state.monthsData[lastCurrent],
           true
         );
-      } else if (type === "multiple") {
+      } else if (type4 === "multiple") {
         [...state.currDate].forEach((item) => {
           const dateArr = splitDate(item);
           let current2 = state.currentIndex;
@@ -7358,13 +7359,13 @@ const CalendarItem = React.forwardRef((props, ref) => {
     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 = (date4) => {
+    if (Utils.compareDate(date4, state.propStartDate)) {
+      date4 = state.propStartDate;
+    } else if (!Utils.compareDate(date4, state.propEndDate)) {
+      date4 = state.propEndDate;
     }
-    const dateArr = splitDate(date);
+    const dateArr = splitDate(date4);
     state.monthsData.forEach((item, index) => {
       if (item.title === locale.calendaritem.monthTitle(dateArr[0], dateArr[1])) {
         if (months.current) {
@@ -7487,7 +7488,7 @@ const Calendar = React.forwardRef((props, ref) => {
     children,
     poppable,
     visible,
-    type,
+    type: type4,
     isAutoBackFill,
     title,
     defaultValue,
@@ -7523,9 +7524,9 @@ const Calendar = React.forwardRef((props, ref) => {
   const select = (param) => {
     onSelected && onSelected(param);
   };
-  const scrollToDate = (date) => {
+  const scrollToDate = (date4) => {
     var _a;
-    (_a = calendarRef.current) == null ? void 0 : _a.scrollToDate(date);
+    (_a = calendarRef.current) == null ? void 0 : _a.scrollToDate(date4);
   };
   const yearMonthChange = (param) => {
     onYearMonthChange && onYearMonthChange(param);
@@ -7538,7 +7539,7 @@ const Calendar = React.forwardRef((props, ref) => {
       CalendarItem,
       {
         ref: calendarRef,
-        type,
+        type: type4,
         isAutoBackFill,
         poppable,
         title: title || locale.calendaritem.title,
@@ -7811,7 +7812,7 @@ const InternalCascader = (props, ref) => {
     defaultValue,
     title,
     optionKey,
-    format,
+    format: format2,
     closeable,
     closeIconPosition,
     closeIcon,
@@ -7851,7 +7852,7 @@ const InternalCascader = (props, ref) => {
       lazy,
       onLoad,
       optionKey,
-      format
+      format: format2
     },
     lazyLoadMap: /* @__PURE__ */ new Map()
   });
@@ -7861,7 +7862,7 @@ const InternalCascader = (props, ref) => {
   });
   useEffect(() => {
     initData();
-  }, [options, format]);
+  }, [options, format2]);
   useEffect(() => {
     if (defaultValue && defaultValue !== innerValue) {
       setInnerValue(defaultValue);
@@ -7869,10 +7870,10 @@ const InternalCascader = (props, ref) => {
   }, [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 @@ const InternalCascader = (props, ref) => {
   const closePopup = () => {
     close();
   };
-  const chooseItem = async (node, type) => {
-    if (!type && node.disabled || !state.panes[state.tabsCursor]) {
+  const chooseItem = async (node, type4) => {
+    if (!type4 && 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 (!type4) {
         const pathNodes = state.panes.map((item) => item.selectedNode);
         const optionParams = pathNodes.map((item) => item.value);
         onChange(optionParams, pathNodes);
@@ -8009,7 +8010,7 @@ const InternalCascader = (props, ref) => {
       });
       setOptionsData(state.panes);
       setTabvalue(`c${state.tabsCursor + 1}`);
-      if (!type) {
+      if (!type4) {
         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 @@ const InternalCascader = (props, ref) => {
     await invokeLazyLoad(node);
     if (state.currentProcessNode === node) {
       state.panes[state.tabsCursor].selectedNode = node;
-      chooseItem(node, type);
+      chooseItem(node, type4);
     }
     setOptionsData(state.panes);
   };
@@ -8085,7 +8086,7 @@ const Cascader = React.forwardRef(InternalCascader);
 Cascader.defaultProps = defaultProps$$;
 Cascader.displayName = "NutCascader";
 const CheckboxGroupContext = createContext(null);
-const Context = CheckboxGroupContext;
+const Context$1 = CheckboxGroupContext;
 const defaultProps$_ = {
   max: void 0,
   labelPosition: "right",
@@ -8156,7 +8157,7 @@ const CheckboxGroup = React.forwardRef(
       });
     }, [options, max]);
     return /* @__PURE__ */ React.createElement(
-      Context.Provider,
+      Context$1.Provider,
       {
         value: {
           labelPosition: labelPosition || "right",
@@ -8219,7 +8220,7 @@ const Checkbox = (props) => {
     ...others
   } = props;
   let { labelPosition, ...rest } = others;
-  const ctx = useContext(Context);
+  const ctx = useContext(Context$1);
   let [innerChecked, setChecked] = usePropsValue({
     value: props.checked,
     defaultValue: props.defaultChecked,
@@ -8419,18 +8420,18 @@ const InternalPickerPanel = (props, ref) => {
     }
     return false;
   };
-  const setTransform = (translateY = 0, type, time = DEFAULT_DURATION, deg) => {
+  const setTransform = (translateY = 0, type4, time = DEFAULT_DURATION, deg) => {
     let nTime = time;
-    if (type !== "end") {
+    if (type4 !== "end") {
       nTime = 0;
     }
     setTouchTime(nTime);
     setTouchDeg(deg);
     setScrollDistance(translateY);
   };
-  const setMove = (move, type, time) => {
+  const setMove = (move, type4, time) => {
     let updateMove = move + transformY.current;
-    if (type === "end") {
+    if (type4 === "end") {
       if (updateMove > 0) {
         updateMove = 0;
       }
@@ -8439,7 +8440,7 @@ const InternalPickerPanel = (props, ref) => {
       }
       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, type4, time, deg);
       setCurrIndex(Math.abs(Math.round(endMove / lineSpacing.current)) + 1);
     } else {
       let deg = 0;
@@ -8492,7 +8493,7 @@ const InternalPickerPanel = (props, ref) => {
     nDistance = speed / 3e-3 * (nDistance < 0 ? -1 : 1);
     return nDistance;
   };
-  const modifyStatus = (type, val) => {
+  const modifyStatus = (type4, val) => {
     const value = val || defaultValue;
     let index = -1;
     if (value) {
@@ -8512,7 +8513,7 @@ const InternalPickerPanel = (props, ref) => {
     }
     setCurrIndex(index === -1 ? 1 : index + 1);
     const move = index === -1 ? 0 : index * lineSpacing.current;
-    type && setChooseValue(-move);
+    type4 && setChooseValue(-move);
     setMove(-move);
   };
   const stopMomentum = () => {
@@ -8670,6 +8671,11 @@ const InternalPicker = (props, ref) => {
       (_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] = useState(selectedValue);
   const [currentValue, setCurrentValue] = useState([]);
   const [columnIndex, setColumnIndex] = useState(0);
@@ -8677,6 +8683,15 @@ const InternalPicker = (props, ref) => {
   const [refs, setRefs] = useRefs();
   const [columnsList, setColumnsList] = useState([]);
   const isConfirmEvent = useRef(false);
+  const actions = {
+    open: () => {
+      setInnerVisible(true);
+    },
+    close: () => {
+      setInnerVisible(false);
+    }
+  };
+  useImperativeHandle(ref, () => actions);
   const formatCascade = (columns, values) => {
     const formatted = [];
     let columnOptions = {
@@ -8712,8 +8727,8 @@ const InternalPicker = (props, ref) => {
     return "single";
   };
   const normalListData = (innerValue2) => {
-    const type = columnsType();
-    switch (type) {
+    const type4 = columnsType();
+    switch (type4) {
       case "multiple":
         return options;
       case "cascade":
@@ -8738,19 +8753,19 @@ const InternalPicker = (props, ref) => {
   };
   useEffect(() => {
     setInnerValue(innerValue !== selectedValue ? selectedValue : innerValue);
-  }, [visible]);
+  }, [innerVisible]);
   useEffect(() => {
-    if (visible) {
+    if (innerVisible) {
       init();
     }
-  }, [options, visible]);
+  }, [options, innerVisible]);
   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 @@ const InternalPicker = (props, ref) => {
     if (moving) {
       isConfirmEvent.current = true;
     } else {
+      console.log("picker confirmed", innerValue);
       setSelectedValue(innerValue);
       closePicker();
     }
@@ -8840,6 +8856,7 @@ const InternalPicker = (props, ref) => {
     }, 0);
   };
   const closePicker = () => {
+    setInnerVisible(false);
     onClose && onClose(setSelectedOptions(), innerValue);
     afterClose && afterClose(setSelectedOptions(), innerValue, pickerRef);
   };
@@ -8848,10 +8865,23 @@ const InternalPicker = (props, ref) => {
       "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] = useState(false);
   const pickerStart = () => {
@@ -8875,16 +8905,16 @@ const InternalPicker = (props, ref) => {
       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",
       afterClose: () => {
         closePicker();
       }
     },
-    /* @__PURE__ */ React.createElement(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(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,7 +8953,7 @@ const InternalPicker = (props, ref) => {
         }));
       })
     )))
-  );
+  ));
 };
 const Picker = React.forwardRef(InternalPicker);
 const Picker$1 = Picker;
@@ -8943,7 +8973,7 @@ const DatePicker = (props) => {
   const {
     startDate,
     endDate,
-    type,
+    type: type4,
     showChinese,
     minuteStep,
     visible,
@@ -8996,16 +9026,16 @@ const DatePicker = (props) => {
   function getMonthEndDay(year, month) {
     return new Date(year, month, 0).getDate();
   }
-  const getBoundary = (type2, value) => {
-    const boundary = type2 === "min" ? startDate : endDate;
+  const getBoundary = (type22, value) => {
+    const boundary = type22 === "min" ? startDate : endDate;
     const year = boundary.getFullYear();
     let month = 1;
-    let date = 1;
+    let date4 = 1;
     let hour = 0;
     let minute = 0;
-    if (type2 === "max") {
+    if (type22 === "max") {
       month = 12;
-      date = getMonthEndDay(value.getFullYear(), value.getMonth() + 1);
+      date4 = getMonthEndDay(value.getFullYear(), value.getMonth() + 1);
       hour = 23;
       minute = 59;
     }
@@ -9013,8 +9043,8 @@ const DatePicker = (props) => {
     if (value.getFullYear() === year) {
       month = boundary.getMonth() + 1;
       if (value.getMonth() + 1 === month) {
-        date = boundary.getDate();
-        if (value.getDate() === date) {
+        date4 = boundary.getDate();
+        if (value.getDate() === date4) {
           hour = boundary.getHours();
           if (value.getHours() === hour) {
             minute = boundary.getMinutes();
@@ -9023,12 +9053,12 @@ const DatePicker = (props) => {
       }
     }
     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`]: date4,
+      [`${type22}Hour`]: hour,
+      [`${type22}Minute`]: minute,
+      [`${type22}Seconds`]: seconds
     };
   };
   const ranges = () => {
@@ -9063,7 +9093,7 @@ const DatePicker = (props) => {
         range: [minSeconds, maxSeconds]
       }
     ];
-    switch (type.toLocaleLowerCase()) {
+    switch (type4.toLocaleLowerCase()) {
       case "date":
         result = result.slice(0, 3);
         break;
@@ -9090,18 +9120,18 @@ const DatePicker = (props) => {
   };
   const updateChooseValueCustmer = (selectedOptions, selectedValue, index) => {
     if (["date", "datetime", "datehour", "month-day", "year-month"].includes(
-      type.toLocaleLowerCase()
+      type4.toLocaleLowerCase()
     )) {
       const formatDate = [];
       selectedValue.forEach((item) => {
         formatDate.push(item);
       });
-      if (type.toLocaleLowerCase() === "month-day" && formatDate.length < 3) {
+      if (type4.toLocaleLowerCase() === "month-day" && formatDate.length < 3) {
         formatDate.unshift(
           new Date(defaultValue || startDate || endDate).getFullYear()
         );
       }
-      if (type.toLocaleLowerCase() === "year-month" && formatDate.length < 3) {
+      if (type4.toLocaleLowerCase() === "year-month" && formatDate.length < 3) {
         formatDate.push(
           new Date(defaultValue || startDate || endDate).getDate()
         );
@@ -9112,22 +9142,22 @@ const DatePicker = (props) => {
         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 date4 = null;
+      if (type4.toLocaleLowerCase() === "date" || type4.toLocaleLowerCase() === "month-day" || type4.toLocaleLowerCase() === "year-month") {
+        date4 = new Date(year, month, day);
+      } else if (type4.toLocaleLowerCase() === "datetime") {
+        date4 = 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 (type4.toLocaleLowerCase() === "datehour") {
+        date4 = 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()) === (date4 == null ? void 0 : date4.getTime());
+      date4 && isDate(date4) && !isEqual && setCurrentDate(formatValue(date4));
     }
     props.onChange && props.onChange(selectedOptions, selectedValue, index);
   };
@@ -9138,28 +9168,28 @@ const DatePicker = (props) => {
     }
     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 = showChinese ? 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++;
@@ -9170,26 +9200,26 @@ const DatePicker = (props) => {
     }
     defaultValueOfPicker[columnIndex] = (_a = arr[index]) == null ? void 0 : _a.value;
     setDefaultValueOfPicker([...defaultValueOfPicker]);
-    if (props.filter && props.filter(type2, arr)) {
-      return props.filter(type2, arr);
+    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;
@@ -9236,116 +9266,1071 @@ const DatePicker = (props) => {
 };
 DatePicker.defaultProps = defaultProps$X;
 DatePicker.displayName = "NutDatePicker";
-const FormItemContext = 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 = 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];
         }
-      };
+      }
+    }
+    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, "onStoreChange", () => {
-      this.forceUpdate();
+    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 warning3(type4, errors) {
+    if (typeof console !== "undefined" && console.warn && typeof ASYNC_VALIDATOR_NO_WARNING === "undefined") {
+      if (errors.every(function(e) {
+        return typeof e === "string";
+      })) {
+        console.warn(type4, 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]";
+          }
+          break;
+        default:
+          return x;
+      }
     });
-    __publicField(this, "renderLayout", (childNode) => {
-      var _a, _b;
-      const {
-        label,
-        name,
-        rules = [{ required: false, message: "" }],
-        className,
-        labelWidth,
-        errorMessageAlign,
-        showErrorLine,
-        showErrorMessage
-      } = {
-        ...defaultProps$W,
-        ...this.props
+    return str;
+  }
+  return template;
+}
+function isNativeStringType(type4) {
+  return type4 === "string" || type4 === "url" || type4 === "hex" || type4 === "email" || type4 === "date" || type4 === "pattern";
+}
+function isEmptyValue(value, type4) {
+  if (value === void 0 || value === null) {
+    return true;
+  }
+  if (type4 === "array" && Array.isArray(value) && !value.length) {
+    return true;
+  }
+  if (isNativeStringType(type4) && 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);
+    }
+  }
+  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([]);
+}
+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);
       };
-      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)
-          }
-        },
-        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
-      )));
+      var flattenArr = flattenObjArr(objArr);
+      asyncSerialArray(flattenArr, func, next);
     });
-    __publicField(this, "pxCheck", (value) => {
-      return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
+    _pending["catch"](function(e) {
+      return e;
     });
+    return _pending;
   }
-  componentDidMount() {
-    this.cancelRegister = this.context.registerField(this);
+  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);
+      }
+    };
+    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]];
   }
-  componentWillUnmount() {
-    if (this.cancelRegister) {
-      this.cancelRegister();
+  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;
+        }
+      }
     }
   }
-  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);
+  return target;
+}
+var required$1 = function required(rule, value, source, errors, options, type4) {
+  if (rule.required && (!source.hasOwnProperty(rule.field) || isEmptyValue(value, type4 || 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 integer(value) {
+    return types.number(value) && parseInt(value, 10) === value;
+  },
+  "float": function float(value) {
+    return types.number(value) && !types.integer(value);
+  },
+  array: function array(value) {
+    return Array.isArray(value);
+  },
+  regexp: function regexp(value) {
+    if (value instanceof RegExp) {
+      return true;
+    }
+    try {
+      return !!new RegExp(value);
+    } catch (e) {
+      return false;
+    }
+  },
+  date: function date(value) {
+    return typeof value.getTime === "function" && typeof value.getMonth === "function" && typeof value.getYear === "function" && !isNaN(value.getTime());
+  },
+  number: function number(value) {
+    if (isNaN(value)) {
+      return false;
+    }
+    return typeof value === "number";
+  },
+  object: function object(value) {
+    return typeof value === "object" && !types.array(value);
+  },
+  method: function method(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 type(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 enumerable(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 pattern(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 method2 = function method3(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 number2 = function number3(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 regexp2 = function regexp3(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 integer2 = function integer3(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 array2 = function array3(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 object2 = function object3(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 enumerable2 = function enumerable3(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 pattern2 = function pattern3(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 date2 = function date3(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 required2 = function required3(rule, value, callback, source, options) {
+  var errors = [];
+  var type4 = Array.isArray(value) ? "array" : typeof value;
+  rules.required(rule, value, source, errors, options, type4);
+  callback(errors);
+};
+var type2 = function type3(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: method2,
+  number: number2,
+  "boolean": _boolean,
+  regexp: regexp2,
+  integer: integer2,
+  "float": floatFn,
+  array: array2,
+  object: object2,
+  "enum": enumerable2,
+  pattern: pattern2,
+  date: date2,
+  url: type2,
+  hex: type2,
+  email: type2,
+  required: required2,
+  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;
+    }
+  };
 }
-__publicField(FormItem, "defaultProps", defaultProps$W);
-__publicField(FormItem, "contextType", FormItemContext);
+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 define(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(type4, validator) {
+  if (typeof validator !== "function") {
+    throw new Error("Cannot register a validator by type, validator is not a function");
+  }
+  validators[type4] = validator;
+};
+Schema.warning = warning;
+Schema.messages = messages;
+Schema.validators = validators;
 class FormStore {
   constructor() {
-    __publicField(this, "store", {});
+    // 初始化数据
+    __publicField(this, "initialValues", {});
     // 存放表单中所有的数据 eg. {password: "ddd",username: "123"}
-    __publicField(this, "fieldEntities", []);
+    __publicField(this, "store", {});
     // 所有的组件实例
-    // 成功和失败的回调
+    __publicField(this, "fieldEntities", []);
+    // 校验成功或失败的回调，onFinish、onFinishFailed
     __publicField(this, "callbacks", {});
-    __publicField(this, "errList", []);
+    __publicField(this, "errors", []);
     /**
      * 注册组件实例
      * @param field
@@ -9354,11 +10339,29 @@ class FormStore {
       this.fieldEntities.push(field);
       return () => {
         this.fieldEntities = this.fieldEntities.filter((item) => item != field);
-        delete this.store[field.props.name];
+        if (this.store) {
+          delete this.store[field.props.name];
+        }
       };
     });
+    /**
+     * 获取 formItem 的值
+     * @param name
+     */
     __publicField(this, "getFieldValue", (name) => {
-      return this.store[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;
+      }
     });
     /**
      * 存储组件数据
@@ -9373,74 +10376,78 @@ class FormStore {
         const { name } = enetity.props;
         Object.keys(newStore).forEach((key) => {
           if (key === name) {
-            enetity.onStoreChange();
+            enetity.onStoreChange("update");
           }
         });
       });
     });
-    /**
-     * 表单校验
-     * rules: { required: true, message: '' }
-     * descriptor: {
-     *    username: {
-     *      type: 'string',
-     *      required: true,
-     *      validator: (rule, value) => {
-     *        return /^[a-zA-Z0-9]+$/.test(value)
-     *      },
-     *    },
-     *  }
-     */
+    __publicField(this, "setCallback", (callback) => {
+      this.callbacks = {
+        ...this.callbacks,
+        ...callback
+      };
+    });
     __publicField(this, "validate", () => {
       const err = [];
-      this.errList.length = 0;
+      this.errors.length = 0;
       this.fieldEntities.forEach((entity) => {
-        const { name, rules = [] } = entity.props;
+        var _a;
+        const { name, rules: rules2 = [] } = entity.props;
         const descriptor = {};
-        if (rules.length) {
-          if (rules.length > 1) {
+        if (rules2.length) {
+          if (rules2.length > 1) {
             descriptor[name] = [];
-            rules.map((v) => {
+            rules2.forEach((v) => {
               descriptor[name].push(v);
             });
           } else {
-            descriptor[name] = rules[0];
+            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, "setCallback", (callback) => {
-      this.callbacks = {
-        ...this.callbacks,
-        ...callback
-      };
-    });
     __publicField(this, "submit", () => {
       var _a, _b, _c, _d;
-      const err = this.validate();
-      if (err.length === 0) {
+      const errors = this.validate();
+      if (errors.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);
+      } 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: () => {
       }
@@ -9459,60 +10466,209 @@ const useForm = (form) => {
   }
   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", (type4) => {
+      if (type4 === "reset") {
+        this.refresh();
+      } else {
+        this.forceUpdate();
+      }
+    });
+    __publicField(this, "renderLayout", (childNode) => {
+      var _a, _b;
+      const { label, name, required: required4, 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 = required4 && /* @__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) {
@@ -9557,7 +10713,7 @@ const Input = forwardRef(
   (props, ref) => {
     const { locale } = useConfig$1();
     const {
-      type,
+      type: type4,
       name,
       placeholder,
       align,
@@ -9619,10 +10775,10 @@ const Input = forwardRef(
     const updateValue = (value2, trigger = "onChange") => {
       let val = value2;
       if (getEnv() === ENV_TYPE.WEB) {
-        if (type === "number") {
+        if (type4 === "number") {
           val = formatNumber(val, false, true);
         }
-        if (type === "digit") {
+        if (type4 === "digit") {
           val = formatNumber(val, true, true);
         }
       }
@@ -9651,18 +10807,18 @@ const Input = forwardRef(
         setActive(false);
       }, 50);
     };
-    const inputType = (type2) => {
+    const inputType = (type22) => {
       if (getEnv() === 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(
       View,
@@ -9681,8 +10837,8 @@ const Input = forwardRef(
           className: "nut-input-native",
           ref: inputRef,
           style: { textAlign: align },
-          type: inputType(type),
-          password: type === "password",
+          type: inputType(type4),
+          password: type4 === "password",
           maxlength: maxLength,
           placeholder: placeholder || locale.placeholder,
           disabled: disabled || readOnly,
@@ -9729,7 +10885,7 @@ const defaultProps$T = {
   disabled: false,
   min: 1,
   max: 9999,
-  readonly: false,
+  readOnly: false,
   allowEmpty: false,
   defaultValue: 0,
   step: 1,
@@ -9743,7 +10899,7 @@ const InputNumber = (props) => {
     disabled,
     min,
     max,
-    readonly,
+    readOnly,
     value,
     defaultValue,
     allowEmpty,
@@ -9898,14 +11054,14 @@ const InputNumber = (props) => {
   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;
@@ -9927,7 +11083,7 @@ const InputNumber = (props) => {
       min,
       max,
       disabled,
-      readOnly: readonly,
+      readOnly,
       value: _checked,
       onInput: changeFormatValue,
       onBlur: burFormatValue,
@@ -9940,7 +11096,7 @@ const InputNumber = (props) => {
       min,
       max,
       disabled,
-      readOnly: readonly,
+      readOnly,
       value: _checked,
       onInput: changeValue,
       onBlur: burValue,
@@ -10298,7 +11454,7 @@ const NumberKeyboard = (props) => {
     title,
     confirmText,
     visible,
-    type,
+    type: type4,
     custom,
     random,
     style,
@@ -10337,7 +11493,7 @@ const NumberKeyboard = (props) => {
   };
   const keysList = useMemo(() => {
     return [...getBasicKeys(), ...getCustomKeys()];
-  }, [type, random, custom]);
+  }, [type4, 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`,
@@ -10398,7 +11554,7 @@ const NumberKeyboard = (props) => {
       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), type4 === "default" && /* @__PURE__ */ React.createElement(
       "span",
       {
         className: `${classPrefix2}__header__close`,
@@ -10407,7 +11563,7 @@ const NumberKeyboard = (props) => {
       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(
+    })), type4 === "rightColumn" && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__sidebar` }, /* @__PURE__ */ React.createElement(
       NumberKeyboardKey,
       {
         key: "delete",
@@ -10643,7 +11799,7 @@ const defaultProps$N = {
 const Range = (props) => {
   const {
     className,
-    range,
+    range: range3,
     disabled,
     button,
     vertical,
@@ -10701,7 +11857,7 @@ const Range = (props) => {
       const classPrefix22 = "nut-range-mark";
       let lowerBound = min;
       let upperBound = max;
-      if (range && Array.isArray(current)) {
+      if (range3 && Array.isArray(current)) {
         lowerBound = current[0];
         upperBound = current[1];
       } else {
@@ -10713,10 +11869,10 @@ const Range = (props) => {
         `${isActive ? `${classPrefix22}-text-active` : ""}`
       ].join(" ");
     },
-    [range, current, min, max]
+    [range3, current, min, max]
   );
   const isRange = (val) => {
-    return !!range && Array.isArray(val);
+    return !!range3 && Array.isArray(val);
   };
   const calcMainAxis = () => {
     const modelVal = current;
@@ -10758,12 +11914,12 @@ const Range = (props) => {
     return style;
   };
   const tickClass = (mark) => {
-    if (range && Array.isArray(current)) {
+    if (range3 && 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;
   };
@@ -10778,9 +11934,9 @@ const Range = (props) => {
   };
   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);
@@ -10820,9 +11976,9 @@ const Range = (props) => {
     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");
   };
@@ -10889,7 +12045,7 @@ const Range = (props) => {
         }
       )
     );
-  })), /* @__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() }, range3 ? [0, 1].map((item, index) => {
     return /* @__PURE__ */ React.createElement(
       "div",
       {
@@ -11107,7 +12263,7 @@ const SearchBar = (props) => {
     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 || "",
@@ -11179,7 +12335,16 @@ const SearchBar = (props) => {
       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()
   );
 };
@@ -11229,7 +12394,7 @@ const ShortPassword = (props) => {
   const comLen = 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 });
@@ -11239,11 +12404,11 @@ const ShortPassword = (props) => {
     }
   }, [visible]);
   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);
@@ -11291,7 +12456,7 @@ const defaultProps$J = {
 const InternalSignature = (props, ref) => {
   const {
     canvasId,
-    type,
+    type: type4,
     lineWidth,
     strokeStyle,
     className,
@@ -11519,7 +12684,7 @@ const TextArea = (props) => {
   } = { ...defaultProps$H, ...props };
   const classPrefix2 = "nut-textarea";
   const compositionRef = useRef(false);
-  const format = (value2) => {
+  const format2 = (value2) => {
     if (maxLength !== void 0 && value2.length > maxLength) {
       return value2.substring(0, maxLength);
     }
@@ -11528,14 +12693,14 @@ const TextArea = (props) => {
   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("");
@@ -11878,11 +13043,11 @@ const InternalUploader = (props, ref) => {
     imageFit,
     disabled,
     multiple,
-    url,
+    url: url2,
     previewUrl,
     headers,
     timeout: timeout2,
-    method,
+    method: method4,
     xhrState,
     data,
     preview,
@@ -11994,11 +13159,11 @@ const InternalUploader = (props, ref) => {
   const executeUpload = (fileItem, index) => {
     const uploadOption = new UploadOptions();
     uploadOption.name = name;
-    uploadOption.url = url;
+    uploadOption.url = url2;
     uploadOption.fileType = fileItem.type;
     uploadOption.formData = fileItem.formData;
     uploadOption.timeout = timeout2 * 1;
-    uploadOption.method = method;
+    uploadOption.method = method4;
     uploadOption.xhrState = xhrState;
     uploadOption.headers = headers;
     uploadOption.taroFilePath = fileItem.path;
@@ -13103,7 +14268,7 @@ const NoticeBar = (props) => {
   const getActive = (pace) => {
     if (pace) {
       const _active = active + pace;
-      return range(_active, -1, childCount);
+      return range3(_active, -1, childCount);
     }
     return active;
   };
@@ -13115,7 +14280,7 @@ const NoticeBar = (props) => {
   const requestFrame = (fn) => {
     window.requestAnimationFrame.call(window, fn);
   };
-  const range = (num, min, max) => {
+  const range3 = (num, min, max) => {
     return Math.min(Math.max(num, min), max);
   };
   const resettPosition = () => {
@@ -13220,7 +14385,7 @@ const Notify = (props) => {
     id,
     children,
     style,
-    type,
+    type: type4,
     className,
     position,
     visible,
@@ -13268,7 +14433,7 @@ const Notify = (props) => {
     [`${classPrefix$b}--popup-top`]: position === "top",
     [`${classPrefix$b}--popup-bottom`]: position === "bottom",
     [`${classPrefix$b}`]: true,
-    [`${classPrefix$b}--${type}`]: true
+    [`${classPrefix$b}--${type4}`]: true
   });
   return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
     CSSTransition$1,
@@ -13367,7 +14532,7 @@ const Popover = (props) => {
   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);
@@ -13390,13 +14555,13 @@ const Popover = (props) => {
     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);
   };
@@ -13438,7 +14603,7 @@ const Popover = (props) => {
     return styles;
   };
   const getRootPosition = () => {
-    let styles = {};
+    const styles = {};
     if (!rootPosition) {
       styles.visibility = "hidden";
       return styles;
@@ -13450,34 +14615,34 @@ const Popover = (props) => {
     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`;
         }
       }
@@ -13885,10 +15050,11 @@ function preventDefault(event, isStopPropagation) {
   }
 }
 const defaultProps$t = {
+  ...ComponentDefaults,
   name: ""
 };
 const Swipe = forwardRef((props, instanceRef) => {
-  const swipeBem = cn("swipe");
+  const classPrefix2 = "nut-swipe";
   const touch = useTouch();
   useReady(() => {
     const getWidth = async () => {
@@ -14010,7 +15176,7 @@ const Swipe = forwardRef((props, instanceRef) => {
         {
           id: "left",
           ref: side === "left" ? leftWrapper : rightWrapper,
-          className: `${swipeBem(side)}`,
+          className: `${classPrefix2}__${side}`,
           onClick: (e) => handleOperate(e, side)
         },
         props[`${side}Action`]
@@ -14050,13 +15216,13 @@ const Swipe = forwardRef((props, instanceRef) => {
     "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;
@@ -14175,7 +15341,7 @@ const Toast = (props) => {
     iconSize,
     msg,
     duration,
-    type,
+    type: type4,
     title,
     closeOnOverlayClick,
     contentClassName,
@@ -14220,7 +15386,7 @@ const Toast = (props) => {
     }
   };
   const hasIcon = () => {
-    if (type !== "text") {
+    if (type4 !== "text") {
       return true;
     }
     return !!icon;
@@ -14234,7 +15400,7 @@ const Toast = (props) => {
       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];
+    }[type4];
   };
   const classes = classNames({
     "nut-toast-has-icon": icon,
@@ -14275,14 +15441,14 @@ const defaultProps$r = {
 };
 const classPrefix$7 = `nut-animate`;
 const Animate = (props) => {
-  const { className, type, action, loop, onClick, children, ...rest } = {
+  const { className, type: type4, action, loop, onClick, children, ...rest } = {
     ...defaultProps$r,
     ...props
   };
   const [clicked, setClicked] = useState(false);
   const classes = classNames({
     "nut-ani-container": true,
-    [`${classPrefix$7}-${type}`]: action === "initial" || clicked ? type : false,
+    [`${classPrefix$7}-${type4}`]: action === "initial" || clicked ? type4 : false,
     loop
   });
   const cls = classNames(classes, className);
@@ -14385,8 +15551,8 @@ const CountUp = (props) => {
           className: `${classPrefix2}__number`,
           style: numberEaseStyle(idx)
         },
-        [...numbers, ...numbers].map((number, subidx) => {
-          return /* @__PURE__ */ React.createElement("span", { key: subidx }, number);
+        [...numbers, ...numbers].map((number4, subidx) => {
+          return /* @__PURE__ */ React.createElement("span", { key: subidx }, number4);
         })
       ) : /* @__PURE__ */ React.createElement("span", { className: `${classPrefix2}__separator` }, item)
     );
@@ -14437,11 +15603,11 @@ const Audio = (props) => {
   const { locale } = useConfig$1();
   const {
     className,
-    url,
+    url: url2,
     style,
     autoplay,
     loop,
-    type,
+    type: type4,
     onFastBack,
     onForward,
     onPause,
@@ -14468,7 +15634,7 @@ const Audio = (props) => {
   });
   const audioRef = useRef(createInnerAudioContext());
   const audioCtx = audioRef.current;
-  audioCtx.src = url;
+  audioCtx.src = url2;
   audioCtx.autoplay = autoplay || false;
   audioCtx.loop = loop || false;
   audioCtx.onPause(() => {
@@ -14597,7 +15763,7 @@ const Audio = (props) => {
     return /* @__PURE__ */ React.createElement("div", { className: b("none-container"), onClick: handleStatusChange }, children);
   };
   const renderAudio = () => {
-    switch (type) {
+    switch (type4) {
       case "icon":
         return renderIcon();
       case "progress":
@@ -14711,7 +15877,7 @@ const CircleProgress = (props) => {
   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 = [];
@@ -14726,7 +15892,7 @@ const CircleProgress = (props) => {
     }
     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`;
@@ -14985,7 +16151,7 @@ const InternalCountDown = (props, ref) => {
     endTime,
     remainingTime,
     millisecond,
-    format,
+    format: format2,
     autoStart,
     time,
     destroy,
@@ -15054,7 +16220,7 @@ const InternalCountDown = (props, ref) => {
       }
     });
   };
-  const formatRemainTime = (t, type) => {
+  const formatRemainTime = (t, type4) => {
     const ts = t;
     const rest2 = {
       d: 0,
@@ -15074,12 +16240,12 @@ const InternalCountDown = (props, ref) => {
       rest2.s = Math.floor(ts % MINUTE / SECOND);
       rest2.ms = Math.floor(ts % SECOND);
     }
-    return type === "custom" ? rest2 : parseFormat({ ...rest2 });
+    return type4 === "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 {
@@ -15385,9 +16551,9 @@ const Ellipsis = (props) => {
     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, type4 = "") => {
     const threeDotWidth = symbolTextWidth;
-    const direc = direction === "middle" && type ? type : direction;
+    const direc = direction === "middle" && type4 ? type4 : direction;
     setExceeded(true);
     let widthPart = -1;
     const start = left;
@@ -15430,8 +16596,8 @@ const Ellipsis = (props) => {
     const match = value.match(/^\d*(\.\d*)?/);
     return match ? Number(match[0]) : 0;
   };
-  const clickHandle = (type) => {
-    if (type === 1) {
+  const clickHandle = (type4) => {
+    if (type4 === 1) {
       setExpanded(true);
       onChange && onChange("expand");
     } else {
@@ -16281,14 +17447,14 @@ const Price = (props) => {
     ...props
   };
   const classPrefix2 = "nut-price";
-  const replaceSpecialChar = (url) => {
-    url = url.replace(/&quot;/g, '"');
-    url = url.replace(/&amp;/g, "&");
-    url = url.replace(/&lt;/g, "<");
-    url = url.replace(/&gt;/g, ">");
-    url = url.replace(/&nbsp;/g, " ");
-    url = url.replace(/&yen;/g, "￥");
-    return url;
+  const replaceSpecialChar = (url2) => {
+    url2 = url2.replace(/&quot;/g, '"');
+    url2 = url2.replace(/&amp;/g, "&");
+    url2 = url2.replace(/&lt;/g, "<");
+    url2 = url2.replace(/&gt;/g, ">");
+    url2 = url2.replace(/&nbsp;/g, " ");
+    url2 = url2.replace(/&yen;/g, "￥");
+    return url2;
   };
   const showSymbol = () => {
     return { __html: symbol ? replaceSpecialChar(symbol) : "" };
@@ -16588,7 +17754,7 @@ const Tag = (props) => {
     style,
     background,
     plain,
-    type,
+    type: type4,
     round,
     children,
     mark,
@@ -16607,7 +17773,7 @@ const Tag = (props) => {
   const classes = () => {
     return classNames({
       [classPrefix2]: true,
-      [`${classPrefix2}--${type}`]: type,
+      [`${classPrefix2}--${type4}`]: type4,
       [`${classPrefix2}--plain`]: plain,
       [`${classPrefix2}--round`]: round,
       [`${classPrefix2}--mark`]: mark,
@@ -16617,7 +17783,7 @@ const Tag = (props) => {
   };
   useEffect(() => {
     setTagClass(classes());
-  }, [type, background, color, plain, round, mark, closeable, className]);
+  }, [type4, background, color, plain, round, mark, closeable, className]);
   const handleClick = (e) => {
     onClick && onClick(e);
   };
@@ -16895,11 +18061,11 @@ const TimeDetail = (props) => {
   }, [options, optionKey, activeDate]);
   const isActive = useCallback(
     (timeKey) => {
-      const date = activeTime.find((item) => {
+      const date4 = 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 (date4 == null ? void 0 : date4[optionKey.childrenKey]) {
+        const time = date4 == null ? void 0 : date4[optionKey.childrenKey].find((time2) => {
           return time2[optionKey.valueKey] === timeKey;
         });
         return time;
@@ -16971,23 +18137,23 @@ const TimeSelect = (props) => {
   };
   const handleSelectTime = (selectTime) => {
     let newActiveTime = [...activeTime];
-    const date = newActiveTime.find((item) => {
+    const date4 = newActiveTime.find((item) => {
       return item[optionKey.valueKey] === activeDate;
     });
-    if (date) {
-      const timeIndex = date[optionKey.childrenKey].findIndex(
+    if (date4) {
+      const timeIndex = date4[optionKey.childrenKey].findIndex(
         (time) => {
           return time[optionKey.valueKey] === selectTime[optionKey.valueKey];
         }
       );
       if (timeIndex > -1) {
         if (multiple) {
-          date[optionKey.childrenKey].splice(timeIndex, 1);
+          date4[optionKey.childrenKey].splice(timeIndex, 1);
         } else {
           newActiveTime = [];
         }
       } else if (multiple) {
-        date[optionKey.childrenKey].push({ ...selectTime });
+        date4[optionKey.childrenKey].push({ ...selectTime });
       } else {
         newActiveTime = [
           {
@@ -17016,9 +18182,9 @@ const TimeSelect = (props) => {
     setActiveTime(newActiveTime);
     onTimeChange && onTimeChange(selectTime, newActiveTime);
   };
-  const handleChange = (date) => {
-    setActiveDate(date[optionKey.valueKey]);
-    onDateChange && onDateChange(date, activeTime);
+  const handleChange = (date4) => {
+    setActiveDate(date4[optionKey.valueKey]);
+    onDateChange && onDateChange(date4, activeTime);
   };
   return /* @__PURE__ */ React.createElement(
     Popup,