@nutui/nutui-react 3.0.1 → 3.0.2

package/dist/nutui.react.umd.js

@@ -4461,6 +4461,7 @@ Check the top-level render call using <` + t + ">.");
       };
     }
     if (element && element.getBoundingClientRect) {
+      console.log(element, element.getBoundingClientRect());
       return element.getBoundingClientRect();
     }
     return {
@@ -4472,7 +4473,7 @@ Check the top-level render call using <` + t + ">.");
       height: 0
     };
   };
-  function useWatch(dep, callback) {
+  function useWatch$1(dep, callback) {
     var config2 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {
       immediate: false
     };
@@ -4620,7 +4621,7 @@ Check the top-level render call using <` + t + ">.");
       threshold,
       container
     ]);
-    useWatch(isFixed, function() {
+    useWatch$1(isFixed, function() {
       onChange && onChange(isFixed);
     });
     React.useEffect(function() {
@@ -6833,7 +6834,7 @@ Please add \`${key2}Action\` when creating your handler.`);
       }
     }
   }
-  const toArray = (a) => is.und(a) ? [] : is.arr(a) ? a : [a];
+  const toArray$1 = (a) => is.und(a) ? [] : is.arr(a) ? a : [a];
   function flush(queue, iterator) {
     if (queue.size) {
       const items = Array.from(queue);
@@ -7841,7 +7842,7 @@ Please add \`${key2}Action\` when creating your handler.`);
   function callProp(value2, ...args) {
     return is.fun(value2) ? value2(...args) : value2;
   }
-  const matchProp = (value2, key2) => value2 === true || !!(key2 && value2 && (is.fun(value2) ? value2(key2) : toArray(value2).includes(key2)));
+  const matchProp = (value2, key2) => value2 === true || !!(key2 && value2 && (is.fun(value2) ? value2(key2) : toArray$1(value2).includes(key2)));
   const resolveProp = (prop, key2) => is.obj(prop) ? key2 && prop[key2] : prop;
   const getDefaultProp = (props, key2) => props.default === true ? props[key2] : props.default ? props.default[key2] : void 0;
   const noopTransform = (value2) => value2;
@@ -8383,7 +8384,7 @@ Please add \`${key2}Action\` when creating your handler.`);
       } = anim;
       const payload = getPayload(anim.to);
       if (!payload && hasFluidValue(anim.to)) {
-        toValues = toArray(getFluidValue(anim.to));
+        toValues = toArray$1(getFluidValue(anim.to));
       }
       anim.values.forEach((node2, i2) => {
         if (node2.done) return;
@@ -8736,7 +8737,7 @@ Please add \`${key2}Action\` when creating your handler.`);
       if (!hasAsyncTo) {
         if (started || hasFluidValue(prevTo)) {
           anim.values = node.getPayload();
-          anim.toValues = hasFluidValue(to2) ? null : goalType == AnimatedString ? [1] : toArray(goal);
+          anim.toValues = hasFluidValue(to2) ? null : goalType == AnimatedString ? [1] : toArray$1(goal);
         }
         if (anim.immediate != immediate) {
           anim.immediate = immediate;
@@ -9009,7 +9010,7 @@ Please add \`${key2}Action\` when creating your handler.`);
         queue
       } = this;
       if (props) {
-        queue = toArray(props).map(createUpdate);
+        queue = toArray$1(props).map(createUpdate);
       } else {
         this.queue = [];
       }
@@ -9025,7 +9026,7 @@ Please add \`${key2}Action\` when creating your handler.`);
       }
       if (keys) {
         const springs = this.springs;
-        each(toArray(keys), (key2) => springs[key2].stop(!!arg));
+        each(toArray$1(keys), (key2) => springs[key2].stop(!!arg));
       } else {
         stopAsync(this._state, this._lastAsyncId);
         this.each((spring) => spring.stop(!!arg));
@@ -9039,7 +9040,7 @@ Please add \`${key2}Action\` when creating your handler.`);
         });
       } else {
         const springs = this.springs;
-        each(toArray(keys), (key2) => springs[key2].pause());
+        each(toArray$1(keys), (key2) => springs[key2].pause());
       }
       return this;
     }
@@ -9050,7 +9051,7 @@ Please add \`${key2}Action\` when creating your handler.`);
         });
       } else {
         const springs = this.springs;
-        each(toArray(keys), (key2) => springs[key2].resume());
+        each(toArray$1(keys), (key2) => springs[key2].resume());
       }
       return this;
     }
@@ -9201,7 +9202,7 @@ Please add \`${key2}Action\` when creating your handler.`);
   function getSprings(ctrl, props) {
     const springs = _extends$1({}, ctrl.springs);
     if (props) {
-      each(toArray(props), (props2) => {
+      each(toArray$1(props), (props2) => {
         if (is.und(props2.keys)) {
           props2 = createUpdate(props2);
         }
@@ -9473,7 +9474,7 @@ Please add \`${key2}Action\` when creating your handler.`);
       }
     }
     _get() {
-      const inputs = is.arr(this.source) ? this.source.map(getFluidValue) : toArray(getFluidValue(this.source));
+      const inputs = is.arr(this.source) ? this.source.map(getFluidValue) : toArray$1(getFluidValue(this.source));
       return this.calc(...inputs);
     }
     _start() {
@@ -9492,7 +9493,7 @@ Please add \`${key2}Action\` when creating your handler.`);
     }
     _attach() {
       let priority2 = 1;
-      each(toArray(this.source), (source) => {
+      each(toArray$1(this.source), (source) => {
         if (hasFluidValue(source)) {
           addFluidObserver(source, this);
         }
@@ -9507,7 +9508,7 @@ Please add \`${key2}Action\` when creating your handler.`);
       this._start();
     }
     _detach() {
-      each(toArray(this.source), (source) => {
+      each(toArray$1(this.source), (source) => {
         if (hasFluidValue(source)) {
           removeFluidObserver(source, this);
         }
@@ -9526,7 +9527,7 @@ Please add \`${key2}Action\` when creating your handler.`);
       } else if (event.type == "idle") {
         this._active.delete(event.parent);
       } else if (event.type == "priority") {
-        this.priority = toArray(this.source).reduce((highest, parent2) => Math.max(highest, (isFrameValue(parent2) ? parent2.priority : 0) + 1), 0);
+        this.priority = toArray$1(this.source).reduce((highest, parent2) => Math.max(highest, (isFrameValue(parent2) ? parent2.priority : 0) + 1), 0);
       }
     }
   }
@@ -9688,7 +9689,7 @@ Please add \`${key2}Action\` when creating your handler.`);
           delete style[key2];
           if (is.und(value2)) return;
           const unit = pxTransforms.test(key2) ? "px" : degTransforms.test(key2) ? "deg" : "";
-          inputs.push(toArray(value2));
+          inputs.push(toArray$1(value2));
           transforms.push(key2 === "rotate3d" ? ([x2, y2, z2, deg]) => [`rotate3d(${x2},${y2},${z2},${addUnit(deg, unit)})`, isValueIdentity(deg, 0)] : (input) => [`${key2}(${input.map((v) => addUnit(v, unit)).join(",")})`, isValueIdentity(input, key2.startsWith("scale") ? 1 : 0)]);
         }
       });
@@ -9955,7 +9956,62 @@ Please add \`${key2}Action\` when creating your handler.`);
   };
   Elevator.displayName = "NutElevator";
   Elevator.Context = elevatorContext;
