feat(FormControl): support ruleDependencies #3729
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Review or Edit in CodeSandboxOpen the branch in Web Editor • VS Code • Insiders |
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
1 Ignored Deployment
|
|
@myNameIsDu is attempting to deploy a commit to the rsuite Team on Vercel. A member of the Team first needs to authorize it. |
|
This pull request is automatically built and testable in CodeSandbox. To see build info of the built libraries, click here or the icon next to each commit SHA. |
simonguo
reviewed
Apr 7, 2024
simonguo
requested changes
Apr 7, 2024
myNameIsDu
force-pushed
the
feat/form-ruleDependencies
branch
from
ad71e89
to
c20d7f2
Compare
simonguo
requested changes
Apr 8, 2024
src/FormControl/FormControl.tsx
Outdated
Comment on lines
233
to
243
| const checkedErrors = checkFieldNames.reduce((acc, checkFieldName) => { | ||
| const checkResult = model?.checkForField(checkFieldName, nextFormValue); | ||
| if (checkResult.hasError) { | ||
| acc[checkFieldName] = checkResult.errorMessage || checkResult; | ||
| } | ||
| return acc; | ||
| }, {} as Record<string, ReactNode>); | ||
| const nextError = { | ||
| ...omit(formError, checkFieldNames), | ||
| ...checkedErrors | ||
| }; |
There was a problem hiding this comment.
This code has a high degree of duplication with the code in then, and it is best to abstract out the reused code.
| @@ -193,6 +193,7 @@ cleanErrorForField: (fieldName: keyof E, callback?: () => void) => void; | |||
| | plaintext | boolean | Make the control plaintext. | | |||
| | readOnly | boolean | Make the control readonly. | | |||
| | rule | checkType | Current field verification rule. If it conflicts with the `<Form>`'s `model`, it get higher priority, [example](/components/form-validation/#field-level-verification-rules). | | |||
| | ruleDependencies | string[] | The dependent fields for the check. | | |||
There was a problem hiding this comment.
Add version badge:
The dependent fields for the check. <br/>
| @@ -180,8 +180,10 @@ cleanErrorForField: (fieldName: keyof E, callback?: () => void) => void; | |||
| | plaintext | boolean | 使控件为纯文本。 | | |||
| | readOnly | boolean | 使控件为只读。 | | |||
| | rule | checkType | 当前字段的校验规则，如果与`<Form>`的`model`冲突，以当前为准，[示例](/zh/components/form-validation/#field-级别的校验规则)。 | | |||
| | ruleDependencies | string[] | 校验依赖的字段。 | | |||
There was a problem hiding this comment.
Add version badge:
校验依赖的字段。 <br/>
src/FormControl/FormControl.tsx
Outdated
| @@ -71,6 +73,9 @@ export interface FormControlProps<P = any, ValueType = any> | |||
|
|
|||
| /** Validation rule */ | |||
| rule?: CheckType<unknown, any>; | |||
|
|
|||
| /** The dependent fields for the check */ | |||
There was a problem hiding this comment.
Indicate version
/**
* The dependent fields for the check.
* @version 5.60.0
*/
simonguo
changed the title
myNameIsDu
force-pushed
the
feat/form-ruleDependencies
branch
from
c20d7f2
to
f10b678
Compare
myNameIsDu
force-pushed
the
feat/form-ruleDependencies
branch
from
f10b678
to
2fa4eab
Compare
myNameIsDu
force-pushed
the
feat/form-ruleDependencies
branch
from
2fa4eab
to
8f77273
Compare
myNameIsDu
force-pushed
the
feat/form-ruleDependencies
branch
from
8f77273
to
9b3c1f9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
before
Kapture.2024-04-07.at.17.08.22.mp4
after
Kapture.2024-04-07.at.17.10.41.mp4