diff --git a/src/components/AvatarList/demo/simple.md b/src/components/AvatarList/demo/simple.md index a9341ff415f1f336b0e34e5ecfa7bd4977273ec0..f531e1625a07233ec2174dc3afb137456f4553e3 100644 --- a/src/components/AvatarList/demo/simple.md +++ b/src/components/AvatarList/demo/simple.md @@ -9,10 +9,10 @@ title: 基础样例 import AvatarList from 'ant-design-pro/lib/AvatarList'; ReactDOM.render( - - - - + + + + , mountNode); ```` diff --git a/src/components/AvatarList/index.less b/src/components/AvatarList/index.less index 6330297e8005a4f5576e9ed5bf0b57b439bf2803..601babd25665b5d8ac359b99070fc1af5a4c3ea7 100644 --- a/src/components/AvatarList/index.less +++ b/src/components/AvatarList/index.less @@ -10,12 +10,16 @@ } .avatarItem { - border: 1px solid #fff; display: inline-block; font-size: @font-size-base; margin-left: -8px; width: @avatar-size-base; height: @avatar-size-base; + :global { + .ant-avatar { + border: 1px solid #fff; + } + } } .avatarItemLarge { diff --git a/src/components/AvatarList/index.md b/src/components/AvatarList/index.md index ad2b7bc43287491d76419cf6656f19b411d8a515..275f701e184eb12245a9ac5d51632278673b651a 100644 --- a/src/components/AvatarList/index.md +++ b/src/components/AvatarList/index.md @@ -5,7 +5,7 @@ order: 1 cols: 1 --- -一组用户头像,常用在项目/团队成员列表。 +一组用户头像,常用在项目/团队成员列表。可通过设置 `size` 属性来指定头像大小。 ## API @@ -13,7 +13,7 @@ cols: 1 | 参数 | 说明 | 类型 | 默认值 | |----------|------------------------------------------|-------------|-------| -| size | 头像大小 | `large`、`small` | - | +| size | 头像大小 | `large`、`small` 、`mini`, `default` | `default` | ### AvatarList.Item diff --git a/src/components/Charts/ChartCard/index.less b/src/components/Charts/ChartCard/index.less index 5cda326e98df471773ede65c29ac7ba023e10300..d6bb659eff3a1db9989a168e2968acc1757d4297 100644 --- a/src/components/Charts/ChartCard/index.less +++ b/src/components/Charts/ChartCard/index.less @@ -25,6 +25,7 @@ height: 38px; } .content { + margin-bottom: 12px; position: relative; width: 100%; } @@ -37,7 +38,7 @@ .footer { border-top: 1px solid @border-color-split; padding-top: 9px; - margin-top: 20px; + margin-top: 8px; & > * { position: relative; } diff --git a/src/components/Charts/MiniProgress/index.js b/src/components/Charts/MiniProgress/index.js index 2f0fafcdabd1ebc99ba50353c891581ab2a3524b..08fe9b536071e9b42183a221f3a102b6d1d797b9 100644 --- a/src/components/Charts/MiniProgress/index.js +++ b/src/components/Charts/MiniProgress/index.js @@ -3,7 +3,7 @@ import { Tooltip } from 'antd'; import styles from './index.less'; -const MiniProgress = ({ target, color, strokeWidth, percent }) => ( +const MiniProgress = ({ target, color = 'rgb(19, 194, 194)', strokeWidth, percent }) => (
} + action={} total={yuan(126560)} footer={} contentHeight={46} diff --git a/src/components/Charts/demo/mini-progress.md b/src/components/Charts/demo/mini-progress.md index daca766a3232e5099863148384d96fec2061e723..6308a8faedb90224d50a2aee0a9f97a28dabb793 100644 --- a/src/components/Charts/demo/mini-progress.md +++ b/src/components/Charts/demo/mini-progress.md @@ -7,6 +7,6 @@ title: 迷你进度条 import { MiniProgress } from 'ant-design-pro/lib/Charts'; ReactDOM.render( - + , mountNode); ```` diff --git a/src/components/Charts/demo/mix.md b/src/components/Charts/demo/mix.md index 6273bfe1dde4d11d01b21f2133807e9654a142bc..c550112d02ade59e36ab0f7e9fe16349613db50f 100644 --- a/src/components/Charts/demo/mix.md +++ b/src/components/Charts/demo/mix.md @@ -37,7 +37,6 @@ ReactDOM.render( /> @@ -46,7 +45,7 @@ ReactDOM.render( } + action={} total={numeral(8846).format('0,0')} footer={} contentHeight={46} @@ -60,7 +59,7 @@ ReactDOM.render( } + action={} total="78%" footer={
@@ -76,7 +75,7 @@ ReactDOM.render( } contentHeight={46} > - + diff --git a/src/components/Charts/demo/tag-cloud.md b/src/components/Charts/demo/tag-cloud.md index c86bdd84d9dc3ae0fdbf02db36daaa42f7d0c926..c66f6fe6bf8bdafb8e31d359a9cabe401568480e 100644 --- a/src/components/Charts/demo/tag-cloud.md +++ b/src/components/Charts/demo/tag-cloud.md @@ -11,7 +11,7 @@ import { TagCloud } from 'ant-design-pro/lib/Charts'; const tags = []; for (let i = 0; i < 50; i += 1) { tags.push({ - name: `test-${i}`, + name: `TagClout-Title-${i}`, value: Math.floor((Math.random() * 50)) + 20, }); }