@hi-ui/form 4.3.2 → 4.3.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @hi-ui/form
 
+## 4.3.4
+
+### Patch Changes
+
+- [#3476](https://github.com/XiaoMi/hiui/pull/3476) [`b12cd78`](https://github.com/XiaoMi/hiui/commit/b12cd78a3e701a0efaacc6f14705a0afcb0fae08) Thanks [@zyprepare](https://github.com/zyprepare)! - fix(form): 修复当 initialValues 为 {} 时无法正常重置表单问题 (#3475)
+
+## 4.3.3
+
+### Patch Changes
+
+- [#3277](https://github.com/XiaoMi/hiui/pull/3277) [`93df0aaff`](https://github.com/XiaoMi/hiui/commit/93df0aafff09be59faeb4bad0ceea57a00df5ccf) Thanks [@zyprepare](https://github.com/zyprepare)! - fix(form): 处理规则消息为空的情况，将其设置为 undefined (#3276)
+
+- [#3275](https://github.com/XiaoMi/hiui/pull/3275) [`b2b66a9e7`](https://github.com/XiaoMi/hiui/commit/b2b66a9e73a1a92d6b0604dc2ad711895154e518) Thanks [@zyprepare](https://github.com/zyprepare)! - fix(form): 优化 valueType 为 number 情况下的校验逻辑 (#3274)
+
 ## 4.3.2
 
 ### Patch Changes

package/lib/cjs/use-form-field.js

@@ -63,6 +63,9 @@ var useFormField = function useFormField(props) {
     // TODO: rules 处理成 Async Validate 的指定结构
     var fieldMD5 = index.stringify(field);
     var modifiedFieldRules = fieldRules.map(function (rule) {
+      if (rule.message === null || rule.message === '') {
+        rule.message = undefined;
+      }
       // 重写 rule 的 validator 函数，正则匹配 validatorRule 中的 field 和 fullField，消除 field 和 fullField 中的双引号
       // issue：https://github.com/XiaoMi/hiui/issues/2931
       if (rule.validator) {
@@ -79,7 +82,17 @@ var useFormField = function useFormField(props) {
       } else return Object.assign({}, rule);
     });
     var validater = new Validater__default["default"]((_Validater = {}, _Validater[fieldMD5] = modifiedFieldRules, _Validater));
-    return validater.validate((_validater$validate = {}, _validater$validate[fieldMD5] = valueType !== 'number' || value === '' ? value : isNaN(value) ? value : Number(value), _validater$validate), {
+    var valueToValidate = value;
+    if (valueType === 'number') {
+      if (typeAssertion.isNullish(value) || value === '') {
+        valueToValidate = value;
+      } else if (isNaN(value)) {
+        valueToValidate = value;
+      } else {
+        valueToValidate = Number(value);
+      }
+    }
+    return validater.validate((_validater$validate = {}, _validater$validate[fieldMD5] = valueToValidate, _validater$validate), {
       firstFields: true
     });
   }, [fieldRules, field, valueType]);

package/lib/cjs/use-form.js

@@ -365,7 +365,7 @@ var useForm = function useForm(_a) {
   var onResetLatestRef = useLatest.useLatestRef(onReset);
   var resetForm = React.useCallback(function (nextState) {
     return tslib.__awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
-      var values, errors, touched, submitting, validating, dispatchFn;
+      var values, errors, touched, registeredKeys, formValues, submitting, validating, dispatchFn;
       return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -373,6 +373,32 @@ var useForm = function useForm(_a) {
               values = nextState && nextState.values ? nextState.values : initialValuesRef.current;
               errors = nextState && nextState.errors ? nextState.errors : initialErrorsRef.current;
               touched = nextState && nextState.touched ? nextState.touched : initialTouchedRef.current;
+              registeredKeys = getRegisteredKeys();
+              formValues = formState.values; // 处理缺失的字段：如果 registeredKeys 中的字段在 values 中不存在，
+              // 则根据 formValues 中对应字段的类型设置对应的空值
+              if (registeredKeys.length > 0) {
+                // 确保 values 是一个对象
+                if (!values || _typeof(values) !== 'object' || typeAssertion.isArray(values)) {
+                  values = {};
+                } else {
+                  // 浅拷贝 values 避免修改原始对象
+                  values = Object.assign({}, values);
+                }
+                registeredKeys.forEach(function (field) {
+                  // 检查字段是否存在于 values 中
+                  var valueInReset = objectUtils.getNested(values, field);
+                  // 如果字段不存在（undefined），则根据 formValues 中的类型设置空值
+                  if (valueInReset === undefined) {
+                    var currentValue = objectUtils.getNested(formValues, field);
+                    // 如果当前值存在（包括 null），根据其类型设置对应的空值
+                    if (currentValue !== undefined) {
+                      var emptyValue = index.getEmptyValueByType(currentValue);
+                      // setNested 返回新对象，需要重新赋值
+                      values = objectUtils.setNested(values, field, emptyValue);
+                    }
+                  }
+                });
+              }
               initialValuesRef.current = values;
               // @ts-ignore
               initialErrorsRef.current = errors;
@@ -392,25 +418,25 @@ var useForm = function useForm(_a) {
                 });
               };
               if (!onResetLatestRef.current) {
-                _context2.next = 15;
+                _context2.next = 18;
                 break;
               }
-              _context2.next = 12;
+              _context2.next = 15;
               return onResetLatestRef.current(formState.values);
-            case 12:
+            case 15:
               dispatchFn();
-              _context2.next = 16;
+              _context2.next = 19;
               break;
-            case 15:
+            case 18:
               dispatchFn();
-            case 16:
+            case 19:
             case "end":
               return _context2.stop();
           }
         }
       }, _callee2);
     }));
