@nutui/nutui-react-taro 2.7.1 → 2.7.3

package/dist/esm/{formitem.taro-CEWRz5EJ.js → formitem.taro-CU6rrcJD.js}

@@ -1,9 +1,31 @@
 import React__default, { createContext, useRef } from "react";
+import { Text, View } from "@tarojs/components";
 import { C as Cell } from "./cell.taro-DWLhb5m6.js";
 import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
 import { a as __awaiter } from "./tslib.es6-iWu3F_1J.js";
 import Schema from "async-validator";
 const Context = createContext({});
+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() {
@@ -36,14 +58,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 = Object.assign(Object.assign({}, 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) => {
@@ -61,7 +85,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 = Object.assign(Object.assign({}, this.callbacks), callback);
@@ -69,6 +98,10 @@ class FormStore {
     this.validateEntities = (entity, errs) => __awaiter(this, void 0, void 0, function* () {
       var _a;
       const { name, rules = [] } = entity.props;
+      if (!name) {
+        console.warn("Form field missing name property");
+        return;
+      }
       const descriptor = {};
       if (rules.length) {
         if (rules.length > 1) {
@@ -120,7 +153,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");
       });
@@ -155,6 +189,7 @@ class FormStore {
         getFieldValue: this.getFieldValue,
         getFieldsValue: this.getFieldsValue,
         setFieldsValue: this.setFieldsValue,
+        setFieldValue: this.setFieldValue,
         resetFields: this.resetFields,
         validateFields: this.validateFields,
         submit: this.submit,
@@ -169,6 +204,9 @@ class FormStore {
       }
     };
   }
+  updateStore(nextStore) {
+    this.store = nextStore;
+  }
 }
 const useForm = (form) => {
   const formRef = useRef();
@@ -191,20 +229,28 @@ function isForwardRefComponent(component) {
     }
   ).$$typeof === component.type.$$typeof;
 }
-const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { required: false, name: "", label: "", rules: [{ required: false, message: "" }], errorMessageAlign: "left", validateTrigger: "onChange", shouldUpdate: false, noStyle: false });
+function toArray(value) {
+  if (value === void 0 || value === null) {
+    return [];
+  }
+  return Array.isArray(value) ? value : [value];
+}
+const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { required: false, name: "", label: "", rules: [{ required: false, message: "" }], errorMessageAlign: "left", shouldUpdate: false, noStyle: false });
 class FormItem extends React__default.Component {
   constructor(props) {
     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 || children === void 0 ? void 0 : children.props) === null || _a === void 0 ? 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 = Object.assign(Object.assign({}, children.props), { [this.props.valuePropName || "value"]: fieldValue !== void 0 ? fieldValue : this.props.initialValue, [this.props.trigger || "onChange"]: (...args) => {
+      const controlled = Object.assign(Object.assign({}, 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"];
         if (originOnChange) {
           originOnChange(...args);
@@ -213,26 +259,24 @@ 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;
@@ -256,7 +300,7 @@ class FormItem extends React__default.Component {
     };
     this.onStoreChange = (type) => {
       if (type === "reset") {
-        this.context.errors[this.props.name] = [];
+        this.context.formInstance.errors[this.props.name] = [];
         this.refresh();
       } else {
         this.forceUpdate();
@@ -264,27 +308,31 @@ class FormItem extends React__default.Component {
     };
     this.renderLayout = (childNode) => {
       var _a;
-      const { label, name, required, rules, className, style, align, errorMessageAlign } = Object.assign(Object.assign({}, defaultProps), this.props);
+      const { label, name, required, rules, className, style, errorMessageAlign, align } = Object.assign(Object.assign({}, defaultProps), this.props);
       const requiredInRules = rules === null || rules === void 0 ? void 0 : rules.some((rule) => rule.required);
-      const item = name ? this.context.errors[name] : [];
-      const { starPosition } = this.context;
-      const renderStar = (required || requiredInRules) && React__default.createElement("i", { className: "required" });
+      const item = name ? this.context.formInstance.errors[name] : [];
+      const { starPosition } = this.context.formInstance;
+      const renderStar = (required || requiredInRules) && React__default.createElement(Text, { className: "nut-form-item-label-required required" }, "*");
       const renderLabel = React__default.createElement(
         React__default.Fragment,
         null,
-        starPosition === "left" ? renderStar : null,
-        label,
+        React__default.createElement(
+          Text,
+          { className: "nut-form-item-labeltxt" },
+          starPosition === "left" ? renderStar : null,
+          label
+        ),
         starPosition === "right" ? renderStar : null
       );
       return React__default.createElement(
         Cell,
-        { className: `nut-form-item ${className}`, style, align, onClick: (e) => this.props.onClick && this.props.onClick(e, this.componentRef) },
-        label ? React__default.createElement("div", { className: "nut-cell-title nut-form-item-label" }, renderLabel) : null,
+        { className: `${this.getClassNameWithDirection("nut-form-item")} ${className}`, style, align, onClick: (e) => this.props.onClick && this.props.onClick(e, this.componentRef) },
+        label ? React__default.createElement(View, { className: `nut-cell-title ${this.getClassNameWithDirection("nut-form-item-label")}` }, renderLabel) : null,
         React__default.createElement(
-          "div",
-          { className: "nut-cell-value nut-form-item-body" },
-          React__default.createElement("div", { className: "nut-form-item-body-slots" }, childNode),
-          React__default.createElement("div", { className: "nut-form-item-body-tips", style: {
+          View,
+          { className: `nut-cell-value ${this.getClassNameWithDirection("nut-form-item-body")}` },
+          React__default.createElement(View, { className: "nut-form-item-body-slots" }, childNode),
+          React__default.createElement(View, { className: "nut-form-item-body-tips", style: {
             textAlign: errorMessageAlign,
             display: (item === null || item === void 0 ? void 0 : item.length) ? "initial" : "none"
           } }, (_a = item === null || item === void 0 ? void 0 : item[0]) === null || _a === void 0 ? void 0 : _a.message)
@@ -297,11 +345,11 @@ 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(Object.assign(Object.assign({}, 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);
   }
@@ -313,6 +361,12 @@ 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;
@@ -320,9 +374,13 @@ class FormItem extends React__default.Component {
     if (!this.props.shouldUpdate) {
       returnChildNode = React__default.cloneElement(child, this.getControlled(child));
     } else {
-      returnChildNode = child(this.context);
+      returnChildNode = child(this.context.formInstance);
     }
-    return React__default.createElement(React__default.Fragment, { key: this.state.resetCount }, this.props.noStyle ? returnChildNode : this.renderLayout(returnChildNode));
+    return React__default.createElement(
+      React__default.Fragment,
+      { key: this.state.resetCount },
+      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;

package/dist/esm/nutui-react.es.js

@@ -14,7 +14,7 @@ import { S } from "./space.taro-B1KsEPZL.js";
 import { S as S2 } from "./sticky.taro-DC98CdU7.js";
 import { S as S3 } from "./safearea.taro-BJpvFsMf.js";
 import { B as B2 } from "./backtop.taro-D3Lo3jFO.js";
-import { E } from "./elevator.taro-Bsc8PcT0.js";
+import { E } from "./elevator.taro-C0Gs93x7.js";
 import { F } from "./fixednav.taro-BodErnYy.js";
 import { N } from "./navbar.taro-HRFRDGii.js";
 import { S as S4 } from "./sidenavbar.taro-C-AoUXLA.js";
@@ -32,7 +32,7 @@ import { C as C8 } from "./cascader.taro-DRE3asjI.js";
 import { C as C9, a as a2 } from "./checkbox.taro-CgqJyhrh.js";
 import { D as D2 } from "./datepicker.taro-DU4OSraL.js";
 import { default as default2 } from "./Form.js";
-import { F as F2 } from "./formitem.taro-CEWRz5EJ.js";
+import { F as F2 } from "./formitem.taro-CU6rrcJD.js";
 import { I as I2 } from "./input.taro-CA9ZpM9a.js";
 import { I as I3 } from "./inputnumber.taro-CZourWz-.js";
 import { M } from "./menu.taro-BmjnA_YM.js";
@@ -47,12 +47,12 @@ import { S as S8 } from "./shortpassword.taro-CUnXqjab.js";
 import { S as S9 } from "./signature.taro-BW4eiGIR.js";
 import { S as S10 } from "./switch.taro-CdBmDo18.js";
 import { T as T5 } from "./textarea.taro-PsaohYay.js";
-import { U } from "./uploader.taro-CceZ5Y4t.js";
+import { U } from "./uploader.taro-C3hV5Aih.js";
 import { A as A2 } from "./actionsheet.taro-kMhbV73n.js";
 import { B as B3 } from "./badge.taro-B42_7q8v.js";
 import { B as B4 } from "./dialog.taro-yjDaaRHA.js";
 import { D as D3 } from "./drag.taro-B_sfzmtW.js";
-import { E as E2 } from "./empty.taro-Dt07kty5.js";
+import { E as E2 } from "./empty.taro-DhCHSdca.js";
 import { I as I4 } from "./infiniteloading.taro-DzIrZvc0.js";
 import { L as L2 } from "./loading.taro-n_qoNgCW.js";
 import { N as N3 } from "./noticebar.taro-BjKDC7We.js";

package/dist/esm/{uploader.taro-CceZ5Y4t.js → uploader.taro-C3hV5Aih.js}

@@ -365,6 +365,7 @@ const InternalUploader = (props, ref) => {
     }
   };
   const readFile = (files) => {
+    const results = [];
     files.forEach((file, index) => {
       var _a2, _b;
       let fileType = file.type;
@@ -400,8 +401,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;

package/dist/locales/base.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.7.1 Fri Nov 22 2024 15:43:35 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react-taro v2.7.3 Fri Dec 13 2024 15:48:17 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/en-US.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.7.1 Fri Nov 22 2024 15:43:35 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react-taro v2.7.3 Fri Dec 13 2024 15:48:17 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/id-ID.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.7.1 Fri Nov 22 2024 15:43:35 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react-taro v2.7.3 Fri Dec 13 2024 15:48:17 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/tr-TR.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.7.1 Fri Nov 22 2024 15:43:35 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react-taro v2.7.3 Fri Dec 13 2024 15:48:17 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-CN.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.7.1 Fri Nov 22 2024 15:43:35 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react-taro v2.7.3 Fri Dec 13 2024 15:48:17 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-TW.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.7.1 Fri Nov 22 2024 15:43:35 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react-taro v2.7.3 Fri Dec 13 2024 15:48:17 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-UG.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.7.1 Fri Nov 22 2024 15:43:35 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react-taro v2.7.3 Fri Dec 13 2024 15:48:17 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */