@nutui/nutui-react 2.7.1 → 2.7.3

package/dist/esm/formitem2.js

@@ -4,6 +4,27 @@ import { C as ComponentDefaults } from "./typings.js";
 import { a as __awaiter } from "./tslib.es6.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 +57,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,49 +84,61 @@ 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);
     };
-    this.validateFields = (nameList) => __awaiter(this, void 0, void 0, function* () {
+    this.validateEntities = (entity, errs) => __awaiter(this, void 0, void 0, function* () {
       var _a;
-      let filterEntitys = [];
-      const errs = [];
-      this.errors.length = 0;
-      if (!nameList || nameList.length === 0) {
-        filterEntitys = this.fieldEntities;
-      } else {
-        filterEntitys = this.fieldEntities.filter(({ props: { name } }) => nameList.includes(name));
+      const { name, rules = [] } = entity.props;
+      if (!name) {
+        console.warn("Form field missing name property");
+        return;
       }
-      for (const entity of filterEntitys) {
-        const { name, rules = [] } = entity.props;
-        const descriptor = {};
-        if (rules.length) {
-          if (rules.length > 1) {
-            descriptor[name] = [];
-            rules.forEach((v) => {
-              descriptor[name].push(v);
-            });
-          } else {
-            descriptor[name] = rules[0];
-          }
+      const descriptor = {};
+      if (rules.length) {
+        if (rules.length > 1) {
+          descriptor[name] = [];
+          rules.forEach((v) => {
+            descriptor[name].push(v);
+          });
+        } else {
+          descriptor[name] = rules[0];
         }
-        const validator = new Schema(descriptor);
-        try {
-          yield validator.validate({ [name]: (_a = this.store) === null || _a === void 0 ? void 0 : _a[name] });
-        } catch ({ errors }) {
-          if (errors) {
-            errs.push(...errors);
-            this.errors[name] = errors;
-          }
-        } finally {
-          if (!errs || errs.length === 0) {
-            this.errors[name] = [];
-          }
+      }
+      const validator = new Schema(descriptor);
+      try {
+        yield validator.validate({ [name]: (_a = this.store) === null || _a === void 0 ? void 0 : _a[name] });
+      } catch ({ errors }) {
+        if (errors) {
+          errs.push(...errors);
+          this.errors[name] = errors;
+        }
+      } finally {
+        if (!errs || errs.length === 0) {
+          this.errors[name] = [];
         }
-        entity.onStoreChange("validate");
       }
+      entity.onStoreChange("validate");
+    });
+    this.validateFields = (nameList) => __awaiter(this, void 0, void 0, function* () {
+      let filterEntities = [];
+      this.errors.length = 0;
+      if (!nameList || nameList.length === 0) {
+        filterEntities = this.fieldEntities;
+      } else {
+        filterEntities = this.fieldEntities.filter(({ props: { name } }) => nameList.includes(name));
+      }
+      const errs = [];
+      yield Promise.all(filterEntities.map((entity) => __awaiter(this, void 0, void 0, function* () {
+        yield this.validateEntities(entity, errs);
+      })));
       return errs;
     });
     this.submit = () => __awaiter(this, void 0, void 0, function* () {
@@ -117,7 +152,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");
       });
@@ -152,6 +188,7 @@ class FormStore {
         getFieldValue: this.getFieldValue,
         getFieldsValue: this.getFieldsValue,
         setFieldsValue: this.setFieldsValue,
+        setFieldValue: this.setFieldValue,
         resetFields: this.resetFields,
         validateFields: this.validateFields,
         submit: this.submit,
@@ -166,6 +203,9 @@ class FormStore {
       }
     };
   }
+  updateStore(nextStore) {
+    this.store = nextStore;
+  }
 }
 const useForm = (form) => {
   const formRef = useRef();
@@ -188,20 +228,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);
@@ -210,26 +258,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;
@@ -253,7 +299,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();
@@ -262,23 +308,27 @@ class FormItem extends React__default.Component {
     this.renderLayout = (childNode) => {
       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("div", { className: "nut-form-item-label-required required" }, "*");
       const renderLabel = React__default.createElement(
         React__default.Fragment,
         null,
-        starPosition === "left" ? renderStar : null,
-        label,
+        React__default.createElement(
+          "span",
+          { className: "nut-form-item-labeltxt" },
+          starPosition === "left" ? renderStar : null,
+          label
+        ),
         starPosition === "right" ? renderStar : null
       );
       return React__default.createElement(
         Cell__default,
-        { 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("div", { className: `nut-cell-title ${this.getClassNameWithDirection("nut-form-item-label")}` }, renderLabel) : null,
         React__default.createElement(
           "div",
-          { className: "nut-cell-value nut-form-item-body" },
+          { className: `nut-cell-value ${this.getClassNameWithDirection("nut-form-item-body")}` },
           React__default.createElement("div", { className: "nut-form-item-body-slots" }, childNode),
           item && item.length > 0 && React__default.createElement("div", { className: "nut-form-item-body-tips", style: { textAlign: errorMessageAlign } }, item[0].message)
         )
@@ -290,11 +340,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);
   }
@@ -306,6 +356,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;
@@ -313,9 +369,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("div", { className: this.context.disabled ? "nut-form-item-disabled" : "" }, this.props.noStyle ? returnChildNode : this.renderLayout(returnChildNode))
+    );
   }
 }
 FormItem.defaultProps = defaultProps;

package/dist/locales/base.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react v2.7.1 Fri Nov 22 2024 15:45:24 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react v2.7.3 Fri Dec 13 2024 15:51:20 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 v2.7.1 Fri Nov 22 2024 15:45:24 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react v2.7.3 Fri Dec 13 2024 15:51:20 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 v2.7.1 Fri Nov 22 2024 15:45:24 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react v2.7.3 Fri Dec 13 2024 15:51:20 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 v2.7.1 Fri Nov 22 2024 15:45:24 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react v2.7.3 Fri Dec 13 2024 15:51:20 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 v2.7.1 Fri Nov 22 2024 15:45:24 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react v2.7.3 Fri Dec 13 2024 15:51:20 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 v2.7.1 Fri Nov 22 2024 15:45:24 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react v2.7.3 Fri Dec 13 2024 15:51:20 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 v2.7.1 Fri Nov 22 2024 15:45:24 GMT+0800 (Central Standard Time)
+* @nutui/nutui-react v2.7.3 Fri Dec 13 2024 15:51:20 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */