fix(antd): fix array tabs error badges (#2964)

alibaba · Mar 20, 2022 · 060cce8 · 060cce8
1 parent 1658ae3
commit 060cce8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/antd/src/array-tabs/index.tsx b/packages/antd/src/array-tabs/index.tsx
@@ -34,7 +34,9 @@ export const ArrayTabs: React.FC<TabsProps> = observer((props) => {
   }
   const badgedTab = (index: number) => {
     const tab = `${field.title || 'Untitled'} ${index + 1}`
-    const errors = field.errors
+    const errors = field.errors.filter((error) =>
+      error.address.includes(`${field.address}.${index}`)
+    )
     if (errors.length) {
       return (
         <Badge size="small" className="errors-badge" count={errors.length}>

diff --git a/packages/core/src/models/Field.ts b/packages/core/src/models/Field.ts
@@ -53,6 +53,7 @@ import {
 } from '../shared/internals'
 import { Form } from './Form'
 import { BaseField } from './BaseField'
+import { IFormFeedback } from '..'
 export class Field<
   Decorator extends JSXComponent = any,
   Component extends JSXComponent = any,
@@ -276,33 +277,33 @@ export class Field<
     createReactions(this)
   }
 
-  get selfErrors() {
+  get selfErrors(): FeedbackMessage {
     return queryFeedbackMessages(this, {
       type: 'error',
     })
   }
 
-  get errors() {
+  get errors(): IFormFeedback[] {
     return this.form.errors.filter(createChildrenFeedbackFilter(this))
   }
 
-  get selfWarnings() {
+  get selfWarnings(): FeedbackMessage {
     return queryFeedbackMessages(this, {
       type: 'warning',
     })
   }
 
-  get warnings() {
+  get warnings(): IFormFeedback[] {
     return this.form.warnings.filter(createChildrenFeedbackFilter(this))
   }
 
-  get selfSuccesses() {
+  get selfSuccesses(): FeedbackMessage {
     return queryFeedbackMessages(this, {
       type: 'success',
     })
   }
 
-  get successes() {
+  get successes(): IFormFeedback[] {
     return this.form.successes.filter(createChildrenFeedbackFilter(this))
   }