@unicom-cloud/ui 0.8.156 → 0.8.158

package/form/hook/useForm.js

@@ -1,55 +1,57 @@
-/* 潘启宝 2026-04-14 16:51:07 星期二 */
-import e from "../store.js";
-import { useEffect as t, useRef as n } from "react";
+/* 潘启宝 2026-05-08 09:13:14 星期五 */
+import e from "../../utils/pick.js";
+import t from "../store.js";
+import { useEffect as n, useRef as r } from "react";
 //#region components/pc/form/hook/useForm.ts
-function r() {
-	let t = new e(), n = {
-		registerField: t.registerField,
-		registerWatcher: t.registerWatcher,
-		registerStateWatcher: t.registerStateWatcher,
-		registerFormWatcher: t.registerFormWatcher,
-		innerSetInitialValues: t.innerSetInitialValues,
-		innerSetInitialValue: t.innerSetInitialValue,
-		innerSetCallbacks: t.innerSetCallbacks,
-		innerSetFieldValue: t.innerSetFieldValue,
-		innerGetStore: t.innerGetStore,
-		innerGetStoreStatus: t.innerGetStoreStatus,
-		innerGetFieldValue: t.innerGetFieldValue,
-		innerGetRegisteredFields: t.innerGetRegisteredFields,
-		innerCollectFormState: t.innerCollectFormState,
-		innerClearStoreByFields: t.innerClearStoreByFields
-	};
-	return {
-		getFieldsValue: t.getFieldsValue,
-		getFieldValue: t.getFieldValue,
-		getFieldError: t.getFieldError,
-		getFieldsError: t.getFieldsError,
-		getTouchedFields: t.getTouchedFields,
-		getFields: t.getFields,
-		getInitialValues: t.getInitialValues,
-		setInitialValues: t.setInitialValues,
-		setInitialValue: t.setInitialValue,
-		setFieldValue: t.setFieldValue,
-		setFieldsValue: t.setFieldsValue,
-		setFields: t.setFields,
-		resetFields: t.resetFields,
-		clearFields: t.clearFields,
-		submit: t.submit,
-		validate: t.validate,
+function i() {
+	let n = new t(), r = e(n, [
+		"registerField",
+		"registerWatcher",
+		"registerStateWatcher",
+		"registerFormWatcher",
+		"innerSetInitialValues",
+		"innerSetInitialValue",
+		"innerSetCallbacks",
+		"innerSetFieldValue",
+		"innerGetStore",
+		"innerGetStoreStatus",
+		"innerGetFieldValue",
+		"innerGetRegisteredFields",
+		"innerCollectFormState",
+		"innerClearStoreByFields"
+	]), i = e(n, [
+		"getFieldsValue",
+		"getFieldValue",
+		"getFieldError",
+		"getFieldsError",
+		"getTouchedFields",
+		"getFields",
+		"getInitialValues",
+		"setInitialValues",
+		"setInitialValue",
+		"setFieldValue",
+		"setFieldsValue",
+		"setFields",
+		"resetFields",
+		"clearFields",
+		"submit",
+		"validate",
+		"getFieldsState"
+	]);
+	return Object.assign(i, {
 		scrollToField: () => {},
-		getFieldsState: t.getFieldsState,
-		getInnerMethods: () => n
-	};
+		getInnerMethods: () => r
+	});
 }
-function i(e) {
-	let i = n(e);
-	i.current || (e ? i.current = e : a());
+function a(e) {
+	let t = r(e);
+	t.current ||= e || a();
 	function a() {
-		let e = r();
-		return i.current = e, e;
+		let e = i();
+		return t.current = e, e;
 	}
-	return t(() => () => {}, []), [i.current, a];
+	return n(() => () => {}, []), [t.current, a];
 }
 //#endregion
-export { i as default, r as getFormInstance };
+export { a as default, i as getFormInstance };
 /* 独立思考，明辨是非 */

package/form/hook/useFormContext.js

@@ -1,4 +1,4 @@
-/* 潘启宝 2026-04-14 16:51:07 星期二 */
+/* 潘启宝 2026-05-08 09:13:14 星期五 */
 import { isFunction as e } from "../../utils/is.js";
 import t from "../../hooks/use-force-update/index.js";
 import { FormContext as n } from "../context.js";

package/form/hook/useFormState.js

@@ -1,4 +1,4 @@
-/* 潘启宝 2026-04-14 16:51:07 星期二 */
+/* 潘启宝 2026-05-08 09:13:14 星期五 */
 import { isEqualWith as e, isFunction as t } from "../../utils/is.js";
 import { FormContext as n } from "../context.js";
 import r from "../../utils/warning.js";

package/form/hook/useWatch.js

@@ -1,4 +1,4 @@
-/* 潘启宝 2026-04-14 16:51:07 星期二 */
+/* 潘启宝 2026-05-08 09:13:14 星期五 */
 import { isArray as e, isFunction as t, isString as n } from "../../utils/is.js";
 import { FormContext as r } from "../context.js";
 import i from "../../utils/warning.js";

package/form/index.js

@@ -1,4 +1,4 @@
-/* 潘启宝 2026-04-14 16:51:07 星期二 */
+/* 潘启宝 2026-05-08 09:13:14 星期五 */
 import { FormContext as e, FormItemContext as t, FormListContext as n, FormProviderContext as r } from "./context.js";
 import { ValidateError as i } from "./utils.js";
 import a, { getFormInstance as o } from "./hook/useForm.js";

package/form/interface.d.ts

@@ -8,7 +8,7 @@ import Store from './store';
 export type IndexedObject = {
     [key: string]: unknown;
 };
-export type KeyType = string | number | symbol;
+export type KeyType = string | number;
 export type ComponentType = keyof JSX.IntrinsicElements | React.ComponentType<unknown>;
 export type FieldError<FieldValue = unknown> = {
     value?: FieldValue;
@@ -22,7 +22,7 @@ export type ValidateFieldsErrors<FieldValue = unknown, FieldKey extends KeyType
  */
 export interface FormProps<FormData = unknown, FieldValue = FormData[keyof FormData], FieldKey extends KeyType = keyof FormData> extends Omit<FormHTMLAttributes<unknown>, 'className' | 'onChange' | 'onSubmit' | 'onReset'>, ReadOnly, Size {
     style?: CSSProperties;
-    className?: string | string[];
+    className?: string;
     prefixCls?: string;
     /**
      * @zh form
@@ -192,7 +192,7 @@ export type FormItemChildrenFn<FormData = unknown, FieldValue = FormData[keyof F
  */
 export interface FormItemProps<FormData = unknown, FieldValue = FormData[keyof FormData], FieldKey extends KeyType = keyof FormData> extends Omit<HTMLAttributes<unknown>, 'className' | 'children'>, ReadOnly {
     style?: CSSProperties;
-    className?: string | string[];
+    className?: string;
     prefixCls?: string;
     store?: FormInstance<FormData, FieldValue, FieldKey>;
     /**
@@ -378,20 +378,19 @@ export interface FormItemTipProps extends Pick<FormItemProps, 'prefixCls' | 'hel
     warnings: ReactNode[];
 }
 export interface FormItemLabelProps extends Pick<FormItemProps, 'tooltip' | 'label' | 'requiredSymbol' | 'required' | 'rules'>, ReadOnly {
-    className?: string | string[];
+    className?: string;
     showColon: boolean | ReactNode;
     prefix: string | undefined;
     htmlFor?: string | undefined;
 }
 export interface FormItemSymbolProps {
     style?: CSSProperties;
-    className?: string | string[];
+    className?: string;
     prefix: string | undefined;
 }
 export interface FormControlProps<FormData = unknown, FieldValue = FormData[keyof FormData], FieldKey extends KeyType = keyof FormData> {
     /** 受控组件的唯一标示。 */
     field?: FieldKey;
-    _key?: FieldKey;
     initialValue?: FieldValue;
     dependencies?: FormItemProps['dependencies'];
     getValueFromEvent?: FormItemProps['getValueFromEvent'];
@@ -413,6 +412,7 @@ export interface FormControlProps<FormData = unknown, FieldValue = FormData[keyo
     help?: ReactNode;
     isFormList?: boolean;
     hasFeedback?: boolean;
+    readOnly?: boolean;
     children?: ReactNode;
 }
 /**
@@ -466,8 +466,8 @@ export type FormItemContextProps<FormData = unknown, FieldValue = FormData[keyof
     validateMessages?: FormProps['validateMessages'];
     schemaOptions?: SchemaOptions;
     updateFormItem?: (field: string, params: {
-        errors?: FieldError<FieldValue>;
-        warnings?: ReactNode[];
+        errors?: FieldError<FieldValue> | null;
+        warnings?: ReactNode[] | null;
     }) => void;
 };
 export type FormInstance<FormData = unknown, FieldValue = FormData[keyof FormData], FieldKey extends KeyType = keyof FormData> = Pick<Store<FormData, FieldValue, FieldKey>, 'getFieldsValue' | 'getFieldValue' | 'getFieldError' | 'getFieldsError' | 'getTouchedFields' | 'getFields' | 'getInitialValues' | 'setInitialValues' | 'setInitialValue' | 'setFieldValue' | 'setFieldsValue' | 'setFields' | 'resetFields' | 'clearFields' | 'submit' | 'validate' | 'getFieldsState'> & {

package/form/interface.js

@@ -1,4 +1,4 @@
-/* 潘启宝 2026-04-14 16:51:07 星期二 */
+/* 潘启宝 2026-05-08 09:13:14 星期五 */
 import "./store.js";
 import "react";
 import "react/jsx-runtime";

package/form/promisify.js

@@ -1,14 +1,14 @@
-/* 潘启宝 2026-04-14 16:51:07 星期二 */
+/* 潘启宝 2026-05-08 09:13:14 星期五 */
 import { isFunction as e } from "../utils/is.js";
 import { ValidateError as t } from "./utils.js";
 //#region components/pc/form/promisify.ts
 function n(n) {
-	return Object.defineProperty((...r) => e(r.at(-1)) ? n.apply(this, r) : new Promise((e, i) => {
-		let a = (n, r) => {
-			n ? i(new t(n)) : e(r);
-		};
-		return r[r.length] = a, r.length++, n.apply(this, r);
-	}), "name", { value: n.name });
+	return Object.defineProperty(function(...r) {
+		return e(r.at(-1)) ? n.apply(this, r) : new Promise((e, i) => {
+			let a = (n, r) => n ? i(new t(n)) : e(r);
+			return r[r.length] = a, r.length++, n.apply(this, r);
+		});
+	}, "name", { value: n.name });
 }
 //#endregion
 export { n as default };

package/form/store.d.ts

@@ -30,7 +30,7 @@ declare class Store<FormData = unknown, FieldValue = FormData[keyof FormData], F
     #private;
     getRegisteredField: (field?: FieldKey) => FormControlImperativeHandle<FormData, FieldValue, FieldKey> | undefined;
     innerCollectFormState: () => void;
-    innerSetInitialValues: (values: Partial<FormData>) => void;
+    innerSetInitialValues: (values?: Partial<FormData>) => void;
     innerSetInitialValue: (field: FieldKey, value: FieldValue) => void;
     innerSetCallbacks: (values: Pick<FormProps<FormData, FieldValue, FieldKey>, innerCallbackType> & {
         onValidateFail?: (errors: { [key in FieldKey]: FieldError<FieldValue>; }, options?: ValidateOptions) => void;
@@ -58,7 +58,7 @@ declare class Store<FormData = unknown, FieldValue = FormData[keyof FormData], F
     getTouchedFields: () => FieldKey[];
     setFieldValue: (field: FieldKey, value: FieldValue) => void;
     setFieldsValue: (values: DeepPartial<FormData>) => void;
-    setFields: (object: { [field in FieldKey]?: {
+    setFields: (params: { [field in FieldKey]?: {
         value?: FieldValue;
         error?: FieldError<FieldValue>;
         touched?: boolean;

package/form/store.js

@@ -1,42 +1,51 @@
-/* 潘启宝 2026-04-14 16:51:07 星期二 */
-import { isArray as e, isArrayAndNotEmpty as t, isExist as n, isFunction as r, isPlainObject as i, isPromise as a } from "../utils/is.js";
-import { NOOP as o } from "../utils/constant.js";
-import { SubmitStatus as s } from "./interface.js";
-import { ValidateError as c, cloneDeep as l, get as u, iterativelyGetKeys as d, normalizeSparseArraysDeep as f, set as p } from "./utils.js";
-import m from "./promisify.js";
+/* 潘启宝 2026-05-08 09:13:14 星期五 */
+import { isArray as e, isArrayAndNotEmpty as t, isExist as n, isFunction as r, isPlainObject as i, isPromise as a, isUndefined as o } from "../utils/is.js";
+import { NOOP as s } from "../utils/constant.js";
+import { SubmitStatus as c } from "./interface.js";
+import { ValidateError as l, cloneDeep as u, get as d, iterativelyGetKeys as f, normalizeSparseArraysDeep as p, set as m } from "./utils.js";
+import h from "./promisify.js";
 import "react";
-import h from "lodash/merge";
-import g from "lodash/castArray";
-import _ from "lodash/has";
-import v from "lodash/omit";
-import y from "lodash/setWith";
-import b from "lodash/unset";
+import g from "lodash/merge";
+import _ from "lodash/castArray";
+import v from "lodash/has";
+import y from "lodash/omit";
+import b from "lodash/setWith";
+import x from "lodash/unset";
 //#region components/pc/form/store.ts
-var x = class {
+var S = class {
 	constructor() {
-		this.getRegisteredField = (e) => this.#t.find((t, n, r) => t.props?.field === e), this.innerCollectFormState = () => {
+		this.#e = c.init, this.#t = [], this.#n = [], this.#r = [], this.#i = [], this.#a = {}, this.#o = {}, this.#s = {}, this.#c = {}, this.#m = (e, t) => e ? this.#t.filter((e, n, r) => e.existField() && (t?.containFormList || !e.props?.isFormList)) : this.#t, this.getRegisteredField = (e) => this.#t.find((t, n, r) => t.props?.field === e), this.#h = (e, t) => {
+			(e === "setFieldValue" || e === "innerSetValue" && !t.ignore) && this.#y(t.changeValues ? f(t.changeValues) : this.#g(t.field)), this.#t.forEach((n, r, i) => {
+				n.onStoreChange(e, {
+					...t,
+					current: this.#o
+				});
+			});
+		}, this.#b = (e) => {
+			this.#e = e, this.innerCollectFormState(), this.#u();
+		}, this.innerCollectFormState = () => {
 			this.#d();
 		}, this.innerSetInitialValues = (e) => {
-			e && (this.#s = h(this.#s, l(e)), Object.entries(e).forEach(([e, t], n, r) => {
-				p(this.#o, e, t);
+			e && (this.#s = g(this.#s, u(e)), Object.entries(e).forEach(([e, t], n, r) => {
+				m(this.#o, e, t);
 			}));
 		}, this.innerSetInitialValue = (e, t) => {
-			e && (this.#s[e] = t, this.#_(e) || p(this.#o, e, u(this.#s, e)));
+			e && (this.#s[e] = t, this.#_(e) || m(this.#o, e, d(this.#s, e)));
 		}, this.innerSetCallbacks = (e) => {
 			this.#c = e;
 		}, this.innerSetFieldValue = (e, t, n) => {
 			if (!e) return;
 			let r = this.getFields();
-			p(this.#o, e, t), this.#f({ [e]: t }), this.#p({ [e]: t }), this.#h("innerSetValue", {
+			m(this.#o, e, t), this.#f({ [e]: t }), this.#p({ [e]: t }), this.#h("innerSetValue", {
 				prev: r,
 				field: e,
 				...n,
 				changeValues: { [e]: t }
 			});
-		}, this.innerGetRegisteredFields = (...e) => this.#m(...e), this.innerGetStore = () => this.#o, this.innerGetStoreStatus = () => ({ submitStatus: this.#e }), this.innerGetFieldValue = (e) => u(this.#o, e), this.innerClearStoreByFields = (e) => {
-			n(e) && (g(e).forEach((e, t, n) => {
-				b(this.#o, e), delete this.#s[e];
-			}), f(this.#o));
+		}, this.innerGetRegisteredFields = (...e) => this.#m(...e), this.innerGetStore = () => this.#o, this.innerGetStoreStatus = () => ({ submitStatus: this.#e }), this.innerGetFieldValue = (e) => d(this.#o, e), this.innerClearStoreByFields = (e) => {
+			n(e) && (_(e).forEach((e, t, n) => {
+				x(this.#o, e), delete this.#s[e];
+			}), p(this.#o));
 		}, this.registerFormWatcher = (e) => (this.#i.push(e), () => {
 			this.#i = this.#i.filter((t, n, r) => t !== e);
 		}), this.registerStateWatcher = (e) => (this.#r.push(e), () => {
@@ -44,7 +53,10 @@ var x = class {
 		}), this.registerWatcher = (e) => (this.#n.push(e), () => {
 			this.#n = this.#n.filter((t, n, r) => t !== e);
 		}), this.registerField = (e) => (this.#t.push(e), this.#l(), () => {
-			this.#t = this.#t.filter((t, n, r) => t !== e), this.#l();
+			this.#t = this.#t.filter((t, r, i) => {
+				let a = "props.field", [o, s] = [d(t, a), d(e, a)];
+				return n(o) && n(s) ? o !== s : t !== e;
+			}), this.#l();
 		}), this.getTouchedFields = () => this.#m(!0).filter((e, t, n) => e.isTouched()).map((e, t, n) => e.props?.field), this.setFieldValue = (e, t) => {
 			e && this.setFields({ [e]: { value: t } });
 		}, this.setFieldsValue = (e) => {
@@ -60,7 +72,7 @@ var x = class {
 				let a = e[t], o = this.getFields();
 				if (a) {
 					let e = {};
-					"error" in a && (e.errors = a.error), "warning" in a && (e.warnings = a.warning), "touched" in a && (e.touched = a.touched), "value" in a && (p(this.#o, t, a.value), n[t] = a.value), this.#h("setFieldValue", {
+					"error" in a && (e.errors = a.error), "warning" in a && (e.warnings = a.warning), "touched" in a && (e.touched = a.touched), "value" in a && (m(this.#o, t, a.value), n[t] = a.value), this.#h("setFieldValue", {
 						data: e,
 						prev: o,
 						field: t,
@@ -68,7 +80,7 @@ var x = class {
 					});
 				}
 			}), this.#f(n);
-		}, this.getFieldValue = (e) => l(this.innerGetFieldValue(e)), this.getFieldError = (e) => {
+		}, this.getFieldValue = (e) => u(this.innerGetFieldValue(e)), this.getFieldError = (e) => {
 			let t = this.getRegisteredField(e);
 			return t ? t.getErrors() : null;
 		}, this.getFieldsError = (t) => {
@@ -80,21 +92,39 @@ var x = class {
 				let i = e.getErrors();
 				i && (n[e.props.field] = i);
 			}), n;
-		}, this.getFields = () => l(this.#o), this.getFieldsValue = (t) => {
+		}, this.getFields = () => u(this.#o), this.getFieldsValue = (t) => {
 			let n = {};
 			return e(t) ? (t.forEach((e, t, r) => {
-				p(n, e, this.getFieldValue(e));
+				m(n, e, this.getFieldValue(e));
 			}), n) : (this.#m(!0).forEach((e, t, r) => {
 				let i = e.props.field;
-				p(n, i, this.innerGetFieldValue(i));
+				m(n, i, this.innerGetFieldValue(i));
 			}), n);
 		}, this.getInitialValues = () => this.#s, this.setInitialValues = (e) => {
 			this.innerSetInitialValues(e), this.setFieldsValue(e);
 		}, this.setInitialValue = (e, t) => {
 			this.innerSetInitialValue(e, t), this.setFieldValue(e, t);
-		}, this.validate = m(this.#x), this.submit = () => (this.#b(s.submitting), this.validate((e, t) => {
+		}, this.#x = (e, n, a) => {
+			let o = this.#m(!0, { containFormList: !0 }), c = t(e) ? o.filter((t, n, r) => [].concat(e).includes(t.props?.field)) : o, l = i(e) ? e : i(n) ? n : {}, d = r(e) ? e : r(n) ? n : a || s, f = c.map((e, t, n) => l?.validateOnly ? e.validateFieldOnly() : e.validateField()), p = (e) => {
+				if (!l?.validateOnly) {
+					let { onValidateFail: t } = this.#c;
+					t?.(e, l);
+				}
+			};
+			return Promise.all(f).then((e) => {
+				let t = {}, n = {};
+				e.forEach((e, r, i) => {
+					e.error && (t = {
+						...t,
+						...e.error
+					}), this.getRegisteredField(e.field)?.props?.isFormList || m(n, e.field, e.value);
+				});
+				let r;
+				return Object.keys(t).length ? (p?.(t), r = d?.(t, u(n))) : r = d?.(null, u(n)), r;
+			}).catch((e) => Promise.reject(e)).finally(() => {});
+		}, this.validate = h(this.#x), this.submit = () => (this.#b(c.submitting), this.validate((e, t) => {
 			let n, { onSubmit: i, onSubmitFailed: o } = this.#c;
-			return e ? (r(o) && (n = o(e)), n ||= Promise.reject(new c(e))) : r(i) && (n = i(t)), a(n) ? n.then((e) => (this.#b(s.success), e)).catch((e) => (this.#b(s.error), e)).finally(() => {}) : this.#b(e ? s.error : s.success), n;
+			return e ? (r(o) && (n = o(e)), n ||= Promise.reject(new l(e))) : r(i) && (n = i(t)), a(n) ? n.then((e) => (this.#b(c.success), e)).catch((e) => (this.#b(c.error), e)).finally(() => {}) : this.#b(e ? c.error : c.success), n;
 		})), this.getFieldsState = (t) => {
 			let n = {}, r = (e) => {
 				if (!e) return null;
@@ -103,7 +133,7 @@ var x = class {
 					errors: t ? [t] : [],
 					warnings: e.getWarnings(),
 					validateStatus: e.getValidateStatus(),
-					isSubmitting: this.#e === s.submitting,
+					isSubmitting: this.#e === c.submitting,
 					isTouched: e.isTouched(),
 					value: this.getFieldValue(e.props.field)
 				};
@@ -116,16 +146,16 @@ var x = class {
 		}, this.resetFields = (t) => {
 			let r = this.getFields(), i = n(t) && !e(t) ? [t] : t, a = {};
 			if (e(i)) i.forEach((e, t, n) => {
-				p(this.#o, e, this.#s[e]), a[e] = this.innerGetFieldValue(e);
+				m(this.#o, e, this.#s[e]), a[e] = this.innerGetFieldValue(e);
 			}), this.#v(i);
 			else {
 				a = this.getFields();
 				let e = {};
 				Object.entries(this.#s).forEach(([t, n], r, i) => {
-					p(e, t, n);
+					m(e, t, n);
 				}), this.#o = e, this.#m(!0).forEach((e, t, n) => {
 					let r = e.props.field;
-					p(a, r, u(this.#o, r));
+					m(a, r, d(this.#o, r));
 				}), this.#v();
 			}
 			this.#f(a), this.#h("reset", {
@@ -137,10 +167,10 @@ var x = class {
 		}, this.clearFields = (t) => {
 			let r = this.getFields(), i = n(t) && !e(t) ? [t] : t, a = {};
 			e(i) ? i.forEach((e, t, n) => {
-				p(this.#o, e, void 0), a[e] = this.innerGetFieldValue(e);
+				m(this.#o, e, void 0), a[e] = this.innerGetFieldValue(e);
 			}) : (this.#o = {}, this.#m(!0).forEach((e, t, n) => {
 				let r = e.props.field;
-				p(a, r, void 0);
+				m(a, r, void 0);
 			})), this.#f(a), this.#h("setFieldValue", {
 				prev: r,
 				field: Object.keys(a),
@@ -151,15 +181,15 @@ var x = class {
 			});
 		};
 	}
-	#e = s.init;
-	#t = [];
-	#n = [];
-	#r = [];
-	#i = [];
-	#a = {};
-	#o = {};
-	#s = {};
-	#c = {};
+	#e;
+	#t;
+	#n;
+	#r;
+	#i;
+	#a;
+	#o;
+	#s;
+	#c;
 	#l() {
 		this.#n.forEach((e, t, n) => {
 			e();
@@ -188,54 +218,27 @@ var x = class {
 			t?.(e, this.getFields());
 		}
 	}
-	#m = (e, t) => e ? this.#t.filter((e, n, r) => e.hasFieldProps() && (t?.containFormList || !e.props?.isFormList)) : this.#t;
-	#h = (e, t) => {
-		(e === "setFieldValue" || e === "innerSetValue" && !t.ignore) && this.#y(t.changeValues ? d(t.changeValues) : this.#g(t.field)), this.#t.forEach((n, r, i) => {
-			n.onStoreChange(e, {
-				...t,
-				current: this.#o
-			});
-		});
-	};
+	#m;
+	#h;
 	#g(e) {
-		return e ? [e, ...[].concat(e).map((e, t, n) => d(p({}, e, void 0))).reduce((e, t) => e.concat(t), [])] : [];
+		return e ? [e, ...[].concat(e).map((e, t, n) => f(m({}, e, void 0))).reduce((e, t) => e.concat(t), [])] : [];
 	}
 	#_(e) {
-		return this.#g(e).some((e, t, n) => _(this.#a, e));
+		return this.#g(e).some((e, t, n) => v(this.#a, e));
 	}
 	#v(e) {
-		e === void 0 && (this.#a = {});
+		o(e) && (this.#a = {});
 		let t = this.#g(e);
-		this.#a = v(this.#a, t);
+		this.#a = y(this.#a, t);
 	}
 	#y(e) {
 		[].concat(e).forEach((e, t, n) => {
-			y(this.#a, e, void 0, Object);
+			b(this.#a, e, void 0, Object);
 		});
 	}
-	#b = (e) => {
-		this.#e = e, this.innerCollectFormState(), this.#u();
-	};
-	#x = (e, n, a) => {
-		let s = this.#m(!0, { containFormList: !0 }), c = t(e) ? s.filter((t, n, r) => [].concat(e).includes(t.props.field)) : s, u = i(e) ? e : i(n) ? n : {}, d = r(e) ? e : r(n) ? n : a || o, f = c.map((e, t, n) => u?.validateOnly ? e.validateFieldOnly() : e.validateField()), m = (e) => {
-			if (!u?.validateOnly) {
-				let { onValidateFail: t } = this.#c;
-				t?.(e, u);
-			}
-		};
-		return Promise.all(f).then((e) => {
-			let t = {}, n = {};
-			e.forEach((e, r, i) => {
-				e.error && (t = {
-					...t,
-					...e.error
-				}), this.getRegisteredField(e.field)?.props?.isFormList || p(n, e.field, e.value);
-			});
-			let r;
-			return Object.keys(t).length ? (m?.(t), r = d?.(t, l(n))) : r = d?.(null, l(n)), r;
-		}).catch((e) => Promise.reject(e)).finally(() => {});
-	};
+	#b;
+	#x;
 };
 //#endregion
-export { x as default };
+export { S as default };
 /* 独立思考，明辨是非 */