-  }, [onResetLatestRef, formState.values]);
+  }, [formState.values, getRegisteredKeys, onResetLatestRef]);
   /**
    * 表单提交
    */

package/lib/cjs/utils/index.js

@@ -9,6 +9,7 @@
  */
 'use strict';
 
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, '__esModule', {
   value: true
 });
@@ -40,6 +41,65 @@ var mergeValues = function mergeValues(source, override) {
   }
   return target;
 };
+/**
+ * 根据值的类型返回对应的空值
+ */
+var getEmptyValueByType = function getEmptyValueByType(value) {
+  // 优先处理特殊对象类型（instanceof 检查）
+  if (typeAssertion.isArray(value)) {
+    return [];
+  }
+  if (value instanceof Date) {
+    return null;
+  }
+  if (value instanceof RegExp) {
+    return /(?:)/;
+  }
+  if (value instanceof Map) {
+    return new Map();
+  }
+  if (value instanceof Set) {
+    return new Set();
+  }
+  // 注意：WeakMap 和 WeakSet 无法创建空实例，返回 null
+  if (value instanceof WeakMap) {
+    return null;
+  }
+  if (value instanceof WeakSet) {
+    return null;
+  }
+  // 处理基本类型（typeof 检查）
+  if (_typeof(value) === 'symbol') {
+    return Symbol('');
+  }
+  if (typeof value === 'bigint') {
+    return BigInt(0);
+  }
+  if (typeof value === 'string') {
+    return '';
+  }
+  if (typeof value === 'number') {
+    return null;
+  }
+  if (typeof value === 'boolean') {
+    return false;
+  }
+  if (typeof value === 'function') {
+    // 函数类型重置为 undefined，因为函数不应该作为表单值
+    return undefined;
+  }
+  // 对于 null 值，保持为 null
+  if (value === null) {
+    return null;
+  }
+  // 处理普通对象（必须在所有 instanceof 检查之后）
+  if (_typeof(value) === 'object') {
+    return {};
+  }
+  // 其他类型（包括 undefined）默认返回 undefined
+  return undefined;
+};
+exports.getEmptyValueByType = getEmptyValueByType;
 exports.isValidField = isValidField;
 exports.mergeValues = mergeValues;
 exports.parse = parse;

package/lib/esm/use-form-field.js

