@hi-ui/form 4.0.0-beta.17 → 4.0.0-beta.18

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

@@ -77,18 +77,12 @@ var useFormField = function useFormField(props) {
   }, [fieldRules, field]); // 注入当前 field 及其验证规则到 Form
 
   React.useEffect(function () {
-    if (typeAssertion.isNullish(field) || field === '') return;
-    if (typeAssertion.isArray(field) && field.every(function (item) {
-      return typeAssertion.isNullish(item) || item === '';
-    })) return;
+    if (!index.isValidField(field)) return;
     registerField(field, {
       validate: fieldValidate
     });
     return function () {
-      if (typeAssertion.isNullish(field) || field === '') return;
-      if (typeAssertion.isArray(field) && field.every(function (item) {
-        return typeAssertion.isNullish(item) || item === '';
-      })) return;
+      if (!index.isValidField(field)) return;
       unregisterField(field);
     };
   }, [registerField, unregisterField, field, fieldValidate]);

package/lib/cjs/use-form.js

@@ -574,7 +574,10 @@ var useForm = function useForm(_a) {
         valueConnectTransform = _props.valueConnectTransform,
         _props$validateTrigge = _props.validateTrigger,
         validateTriggerProp = _props$validateTrigge === void 0 ? validateTriggersMemo : _props$validateTrigge,
-        children = _props.children;
+        children = _props.children; // field 未设置，不进行收集管理
+
+    if (!index.isValidField(field)) return {}; // 控件的 props
+
     var controlProps = children && children.props || {};
     var validateTrigger = typeAssertion.isArray(validateTriggerProp) ? validateTriggerProp : [validateTriggerProp];
     var validateOnCollect = validateTrigger.includes(valueChangeFuncPropName);

package/lib/cjs/utils/index.js

@@ -13,6 +13,8 @@ Object.defineProperty(exports, '__esModule', {
   value: true
 });
 
+var typeAssertion = require('@hi-ui/type-assertion');
+
 var stringify = function stringify(field) {
   return JSON.stringify(field);
 };
@@ -21,5 +23,14 @@ var parse = function parse(fieldStr) {
   return JSON.parse(fieldStr);
 };
 
+var isValidField = function isValidField(field) {
+  if (typeAssertion.isNullish(field) || field === '') return false;
+  if (typeAssertion.isArray(field) && field.every(function (item) {
+    return typeAssertion.isNullish(item) || item === '';
+  })) return false;
+  return true;
+};
+
+exports.isValidField = isValidField;
 exports.parse = parse;
 exports.stringify = stringify;

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

@@ -9,10 +9,10 @@
  */
 import { useMemo, useCallback, useEffect } from 'react';
 import { useFormContext } from './context.js';
-import { isArrayNonEmpty, isNullish, isArray } from '@hi-ui/type-assertion';
+import { isArrayNonEmpty } from '@hi-ui/type-assertion';
 import Validater from 'async-validator';
 import { normalizeArray } from '@hi-ui/array-utils';
-import { stringify } from './utils/index.js';
+import { stringify, isValidField } from './utils/index.js';
 
 var useFormField = function useFormField(props) {
   var field = props.field,
@@ -56,18 +56,12 @@ var useFormField = function useFormField(props) {
   }, [fieldRules, field]); // 注入当前 field 及其验证规则到 Form
 
   useEffect(function () {
-    if (isNullish(field) || field === '') return;
-    if (isArray(field) && field.every(function (item) {
-      return isNullish(item) || item === '';
-    })) return;
+    if (!isValidField(field)) return;
     registerField(field, {
       validate: fieldValidate
     });
     return function () {
-      if (isNullish(field) || field === '') return;
-      if (isArray(field) && field.every(function (item) {
-        return isNullish(item) || item === '';
-      })) return;
+      if (!isValidField(field)) return;
       unregisterField(field);
     };
   }, [registerField, unregisterField, field, fieldValidate]);

package/lib/esm/use-form.js

@@ -9,7 +9,7 @@
  */
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import { __rest, __awaiter } from 'tslib';
-import { stringify, parse } from './utils/index.js';
+import { stringify, parse, isValidField } from './utils/index.js';
 import React, { useMemo, useReducer, useCallback, useRef } from 'react';
 import { useLatestRef, useLatestCallback } from '@hi-ui/use-latest';
 import { isArray, isObjectLike, isFunction } from '@hi-ui/type-assertion';
@@ -547,7 +547,10 @@ var useForm = function useForm(_a) {
         valueConnectTransform = _props.valueConnectTransform,
         _props$validateTrigge = _props.validateTrigger,
         validateTriggerProp = _props$validateTrigge === void 0 ? validateTriggersMemo : _props$validateTrigge,
-        children = _props.children;
+        children = _props.children; // field 未设置，不进行收集管理
+
+    if (!isValidField(field)) return {}; // 控件的 props
+
     var controlProps = children && children.props || {};
     var validateTrigger = isArray(validateTriggerProp) ? validateTriggerProp : [validateTriggerProp];
     var validateOnCollect = validateTrigger.includes(valueChangeFuncPropName);

package/lib/esm/utils/index.js

@@ -7,6 +7,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import { isNullish, isArray } from '@hi-ui/type-assertion';
+
 var stringify = function stringify(field) {
   return JSON.stringify(field);
 };
@@ -15,4 +17,12 @@ var parse = function parse(fieldStr) {
   return JSON.parse(fieldStr);
 };
 
-export { parse, stringify };
+var isValidField = function isValidField(field) {
+  if (isNullish(field) || field === '') return false;
+  if (isArray(field) && field.every(function (item) {
+    return isNullish(item) || item === '';
+  })) return false;
+  return true;
+};
+
+export { isValidField, parse, stringify };

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

@@ -1,4 +1,4 @@
 import { FormFieldPath } from './../types';
-export declare const setProp: (o: any, filed: any, value: any) => any;
 export declare const stringify: (field: FormFieldPath) => string;
 export declare const parse: (fieldStr: string) => FormFieldPath;
+export declare const isValidField: (field: FormFieldPath | undefined) => field is FormFieldPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/form",
-  "version": "4.0.0-beta.17",
+  "version": "4.0.0-beta.18",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HIUI <mi-hiui@xiaomi.com>",
@@ -65,5 +65,5 @@
     "react": "^17.0.1",
     "react-dom": "^17.0.1"
   },
-  "gitHead": "81afa0b917a45440e9afd759b24e4c9a7fa9fec0"
+  "gitHead": "85818619960345c5c33ec381769e7501d189cb41"
 }