mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-12-01 23:29:30 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

Merge branch 'Carrotzpc-develop-0.12.0' into develop-0.12.0

Browse Source
This commit is contained in:
afc163 2016-01-14 20:40:49 +08:00
commit e91b630e8a
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/tag/demo/basic.md
View File

@ -17,6 +17,6 @@ ReactDOM.render(<div>
<Tag>标签一</Tag> <Tag>标签一</Tag>
<Tag>标签二</Tag> <Tag>标签二</Tag>
<Tag closable onClose={onClose}>标签三</Tag> <Tag closable onClose={onClose}>标签三</Tag>
<Tag href="http://www.baidu.com">标签四（链接）</Tag> <a href="https://www.alipay.com/" target="_blank"><Tag>标签四（链接）</Tag></a>
</div>, mountNode); </div>, mountNode);
```` ````

2
components/tag/index.jsx
View File

@ -45,7 +45,7 @@ class AntTag extends React.Component {
transitionName={this.props.prefixCls + '-zoom'} transitionName={this.props.prefixCls + '-zoom'}
onEnd={this.animationEnd.bind(this)}> onEnd={this.animationEnd.bind(this)}>
<div data-show={!this.state.closing} className={className}> <div data-show={!this.state.closing} className={className}>
<a className={this.props.prefixCls + '-text'} {...this.props} /> <span className={this.props.prefixCls + '-text'} {...this.props} />
{close} {close}
</div> </div>
</Animate> </Animate>

1
components/tag/index.md
View File

@ -17,7 +17,6 @@
| 参数 | 说明 | 类型 | 可选值 | 默认值 | | 参数 | 说明 | 类型 | 可选值 | 默认值 |
|----------------|--------------------------------|------------|---------|--------| |----------------|--------------------------------|------------|---------|--------|
| href | 链接的地址，会传给 a 标签 | string | | false |
| closable | 标签是否可以关闭 | boolean | | false | | closable | 标签是否可以关闭 | boolean | | false |
| onClose | 组合时根据此项判定checked | function | | 无 | | onClose | 组合时根据此项判定checked | function | | 无 |
| color | 标签的色彩 | string | blue green yellow red | 无 | | color | 标签的色彩 | string | blue green yellow red | 无 |