-  var defaultProps$1l = _object_spread_props(_object_spread({}, defaultOverlayProps), {
+  function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+  }
+  var defaultProps$1l = _object_spread_props(_object_spread({}, ComponentDefaults), {
+    value: "",
+    dot: false,
+    max: 99,
+    top: 0,
+    right: 0,
+    fill: "solid",
+    size: "large"
+  });
+  var Badge = function(props) {
+    var isIcon = function isIcon2() {
+      if ((typeof value2 === "undefined" ? "undefined" : _type_of(value2)) === "object" && value2) return value2;
+    };
+    var isNumber = function isNumber2() {
+      if (typeof value2 === "number" && value2) return value2;
+    };
+    var isString = function isString2() {
+      if (typeof value2 === "string" && value2) return value2;
+    };
+    var _this;
+    var rtl = useRtl();
+    var _$_object_spread = _object_spread({}, defaultProps$1l, props), className = _$_object_spread.className, style = _$_object_spread.style, value2 = _$_object_spread.value, max = _$_object_spread.max, children = _$_object_spread.children, dot = _$_object_spread.dot, top = _$_object_spread.top, right = _$_object_spread.right, fill = _$_object_spread.fill, size = _$_object_spread.size;
+    var classPrefix2 = "nut-badge";
+    var classes = classNames(classPrefix2, className);
+    var getContent = function() {
+      if (dot || value2 === 0) return null;
+      if (typeof value2 === "number") {
+        return max < value2 ? "".concat(max, "+") : "".concat(value2);
+      }
+      return value2;
+    };
+    var _obj;
+    var contentClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-sup"), isNumber() || isString() || dot), _define_property(_obj, "".concat(classPrefix2, "-number"), isNumber()), _define_property(_obj, "".concat(classPrefix2, "-one"), typeof getContent() === "string" && ((_this = "".concat(getContent())) === null || _this === void 0 ? void 0 : _this.length) === 1), _define_property(_obj, "".concat(classPrefix2, "-dot"), dot), _define_property(_obj, "".concat(classPrefix2, "-dot-").concat(size), dot), _define_property(_obj, "".concat(classPrefix2, "-").concat(fill), fill === "outline"), _define_property(_obj, "".concat(classPrefix2, "-content"), children), _obj));
+    var getPositionStyle = function() {
+      return _define_property({
+        top: "".concat(Number(top) || 0, "px")
+      }, rtl ? "left" : "right", "".concat(Number(right) || 0, "px"));
+    };
+    var _obj1;
+    return /* @__PURE__ */ React.createElement("div", {
+      className: classes,
+      style
+    }, isIcon() && /* @__PURE__ */ React.createElement("div", {
+      className: classNames("".concat(classPrefix2, "-content"), (_obj1 = {}, _define_property(_obj1, "".concat(classPrefix2, "-icon"), true), _define_property(_obj1, "".concat(classPrefix2, "-icon-rtl"), rtl), _obj1)),
+      style: getPositionStyle()
+    }, value2), children, !isIcon() && (getContent() || dot) && /* @__PURE__ */ React.createElement("div", {
+      className: contentClasses,
+      style: getPositionStyle()
+    }, getContent()));
+  };
+  Badge.displayName = "NutBadge";
+  var defaultProps$1k = _object_spread_props(_object_spread({}, defaultOverlayProps), {
     activeText: "",
     inactiveText: "",
     type: "right",
@@ -9973,7 +10029,7 @@ Please add \`${key2}Action\` when creating your handler.`);
   });
   var FixedNav = function(props) {
     var locale = useConfig().locale;
-    var _ref = _object_spread({}, defaultProps$1l, props), overlay = _ref.overlay, visible = _ref.visible, list = _ref.list, activeText = _ref.activeText, inactiveText = _ref.inactiveText, position2 = _ref.position, type2 = _ref.type, children = _ref.children, style = _ref.style, className = _ref.className, content2 = _ref.content, zIndex = _ref.zIndex, onChange = _ref.onChange, onSelect = _ref.onSelect, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps$1k, props), overlay = _ref.overlay, visible = _ref.visible, list = _ref.list, activeText = _ref.activeText, inactiveText = _ref.inactiveText, position2 = _ref.position, type2 = _ref.type, children = _ref.children, style = _ref.style, className = _ref.className, content2 = _ref.content, zIndex = _ref.zIndex, onChange = _ref.onChange, onSelect = _ref.onSelect, rest = _object_without_properties(_ref, [
       "overlay",
       "visible",
       "list",
@@ -9993,6 +10049,20 @@ Please add \`${key2}Action\` when creating your handler.`);
     var classes = classNames(classPrefix2, {
       active: visible
     }, type2, className);
+    var renderListItem = function(item, index2) {
+      return /* @__PURE__ */ React.createElement("div", {
+        className: "".concat(classPrefix2, "-list-item"),
+        onClick: function(event) {
+          return onSelect(item, event);
+        },
+        key: item.id || index2
+      }, /* @__PURE__ */ React.isValidElement(item.icon) ? item.icon : /* @__PURE__ */ React.createElement("img", {
+        src: item.icon,
+        alt: ""
+      }), /* @__PURE__ */ React.createElement("div", {
+        className: "".concat(classPrefix2, "-list-text")
+      }, item.text));
+    };
     return /* @__PURE__ */ React.createElement("div", _object_spread({
       className: classes,
       style: _object_spread({}, position2, style)
@@ -10007,20 +10077,11 @@ Please add \`${key2}Action\` when creating your handler.`);
     }, children || /* @__PURE__ */ React.createElement("div", {
       className: "".concat(classPrefix2, "-list")
     }, list.map(function(item, index2) {
-      return /* @__PURE__ */ React.createElement("div", {
-        className: "".concat(classPrefix2, "-list-item"),
-        onClick: function(event) {
-          return onSelect(item, event);
-        },
-        key: item.id || index2
-      }, /* @__PURE__ */ React.isValidElement(item.icon) ? item.icon : /* @__PURE__ */ React.createElement("img", {
-        src: item.icon,
-        alt: ""
-      }), /* @__PURE__ */ React.createElement("div", {
-        className: "".concat(classPrefix2, "-list-text")
-      }, item.text), item.num && /* @__PURE__ */ React.createElement("div", {
-        className: "b"
-      }, item.num));
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, item.num ? /* @__PURE__ */ React.createElement(Badge, {
+        value: item.num,
+        top: 8,
+        right: 6
+      }, renderListItem(item, index2)) : /* @__PURE__ */ React.createElement(React.Fragment, null, renderListItem(item, index2)));
     }))), /* @__PURE__ */ React.createElement("div", {
       className: "".concat(classPrefix2, "-btn"),
       onClick: function() {
@@ -10033,7 +10094,7 @@ Please add \`${key2}Action\` when creating your handler.`);
     }, visible ? activeText || locale.fixednav.activeText : inactiveText || locale.fixednav.inactiveText))));
   };
   FixedNav.displayName = "NutFixedNav";
