fix(DatePicker): defaultDate should consider maxDate & minDate. fix #…

…1033 (#1035)

components/date-picker/__tests__/__snapshots__/demo.test.web.js.snap

@@ -24,7 +24,7 @@ exports[`renders ./components/date-picker/demo/basic.md correctly 1`] = `
             <div
               class="am-list-extra"
             >
-              2016-11-22
+              可选,小于结束日期
             </div>
             <div
               class="am-list-arrow am-list-arrow-horizontal"

components/date-picker/demo/basic.md

@@ -16,7 +16,7 @@ import 'moment/locale/zh-cn';
 import enUs from 'antd-mobile/lib/date-picker/locale/en_US';
 
 const zhNow = moment().locale('zh-cn').utcOffset(8);
-const maxDate = moment('2018-12-03 +0800', 'YYYY-MM-DD Z').utcOffset(8);
+const maxDate = moment('2016-12-03 +0800', 'YYYY-MM-DD Z').utcOffset(8);
 const minDate = moment('2015-08-06 +0800', 'YYYY-MM-DD Z').utcOffset(8);
 
 const maxTime = moment('22:00 +0800', 'HH:mm Z').utcOffset(8);
@@ -59,7 +59,7 @@ class Test extends React.Component {
           title="选择日期"
           extra="可选,小于结束日期"
           {...getFieldProps('date1', {
-            initialValue: zhNow,
+
           })}
           minDate={minDate}
           maxDate={maxDate}

components/date-picker/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PopupDatePicker from 'rmc-date-picker/lib/Popup';
 import PopupStyles from '../picker/styles';
-import { formatFn, getProps as getDefaultProps } from './utils';
+import { formatFn, getProps as getDefaultProps, getDefaultDate } from './utils';
 import assign from 'object-assign';
 import tsPropsType from './PropsType';
 import RCDatePicker from 'rmc-date-picker/lib/DatePicker';
@@ -44,7 +44,7 @@ export default class DatePicker extends React.Component<tsPropsType, any> {
         mode={props.mode}
         minDate={props.minDate}
         maxDate={props.maxDate}
-        defaultDate={value || defaultDate}
+        defaultDate={value || getDefaultDate(this.props)}
       />
     );
     const newProps = {
@@ -57,7 +57,7 @@ export default class DatePicker extends React.Component<tsPropsType, any> {
         datePicker={dataPicker}
         styles={styles}
         {...newProps}
-        date={value || defaultDate}
+        date={value || getDefaultDate(this.props)}
       >
         {React.cloneElement(children, extraProps)}
       </PopupDatePicker>

components/date-picker/index.web.tsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import PopupDatePicker from 'rmc-date-picker/lib/Popup';
 import RCDatePicker from 'rmc-date-picker/lib/DatePicker';
-import { formatFn, getProps } from './utils';
+import { formatFn, getProps, getDefaultDate } from './utils';
 import assign from 'object-assign';
 import tsPropsType from './PropsType';
 import { getComponentLocale, getLocaleCode } from '../_util/getLocale';
@@ -49,9 +49,10 @@ export default class DatePicker extends React.Component<tsPropsType, any> {
         mode={props.mode}
         pickerPrefixCls={props.pickerPrefixCls}
         prefixCls={props.prefixCls}
-        defaultDate={value || defaultDate}
+        defaultDate={value || getDefaultDate(this.props)}
       />
     );
+
     return (
       <PopupDatePicker
         datePicker={dataPicker}
@@ -60,7 +61,7 @@ export default class DatePicker extends React.Component<tsPropsType, any> {
         maskTransitionName="am-fade"
         {...props}
         prefixCls={popupPrefixCls}
-        date={value || defaultDate}
+        date={value || getDefaultDate(this.props)}
         dismissText={dismissText}
         okText={okText}
       >

components/date-picker/utils.tsx

@@ -28,9 +28,23 @@ export function getProps() {
   return {
     mode: 'datetime',
     extra: '请选择',
-    defaultDate: moment(),
     onChange() {
     },
     title: '',
   };
 }
+
+export function getDefaultDate(props) {
+  const { defaultDate, minDate, maxDate } = props;
+  if (defaultDate) {
+    return defaultDate;
+  }
+  const now = moment();
+  if (minDate && now.isBefore(minDate)) {
+    return minDate;
+  }
+  if (maxDate && maxDate.isBefore(now)) {
+    return minDate;
+  }
+  return now;
+}