diff --git a/src/blockHeader/__tests__/__snapshots__/blockHeader.test.tsx.snap b/src/blockHeader/__tests__/__snapshots__/blockHeader.test.tsx.snap index 21fbdb5b0..23c5e2dd0 100644 --- a/src/blockHeader/__tests__/__snapshots__/blockHeader.test.tsx.snap +++ b/src/blockHeader/__tests__/__snapshots__/blockHeader.test.tsx.snap @@ -15,10 +15,10 @@ exports[`test BlockHeader render should render BlockHeader success render 1`] = class="title__box" >
{ <>
- } - /> +
- } - /> + } /> +
+ } /> ); }; diff --git a/src/blockHeader/demos/basic.tsx b/src/blockHeader/demos/basic.tsx index 226c2c667..687163ce8 100644 --- a/src/blockHeader/demos/basic.tsx +++ b/src/blockHeader/demos/basic.tsx @@ -1,4 +1,5 @@ import React, { useState } from 'react'; +import { PieChartOutlined } from '@ant-design/icons'; import { Radio, Space, Switch } from 'antd'; import { BlockHeader } from 'dt-react-component'; import { SizeType } from 'dt-react-component/blockHeader'; @@ -40,6 +41,15 @@ export default () => {

+ } + background={showBackground} + tooltip={tooltip ? '这里展示问号提示' : ''} + description={description ? '提示说明文字' : ''} + /> 基础使用 -自定义 icon +自定义 icon 带提示信息的标题 展开/收起内容 @@ -25,20 +25,20 @@ demo: ### BlockHeader -| 参数 | 说明 | 类型 | 默认值 | -| ----------------- | ---------------------------------- | --------------------------- | -------- | -| title | 标题 | `string` | - | -| addonBefore | 标题前的图标,默认是一个色块 | `React.ReactNode` | - | -| description | 标题提示文案 | `React.ReactNode` | - | -| tooltip | 默认展示问号提示 | `TooltipProps \| TooltipProps['title']` | - | -| addonAfter | 标题后的内容 | `React.ReactNode` | - | -| size | 小标题、中标题,默认为中标题 | `small \| middle \| large` | `middle` | +| 参数 | 说明 | 类型 | 默认值 | +| ------------- | ---------------------------------- | --------------------------------------- | -------- | +| title | 标题 | `string` | - | +| addonBefore | 标题前的图标,默认是一个色块 | `React.ReactNode` | - | +| description | 标题提示文案 | `React.ReactNode` | - | +| tooltip | 默认展示问号提示 | `TooltipProps \| TooltipProps['title']` | - | +| addonAfter | 标题后的内容 | `React.ReactNode` | - | +| size | 小标题、中标题,默认为中标题 | `small \| middle \| large` | `middle` | | className | 标题一行的样式类名 | `string` | - | | style | 标题的样式 | `React.CSSProperties` | - | -| background | 是否显示背景 | `boolean` | `true` | -| expand | 当前展开状态 | `boolean` | | -| defaultExpand | 是否默认展开内容 | `boolean` | `true` | -| hasBottom | 是否有默认下边距 16px | `boolean` | `false` | -| spaceBottom | 自定义下边距,优先级高于 hasBottom | `number` | `0` | -| children | 展开/收起的内容 | `React.ReactNode` | - | -| onExpand | 展开/收起时的回调 | `(expand: boolean) => void` | - | +| background | 是否显示背景 | `boolean` | `true` | +| expand | 当前展开状态 | `boolean` | | +| defaultExpand | 是否默认展开内容 | `boolean` | `true` | +| hasBottom | 是否有默认下边距 16px | `boolean` | `false` | +| spaceBottom | 自定义下边距,优先级高于 hasBottom | `number` | `0` | +| children | 展开/收起的内容 | `React.ReactNode` | - | +| onExpand | 展开/收起时的回调 | `(expand: boolean) => void` | - | diff --git a/src/blockHeader/index.tsx b/src/blockHeader/index.tsx index 67117aee8..30086f8a5 100644 --- a/src/blockHeader/index.tsx +++ b/src/blockHeader/index.tsx @@ -68,7 +68,7 @@ const BlockHeader: React.FC = function (props) { addonAfter, expand, children = '', - addonBefore =
, + addonBefore =
, onExpand, } = props; @@ -98,7 +98,11 @@ const BlockHeader: React.FC = function (props) { onClick={() => handleExpand(!currentExpand)} >
- {addonBefore ?
{addonBefore}
: null} + {addonBefore ? ( +
+ {addonBefore} +
+ ) : null}
{title}
{tooltipProps?.title ? (
diff --git a/src/blockHeader/style.scss b/src/blockHeader/style.scss index b317f533f..8cc1b4a7e 100644 --- a/src/blockHeader/style.scss +++ b/src/blockHeader/style.scss @@ -55,16 +55,29 @@ $card_prefix: "dtc-block-header"; &__addon-before { margin-right: 8px; color: #1D78FF; - &--middle, + &--middle { + .addon-before--default { + width: 4px; + height: 16px; + background-color: #1D78FF; + } + font-size: 20px; + } &--small { - width: 4px; - height: 16px; - background-color: #1D78FF; + .addon-before--default { + width: 4px; + height: 16px; + background-color: #1D78FF; + } + font-size: 16px; } &--large { - width: 4px; - height: 20px; - background-color: #1D78FF; + .addon-before--default { + width: 4px; + height: 20px; + background-color: #1D78FF; + } + font-size: 24px; } } &__tooltip {