diff --git a/components/datepicker/demo/transitionName.md b/components/datepicker/demo/transitionName.md new file mode 100644 index 0000000000..8be56917a1 --- /dev/null +++ b/components/datepicker/demo/transitionName.md @@ -0,0 +1,17 @@ +# 基本 + +- order: 0 + +启用动画。 + +--- + +````jsx +var Datepicker = antd.Datepicker; + +React.render( + +, document.getElementById('components-datepicker-demo-transitionname')); +```` diff --git a/components/datepicker/index.jsx b/components/datepicker/index.jsx index 62c88b84fe..4f5417371b 100644 --- a/components/datepicker/index.jsx +++ b/components/datepicker/index.jsx @@ -68,6 +68,7 @@ export default React.createClass({ ); return ( } calendar={calendar} formatter={new DateTimeFormat(this.props.format)} diff --git a/components/datepicker/index.md b/components/datepicker/index.md index a1fa308b13..5ce53f76c4 100644 --- a/components/datepicker/index.md +++ b/components/datepicker/index.md @@ -23,6 +23,7 @@ | value | 日期 | string | 无 | | format | 展示的日期格式 | string | "yyyy-MM-dd" | | disabled | 不可选择的日期 | function | 无 | +| transitionName | 动画名称 | String.可取 'slide-up' | 无. | | onSelect | 选择日期的回调 | function | 无 | | showTime | 显示时间选择条 | boolean | false | diff --git a/package.json b/package.json index 12af22a387..ccc837da12 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "dependencies": { "gregorian-calendar": "~3.0.0", "gregorian-calendar-format": "~3.0.1", - "rc-calendar": "~3.9.0", + "rc-calendar": "~3.10.0", "rc-dialog": "~4.3.5", "rc-dropdown": "~1.1.1", "rc-input-number": "~2.0.0",