diff --git a/src/blockHeader/__tests__/__snapshots__/blockHeader.test.tsx.snap b/src/blockHeader/__tests__/__snapshots__/blockHeader.test.tsx.snap index 23c5e2dd0..3fd7ca01b 100644 --- a/src/blockHeader/__tests__/__snapshots__/blockHeader.test.tsx.snap +++ b/src/blockHeader/__tests__/__snapshots__/blockHeader.test.tsx.snap @@ -7,6 +7,7 @@ exports[`test BlockHeader render should render BlockHeader success render 1`] =
{ }); test('should render BlockHeader correct margin-bottom', () => { - const { container: noStyle } = render(); - expect(noStyle.querySelector('.dtc-block-header')).not.toHaveAttribute('style'); + const { container: haveStyle } = render(); + expect(haveStyle.querySelector('.dtc-block-header')).toHaveAttribute('style'); const { container: defaultBottom } = render( ); expect(defaultBottom.querySelector('.dtc-block-header')).toHaveStyle({ marginBottom: 16 }); const { container: customizeBottom } = render( - + ); expect(customizeBottom.querySelector('.dtc-block-header')).toHaveStyle({ marginBottom: 10, diff --git a/src/blockHeader/demos/addonBefore.tsx b/src/blockHeader/demos/addonBefore.tsx index dc4829d11..5794f6559 100644 --- a/src/blockHeader/demos/addonBefore.tsx +++ b/src/blockHeader/demos/addonBefore.tsx @@ -6,11 +6,8 @@ export default () => { return ( <> -
-
} /> -
} /> ); diff --git a/src/blockHeader/demos/basic.tsx b/src/blockHeader/demos/basic.tsx index 687163ce8..def041999 100644 --- a/src/blockHeader/demos/basic.tsx +++ b/src/blockHeader/demos/basic.tsx @@ -44,7 +44,6 @@ export default () => { } background={showBackground} tooltip={tooltip ? '这里展示问号提示' : ''} diff --git a/src/blockHeader/index.md b/src/blockHeader/index.md index ea8caf1ef..8f512d556 100644 --- a/src/blockHeader/index.md +++ b/src/blockHeader/index.md @@ -38,7 +38,6 @@ demo: | background | 是否显示背景 | `boolean` | `true` | | expand | 当前展开状态 | `boolean` | | | defaultExpand | 是否默认展开内容 | `boolean` | `true` | -| hasBottom | 是否有默认下边距 16px | `boolean` | `false` | -| spaceBottom | 自定义下边距,优先级高于 hasBottom | `number` | `0` | +| spaceBottom | 自定义下边距,优先级高于 hasBottom | `number` | `16` | | children | 展开/收起的内容 | `React.ReactNode` | - | | onExpand | 展开/收起时的回调 | `(expand: boolean) => void` | - | diff --git a/src/blockHeader/index.tsx b/src/blockHeader/index.tsx index 30086f8a5..8a2c33c03 100644 --- a/src/blockHeader/index.tsx +++ b/src/blockHeader/index.tsx @@ -30,8 +30,6 @@ export interface IBlockHeaderProps { * 默认 中标题 */ size?: SizeType; - /** 是否展示 Bottom,默认 false,Bottom 值 16px */ - hasBottom?: boolean; /** 自定义 Bottom 值 */ spaceBottom?: number; /** 标题一行的样式类名 */ @@ -59,8 +57,7 @@ const BlockHeader: React.FC = function (props) { description = '', tooltip, size = 'middle', - hasBottom = false, - spaceBottom = 0, + spaceBottom = 16, className = '', style = {}, background = true, @@ -79,7 +76,6 @@ const BlockHeader: React.FC = function (props) { const tooltipProps = toTooltipProps(tooltip); let bottomStyle; - if (hasBottom) bottomStyle = { marginBottom: 16 }; if (spaceBottom) bottomStyle = { marginBottom: spaceBottom }; const handleExpand = (expand: boolean) => {