Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0

This commit is contained in:
afc163 2015-10-26 11:09:12 +08:00
commit 4edb61876e
2 changed files with 2 additions and 6 deletions

View File

@ -1,7 +1,6 @@
# 添加
- order: 4
- hidden: true
演示添加删除功能。
@ -23,9 +22,6 @@ var addStyle = {
pointerEvents: 'auto',
color: 'black',
};
var extraStyle = {
float: 'right'
};
var Test = React.createClass({
getInitialState() {
@ -77,7 +73,7 @@ var Test = React.createClass({
return <Tabs
onChange={this.onChange}
activeKey={this.state.activeKey}
tabBarExtraContent={<div style={extraStyle}><Button type="primary">其它操作</Button></div>}>
tabBarExtraContent={<Button type="primary">其它操作</Button>}>
{
this.state.tabs.map((t)=>{
return <TabPane key={t.title} tab={<div>{t.title} <Icon type="cross" style={closeStyle} onClick={this.remove.bind(this,t.title)}></Icon></div>}>

View File

@ -56,7 +56,7 @@
"rc-steps": "~1.3.2",
"rc-switch": "~1.2.0",
"rc-table": "~3.2.0",
"rc-tabs": "~5.4.2",
"rc-tabs": "~5.4.3",
"rc-tooltip": "~3.0.1",
"rc-tree": "~0.16.2",
"rc-upload": "~1.6.4",