@nutui/nutui-react-taro 2.7.1 → 2.7.3

package/dist/nutui.react.es.js

@@ -1,12 +1,12 @@
 /*!
-* @nutui/nutui-react-taro v2.7.1 Fri Nov 22 2024 15:43:06 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react-taro v2.7.3 Fri Dec 13 2024 15:47:49 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
 import * as React from "react";
 import React__default, { useCallback, createContext, useContext, useState, useRef, useEffect, useMemo as useMemo$1, useImperativeHandle, isValidElement, forwardRef, Component, Children } from "react";
 import Taro, { getEnv, createSelectorQuery, usePageScroll, getSystemInfoSync, pageScrollTo, nextTick, ENV_TYPE, useReady, canvasToTempFilePath, uploadFile, chooseMedia, chooseImage, Events, getCurrentInstance, createInnerAudioContext, getSystemInfo, createOffscreenCanvas } from "@tarojs/taro";
-import { Image as Image$2, View, ScrollView, PickerView, PickerViewColumn, Input as Input$1, Textarea, Swiper as Swiper$1, SwiperItem as SwiperItem$1, Video as Video$1, Canvas } from "@tarojs/components";
+import { Image as Image$2, View, ScrollView, PickerView, PickerViewColumn, Form as Form$1, Text, Input as Input$1, Textarea, Swiper as Swiper$1, SwiperItem as SwiperItem$1, Video as Video$1, Canvas } from "@tarojs/components";
 import ReactDOM, { createPortal } from "react-dom";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x2) {
@@ -4180,6 +4180,21 @@ const BackTop = (props) => {
   return /* @__PURE__ */ React__default.createElement("div", { className: cls, style: styles, onClick: (e2) => goTop(e2) }, children || /* @__PURE__ */ React__default.createElement(N, { size: 19, className: "nut-backtop-main" }));
 };
 BackTop.displayName = "NutBackTop";
