diff --git a/components/datepicker/demo/month-picker.md b/components/datepicker/demo/month-picker.md new file mode 100644 index 000000000..47e72827b --- /dev/null +++ b/components/datepicker/demo/month-picker.md @@ -0,0 +1,15 @@ +# 月选择器 + +- order: 9 + +使用 MonthPicker 实现月选择器. + +--- + +````jsx +import { Datepicker } from 'antd'; +const MonthPicker = Datepicker.MonthPicker; +ReactDOM.render( + +, document.getElementById('components-datepicker-demo-month-picker')); +```` diff --git a/components/datepicker/index.jsx b/components/datepicker/index.jsx index 3cbc77446..d0ca23241 100644 --- a/components/datepicker/index.jsx +++ b/components/datepicker/index.jsx @@ -8,11 +8,11 @@ import CalendarLocale from 'rc-calendar/lib/locale/zh_CN'; import DateTimeFormat from 'gregorian-calendar-format'; import objectAssign from 'object-assign'; -function createPicker(TheCalendar) { +function createPicker(TheCalendar, defaultFormat) { return React.createClass({ getDefaultProps() { return { - format: 'yyyy-MM-dd', + format: defaultFormat || 'yyyy-MM-dd', transitionName: 'slide-up', popupStyle: {}, onSelect: null, // 向前兼容 @@ -154,7 +154,7 @@ function createPicker(TheCalendar) { } const AntDatePicker = createPicker(Calendar); -const AntMonthPicker = createPicker(MonthCalendar); +const AntMonthPicker = createPicker(MonthCalendar, 'yyyy-MM'); const AntCalendar = React.createClass({ getDefaultProps() { diff --git a/scripts/demo.js b/scripts/demo.js index 82c91e8d9..d2a4d5d16 100644 --- a/scripts/demo.js +++ b/scripts/demo.js @@ -1,10 +1,25 @@ -window.require = function(path) { - if (path in window) { - return window[path]; - } else { - throw 'There should not have modules here: ' + path; - } +function capitalizeFirstLetter(string) { + return string.charAt(0).toUpperCase() + string.slice(1); +} + +window.require = function (path) { + var result = window; + var namespaces = path.split('/'); + namespaces.forEach(function (key, i) { + if (i === 2) { + key = capitalizeFirstLetter(key); + } + if (key !== 'lib') { + if (result[key]) { + result = result[key]; + } else { + throw 'There should not have modules here: ' + path; + } + } + }); + return result; }; + window['css-animation'] = require('css-animation'); window['react-router'] = require('react-router'); window.Clip = require('./clip'); @@ -101,7 +116,7 @@ InstantClickChangeFns.push(function () { ReactDOM.render( - , document.getElementById('versions-select')); + , document.getElementById('versions-select')); }); window.BrowserDemo = React.createClass({ @@ -114,7 +129,7 @@ window.BrowserDemo = React.createClass({
- +
{this.props.children} diff --git a/style/components/table.less b/style/components/table.less index 800a5e0b2..0efc47119 100644 --- a/style/components/table.less +++ b/style/components/table.less @@ -245,6 +245,7 @@ } &.clear { float: right; + margin-right: -32px; } } }