-  var defaultProps$1k = _object_spread_props(_object_spread({}, ComponentDefaults), {
+  var defaultProps$1j = _object_spread_props(_object_spread({}, ComponentDefaults), {
     left: "",
     right: "",
     back: "",
@@ -10043,7 +10104,7 @@ Please add \`${key2}Action\` when creating your handler.`);
     zIndex: 10
   });
   var NavBar = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps$1k, props), right = _$_object_spread.right, left = _$_object_spread.left, title = _$_object_spread.title, className = _$_object_spread.className, style = _$_object_spread.style, back = _$_object_spread.back, fixed = _$_object_spread.fixed, safeAreaInsetTop = _$_object_spread.safeAreaInsetTop, placeholder = _$_object_spread.placeholder, zIndex = _$_object_spread.zIndex, onBackClick = _$_object_spread.onBackClick;
+    var _$_object_spread = _object_spread({}, defaultProps$1j, props), right = _$_object_spread.right, left = _$_object_spread.left, title = _$_object_spread.title, className = _$_object_spread.className, style = _$_object_spread.style, back = _$_object_spread.back, fixed = _$_object_spread.fixed, safeAreaInsetTop = _$_object_spread.safeAreaInsetTop, placeholder = _$_object_spread.placeholder, zIndex = _$_object_spread.zIndex, onBackClick = _$_object_spread.onBackClick;
     var classPrefix2 = "nut-navbar";
     var rtl = useRtl();
     var children = Array.isArray(props.children) ? props.children : [
@@ -10109,13 +10170,13 @@ Please add \`${key2}Action\` when creating your handler.`);
     });
     return ret;
   }
