x-ui-design 0.4.76 → 0.4.77
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/types/types/form.d.ts +1 -1
- package/dist/index.esm.js +4 -23
- package/dist/index.esm.js.map +1 -1
- package/dist/index.js +4 -23
- package/dist/index.js.map +1 -1
- package/lib/components/Form/Item/Item.tsx +3 -22
- package/lib/hooks/useForm.ts +1 -5
- package/lib/types/form.ts +1 -1
- package/package.json +1 -1
|
@@ -87,7 +87,7 @@ export interface FormInstance {
|
|
|
87
87
|
setFields: (fields: FieldData[]) => void;
|
|
88
88
|
resetFields: (nameList?: string[], showError?: boolean | null) => void;
|
|
89
89
|
getFieldError: (name: string) => string[];
|
|
90
|
-
registerField: (name: string, rules?: RuleObject[], remove?: boolean
|
|
90
|
+
registerField: (name: string, rules?: RuleObject[], remove?: boolean) => void;
|
|
91
91
|
setFieldValue: (name: string, value: RuleTypes, errors?: string[], reset?: boolean | null | undefined, touch?: boolean) => void;
|
|
92
92
|
getFieldValue: (name: string) => RuleTypes;
|
|
93
93
|
validateFields: (nameList?: string[]) => Promise<boolean>;
|
package/dist/index.esm.js
CHANGED
|
@@ -710,7 +710,7 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
|
|
|
710
710
|
function isFieldValidating(name) {
|
|
711
711
|
return !!name;
|
|
712
712
|
}
|
|
713
|
-
function registerField(name, rules = [], remove = false
|
|
713
|
+
function registerField(name, rules = [], remove = false) {
|
|
714
714
|
if (remove) {
|
|
715
715
|
delete formRef.current[stepRef.current]?.[name];
|
|
716
716
|
delete rulesRef.current[name];
|
|
@@ -719,9 +719,6 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
|
|
|
719
719
|
formRef.current[stepRef.current][name] = initialValues?.[name];
|
|
720
720
|
}
|
|
721
721
|
rulesRef.current[name] = rules;
|
|
722
|
-
if (fieldRef) {
|
|
723
|
-
fieldInstancesRef.current[name] = fieldRef;
|
|
724
|
-
}
|
|
725
722
|
}
|
|
726
723
|
}
|
|
727
724
|
async function validateField(name) {
|
|
@@ -989,7 +986,6 @@ const FormItem$1 = ({
|
|
|
989
986
|
}) => {
|
|
990
987
|
const formContext = useContext(FormContext);
|
|
991
988
|
const errorRef = useRef(null);
|
|
992
|
-
const fieldRef = useRef(null);
|
|
993
989
|
if (!formContext) {
|
|
994
990
|
throw new Error('FormItem must be used within a Form');
|
|
995
991
|
}
|
|
@@ -1006,10 +1002,10 @@ const FormItem$1 = ({
|
|
|
1006
1002
|
const childrenList = useMemo(() => flattenChildren(children), [children]);
|
|
1007
1003
|
useEffect(() => {
|
|
1008
1004
|
if (name && !getFieldInstance(name)) {
|
|
1009
|
-
registerField(name, rules
|
|
1005
|
+
registerField(name, rules);
|
|
1010
1006
|
}
|
|
1011
1007
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
1012
|
-
}, [name, rules
|
|
1008
|
+
}, [name, rules]);
|
|
1013
1009
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
1014
1010
|
useEffect(() => () => registerField(name, undefined, true), [name]);
|
|
1015
1011
|
useEffect(() => {
|
|
@@ -1031,17 +1027,6 @@ const FormItem$1 = ({
|
|
|
1031
1027
|
}, [dependencies, name]);
|
|
1032
1028
|
const isRequired = useMemo(() => rules.some(rule => rule.required), [rules]);
|
|
1033
1029
|
const errorMessage = getFieldError(name)?.[0];
|
|
1034
|
-
const mergeRefs = elementRef => {
|
|
1035
|
-
return el => {
|
|
1036
|
-
fieldRef.current = el;
|
|
1037
|
-
if (typeof elementRef === 'function') {
|
|
1038
|
-
elementRef(el);
|
|
1039
|
-
} else if (elementRef && typeof elementRef === 'object') {
|
|
1040
|
-
// @ts-ignore
|
|
1041
|
-
elementRef.current = el;
|
|
1042
|
-
}
|
|
1043
|
-
};
|
|
1044
|
-
};
|
|
1045
1030
|
return /*#__PURE__*/React.createElement("div", {
|
|
1046
1031
|
style: style,
|
|
1047
1032
|
className: clsx([`${prefixCls}`, {
|
|
@@ -1064,11 +1049,7 @@ const FormItem$1 = ({
|
|
|
1064
1049
|
...childProps
|
|
1065
1050
|
} = child.props;
|
|
1066
1051
|
const fieldValue = value ?? getFieldValue(name) ?? initialValue;
|
|
1067
|
-
return /*#__PURE__*/React.createElement("div", {
|
|
1068
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
1069
|
-
// @ts-expect-error
|
|
1070
|
-
ref: mergeRefs(child.ref)
|
|
1071
|
-
}, /*#__PURE__*/React.createElement(FormItemChildComponent, _extends({}, props, {
|
|
1052
|
+
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(FormItemChildComponent, _extends({}, props, {
|
|
1072
1053
|
key: `${key}_${isReseting}`,
|
|
1073
1054
|
name: name,
|
|
1074
1055
|
child: child,
|