feat: card 组件 extra 属性支持 ReactNode

#1684
NervJS · Nov 6, 2023 · acb1924 · acb1924
1 parent e67eee3
commit acb1924
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/packages/taro-ui/src/components/card/index.tsx b/packages/taro-ui/src/components/card/index.tsx
@@ -55,9 +55,9 @@ export default class AtCard extends React.Component<AtCardProps> {
 
           <Text className='at-card__header-title'>{title}</Text>
           {extra && (
-            <Text style={{ ...extraStyle }} className='at-card__header-extra'>
+            <View style={{ ...extraStyle }} className='at-card__header-extra'>
               {extra}
-            </Text>
+            </View>
           )}
         </View>
         <View className='at-card__content'>
@@ -74,7 +74,6 @@ AtCard.defaultProps = {
   isFull: false,
   thumb: '',
   title: '',
-  extra: '',
   extraStyle: {}
 }
 
@@ -83,7 +82,7 @@ AtCard.propTypes = {
   isFull: PropTypes.bool,
   thumb: PropTypes.string,
   title: PropTypes.string,
-  extra: PropTypes.string,
+  extra: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
   icon: PropTypes.object,
   onClick: PropTypes.func,
   renderIcon: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),

diff --git a/packages/taro-ui/types/card.d.ts b/packages/taro-ui/types/card.d.ts
@@ -1,4 +1,4 @@
-import { MouseEvent, ComponentClass } from 'react'
+import { ComponentClass } from 'react'
 import { CommonEventFunction } from '@tarojs/components/types/common'
 
 import AtComponent, { AtIconBaseProps } from './base'
@@ -23,7 +23,7 @@ export interface AtCardProps extends AtComponent {
   /**
    * 元素的额外信息
    */
-  extra?: string
+  extra?: JSX.Element | string
   /**
    * 元素的额外信息自定义样式
    */