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

This commit is contained in:
afc163 2015-08-21 15:15:58 +08:00
commit d100fd4fa8
10 changed files with 17 additions and 19 deletions

View File

@ -10,7 +10,7 @@
var Menu = antd.Menu;
var Dropdown = antd.Dropdown;
var menu = <Menu>
var menu = <Menu style={{width:150}}>
<Menu.Item>
<a target="_blank" href="http://www.alipay.com/">第一个菜单项</a>
</Menu.Item>

View File

@ -9,11 +9,11 @@
````jsx
var Menu = antd.Menu;
var Dropdown = antd.Dropdown;
var onClick = function ({key}){
var onSelect = function ({key}){
alert('选中了菜单' + key);
};
var menu = <Menu onClick={onClick}>
var menu = <Menu onSelect={onSelect} style={{width:150}}>
<Menu.Item key="1">第一个菜单项</Menu.Item>
<Menu.Item key="2">第二个菜单项</Menu.Item>
<Menu.Item key="3">第三个菜单项</Menu.Item>

View File

@ -10,7 +10,7 @@
var Menu = antd.Menu;
var Dropdown = antd.Dropdown;
var menu = <Menu>
var menu = <Menu style={{width:150}}>
<Menu.Item key="0">
<a target="_blank" href="http://www.alipay.com/">第一个菜单项</a>
</Menu.Item>

View File

@ -10,7 +10,7 @@
var Menu = antd.Menu;
var Dropdown = antd.Dropdown;
var menu = <Menu>
var menu = <Menu style={{width:150}}>
<Menu.Item key="0">
<a href="http://www.alipay.com/">第一个菜单项</a>
</Menu.Item>

View File

@ -63,7 +63,6 @@ export default React.createClass({
<Tooltip placement={this.props.placement}
overlayStyle={this.props.overlayStyle}
prefixCls={prefixCls}
renderPopupToBody={true}
onVisibleChange={this.onVisibleChange}
transitionName={transitionName}
visible={this.state.visible}

View File

@ -33,7 +33,6 @@ export default React.createClass({
prefixCls={prefixCls}
delay={0.1}
overlayStyle={this.props.overlayStyle}
renderPopupToBody={true}
transitionName={transitionName}
trigger={this.props.trigger}
overlay={overlay}>

View File

@ -37,10 +37,10 @@ var App = React.createClass({
},
render() {
var provinceOptions = provinceData.map(function(province) {
return <Option value={province}>{province}</Option>;
return <Option key={province}>{province}</Option>;
});
var cityOptions = this.state.cities.map(function(city) {
return <Option value={city}>{city}</Option>;
return <Option key={city}>{city}</Option>;
});
return <div>
<Select defaultValue={provinceData[0]} style={{width:150}} onChange={this.handleProvinceChange}>

View File

@ -39,11 +39,11 @@
"is-equal-shallow": "~0.1.3",
"object-assign": "3.x",
"rc-animate": "~1.1.0",
"rc-calendar": "~3.13.0",
"rc-calendar": "~3.14.0",
"rc-checkbox": "~1.1.1",
"rc-collapse": "~1.2.3",
"rc-dialog": "~5.0.1",
"rc-dropdown": "~1.2.0",
"rc-dropdown": "~1.3.0",
"rc-form-validation": "~2.4.7",
"rc-input-number": "~2.0.1",
"rc-menu": "~4.3.1",
@ -57,7 +57,7 @@
"rc-switch": "~1.2.0",
"rc-table": "~3.1.0",
"rc-tabs": "~5.3.2",
"rc-tooltip": "~2.5.0",
"rc-tooltip": "~2.6.1",
"rc-tree": "~0.14.3",
"rc-upload": "~1.3.1",
"rc-util": "~2.0.3",
@ -71,7 +71,6 @@
"babel-loader": "^5.3.2",
"busboy": "~0.2.9",
"chalk": "~1.1.0",
"css-animation": "~1.0.3",
"css-loader": "^0.14.1",
"eslint": "^1.1.0",
"eslint-plugin-react": "~3.2.2",
@ -84,7 +83,6 @@
"lodash": "^3.10.0",
"nico-jsx": "~0.5.8",
"precommit-hook": "^1.0.7",
"rc-tabs": "~5.3.3",
"react-router": "~1.0.0-beta3",
"webpack": "^1.10.1",
"webpack-dev-middleware": "^1.2.0"

View File

@ -1,17 +1,19 @@
.@{calendar-prefix-cls}-picker .@{calendar-prefix-cls},
.@{calendar-prefix-cls}-picker-container .@{calendar-prefix-cls} {
&-hidden {
display: none;
}
position: absolute;
display: none;
left: -9999px;
top: -9999px;
z-index: 9;
z-index: 1000;
}
.@{calendar-prefix-cls}-picker {
position: relative;
display: inline-block;
&-input {
> input {
outline: none;
}

View File

@ -287,7 +287,7 @@
box-shadow: @overlay-shadow;
border-radius: 4px;
box-sizing: border-box;
z-index: 100;
z-index: 1000;
left: -9999px;
top: -9999px;
position: absolute;