mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-25 19:50:05 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
afc163 2015-08-24 14:34:33 +08:00
commit 7a01d55b2a
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/datepicker/index.jsx
View File

@ -17,7 +17,7 @@ Locale.shortMonths = ['1月', '2月', '3月', '4月', '5月', '6月',
let defaultCalendarValue = new GregorianCalendar(zhCn);
defaultCalendarValue.setTime(Date.now());
export default React.createClass({
const AntDatepicker = React.createClass({
getInitialState() {
var value;
if (this.props.value) {
@ -93,3 +93,19 @@ export default React.createClass({
);
}
});
const AntCalendar = React.createClass({
getDefaultProps() {
return {
locale: CalendarLocale,
prefixCls: 'ant-calendar',
};
},
render() {
return <Calendar {...this.props}/>;
}
});
AntDatepicker.Calendar = AntCalendar;
export default AntDatepicker;

2
package.json
View File

@ -39,7 +39,7 @@
"is-equal-shallow": "~0.1.3",
"object-assign": "3.x",
"rc-animate": "~1.2.0",
"rc-calendar": "~3.14.2",
"rc-calendar": "~3.15.0",
"rc-checkbox": "~1.1.1",
"rc-collapse": "~1.3.0",
"rc-dialog": "~5.0.2",