feat(validateFields): add message to reject error type (#748)

react-component · Jan 22, 2025 · cb73743 · cb73743
1 parent 24c7583
commit cb73743
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/interface.ts b/src/interface.ts
@@ -86,6 +86,7 @@ export type RuleObject = AggregationRule | ArrayRule;
 export type Rule = RuleObject | RuleRender;
 
 export interface ValidateErrorEntity<Values = any> {
+  message: string;
   values: Values;
   errorFields: { name: InternalNamePath; errors: string[] }[];
   outOfDate: boolean;

diff --git a/src/useForm.ts b/src/useForm.ts
@@ -982,7 +982,9 @@ export class FormStore {
       })
       .catch((results: { name: InternalNamePath; errors: string[] }[]) => {
         const errorList = results.filter(result => result && result.errors.length);
+        const errorMessage = errorList[0]?.errors?.[0];
         return Promise.reject({
+          message: errorMessage,
           values: this.getFieldsValue(namePathList),
           errorFields: errorList,
           outOfDate: this.lastValidatePromise !== summaryPromise,

diff --git a/tests/index.test.tsx b/tests/index.test.tsx
@@ -328,9 +328,12 @@ describe('Form.Basic', () => {
     matchError(container, "'user' is required");
     expect(onFinish).not.toHaveBeenCalled();
     expect(onFinishFailed).toHaveBeenCalledWith({
+      message: "'user' is required",
       errorFields: [{ name: ['user'], errors: ["'user' is required"], warnings: [] }],
       outOfDate: false,
-      values: {},
+      values: {
+        user: undefined
+      },
     });
 
     onFinish.mockReset();