@@ -9,7 +9,7 @@
  */
 import { useMemo, useCallback, useEffect } from 'react';
 import { useFormContext } from './context.js';
-import { isArrayNonEmpty } from '@hi-ui/type-assertion';
+import { isArrayNonEmpty, isNullish } from '@hi-ui/type-assertion';
 import Validater from 'async-validator';
 import { normalizeArray } from '@hi-ui/array-utils';
 import { stringify, isValidField } from './utils/index.js';
@@ -51,6 +51,9 @@ var useFormField = function useFormField(props) {
     // TODO: rules 处理成 Async Validate 的指定结构
     var fieldMD5 = stringify(field);
     var modifiedFieldRules = fieldRules.map(function (rule) {
+      if (rule.message === null || rule.message === '') {
+        rule.message = undefined;
+      }
       // 重写 rule 的 validator 函数，正则匹配 validatorRule 中的 field 和 fullField，消除 field 和 fullField 中的双引号
       // issue：https://github.com/XiaoMi/hiui/issues/2931
       if (rule.validator) {
@@ -67,7 +70,17 @@ var useFormField = function useFormField(props) {
       } else return Object.assign({}, rule);
     });
     var validater = new Validater((_Validater = {}, _Validater[fieldMD5] = modifiedFieldRules, _Validater));
-    return validater.validate((_validater$validate = {}, _validater$validate[fieldMD5] = valueType !== 'number' || value === '' ? value : isNaN(value) ? value : Number(value), _validater$validate), {
+    var valueToValidate = value;
+    if (valueType === 'number') {
+      if (isNullish(value) || value === '') {
+        valueToValidate = value;
+      } else if (isNaN(value)) {
+        valueToValidate = value;
+      } else {
+        valueToValidate = Number(value);
+      }
+    }
+    return validater.validate((_validater$validate = {}, _validater$validate[fieldMD5] = valueToValidate, _validater$validate), {
       firstFields: true
     });
   }, [fieldRules, field, valueType]);

package/lib/esm/use-form.js

@@ -10,7 +10,7 @@ import _typeof from "@babel/runtime/helpers/esm/typeof";
  */
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import { __rest, __awaiter } from 'tslib';
-import { stringify, parse, mergeValues, isValidField } from './utils/index.js';
+import { stringify, parse, mergeValues, getEmptyValueByType, isValidField } from './utils/index.js';
 import React, { useMemo, useRef, useReducer, useCallback } from 'react';
 import scrollIntoView from 'scroll-into-view-if-needed';
 import { useLatestRef, useLatestCallback } from '@hi-ui/use-latest';
@@ -352,7 +352,7 @@ var useForm = function useForm(_a) {
   var onResetLatestRef = useLatestRef(onReset);
   var resetForm = useCallback(function (nextState) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var values, errors, touched, submitting, validating, dispatchFn;
+      var values, errors, touched, registeredKeys, formValues, submitting, validating, dispatchFn;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -360,6 +360,32 @@ var useForm = function useForm(_a) {
               values = nextState && nextState.values ? nextState.values : initialValuesRef.current;
               errors = nextState && nextState.errors ? nextState.errors : initialErrorsRef.current;
               touched = nextState && nextState.touched ? nextState.touched : initialTouchedRef.current;
+              registeredKeys = getRegisteredKeys();
+              formValues = formState.values; // 处理缺失的字段：如果 registeredKeys 中的字段在 values 中不存在，
+              // 则根据 formValues 中对应字段的类型设置对应的空值
+              if (registeredKeys.length > 0) {
+                // 确保 values 是一个对象
+                if (!values || _typeof(values) !== 'object' || isArray(values)) {
+                  values = {};
+                } else {
+                  // 浅拷贝 values 避免修改原始对象
+                  values = Object.assign({}, values);
+                }
+                registeredKeys.forEach(function (field) {
+                  // 检查字段是否存在于 values 中
+                  var valueInReset = getNested(values, field);
+                  // 如果字段不存在（undefined），则根据 formValues 中的类型设置空值
+                  if (valueInReset === undefined) {
+                    var currentValue = getNested(formValues, field);
+                    // 如果当前值存在（包括 null），根据其类型设置对应的空值
+                    if (currentValue !== undefined) {
+                      var emptyValue = getEmptyValueByType(currentValue);
+                      // setNested 返回新对象，需要重新赋值
+                      values = setNested(values, field, emptyValue);
+                    }
+                  }
+                });
+              }
               initialValuesRef.current = values;
               // @ts-ignore
               initialErrorsRef.current = errors;
@@ -379,25 +405,25 @@ var useForm = function useForm(_a) {
                 });
               };
               if (!onResetLatestRef.current) {
-                _context2.next = 15;
+                _context2.next = 18;
                 break;
               }
-              _context2.next = 12;
+              _context2.next = 15;
               return onResetLatestRef.current(formState.values);
-            case 12:
+            case 15:
               dispatchFn();
-              _context2.next = 16;
+              _context2.next = 19;
               break;
-            case 15:
+            case 18:
               dispatchFn();
-            case 16:
+            case 19:
             case "end":
               return _context2.stop();
           }
         }
       }, _callee2);
     }));
