diff --git a/packages/card/en-US.md b/packages/card/en-US.md index aed4886c0..78ce5b3df 100644 --- a/packages/card/en-US.md +++ b/packages/card/en-US.md @@ -75,6 +75,7 @@ Use slot to custom content. | num | Custom num | | price | Custom price | | origin-price | Custom origin price | +| bottom | Custom price bottom | | thumb | Custom thumb | | tag | Custom thumb tag | | tags | Custom tags | diff --git a/packages/card/index.less b/packages/card/index.less index fde0b3cb0..2e6eecd9e 100644 --- a/packages/card/index.less +++ b/packages/card/index.less @@ -31,7 +31,7 @@ flex: 1; flex-direction: column; min-width: 0; /* hack for flex box ellipsis */ - height: @card-thumb-size; + min-height: @card-thumb-size; &--centered { justify-content: center; diff --git a/packages/card/index.tsx b/packages/card/index.tsx index ede70c584..bbecdbca0 100644 --- a/packages/card/index.tsx +++ b/packages/card/index.tsx @@ -29,6 +29,7 @@ export type CardSlots = DefaultSlots & { title?: ScopedSlot; thumb?: ScopedSlot; price?: ScopedSlot; + bottom?: ScopedSlot; footer?: ScopedSlot; 'origin-price'?: ScopedSlot; }; @@ -155,6 +156,7 @@ function Card( {Price()} {OriginPrice()} {Num()} + {slots.bottom && slots.bottom()} )} diff --git a/packages/card/test/__snapshots__/index.spec.js.snap b/packages/card/test/__snapshots__/index.spec.js.snap index c57dd3037..9a15c3e0a 100644 --- a/packages/card/test/__snapshots__/index.spec.js.snap +++ b/packages/card/test/__snapshots__/index.spec.js.snap @@ -1,5 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`render bottom slot 1`] = ` +