@hi-ui/form 4.3.2 → 4.3.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @hi-ui/form
 
+## 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/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/package.json

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