-  }, [onResetLatestRef, formState.values]);
+  }, [formState.values, getRegisteredKeys, onResetLatestRef]);
   /**
    * 表单提交
    */

package/lib/esm/utils/index.js

@@ -1,3 +1,4 @@
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 /** @LICENSE
  * @hi-ui/form
  * https://github.com/XiaoMi/hiui/tree/master/packages/ui/form#readme
@@ -35,4 +36,62 @@ var mergeValues = function mergeValues(source, override) {
   }
   return target;
 };
-export { isValidField, mergeValues, parse, stringify };
+/**
+ * 根据值的类型返回对应的空值
+ */
+var getEmptyValueByType = function getEmptyValueByType(value) {
+  // 优先处理特殊对象类型（instanceof 检查）
+  if (isArray(value)) {
+    return [];
+  }
+  if (value instanceof Date) {
+    return null;
+  }
+  if (value instanceof RegExp) {
+    return /(?:)/;
+  }
+  if (value instanceof Map) {
+    return new Map();
+  }
+  if (value instanceof Set) {
+    return new Set();
+  }
+  // 注意：WeakMap 和 WeakSet 无法创建空实例，返回 null
+  if (value instanceof WeakMap) {
+    return null;
+  }
+  if (value instanceof WeakSet) {
+    return null;
+  }
+  // 处理基本类型（typeof 检查）
+  if (_typeof(value) === 'symbol') {
+    return Symbol('');
+  }
+  if (typeof value === 'bigint') {
+    return BigInt(0);
+  }
+  if (typeof value === 'string') {
+    return '';
+  }
+  if (typeof value === 'number') {
+    return null;
+  }
+  if (typeof value === 'boolean') {
+    return false;
+  }
+  if (typeof value === 'function') {
+    // 函数类型重置为 undefined，因为函数不应该作为表单值
+    return undefined;
+  }
+  // 对于 null 值，保持为 null
+  if (value === null) {
+    return null;
+  }
+  // 处理普通对象（必须在所有 instanceof 检查之后）
+  if (_typeof(value) === 'object') {
+    return {};
+  }
+  // 其他类型（包括 undefined）默认返回 undefined
+  return undefined;
+};
+export { getEmptyValueByType, isValidField, mergeValues, parse, stringify };

package/lib/types/utils/index.d.ts

@@ -3,3 +3,7 @@ export declare const stringify: (field: FormFieldPath) => string;
 export declare const parse: (fieldStr: string) => FormFieldPath;
 export declare const isValidField: (field: FormFieldPath | undefined) => field is FormFieldPath;
 export declare const mergeValues: <T extends Object, E extends T>(source: T, override: E | null | undefined) => T;
+/**
+ * 根据值的类型返回对应的空值
+ */
+export declare const getEmptyValueByType: (value: any) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/form",
-  "version": "4.3.2",
+  "version": "4.3.4",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",