+const idCounter = {};
+function uniqueId(prefix = "$nut$") {
+  if (!idCounter[prefix]) {
+    idCounter[prefix] = 0;
+  }
+  const id = ++idCounter[prefix];
+  if (prefix === "$nut$") {
+    return `${id}`;
+  }
+  return `${prefix}${id}`;
+}
+function useUuid() {
+  const idRef = useRef(uniqueId());
+  return idRef.current;
+}
 const elevatorContext = createContext({});
 const defaultProps$1i = {
   ...ComponentDefaults,
@@ -4211,6 +4226,7 @@ const Elevator = (props) => {
     ...defaultProps$1i,
     ...props
   };
+  const uuid = useUuid();
   const classPrefix2 = "nut-elevator";
   const listview = useRef(null);
   const initData = {
@@ -4247,7 +4263,7 @@ const Elevator = (props) => {
     state.current.listHeight.push(height2);
     for (let i2 = 0; i2 < state.current.listGroup.length; i2++) {
       const query = createSelectorQuery();
-      query.selectAll(`.${className} .nut-elevator-item-${i2}`).boundingClientRect();
+      query.selectAll(`.${classPrefix2}-${uuid} .nut-elevator-item-${i2}`).boundingClientRect();
       query.exec((res) => {
         if (res[0][0]) height2 += res[0][0].height;
         state.current.listHeight.push(height2);
@@ -4306,7 +4322,7 @@ const Elevator = (props) => {
   };
   const setListGroup = () => {
     if (listview.current) {
-      createSelectorQuery().selectAll(`.${className} .nut-elevator-list-item`).node((el) => {
+      createSelectorQuery().selectAll(`.${classPrefix2}-${uuid} .nut-elevator-list-item`).node((el) => {
         state.current.listGroup = [...Object.keys(el)];
         calculateHeight();
       }).exec();
@@ -4340,86 +4356,96 @@ const Elevator = (props) => {
       });
     }
   }, [listview]);
-  return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2} ${className}`, style, ...rest }, /* @__PURE__ */ React__default.createElement(
+  return /* @__PURE__ */ React__default.createElement(
     "div",
     {
-      className: `${classPrefix2}-list`,
-      style: { height: Number.isNaN(+height) ? height : `${height}px` }
+      className: `${classPrefix2} ${className} ${classPrefix2}-${uuid}`,
+      style,
+      ...rest
     },
     /* @__PURE__ */ React__default.createElement(
-      ScrollView,
+      "div",
       {
-        scrollTop,
-        scrollY: true,
-        scrollWithAnimation: true,
-        scrollAnchoring: true,
-        className: `${classPrefix2}-list-inner`,
-        type: "list",
-        ref: listview,
-        onScroll: listViewScroll,
-        onTouchStart: (e2) => {
-          scrolling.current = false;
-        }
+        className: `${classPrefix2}-list`,
+        style: { height: Number.isNaN(+height) ? height : `${height}px` }
+      },
+      /* @__PURE__ */ React__default.createElement(
+        ScrollView,
+        {
+          scrollTop,
+          scrollY: true,
+          scrollWithAnimation: true,
+          scrollAnchoring: true,
+          className: `${classPrefix2}-list-inner`,
+          type: "list",
+          ref: listview,
+          onScroll: listViewScroll,
+          onTouchStart: (e2) => {
+            scrolling.current = false;
+          }
+        },
+        list.map((item, idx) => {
+          return /* @__PURE__ */ React__default.createElement(
+            "div",
+            {
+              className: `${classPrefix2}-list-item nut-elevator-item-${idx}`,
+              key: idx
+            },
+            /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-list-item-code` }, item[floorKey]),
+            /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, item.list.map((subitem) => {
+              return /* @__PURE__ */ React__default.createElement(
+                "div",
+                {
+                  className: classNames({
+                    [`${classPrefix2}-list-item-name`]: true,
+                    [`${classPrefix2}-list-item-name-highcolor`]: currentData.id === subitem.id && currentKey === item[floorKey]
+                  }),
+                  key: subitem.id,
+                  onClick: () => handleClickItem(item[floorKey], subitem)
+                },
+                children ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(elevatorContext.Provider, { value: subitem }, children)) : subitem.name
+              );
+            }))
+          );
+        })
+      )
+    ),
+    showKeys ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, list.length && scrollStart ? /* @__PURE__ */ React__default.createElement(
+      "div",
+      {
+        className: classNames({
+          [`${classPrefix2}-code-current`]: true,
+          [`${classPrefix2}-code-current-current`]: true
+        })
       },
-      list.map((item, idx) => {
+      list[codeIndex][floorKey]
+    ) : null, /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-bars` }, /* @__PURE__ */ React__default.createElement(
+      "div",
+      {
+        className: `${classPrefix2}-bars-inner`,
+        onTouchStart: (event) => touchStart(event),
+        onTouchMove: (event) => touchMove(event),
+        onTouchEnd: touchEnd,
+        style: { touchAction: "pan-y" }
+      },
+      list.map((item, index) => {
         return /* @__PURE__ */ React__default.createElement(
           "div",
           {
-            className: `${classPrefix2}-list-item nut-elevator-item-${idx}`,
-            key: idx
+            className: classNames({
+              [`${classPrefix2}-bars-inner-item`]: true,
+              [`${classPrefix2}-bars-inner-item-active`]: item[floorKey] === list[codeIndex][floorKey]
+            }),
+            "data-index": index,
+            key: index,
+            onClick: () => handleClickIndex(item[floorKey])
           },
-          /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-list-item-code` }, item[floorKey]),
-          /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, item.list.map((subitem) => {
-            return /* @__PURE__ */ React__default.createElement(
-              "div",
-              {
-                className: classNames({
-                  [`${classPrefix2}-list-item-name`]: true,
-                  [`${classPrefix2}-list-item-name-highcolor`]: currentData.id === subitem.id && currentKey === item[floorKey]
-                }),
-                key: subitem.id,
-                onClick: () => handleClickItem(item[floorKey], subitem)
-              },
-              children ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(elevatorContext.Provider, { value: subitem }, children)) : subitem.name
-            );
-          }))
+          item[floorKey]
         );
       })
