feat(next/antd): support disabled props from field in ArrayBase.Addit…

…ion (#2746)
alibaba · Jan 11, 2022 · 29624ca · 29624ca
1 parent 129cd69
commit 29624ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/antd/src/array-base/index.tsx b/packages/antd/src/array-base/index.tsx
@@ -11,7 +11,7 @@ import { AntdIconProps } from '@ant-design/icons/lib/components/AntdIcon'
 import { ButtonProps } from 'antd/lib/button'
 import { ArrayField } from '@formily/core'
 import { useField, useFieldSchema, Schema, JSXComponent } from '@formily/react'
-import { isValid, clone } from '@formily/shared'
+import { isValid, clone, isBool } from '@formily/shared'
 import { SortableHandle } from 'react-sortable-hoc'
 import { usePrefixCls } from '../__builtins__'
 import cls from 'classnames'
@@ -148,7 +148,7 @@ ArrayBase.Addition = (props) => {
       type="dashed"
       block
       {...props}
-      disabled={array.field?.disabled}
+      disabled={isBool(self?.disabled) ? self?.disabled : array.field?.disabled}
       className={cls(`${prefixCls}-addition`, props.className)}
       onClick={(e) => {
         if (array.props?.disabled) return

diff --git a/packages/next/src/array-base/index.tsx b/packages/next/src/array-base/index.tsx
@@ -1,6 +1,6 @@
 import React, { createContext, useContext } from 'react'
 import { Button } from '@alifd/next'
-import { isValid, clone } from '@formily/shared'
+import { isValid, clone, isBool } from '@formily/shared'
 import { ButtonProps } from '@alifd/next/lib/button'
 import { ArrayField } from '@formily/core'
 import { useField, useFieldSchema, Schema, JSXComponent } from '@formily/react'
@@ -146,7 +146,7 @@ ArrayBase.Addition = (props) => {
   return (
     <Button
       {...props}
-      disabled={array.field?.disabled}
+      disabled={isBool(self?.disabled) ? self?.disabled : array.field?.disabled}
       className={cls(`${prefixCls}-addition`, props.className)}
       style={{ display: 'block', width: '100%', ...props.style }}
       onClick={(e) => {