Merge 406a37f into 7138cf6

uxcore · Jun 18, 2019 · a3f20de · a3f20de
2 parents 7138cf6 + 406a37f
commit a3f20de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/demo/CalendarDemo.jsx b/demo/CalendarDemo.jsx
@@ -132,6 +132,7 @@ class Demo extends React.Component {
             value={value}
             onSelect={this.onSelect}
             showDateInput
+            // renderFooter={() => {return 'aaa'}}
           />
         </div>
         <div

diff --git a/src/RcCalendar.jsx b/src/RcCalendar.jsx
@@ -76,7 +76,7 @@ const Calendar = createClass({
     renderSidebar: PropTypes.func,
     yearSelectTotal: PropTypes.number,
     yearSelectOffset: PropTypes.number,
-    localeStr: PropTypes.string
+    localeStr: PropTypes.string,
   },
 
   mixins: [CommonMixin, CalendarMixin],
@@ -211,7 +211,8 @@ const Calendar = createClass({
       disabledTime,
       yearSelectOffset,
       yearSelectTotal,
-      localeStr
+      localeStr,
+      renderFooter,
     } = this.props;
     const { value, selectedValue, showTimePicker } = this.state;
     const disabledTimeConfig = showTimePicker && disabledTime && timePicker
@@ -290,6 +291,7 @@ const Calendar = createClass({
             </div>
           ) : null}
         </div>
+        {renderFooter ? renderFooter() : null}
         {timePicker && showTimePicker ? (
           <CalendarFooter locale={locale} prefixCls={prefixCls} onOk={this.onOk} />
         ) : null}