-    )
-  ), showKeys ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, list.length && scrollStart ? /* @__PURE__ */ React__default.createElement(
-    "div",
-    {
-      className: classNames({
-        [`${classPrefix2}-code-current`]: true,
-        [`${classPrefix2}-code-current-current`]: true
-      })
-    },
-    list[codeIndex][floorKey]
-  ) : null, /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-bars` }, /* @__PURE__ */ React__default.createElement(
-    "div",
-    {
-      className: `${classPrefix2}-bars-inner`,
-      onTouchStart: (event) => touchStart(event),
-      onTouchMove: (event) => touchMove(event),
-      onTouchEnd: touchEnd,
-      style: { touchAction: "pan-y" }
-    },
-    list.map((item, index) => {
-      return /* @__PURE__ */ React__default.createElement(
-        "div",
-        {
-          className: classNames({
-            [`${classPrefix2}-bars-inner-item`]: true,
-            [`${classPrefix2}-bars-inner-item-active`]: item[floorKey] === list[codeIndex][floorKey]
-          }),
-          "data-index": index,
-          key: index,
-          onClick: () => handleClickIndex(item[floorKey])
-        },
-        item[floorKey]
-      );
-    })
-  ))) : null, sticky && scrollY > 0 ? /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-list-fixed` }, /* @__PURE__ */ React__default.createElement("span", { className: `${classPrefix2}-list-fixed-title` }, list[codeIndex][floorKey])) : null);
+    ))) : null,
+    sticky && scrollY > 0 ? /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-list-fixed` }, /* @__PURE__ */ React__default.createElement("span", { className: `${classPrefix2}-list-fixed-title` }, list[codeIndex][floorKey])) : null
+  );
 };
 Elevator.displayName = "NutElevator";
 Elevator.Context = elevatorContext;
@@ -5205,21 +5231,6 @@ function requestAniFrame() {
   };
 }
 const requestAniFrame$1 = requestAniFrame();
-const idCounter = {};
-function uniqueId(prefix = "$nut$") {
-  if (!idCounter[prefix]) {
-    idCounter[prefix] = 0;
-  }
-  const id = ++idCounter[prefix];
-  if (prefix === "$nut$") {
-    return `${id}`;
-  }
-  return `${prefix}${id}`;
-}
-function useUuid() {
-  const idRef = useRef(uniqueId());
-  return idRef.current;
-}
 const defaultProps$18 = {
   ...ComponentDefaults,
   tabStyle: {},
@@ -9829,6 +9840,25 @@ Schema.register = function register(type4, validator) {
 Schema.warning = warning;
 Schema.messages = messages;
 Schema.validators = validators;
+function merge(...objects) {
+  const result = Array.isArray(objects[0]) ? [] : {};
+  function mergeHelper(obj, path = []) {
+    for (const [key, value] of Object.entries(obj)) {
+      const newPath = [...path, key];
+      if (Array.isArray(value)) {
+        result[key] = [...value];
+      } else if (typeof value === "object" && value !== null) {
+        if (path.some((p) => p === value)) continue;
+        if (!result[key]) result[key] = {};
+        mergeHelper(value, newPath);
+      } else {
+        result[key] = value;
+      }
+    }
+  }
+  objects.filter((obj) => !!obj).forEach((obj) => mergeHelper(obj));
+  return result;
+}
 const SECRET = "NUT_FORM_INTERNAL";
 class FormStore {
   constructor() {
@@ -9861,17 +9891,16 @@ class FormStore {
       });
       return fieldsValue;
     };
-    this.setInitialValues = (values, init) => {
+    this.setInitialValues = (initialValues, init) => {
+      this.initialValues = initialValues || {};
       if (init) {
-        this.initialValues = values;
-        this.store = values;
+        const nextStore = merge(initialValues, this.store);
+        this.updateStore(nextStore);
       }
     };
-    this.setFieldsValue = (newStore, needValidate = true) => {
-      this.store = {
-        ...this.store,
-        ...newStore
-      };
+    this.setFieldsValue = (newStore) => {
+      const nextStore = merge(this.store, newStore);
+      this.updateStore(nextStore);
       this.fieldEntities.forEach((entity) => {
         const { name } = entity.props;
         Object.keys(newStore).forEach((key) => {
@@ -9889,7 +9918,12 @@ class FormStore {
           item.entity.onStoreChange("update");
         }
       });
-      needValidate && this.validateFields();
+    };
+    this.setFieldValue = (name, value) => {
+      const store = {
+        [name]: value
+      };
+      this.setFieldsValue(store);
     };
     this.setCallback = (callback) => {
       this.callbacks = {
@@ -9900,6 +9934,10 @@ class FormStore {
     this.validateEntities = async (entity, errs) => {
       var _a;
       const { name, rules: rules2 = [] } = entity.props;
+      if (!name) {
+        console.warn("Form field missing name property");
+        return;
+      }
       const descriptor = {};
       if (rules2.length) {
         if (rules2.length > 1) {
@@ -9955,7 +9993,8 @@ class FormStore {
     };
     this.resetFields = () => {
       this.errors.length = 0;
-      this.store = this.initialValues;
+      const nextStore = merge({}, this.initialValues);
+      this.updateStore(nextStore);
       this.fieldEntities.forEach((entity) => {
         entity.onStoreChange("reset");
       });
@@ -9990,6 +10029,7 @@ class FormStore {
         getFieldValue: this.getFieldValue,
         getFieldsValue: this.getFieldsValue,
         setFieldsValue: this.setFieldsValue,
+        setFieldValue: this.setFieldValue,
         resetFields: this.resetFields,
         validateFields: this.validateFields,
         submit: this.submit,
@@ -10004,6 +10044,9 @@ class FormStore {
       }
     };
   }
+  updateStore(nextStore) {
+    this.store = nextStore;
+  }
 }
 const useForm = (form) => {
   const formRef = useRef();
@@ -10021,7 +10064,9 @@ const defaultProps$Y = {
   ...ComponentDefaults,
   labelPosition: "right",
   starPosition: "left",
+  disabled: false,
   divider: false,
+  validateTrigger: "onChange",
   onFinish: (values) => {
   },
   onFinishFailed: (values, errorFields) => {
@@ -10042,8 +10087,10 @@ const Form = React__default.forwardRef(
       children,
       initialValues,
       divider,
+      disabled,
       onFinish,
       onFinishFailed,
+      validateTrigger,
       labelPosition,
       starPosition,
       form
@@ -10071,7 +10118,7 @@ const Form = React__default.forwardRef(
       mountRef.current = true;
     }
     return /* @__PURE__ */ React__default.createElement(
-      "form",
+      Form$1,
       {
         className: classNames(
           classPrefix2,
@@ -10090,7 +10137,13 @@ const Form = React__default.forwardRef(
           resetFields();
         }
       },
-      /* @__PURE__ */ React__default.createElement(Cell.Group, { divider }, /* @__PURE__ */ React__default.createElement(Context.Provider, { value: formInstance }, children), footer ? /* @__PURE__ */ React__default.createElement(Cell, { className: `${classPrefix2}-footer` }, footer) : null)
+      /* @__PURE__ */ React__default.createElement(Cell.Group, { divider }, /* @__PURE__ */ React__default.createElement(
+        Context.Provider,
+        {
+          value: { formInstance, labelPosition, disabled, validateTrigger }
+        },
+        children
+      ), footer ? /* @__PURE__ */ React__default.createElement(Cell, { className: `${classPrefix2}-footer` }, footer) : null)
     );
   }
 );
@@ -10104,6 +10157,12 @@ function isForwardRefComponent(component) {
     }
   ).$$typeof === component.type.$$typeof;
 }
+function toArray(value) {
+  if (value === void 0 || value === null) {
+    return [];
+  }
+  return Array.isArray(value) ? value : [value];
+}
 const defaultProps$X = {
   ...ComponentDefaults,
   required: false,
@@ -10111,7 +10170,6 @@ const defaultProps$X = {
   label: "",
   rules: [{ required: false, message: "" }],
   errorMessageAlign: "left",
-  validateTrigger: "onChange",
   shouldUpdate: false,
   noStyle: false
 };
@@ -10120,15 +10178,21 @@ const _FormItem = class _FormItem extends React__default.Component {
     super(props);
     this.getControlled = (children) => {
       var _a;
-      const { setFieldsValue, getFieldValue } = this.context;
-      const { dispatch } = this.context.getInternal(SECRET);
+      const { setFieldsValue, getFieldValue } = this.context.formInstance;
+      const { dispatch } = this.context.formInstance.getInternal(SECRET);
       const { name = "" } = this.props;
       if ((_a = children == null ? void 0 : children.props) == null ? void 0 : _a.defaultValue) {
-        console.warn("通过 initialValue 设置初始值");
+        if (process.env.NODE_ENV !== "production") {
+          console.warn(
+            "[NutUI] FormItem:",
+            "请通过 initialValue 设置初始值，而不是 defaultValue"
+          );
+        }
       }
       const fieldValue = getFieldValue(name);
       const controlled = {
         ...children.props,
+        className: children.props.className,
         [this.props.valuePropName || "value"]: fieldValue !== void 0 ? fieldValue : this.props.initialValue,
         [this.props.trigger || "onChange"]: (...args) => {
           const originOnChange = children.props[this.props.trigger || "onChange"];
@@ -10139,27 +10203,25 @@ const _FormItem = class _FormItem extends React__default.Component {
           if (this.props.getValueFromEvent) {
             next = this.props.getValueFromEvent(...args);
           }
-          setFieldsValue({ [name]: next }, false);
+          setFieldsValue({ [name]: next });
         }
       };
       const { validateTrigger } = this.props;
-      let validateTriggers = [this.props.trigger || "onChange"];
-      if (validateTrigger) {
-        validateTriggers = typeof validateTrigger === "string" ? [validateTrigger] : [...validateTrigger];
-        validateTriggers.forEach((trigger) => {
-          const originTrigger = controlled[trigger];
-          controlled[trigger] = (...args) => {
-            if (originTrigger) {
-              originTrigger(...args);
-            }
-            if (this.props.rules && this.props.rules.length) {
-              dispatch({
-                name: this.props.name
-              });
-            }
-          };
-        });
-      }
+      const mergedValidateTrigger = validateTrigger || this.context.validateTrigger;
+      const validateTriggers = toArray(mergedValidateTrigger);
+      validateTriggers.forEach((trigger) => {
+        const originTrigger = controlled[trigger];
+        controlled[trigger] = (...args) => {
+          if (originTrigger) {
+            originTrigger(...args);
+          }
+          if (this.props.rules && this.props.rules.length) {
+            dispatch({
+              name: this.props.name
+            });
+          }
+        };
+      });
       if (isForwardRefComponent(children)) {
         controlled.ref = (componentInstance) => {
           const originRef = children.ref;
@@ -10183,7 +10245,7 @@ const _FormItem = class _FormItem extends React__default.Component {
     };
     this.onStoreChange = (type4) => {
       if (type4 === "reset") {
-        this.context.errors[this.props.name] = [];
+        this.context.formInstance.errors[this.props.name] = [];
         this.refresh();
       } else {
         this.forceUpdate();
@@ -10198,37 +10260,50 @@ const _FormItem = class _FormItem extends React__default.Component {
         rules: rules2,
         className,
         style,
-        align,
-        errorMessageAlign
+        errorMessageAlign,
+        align
       } = {
         ...defaultProps$X,
         ...this.props
       };
       const requiredInRules = rules2 == null ? void 0 : rules2.some((rule) => rule.required);
-      const item = name ? this.context.errors[name] : [];
-      const { starPosition } = this.context;
-      const renderStar = (required4 || requiredInRules) && /* @__PURE__ */ React__default.createElement("i", { className: "required" });
-      const renderLabel = /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, starPosition === "left" ? renderStar : null, label, starPosition === "right" ? renderStar : null);
+      const item = name ? this.context.formInstance.errors[name] : [];
+      const { starPosition } = this.context.formInstance;
+      const renderStar = (required4 || requiredInRules) && /* @__PURE__ */ React__default.createElement(Text, { className: "nut-form-item-label-required required" }, "*");
+      const renderLabel = /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(Text, { className: "nut-form-item-labeltxt" }, starPosition === "left" ? renderStar : null, label), starPosition === "right" ? renderStar : null);
       return /* @__PURE__ */ React__default.createElement(
         Cell,
         {
-          className: `nut-form-item ${className}`,
+          className: `${this.getClassNameWithDirection("nut-form-item")} ${className}`,
           style,
           align,
           onClick: (e2) => this.props.onClick && this.props.onClick(e2, this.componentRef)
         },
-        label ? /* @__PURE__ */ React__default.createElement("div", { className: "nut-cell-title nut-form-item-label" }, renderLabel) : null,
-        /* @__PURE__ */ React__default.createElement("div", { className: "nut-cell-value nut-form-item-body" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-form-item-body-slots" }, childNode), /* @__PURE__ */ React__default.createElement(
-          "div",
+        label ? /* @__PURE__ */ React__default.createElement(
+          View,
           {
-            className: "nut-form-item-body-tips",
-            style: {
-              textAlign: errorMessageAlign,
-              display: (item == null ? void 0 : item.length) ? "initial" : "none"
-            }
+            className: `nut-cell-title ${this.getClassNameWithDirection("nut-form-item-label")}`
           },
-          (_a = item == null ? void 0 : item[0]) == null ? void 0 : _a.message
-        ))
+          renderLabel
+        ) : null,
+        /* @__PURE__ */ React__default.createElement(
+          View,
+          {
+            className: `nut-cell-value ${this.getClassNameWithDirection("nut-form-item-body")}`
+          },
+          /* @__PURE__ */ React__default.createElement(View, { className: "nut-form-item-body-slots" }, childNode),
+          /* @__PURE__ */ React__default.createElement(
+            View,
+            {
+              className: "nut-form-item-body-tips",
+              style: {
+                textAlign: errorMessageAlign,
+                display: (item == null ? void 0 : item.length) ? "initial" : "none"
+              }
+            },
+            (_a = item == null ? void 0 : item[0]) == null ? void 0 : _a.message
+          )
+        )
       );
     };
     this.componentRef = React__default.createRef();
@@ -10237,14 +10312,14 @@ const _FormItem = class _FormItem extends React__default.Component {
     };
   }
   componentDidMount() {
-    const { store = {}, setInitialValues } = this.context.getInternal(SECRET);
+    const { store = {}, setInitialValues } = this.context.formInstance.getInternal(SECRET);
     if (this.props.initialValue && this.props.name && !Object.keys(store).includes(this.props.name)) {
       setInitialValues(
         { ...store, [this.props.name]: this.props.initialValue },
         true
       );
     }
-    const { registerField, registerUpdate } = this.context.getInternal(SECRET);
+    const { registerField, registerUpdate } = this.context.formInstance.getInternal(SECRET);
     this.cancelRegister = registerField(this);
     this.eventOff = registerUpdate(this, this.props.shouldUpdate);
   }
@@ -10256,6 +10331,12 @@ const _FormItem = class _FormItem extends React__default.Component {
       this.eventOff();
     }
   }
+  getClassNameWithDirection(className) {
+    if (className && this.context.labelPosition) {
+      return `${className} ${className}-${this.context.labelPosition}`;
+    }
+    return className;
+  }
   render() {
     const { children } = this.props;
     const child = Array.isArray(children) ? children[0] : children;
@@ -10266,9 +10347,16 @@ const _FormItem = class _FormItem extends React__default.Component {
         this.getControlled(child)
       );
     } else {
-      returnChildNode = child(this.context);
+      returnChildNode = child(this.context.formInstance);
     }
-    return /* @__PURE__ */ React__default.createElement(React__default.Fragment, { key: this.state.resetCount }, this.props.noStyle ? returnChildNode : this.renderLayout(returnChildNode));
+    return /* @__PURE__ */ React__default.createElement(React__default.Fragment, { key: this.state.resetCount }, /* @__PURE__ */ React__default.createElement(
+      View,
+      {
+        className: this.context.disabled ? "nut-form-item-disabled" : "",
+        catchMove: this.context.disabled
+      },
+      this.props.noStyle ? returnChildNode : this.renderLayout(returnChildNode)
+    ));
   }
 };
 _FormItem.defaultProps = defaultProps$X;
@@ -13150,6 +13238,7 @@ const InternalUploader = (props, ref) => {
     }
   };
   const readFile = (files) => {
+    const results = [];
     files.forEach((file, index) => {
       var _a, _b;
       let fileType = file.type;
@@ -13185,8 +13274,9 @@ const InternalUploader = (props, ref) => {
         fileItem.url = fileType === "video" ? file.thumbTempFilePath : filepath;
       }
       executeUpload(fileItem, index);
-      setFileList([...fileList, fileItem]);
+      results.push(fileItem);
     });
+    setFileList([...fileList, ...results]);
   };
   const filterFiles = (files) => {
     const maximum = maxCount * 1;
@@ -13782,6 +13872,12 @@ const Drag = (props) => {
   );
 };
 Drag.displayName = "NutDrag";
+const getButtonType = (actions, index) => {
+  if (!actions || actions.length === 0) return "default";
+  const action = actions[index];
+  if (action.type) return action.type;
+  return actions.length > 1 && index === 0 ? "default" : "primary";
+};
 const defaultStatus = {
   empty: "https://storage.360buyimg.com/imgtools/30186cfda0-0d3eee40-c0ac-11ee-9382-9125782aa3b8.png",
   error: "https://storage.360buyimg.com/imgtools/f3278d0ebb-0ce360c0-c0ac-11ee-8375-193101bb1a46.png",
@@ -13845,10 +13941,13 @@ const Empty = (props) => {
           [`${classPrefix$f}-actions-right`]: actions.length === 1,
           [`${classPrefix$f}-actions-left`]: actions.length > 1 && index === 0
         }),
-        type: `${actions.length > 1 && index === 0 ? "default" : "primary"}`,
-        size: "small",
-        fill: "outline",
-        key: `action-${index}`
+        style: item.style,
+        type: getButtonType(actions, index),
+        size: item.size || "small",
+        fill: item.fill || "outline",
+        disabled: item.disabled || false,
+        key: `action-${index}`,
+        onClick: item.onClick || (() => void 0)
       },
       item == null ? void 0 : item.text
     );