Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP fix: Improve form error message display #8935

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP fix: Improve form error message display #8935

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee78b36
fix: Improve form error message display
Wxh16144 Dec 20, 2024
175dc33
Merge branch 'master' into wuxh/fix-8895
Wxh16144 Dec 20, 2024
f6c7f4f
Merge branch 'master' into wuxh/fix-8895
Wxh16144 Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 78 additions & 96 deletions packages/form/src/components/FormItem/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,18 +182,64 @@ const WarpFormItem: React.FC<
help,
...props
}) => {
const formDom = useMemo(() => {
let getValuePropsFunc: any = (value: any) => {
const newValue = convertValue?.(value, props.name!) ?? value;
if (props.getValueProps) return props.getValueProps(newValue);
return {
[valuePropName || 'value']: newValue,
const formDom = useMemo(() => {
let getValuePropsFunc: any = (value: any) => {
const newValue = convertValue?.(value, props.name!) ?? value;
if (props.getValueProps) return props.getValueProps(newValue);
return {
[valuePropName || 'value']: newValue,
};
};
};
if (!convertValue && !props.getValueProps) {
getValuePropsFunc = undefined;
}
if (!addonAfter && !addonBefore) {
if (!convertValue && !props.getValueProps) {
getValuePropsFunc = undefined;
}

const prepareItemRender = (
inputProps: FormItemProps & {
errors: React.ReactNode[];
warnings: React.ReactNode[];
},
doms: {
input: JSX.Element;
errorList: JSX.Element;
extra: JSX.Element;
}) => {

const nextInput = (addonAfter || addonBefore)
? (
<div
style={{
display: 'flex',
alignItems: 'center',
flexWrap: 'wrap',
...addonWarpStyle,
}}
>
{addonBefore ? (
<div style={{ marginInlineEnd: 8 }}>{addonBefore}</div>
) : null}
{doms.input}
{addonAfter ? (
<div style={{ marginInlineStart: 8 }}>{addonAfter}</div>
) : null}
</div>
)
: doms.input

const nextErrorList = typeof help === 'function'
? help({
errors: inputProps.errors,
warnings: inputProps.warnings,
})
: doms.errorList

return {
...doms,
input: nextInput,
errorList: nextErrorList
}
}

return (
<Form.Item
{...props}
Expand All @@ -203,101 +249,37 @@ const WarpFormItem: React.FC<
// @ts-ignore
_internalItemRender={{
mark: 'pro_table_render',
render: (
inputProps: FormItemProps & {
errors: React.ReactNode[];
warnings: React.ReactNode[];
},
doms: {
input: JSX.Element;
errorList: JSX.Element;
extra: JSX.Element;
},
) => (
<>
{doms.input}
{typeof help === 'function'
? help({
errors: inputProps.errors,
warnings: inputProps.warnings,
})
: doms.errorList}
{doms.extra}
</>
),
prepare: prepareItemRender,
// Legacy
render(...args: Parameters<typeof prepareItemRender>) {
const { input, errorList, extra } = prepareItemRender(...args);
return (
<>
{input}
{errorList}
{extra}
</>
)
}
}}
>
{children}
</Form.Item>
);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [addonAfter, addonBefore, children, convertValue?.toString(), props]);

return (
<Form.Item
{...props}
help={typeof help !== 'function' ? help : undefined}
valuePropName={valuePropName}
// @ts-ignore
_internalItemRender={{
mark: 'pro_table_render',
render: (
inputProps: FormItemProps & {
errors: React.ReactNode[];
warnings: React.ReactNode[];
},
doms: {
input: JSX.Element;
errorList: JSX.Element;
extra: JSX.Element;
},
) => (
<>
<div
style={{
display: 'flex',
alignItems: 'center',
flexWrap: 'wrap',
...addonWarpStyle,
}}
>
{addonBefore ? (
<div style={{ marginInlineEnd: 8 }}>{addonBefore}</div>
) : null}
{doms.input}
{addonAfter ? (
<div style={{ marginInlineStart: 8 }}>{addonAfter}</div>
) : null}
</div>
{typeof help === 'function'
? help({
errors: inputProps.errors,
warnings: inputProps.warnings,
})
: doms.errorList}
{doms.extra}
</>
),
<FormItemProvide.Provider
value={{
name: props.name,
label: props.label,
}}
{...props}
getValueProps={getValuePropsFunc}
>
{children}
</Form.Item>
{formDom}
</FormItemProvide.Provider>
);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [addonAfter, addonBefore, children, convertValue?.toString(), props]);

return (
<FormItemProvide.Provider
value={{
name: props.name,
label: props.label,
}}
>
{formDom}
</FormItemProvide.Provider>
);
};
};

export type ProFormItemProps = FormItemProps & {
ignoreFormItem?: boolean;
Expand Down
Loading