diff --git a/README.md b/README.md index 430b0f84..ea6f13c1 100644 --- a/README.md +++ b/README.md @@ -472,6 +472,12 @@ http://react-component.github.io/calendar/examples/index.html called when a date is changed inside calendar (next year/next month/keyboard) + + renderFooter + () => React.Node + + extra footer + diff --git a/assets/index.less b/assets/index.less index 91787674..89e11059 100644 --- a/assets/index.less +++ b/assets/index.less @@ -8,7 +8,3 @@ @import "index/DecadePanel"; @import "common/RangeCalendar"; @import "common/FullCalendar"; - -.@{prefixClass}-month-calendar { - height: 308px; -} \ No newline at end of file diff --git a/assets/index/MonthPanel.less b/assets/index/MonthPanel.less index 22b57ea5..6fd91d76 100644 --- a/assets/index/MonthPanel.less +++ b/assets/index/MonthPanel.less @@ -119,8 +119,6 @@ } } - - .@{prefixClass}-month-panel-selected-cell .@{prefixClass}-month-panel-month { background: #3fc7fa; color: #fff; @@ -130,3 +128,8 @@ color: #fff; } } + +.@{prefixClass}-month-header-wrap { + position: relative; + height: 308px; +} diff --git a/src/MonthCalendar.jsx b/src/MonthCalendar.jsx index 8e4e00aa..aa15220c 100644 --- a/src/MonthCalendar.jsx +++ b/src/MonthCalendar.jsx @@ -3,6 +3,7 @@ import createReactClass from 'create-react-class'; import PropTypes from 'prop-types'; import KeyCode from 'rc-util/lib/KeyCode'; import CalendarHeader from './calendar/CalendarHeader'; +import CalendarFooter from './calendar/CalendarFooter'; import CalendarMixin from './mixin/CalendarMixin'; import CommonMixin from './mixin/CommonMixin'; @@ -74,18 +75,26 @@ const MonthCalendar = createReactClass({ const { props, state } = this; const { mode, value } = state; const children = ( - +
+
+ +
+ +
); return this.renderRoot({ className: `${props.prefixCls}-month-calendar`,