-  var defaultProps$1j = {
+  var defaultProps$1i = {
     title: "",
     value: "",
     disabled: false
   };
   var SideBarItem = function(props) {
-    var _mergeProps = mergeProps(defaultProps$1j, props), children = _mergeProps.children, className = _mergeProps.className, disabled = _mergeProps.disabled;
+    var _mergeProps = mergeProps(defaultProps$1i, props), children = _mergeProps.children, className = _mergeProps.className, disabled = _mergeProps.disabled;
     var classPrefix2 = "nut-sidebaritem";
     var classes = classNames(classPrefix2, {
       active: !disabled && props.active
@@ -10156,13 +10217,13 @@ Please add \`${key2}Action\` when creating your handler.`);
       setState
     ];
   }
-  var defaultProps$1i = _object_spread_props(_object_spread({}, ComponentDefaults), {
+  var defaultProps$1h = _object_spread_props(_object_spread({}, ComponentDefaults), {
     contentDuration: 0,
     sidebarDuration: 0
   });
   var classPrefix$l = "nut-sidebar";
   var SideBar = function(props) {
-    var _mergeProps = mergeProps(defaultProps$1i, props), contentDuration = _mergeProps.contentDuration, sidebarDuration = _mergeProps.sidebarDuration, children = _mergeProps.children, onClick = _mergeProps.onClick, onChange = _mergeProps.onChange, className = _mergeProps.className, rest = _object_without_properties(_mergeProps, [
+    var _mergeProps = mergeProps(defaultProps$1h, props), contentDuration = _mergeProps.contentDuration, sidebarDuration = _mergeProps.sidebarDuration, children = _mergeProps.children, onClick = _mergeProps.onClick, onChange = _mergeProps.onChange, className = _mergeProps.className, rest = _object_without_properties(_mergeProps, [
       "contentDuration",
       "sidebarDuration",
       "children",
@@ -10301,61 +10362,6 @@ Please add \`${key2}Action\` when creating your handler.`);
   };
   SideBar.displayName = "NutSideBar";
   SideBar.Item = SideBarItem;
-  function _type_of(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-  }
-  var defaultProps$1h = _object_spread_props(_object_spread({}, ComponentDefaults), {
-    value: "",
-    dot: false,
-    max: 99,
-    top: 0,
-    right: 0,
-    fill: "solid",
-    size: "large"
-  });
-  var Badge = function(props) {
-    var isIcon = function isIcon2() {
-      if ((typeof value2 === "undefined" ? "undefined" : _type_of(value2)) === "object" && value2) return value2;
-    };
-    var isNumber = function isNumber2() {
-      if (typeof value2 === "number" && value2) return value2;
-    };
-    var isString = function isString2() {
-      if (typeof value2 === "string" && value2) return value2;
-    };
-    var _this;
-    var rtl = useRtl();
-    var _$_object_spread = _object_spread({}, defaultProps$1h, props), className = _$_object_spread.className, style = _$_object_spread.style, value2 = _$_object_spread.value, max = _$_object_spread.max, children = _$_object_spread.children, dot = _$_object_spread.dot, top = _$_object_spread.top, right = _$_object_spread.right, fill = _$_object_spread.fill, size = _$_object_spread.size;
-    var classPrefix2 = "nut-badge";
-    var classes = classNames(classPrefix2, className);
-    var getContent = function() {
-      if (dot || value2 === 0) return null;
-      if (typeof value2 === "number") {
-        return max < value2 ? "".concat(max, "+") : "".concat(value2);
-      }
-      return value2;
-    };
-    var _obj;
-    var contentClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-sup"), isNumber() || isString() || dot), _define_property(_obj, "".concat(classPrefix2, "-number"), isNumber()), _define_property(_obj, "".concat(classPrefix2, "-one"), typeof getContent() === "string" && ((_this = "".concat(getContent())) === null || _this === void 0 ? void 0 : _this.length) === 1), _define_property(_obj, "".concat(classPrefix2, "-dot"), dot), _define_property(_obj, "".concat(classPrefix2, "-dot-").concat(size), dot), _define_property(_obj, "".concat(classPrefix2, "-").concat(fill), fill === "outline"), _define_property(_obj, "".concat(classPrefix2, "-content"), children), _obj));
-    var getPositionStyle = function() {
-      return _define_property({
-        top: "".concat(Number(top) || 0, "px")
-      }, rtl ? "left" : "right", "".concat(Number(right) || 0, "px"));
-    };
-    var _obj1;
-    return /* @__PURE__ */ React.createElement("div", {
-      className: classes,
-      style
-    }, isIcon() && /* @__PURE__ */ React.createElement("div", {
-      className: classNames("".concat(classPrefix2, "-content"), (_obj1 = {}, _define_property(_obj1, "".concat(classPrefix2, "-icon"), true), _define_property(_obj1, "".concat(classPrefix2, "-icon-rtl"), rtl), _obj1)),
-      style: getPositionStyle()
-    }, value2), children, !isIcon() && (getContent() || dot) && /* @__PURE__ */ React.createElement("div", {
-      className: contentClasses,
-      style: getPositionStyle()
-    }, getContent()));
-  };
-  Badge.displayName = "NutBadge";
   const TabbarContext = React.createContext(null);
   var defaultProps$1g = _object_spread_props(_object_spread({}, ComponentDefaults), {
     title: "",
@@ -10885,17 +10891,6 @@ Please add \`${key2}Action\` when creating your handler.`);
       return { value: op[0] ? op[1] : void 0, done: true };
     }
   }
-  function __values(o) {
-    var s2 = typeof Symbol === "function" && Symbol.iterator, m2 = s2 && o[s2], i2 = 0;
-    if (m2) return m2.call(o);
-    if (o && typeof o.length === "number") return {
-      next: function() {
-        if (o && i2 >= o.length) o = void 0;
-        return { value: o && o[i2++], done: !o };
-      }
-    };
-    throw new TypeError(s2 ? "Object is not iterable." : "Symbol.iterator is not defined.");
-  }
   typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
     var e2 = new Error(message);
     return e2.name = "SuppressedError", e2.error = error, e2.suppressed = suppressed, e2;
@@ -15312,7 +15307,7 @@ Please add \`${key2}Action\` when creating your handler.`);
       pattern: {
         mismatch: "%s value %s does not match pattern %s"
       },
-      clone: function clone() {
+      clone: function clone2() {
         var cloned = JSON.parse(JSON.stringify(this));
         cloned.clone = this.clone;
         return cloned;
@@ -15576,299 +15571,391 @@ Please add \`${key2}Action\` when creating your handler.`);
   Schema.warning = warning;
   Schema.messages = messages;
   Schema.validators = validators;
+  function merge() {
+    for (var _len = arguments.length, items = new Array(_len), _key = 0; _key < _len; _key++) {
+      items[_key] = arguments[_key];
+    }
+    return _merge(items[0] === true, false, items);
+  }
+  function recursive() {
+    for (var _len = arguments.length, items = new Array(_len), _key = 0; _key < _len; _key++) {
+      items[_key] = arguments[_key];
+    }
+    return _merge(items[0] === true, true, items);
+  }
+  function clone(input) {
+    if (Array.isArray(input)) {
+      var output = [];
+      for (var index2 = 0; index2 < input.length; ++index2) output.push(clone(input[index2]));
+      return output;
+    }
+    if (isPlainObject(input)) {
+      var output1 = {};
+      for (var index1 in input) output1[index1] = clone(input[index1]);
+      return output1;
+    }
+    return input;
+  }
+  function isPlainObject(input) {
+    if (input === null || (typeof input === "undefined" ? "undefined" : _type_of(input)) !== "object") return false;
+    if (Object.getPrototypeOf(input) === null) return true;
+    var ref = input;
+    while (Object.getPrototypeOf(ref) !== null) ref = Object.getPrototypeOf(ref);
+    return Object.getPrototypeOf(input) === ref;
+  }
+  function _recursiveMerge(base, extend) {
+    if (!isPlainObject(base) || !isPlainObject(extend)) return extend;
+    for (var key2 in extend) {
+      if (key2 === "__proto__" || key2 === "constructor" || key2 === "prototype") continue;
+      base[key2] = isPlainObject(base[key2]) && isPlainObject(extend[key2]) ? _recursiveMerge(base[key2], extend[key2]) : extend[key2];
+    }
+    return base;
+  }
+  function _merge(isClone, isRecursive, items) {
+    var result;
+    if (isClone || !isPlainObject(result = items.shift())) result = {};
+    for (var index2 = 0; index2 < items.length; ++index2) {
+      var item = items[index2];
+      if (!isPlainObject(item)) continue;
+      for (var key2 in item) {
+        if (key2 === "__proto__" || key2 === "constructor" || key2 === "prototype") continue;
+        var value2 = isClone ? clone(item[key2]) : item[key2];
+        result[key2] = isRecursive ? _recursiveMerge(result[key2], value2) : value2;
+      }
+    }
+    return result;
+  }
   var SECRET = "NUT_FORM_INTERNAL";
-  var FormStore = function FormStore2() {
-    var _this = this;
-    var _this1 = this;
-    _class_call_check(this, FormStore2);
-    var _this2 = this;
-    _define_property(this, "initialValues", {});
-    _define_property(this, "updateList", []);
-    _define_property(this, "store", {});
-    _define_property(this, "fieldEntities", []);
-    _define_property(this, "callbacks", {});
-    _define_property(this, "errors", {});
-    _define_property(this, "registerField", function(field) {
-      _this.fieldEntities.push(field);
-      return function() {
-        _this.fieldEntities = _this.fieldEntities.filter(function(item) {
-          return item !== field;
+  var FormStore = /* @__PURE__ */ function() {
+    function FormStore2() {
+      var _this = this;
+      var _this1 = this;
+      _class_call_check(this, FormStore2);
+      var _this2 = this;
+      _define_property(this, "initialValues", {});
+      _define_property(this, "updateList", []);
+      _define_property(this, "store", {});
+      _define_property(this, "fieldEntities", []);
+      _define_property(this, "callbacks", {});
+      _define_property(this, "errors", {});
+      _define_property(this, "registerField", function(field) {
+        _this.fieldEntities.push(field);
+        return function() {
+          _this.fieldEntities = _this.fieldEntities.filter(function(item) {
+            return item !== field;
+          });
+        };
+      });
+      _define_property(this, "getFieldValue", function(name2) {
+        var _this_store;
+        return (_this_store = _this.store) === null || _this_store === void 0 ? void 0 : _this_store[name2];
+      });
+      _define_property(this, "getFieldsValue", function(nameList) {
+        if (typeof nameList === "boolean") {
+          return JSON.parse(JSON.stringify(_this.store));
+        }
+        var fieldsValue = {};
+        nameList.forEach(function(field) {
+          fieldsValue[field] = _this.getFieldValue(field);
         });
-        if (_this.store) {
-          delete _this.store[field.props.name];
+        return fieldsValue;
+      });
+      _define_property(this, "setInitialValues", function(initialValues, init) {
+        _this.initialValues = initialValues || {};
+        if (init) {
+          var nextStore = merge(initialValues, _this.store);
+          _this.updateStore(nextStore);
+          _this.notifyWatch();
         }
-      };
-    });
-    _define_property(this, "getFieldValue", function(name2) {
-      var _this_store;
-      return (_this_store = _this.store) === null || _this_store === void 0 ? void 0 : _this_store[name2];
-    });
-    _define_property(this, "getFieldsValue", function(nameList) {
-      if (typeof nameList === "boolean") {
-        return JSON.parse(JSON.stringify(_this.store));
-      }
-      var fieldsValue = {};
-      nameList.forEach(function(field) {
-        fieldsValue[field] = _this.getFieldValue(field);
       });
-      return fieldsValue;
-    });
-    _define_property(this, "setInitialValues", function(values, init) {
-      if (init) {
-        _this.initialValues = values;
-        _this.store = values;
-      }
-    });
-    _define_property(this, "setFieldsValue", function(newStore) {
-      var needValidate = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
-      _this1.store = _object_spread({}, _this1.store, newStore);
-      _this1.fieldEntities.forEach(function(entity) {
-        var name2 = entity.props.name;
-        Object.keys(newStore).forEach(function(key2) {
-          if (key2 === name2) {
-            entity.onStoreChange("update");
+      _define_property(this, "setFieldsValue", function(newStore) {
+        var nextStore = recursive(true, _this.store, newStore);
+        _this.updateStore(nextStore);
+        _this.fieldEntities.forEach(function(entity) {
+          var name2 = entity.props.name;
+          Object.keys(newStore).forEach(function(key2) {
+            if (key2 === name2) {
+              entity.onStoreChange("update");
+            }
+          });
+        });
+        _this.updateList.forEach(function(item) {
+          var shouldUpdate = item.condition;
+          if (typeof item.condition === "function") {
+            shouldUpdate = item.condition();
+          }
+          if (shouldUpdate) {
+            item.entity.onStoreChange("update");
           }
         });
+        _this.notifyWatch();
       });
-      _this1.updateList.forEach(function(item) {
-        var shouldUpdate = item.condition;
-        if (typeof item.condition === "function") {
-          shouldUpdate = item.condition();
-        }
-        if (shouldUpdate) {
-          item.entity.onStoreChange("update");
-        }
+      _define_property(this, "setFieldValue", function(name2, value2) {
+        var store = _define_property({}, name2, value2);
+        _this.setFieldsValue(store);
+        _this.notifyWatch([
+          name2
+        ]);
       });
-      needValidate && _this1.validateFields();
-    });
-    _define_property(this, "setCallback", function(callback) {
-      _this.callbacks = _object_spread({}, _this.callbacks, callback);
-    });
-    _define_property(this, "validateFields", /* @__PURE__ */ function() {
-      var _ref = _async_to_generator(function(nameList) {
-        var filterEntitys, errs, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step, err;
+      _define_property(this, "setCallback", function(callback) {
+        _this.callbacks = _object_spread({}, _this.callbacks, callback);
+      });
+      _define_property(this, "validateEntities", /* @__PURE__ */ function() {
+        var _ref = _async_to_generator(function(entity, errs) {
+          var _entity_props, name2, _entity_props_rules, rules2, descriptor, validator, _this_store, param, errors, _errs;
+          return __generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                _entity_props = entity.props, name2 = _entity_props.name, _entity_props_rules = _entity_props.rules, rules2 = _entity_props_rules === void 0 ? [] : _entity_props_rules;
+                if (!name2) {
+                  console.warn("Form field missing name property");
+                  return [
+                    2
+                  ];
+                }
+                descriptor = {};
+                if (rules2.length) {
+                  if (rules2.length > 1) {
+                    descriptor[name2] = [];
+                    rules2.forEach(function(v) {
+                      descriptor[name2].push(v);
+                    });
+                  } else {
+                    descriptor[name2] = rules2[0];
+                  }
+                }
+                validator = new Schema(descriptor);
+                _state.label = 1;
+              case 1:
+                _state.trys.push([
+                  1,
+                  3,
+                  4,
+                  5
+                ]);
+                return [
+                  4,
+                  validator.validate(_define_property({}, name2, (_this_store = _this2.store) === null || _this_store === void 0 ? void 0 : _this_store[name2]))
+                ];
+              case 2:
+                _state.sent();
+                return [
+                  3,
+                  5
+                ];
+              case 3:
+                param = _state.sent();
+                errors = param.errors;
+                if (errors) {
+                  (_errs = errs).push.apply(_errs, _to_consumable_array(errors));
+                  _this2.errors[name2] = errors;
+                }
+                return [
+                  3,
+                  5
+                ];
+              case 4:
+                if (!errs || errs.length === 0) {
+                  _this2.errors[name2] = [];
+                }
+                return [
+                  7
+                ];
+              case 5:
+                entity.onStoreChange("validate");
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(entity, errs) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      _define_property(this, "validateFields", /* @__PURE__ */ function() {
+        var _ref = _async_to_generator(function(nameList) {
+          var filterEntities, errs;
+          return __generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                filterEntities = [];
+                if (!nameList || nameList.length === 0) {
+                  filterEntities = _this2.fieldEntities;
+                } else {
+                  filterEntities = _this2.fieldEntities.filter(function(param) {
+                    var name2 = param.props.name;
+                    return nameList.includes(name2);
+                  });
+                }
+                errs = [];
+                return [
+                  4,
+                  Promise.all(filterEntities.map(/* @__PURE__ */ function() {
+                    var _ref2 = _async_to_generator(function(entity) {
+                      return __generator(this, function(_state2) {
+                        switch (_state2.label) {
+                          case 0:
+                            return [
+                              4,
+                              _this2.validateEntities(entity, errs)
+                            ];
+                          case 1:
+                            _state2.sent();
+                            return [
+                              2
+                            ];
+                        }
+                      });
+                    });
+                    return function(entity) {
+                      return _ref2.apply(this, arguments);
+                    };
+                  }()))
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  2,
+                  errs
+                ];
+            }
+          });
+        });
+        return function(nameList) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      _define_property(this, "submit", /* @__PURE__ */ _async_to_generator(function() {
+        var errors, _this_callbacks_onFinish, _this_callbacks, _this_callbacks_onFinishFailed, _this_callbacks1;
         return __generator(this, function(_state) {
           switch (_state.label) {
             case 0:
-              filterEntitys = [];
-              errs = [];
-              _this2.errors.length = 0;
-              if (!nameList || nameList.length === 0) {
-                filterEntitys = _this2.fieldEntities;
-              } else {
-                filterEntitys = _this2.fieldEntities.filter(function(param) {
-                  var name2 = param.props.name;
-                  return nameList.includes(name2);
-                });
-              }
-              _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-              _state.label = 1;
-            case 1:
-              _state.trys.push([
-                1,
-                6,
-                7,
-                8
-              ]);
-              _loop = function() {
-                var entity, _entity_props, name2, _entity_props_rules, rules2, descriptor, validator, _this_store, param, errors, _errs;
-                return __generator(this, function(_state2) {
-                  switch (_state2.label) {
-                    case 0:
-                      entity = _step.value;
-                      _entity_props = entity.props, name2 = _entity_props.name, _entity_props_rules = _entity_props.rules, rules2 = _entity_props_rules === void 0 ? [] : _entity_props_rules;
-                      descriptor = {};
-                      if (rules2.length) {
-                        if (rules2.length > 1) {
-                          descriptor[name2] = [];
-                          rules2.forEach(function(v) {
-                            descriptor[name2].push(v);
-                          });
-                        } else {
-                          descriptor[name2] = rules2[0];
-                        }
-                      }
-                      validator = new Schema(descriptor);
-                      _state2.label = 1;
-                    case 1:
-                      _state2.trys.push([
-                        1,
-                        3,
-                        4,
-                        5
-                      ]);
-                      return [
-                        4,
-                        validator.validate(_define_property({}, name2, (_this_store = _this2.store) === null || _this_store === void 0 ? void 0 : _this_store[name2]))
-                      ];
-                    case 2:
-                      _state2.sent();
-                      return [
-                        3,
-                        5
-                      ];
-                    case 3:
-                      param = _state2.sent();
-                      errors = param.errors;
-                      if (errors) {
-                        (_errs = errs).push.apply(_errs, _to_consumable_array(errors));
-                        _this2.errors[name2] = errors;
-                      }
-                      return [
-                        3,
-                        5
-                      ];
-                    case 4:
-                      if (!errs || errs.length === 0) {
-                        _this2.errors[name2] = [];
-                      }
-                      return [
-                        7
-                      ];
-                    case 5:
-                      entity.onStoreChange("validate");
-                      return [
-                        2
-                      ];
-                  }
-                });
-              };
-              _iterator = filterEntitys[Symbol.iterator]();
-              _state.label = 2;
-            case 2:
-              if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done)) return [
-                3,
-                5
-              ];
               return [
-                5,
-                __values(_loop())
-              ];
-            case 3:
-              _state.sent();
-              _state.label = 4;
-            case 4:
-              _iteratorNormalCompletion = true;
-              return [
-                3,
-                2
-              ];
-            case 5:
-              return [
-                3,
-                8
-              ];
-            case 6:
-              err = _state.sent();
-              _didIteratorError = true;
-              _iteratorError = err;
-              return [
-                3,
-                8
+                4,
+                _this2.validateFields()
               ];
-            case 7:
-              try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                  _iterator.return();
-                }
-              } finally {
-                if (_didIteratorError) {
-                  throw _iteratorError;
-                }
+            case 1:
+              errors = _state.sent();
+              if (errors.length === 0) {
+                (_this_callbacks_onFinish = (_this_callbacks = _this2.callbacks).onFinish) === null || _this_callbacks_onFinish === void 0 ? void 0 : _this_callbacks_onFinish.call(_this_callbacks, _this2.store);
+              } else if (errors.length > 0) {
+                (_this_callbacks_onFinishFailed = (_this_callbacks1 = _this2.callbacks).onFinishFailed) === null || _this_callbacks_onFinishFailed === void 0 ? void 0 : _this_callbacks_onFinishFailed.call(_this_callbacks1, _this2.store, errors);
               }
               return [
-                7
-              ];
-            case 8:
-              return [
-                2,
-                errs
+                2
               ];
           }
         });
-      });
-      return function(nameList) {
-        return _ref.apply(this, arguments);
-      };
-    }());
-    _define_property(this, "submit", /* @__PURE__ */ _async_to_generator(function() {
-      var errors, _this_callbacks_onFinish, _this_callbacks, _this_callbacks_onFinishFailed, _this_callbacks1;
-      return __generator(this, function(_state) {
-        switch (_state.label) {
-          case 0:
-            return [
-              4,
-              _this2.validateFields()
-            ];
-          case 1:
-            errors = _state.sent();
-            if (errors.length === 0) {
-              (_this_callbacks_onFinish = (_this_callbacks = _this2.callbacks).onFinish) === null || _this_callbacks_onFinish === void 0 ? void 0 : _this_callbacks_onFinish.call(_this_callbacks, _this2.store);
-            } else if (errors.length > 0) {
-              (_this_callbacks_onFinishFailed = (_this_callbacks1 = _this2.callbacks).onFinishFailed) === null || _this_callbacks_onFinishFailed === void 0 ? void 0 : _this_callbacks_onFinishFailed.call(_this_callbacks1, _this2.store, errors);
-            }
-            return [
-              2
-            ];
+      }));
+      _define_property(this, "resetFields", function(namePaths) {
+        if (namePaths && namePaths.length) {
+          namePaths.forEach(function(path) {
+            _this.errors[path] = null;
+            _this.fieldEntities.forEach(function(entity) {
+              var name2 = entity.props.name;
+              if (name2 === path) {
+                if (path in _this.initialValues) {
+                  _this.updateStore(_define_property({}, path, _this.initialValues[path]));
+                } else {
+                  delete _this.store[path];
+                }
+                entity.onStoreChange("reset");
+              }
+            });
+          });
+        } else {
+          var nextStore = merge({}, _this.initialValues);
+          _this.updateStore(nextStore);
+          _this.fieldEntities.forEach(function(entity) {
+            entity.onStoreChange("reset");
+          });
         }
       });
-    }));
-    _define_property(this, "resetFields", function() {
-      _this.errors.length = 0;
-      _this.store = _this.initialValues;
-      _this.fieldEntities.forEach(function(entity) {
-        entity.onStoreChange("reset");
+      _define_property(this, "registerUpdate", function(field, shouldUpdate) {
+        _this.updateList.push({
+          entity: field,
+          condition: shouldUpdate
+        });
+        return function() {
+          _this.updateList = _this.updateList.filter(function(i2) {
+            return i2.entity !== field;
+          });
+        };
       });
-    });
-    _define_property(this, "registerUpdate", function(field, shouldUpdate) {
-      _this.updateList.push({
-        entity: field,
-        condition: shouldUpdate
+      _define_property(this, "dispatch", function(param) {
+        var name2 = param.name;
+        _this.validateFields([
+          name2
+        ]);
       });
-      return function() {
-        _this.updateList = _this.updateList.filter(function(i2) {
-          return i2.entity !== field;
-        });
-      };
-    });
-    _define_property(this, "dispatch", function(param) {
-      var name2 = param.name;
-      _this.validateFields([
-        name2
-      ]);
-    });
-    _define_property(this, "getInternal", function(key2) {
-      if (key2 === SECRET) {
+      _define_property(this, "getInternal", function(key2) {
+        if (key2 === SECRET) {
+          return {
+            registerField: _this.registerField,
+            setCallback: _this.setCallback,
+            setInitialValues: _this.setInitialValues,
+            dispatch: _this.dispatch,
+            store: _this.store,
+            fieldEntities: _this.fieldEntities,
+            registerUpdate: _this.registerUpdate,
+            registerWatch: _this.registerWatch
+          };
+        }
+      });
+      _define_property(this, "getForm", function() {
         return {
-          registerField: _this.registerField,
-          setCallback: _this.setCallback,
-          setInitialValues: _this.setInitialValues,
-          dispatch: _this.dispatch,
-          store: _this.store,
-          fieldEntities: _this.fieldEntities,
-          registerUpdate: _this.registerUpdate
+          getFieldValue: _this.getFieldValue,
+          getFieldsValue: _this.getFieldsValue,
+          setFieldsValue: _this.setFieldsValue,
+          setFieldValue: _this.setFieldValue,
+          resetFields: _this.resetFields,
+          validateFields: _this.validateFields,
+          submit: _this.submit,
+          errors: _this.errors,
+          getInternal: _this.getInternal
         };
-      }
-    });
-    _define_property(this, "getForm", function() {
-      return {
-        getFieldValue: _this.getFieldValue,
-        getFieldsValue: _this.getFieldsValue,
-        setFieldsValue: _this.setFieldsValue,
-        resetFields: _this.resetFields,
-        validateFields: _this.validateFields,
-        submit: _this.submit,
-        errors: _this.errors,
-        getInternal: _this.getInternal
+      });
+      _define_property(this, "watchList", []);
+      _define_property(this, "registerWatch", function(callback) {
+        _this.watchList.push(callback);
+        return function() {
+          _this.watchList = _this.watchList.filter(function(fn) {
+            return fn !== callback;
+          });
+        };
+      });
+      _define_property(this, "notifyWatch", function() {
+        var namePath = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
+        if (_this1.watchList.length) {
+          var allValues;
+          if (!namePath || namePath.length === 0) {
+            allValues = _this1.getFieldsValue(true);
+          } else {
+            allValues = _this1.getFieldsValue(namePath);
+          }
+          _this1.watchList.forEach(function(callback) {
+            callback(allValues, namePath);
+          });
+        }
+      });
+      this.callbacks = {
+        onFinish: function() {
+        },
+        onFinishFailed: function() {
+        }
       };
-    });
-    this.callbacks = {
-      onFinish: function() {
-      },
-      onFinishFailed: function() {
+    }
+    _create_class(FormStore2, [
+      {
+        key: "updateStore",
+        value: function updateStore(nextStore) {
+          this.store = nextStore;
+        }
       }
-    };
-  };
+    ]);
+    return FormStore2;
+  }();
   var useForm = function(form) {
     var formRef = React.useRef();
     if (!formRef.current) {
@@ -15883,10 +15970,32 @@ Please add \`${key2}Action\` when creating your handler.`);
       formRef.current
     ];
   };
+  var useWatch = function(path, form) {
+    var formInstance = form.getInternal(SECRET);
+    var _useState = _sliced_to_array(React.useState(), 2), value2 = _useState[0], setValue = _useState[1];
+    React.useEffect(function() {
+      var unsubscribe = formInstance.registerWatch(function(data2, namePath) {
+        var value3 = data2[path];
+        setValue(value3);
+      });
+      var initialValue = form.getFieldsValue(true);
+      if (value2 !== initialValue[path]) {
+        setValue(initialValue[path]);
+      }
+      return function() {
+        return unsubscribe();
+      };
+    }, [
+      form
+    ]);
+    return value2;
+  };
   var defaultProps$_ = _object_spread_props(_object_spread({}, ComponentDefaults), {
     labelPosition: "right",
     starPosition: "left",
+    disabled: false,
     divider: false,
+    validateTrigger: "onChange",
     onFinish: function(values) {
     },
     onFinishFailed: function(values, errorFields) {
@@ -15899,7 +16008,7 @@ Please add \`${key2}Action\` when creating your handler.`);
   };
   var Form = /* @__PURE__ */ React.forwardRef(function(props, ref) {
     var classPrefix2 = "nut-form";
-    var _$_object_spread = _object_spread({}, defaultProps$_, props), className = _$_object_spread.className, style = _$_object_spread.style, footer = _$_object_spread.footer, children = _$_object_spread.children, initialValues = _$_object_spread.initialValues, divider = _$_object_spread.divider, onFinish = _$_object_spread.onFinish, onFinishFailed = _$_object_spread.onFinishFailed, labelPosition = _$_object_spread.labelPosition, starPosition = _$_object_spread.starPosition, form = _$_object_spread.form;
+    var _$_object_spread = _object_spread({}, defaultProps$_, props), className = _$_object_spread.className, style = _$_object_spread.style, footer = _$_object_spread.footer, children = _$_object_spread.children, initialValues = _$_object_spread.initialValues, divider = _$_object_spread.divider, disabled = _$_object_spread.disabled, onFinish = _$_object_spread.onFinish, onFinishFailed = _$_object_spread.onFinishFailed, validateTrigger = _$_object_spread.validateTrigger, labelPosition = _$_object_spread.labelPosition, starPosition = _$_object_spread.starPosition, form = _$_object_spread.form;
     var formInstance;
     if (form !== void 0) {
       formInstance = form;
@@ -15938,7 +16047,12 @@ Please add \`${key2}Action\` when creating your handler.`);
     }, /* @__PURE__ */ React.createElement(Cell.Group, {
       divider
     }, /* @__PURE__ */ React.createElement(Context.Provider, {
-      value: formInstance
+      value: {
+        formInstance,
+        labelPosition,
+        disabled,
+        validateTrigger
+      }
     }, children), footer ? /* @__PURE__ */ React.createElement(Cell, {
       className: "".concat(classPrefix2, "-footer")
     }, footer) : null));
@@ -15998,6 +16112,14 @@ Please add \`${key2}Action\` when creating your handler.`);
       }
     ).$$typeof === component.type.$$typeof;
   }
+  function toArray(value2) {
+    if (value2 === void 0 || value2 === null) {
+      return [];
+    }
+    return Array.isArray(value2) ? value2 : [
+      value2
+    ];
+  }
   var defaultProps$Z = _object_spread_props(_object_spread({}, ComponentDefaults), {
     required: false,
     name: "",
@@ -16009,7 +16131,6 @@ Please add \`${key2}Action\` when creating your handler.`);
       }
     ],
     errorMessageAlign: "left",
-    validateTrigger: "onChange",
     shouldUpdate: false,
     noStyle: false
   });
@@ -16023,15 +16144,19 @@ Please add \`${key2}Action\` when creating your handler.`);
       ]), _define_property(_this, "cancelRegister", void 0), _define_property(_this, "componentRef", void 0), _define_property(_this, "eventOff", void 0), // children添加value属性和onChange事件
       _define_property(_this, "getControlled", function(children) {
         var _children_props;
-        var _this_context = _this.context, setFieldsValue = _this_context.setFieldsValue, getFieldValue = _this_context.getFieldValue;
-        var dispatch = _this.context.getInternal(SECRET).dispatch;
+        var _this_context_formInstance = _this.context.formInstance, setFieldsValue = _this_context_formInstance.setFieldsValue, getFieldValue = _this_context_formInstance.getFieldValue;
+        var dispatch = _this.context.formInstance.getInternal(SECRET).dispatch;
         var _this_props = _this.props, _this_props_name = _this_props.name, name2 = _this_props_name === void 0 ? "" : _this_props_name;
         if (children === null || children === void 0 ? void 0 : (_children_props = children.props) === null || _children_props === void 0 ? void 0 : _children_props.defaultValue) {
-          console.warn("通过 initialValue 设置初始值");
+          if (process.env.NODE_ENV !== "production") {
+            console.warn("[NutUI] FormItem:", "请通过 initialValue 设置初始值，而不是 defaultValue");
+          }
         }
         var fieldValue = getFieldValue(name2);
         var _obj;
-        var controlled = _object_spread_props(_object_spread({}, children.props), (_obj = {}, _define_property(_obj, _this.props.valuePropName || "value", fieldValue !== void 0 ? fieldValue : _this.props.initialValue), _define_property(_obj, _this.props.trigger || "onChange", function() {
+        var controlled = _object_spread_props(_object_spread({}, children.props), (_obj = {
+          className: children.props.className
+        }, _define_property(_obj, _this.props.valuePropName || "value", fieldValue !== void 0 ? fieldValue : _this.props.initialValue), _define_property(_obj, _this.props.trigger || "onChange", function() {
           for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
             args[_key] = arguments[_key];
           }
@@ -16044,33 +16169,27 @@ Please add \`${key2}Action\` when creating your handler.`);
             var _this_props2;
             next = (_this_props2 = _this.props).getValueFromEvent.apply(_this_props2, _to_consumable_array(args));
           }
-          setFieldsValue(_define_property({}, name2, next), false);
+          setFieldsValue(_define_property({}, name2, next));
         }), _obj));
         var validateTrigger = _this.props.validateTrigger;
-        var validateTriggers = [
-          _this.props.trigger || "onChange"
-        ];
-        if (validateTrigger) {
-          validateTriggers = typeof validateTrigger === "string" ? [
-            validateTrigger
-          ] : _to_consumable_array(validateTrigger);
-          validateTriggers.forEach(function(trigger) {
-            var originTrigger = controlled[trigger];
-            controlled[trigger] = function() {
-              for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-                args[_key] = arguments[_key];
-              }
-              if (originTrigger) {
-                originTrigger.apply(void 0, _to_consumable_array(args));
-              }
-              if (_this.props.rules && _this.props.rules.length) {
-                dispatch({
-                  name: _this.props.name
-                });
-              }
-            };
-          });
-        }
+        var mergedValidateTrigger = validateTrigger || _this.context.validateTrigger;
+        var validateTriggers = toArray(mergedValidateTrigger);
+        validateTriggers.forEach(function(trigger) {
+          var originTrigger = controlled[trigger];
+          controlled[trigger] = function() {
+            for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+              args[_key] = arguments[_key];
+            }
+            if (originTrigger) {
+              originTrigger.apply(void 0, _to_consumable_array(args));
+            }
+            if (_this.props.rules && _this.props.rules.length) {
+              dispatch({
+                name: _this.props.name
+              });
+            }
+          };
+        });
         if (isForwardRefComponent(children)) {
           controlled.ref = function(componentInstance) {
             var originRef = children.ref;
@@ -16095,7 +16214,7 @@ Please add \`${key2}Action\` when creating your handler.`);
         });
       }), _define_property(_this, "onStoreChange", function(type2) {
         if (type2 === "reset") {
-          _this.context.errors[_this.props.name] = [];
+          _this.context.formInstance.errors[_this.props.name] = [];
           _this.refresh();
         } else {
           _this.forceUpdate();
@@ -16105,23 +16224,25 @@ Please add \`${key2}Action\` when creating your handler.`);
         var requiredInRules = rules2 === null || rules2 === void 0 ? void 0 : rules2.some(function(rule) {
           return rule.required;
         });
-        var item = name2 ? _this.context.errors[name2] : [];
-        var starPosition = _this.context.starPosition;
-        var renderStar = (required2 || requiredInRules) && /* @__PURE__ */ React.createElement("i", {
-          className: "required"
-        });
-        var renderLabel = /* @__PURE__ */ React.createElement(React.Fragment, null, starPosition === "left" ? renderStar : null, label, starPosition === "right" ? renderStar : null);
+        var item = name2 ? _this.context.formInstance.errors[name2] : [];
+        var starPosition = _this.context.formInstance.starPosition;
+        var renderStar = (required2 || requiredInRules) && /* @__PURE__ */ React.createElement("div", {
+          className: "nut-form-item-label-required required"
+        }, "*");
+        var renderLabel = /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("span", {
+          className: "nut-form-item-labeltxt"
+        }, starPosition === "left" ? renderStar : null, label), starPosition === "right" ? renderStar : null);
         return /* @__PURE__ */ React.createElement(Cell, {
-          className: "nut-form-item ".concat(className),
+          className: "".concat(_this.getClassNameWithDirection("nut-form-item"), " ").concat(className),
           style,
           align,
           onClick: function(e2) {
             return _this.props.onClick && _this.props.onClick(e2, _this.componentRef);
           }
         }, label ? /* @__PURE__ */ React.createElement("div", {
-          className: "nut-cell-title nut-form-item-label"
+          className: "nut-cell-title ".concat(_this.getClassNameWithDirection("nut-form-item-label"))
         }, renderLabel) : null, /* @__PURE__ */ React.createElement("div", {
-          className: "nut-cell-value nut-form-item-body"
+          className: "nut-cell-value ".concat(_this.getClassNameWithDirection("nut-form-item-body"))
         }, /* @__PURE__ */ React.createElement("div", {
           className: "nut-form-item-body-slots"
         }, childNode), item && item.length > 0 && /* @__PURE__ */ React.createElement("div", {
@@ -16141,11 +16262,11 @@ Please add \`${key2}Action\` when creating your handler.`);
       {
         key: "componentDidMount",
         value: function componentDidMount() {
-          var _this_context_getInternal = this.context.getInternal(SECRET), _this_context_getInternal_store = _this_context_getInternal.store, store = _this_context_getInternal_store === void 0 ? {} : _this_context_getInternal_store, setInitialValues = _this_context_getInternal.setInitialValues;
+          var _this_context_formInstance_getInternal = this.context.formInstance.getInternal(SECRET), _this_context_formInstance_getInternal_store = _this_context_formInstance_getInternal.store, store = _this_context_formInstance_getInternal_store === void 0 ? {} : _this_context_formInstance_getInternal_store, setInitialValues = _this_context_formInstance_getInternal.setInitialValues;
           if (this.props.initialValue && this.props.name && !Object.keys(store).includes(this.props.name)) {
             setInitialValues(_object_spread_props(_object_spread({}, store), _define_property({}, this.props.name, this.props.initialValue)), true);
           }
-          var _this_context_getInternal1 = this.context.getInternal(SECRET), registerField = _this_context_getInternal1.registerField, registerUpdate = _this_context_getInternal1.registerUpdate;
+          var _this_context_formInstance_getInternal1 = this.context.formInstance.getInternal(SECRET), registerField = _this_context_formInstance_getInternal1.registerField, registerUpdate = _this_context_formInstance_getInternal1.registerUpdate;
           this.cancelRegister = registerField(this);
           this.eventOff = registerUpdate(this, this.props.shouldUpdate);
         }
@@ -16161,6 +16282,15 @@ Please add \`${key2}Action\` when creating your handler.`);
           }
         }
       },
+      {
+        key: "getClassNameWithDirection",
+        value: function getClassNameWithDirection(className) {
+          if (className && this.context.labelPosition) {
+            return "".concat(className, " ").concat(className, "-").concat(this.context.labelPosition);
+          }
+          return className;
+        }
+      },
       {
         key: "render",
         value: function render2() {
@@ -16170,11 +16300,13 @@ Please add \`${key2}Action\` when creating your handler.`);
           if (!this.props.shouldUpdate) {
             returnChildNode = /* @__PURE__ */ React.cloneElement(child, this.getControlled(child));
           } else {
-            returnChildNode = child(this.context);
+            returnChildNode = child(this.context.formInstance);
           }
           return /* @__PURE__ */ React.createElement(React.Fragment, {
             key: this.state.resetCount
-          }, this.props.noStyle ? returnChildNode : this.renderLayout(returnChildNode));
+          }, /* @__PURE__ */ React.createElement("div", {
+            className: this.context.disabled ? "nut-form-item-disabled" : ""
+          }, this.props.noStyle ? returnChildNode : this.renderLayout(returnChildNode)));
         }
       }
     ]);
@@ -16185,6 +16317,7 @@ Please add \`${key2}Action\` when creating your handler.`);
   var InnerForm = Form;
   InnerForm.Item = FormItem;
   InnerForm.useForm = useForm;
+  InnerForm.useWatch = useWatch;
   function trimExtraChar(value2, char, regExp) {
     var index2 = value2.indexOf(char);
     if (index2 === -1) {
@@ -23356,7 +23489,7 @@ Please add \`${key2}Action\` when creating your handler.`);
           shapePath._length = 0;
           shapePath.c = false;
         }
-        function clone(shape) {
+        function clone2(shape) {
           var cloned = factory.newElement();
           var i2;
           var len = shape._length === void 0 ? shape.v.length : shape._length;
@@ -23368,7 +23501,7 @@ Please add \`${key2}Action\` when creating your handler.`);
           return cloned;
         }
         var factory = poolFactory(4, create, release);
-        factory.clone = clone;
+        factory.clone = clone2;
         return factory;
       }();
       function ShapeCollection() {
@@ -24086,7 +24219,7 @@ Please add \`${key2}Action\` when creating your handler.`);
           }
           return true;
         }
-        function clone(matr) {
+        function clone2(matr) {
           var i2;
           for (i2 = 0; i2 < 16; i2 += 1) {
             matr.props[i2] = this.props[i2];
@@ -24238,7 +24371,7 @@ Please add \`${key2}Action\` when creating your handler.`);
           this.applyToPointStringified = applyToPointStringified;
           this.toCSS = toCSS;
           this.to2dCSS = to2dCSS;
-          this.clone = clone;
+          this.clone = clone2;
           this.cloneFromProps = cloneFromProps;
           this.equals = equals;
           this.inversePoints = inversePoints;