fix(DatePikcer2): timePanelProps.defaultValue issue, close alibaba-fu…

…sion#3203
v5zz · Jul 21, 2021 · 1a7b25c · 1a7b25c
1 parent 2287c39
commit 1a7b25c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/docs/date-picker2/demo/disabledDate.md b/docs/date-picker2/demo/disabledDate.md
@@ -17,10 +17,10 @@ Disable date cells by `disabledDate`.
 
 ````jsx
 import { DatePicker2 } from '@alifd/next';
-import moment from 'moment';
+import dayjs from 'dayjs';
 
 const { RangePicker, MonthPicker, YearPicker } = DatePicker2;
-const currentDate = moment();
+const currentDate = dayjs();
 
 // Disable all dates before today
 const disabledDate = function (date, mode) {

diff --git a/docs/date-picker2/demo/show-time.md b/docs/date-picker2/demo/show-time.md
@@ -17,21 +17,19 @@ Enable `showTime` to create a DatePicker2/RangePicker with time.
 
 ````jsx
 import { DatePicker2 } from '@alifd/next';
-import dayjs from 'dayjs';
 
 const { RangePicker } = DatePicker2;
 const onChange = (value) => console.log('onChange: ', value);
 const onOk = (value) => console.log('onOK: ', value.format('YYYY-MM-DD HH:mm:ss'));
 const onRangeOk = (value) => console.log('onOk: [%s, %s]', ...value);
 
-const defaultTimeValue = dayjs('09:00:00', 'HH:mm:ss', true);
-const defaultTimeValues = [dayjs('09:00:00', 'HH:mm:ss', true), dayjs('23:59:59', 'HH:mm:ss', true)];
+const defaultTimeValue = '09:00:00';
 
 ReactDOM.render(<div className="app">
   <div><DatePicker2 showTime onChange={onChange} onOk={onOk} /></div>
   <div><DatePicker2 showTime timePanelProps={{ defaultValue: defaultTimeValue, secondStep: 10 }} onChange={onChange} onOk={onOk} /></div>
   <div><RangePicker showTime onChange={onChange} onOk={onRangeOk} /></div>
-  <div><RangePicker showTime timePanelProps={{ defaultValue: defaultTimeValues, format: 'HH:mm', minuteStep: 15 }} onChange={onChange} onOk={onRangeOk} /></div>
+  <div><RangePicker showTime timePanelProps={{ defaultValue: ['09:00', '23:59'], format: 'HH:mm', minuteStep: 15 }} onChange={onChange} onOk={onRangeOk} /></div>
 </div>, mountNode);
 ````
 ```css

diff --git a/src/date-picker2/panels/date-panel.jsx b/src/date-picker2/panels/date-panel.jsx
@@ -35,10 +35,14 @@ class DatePanel extends React.Component {
 
         // 默认时间
         const { timePanelProps = {} } = props;
-
         let defaultTime = timePanelProps.defaultValue;
+
         if (defaultTime) {
-            defaultTime = datejs(defaultTime, timePanelProps.format || 'HH:mm:ss');
+            // fix: https://github.com/alibaba-fusion/next/issues/3203
+            defaultTime = datejs(
+                defaultTime,
+                typeof defaultTime === 'string' ? timePanelProps.format || 'HH:mm:ss' : undefined
+            );
         }
 
         this.state = {

diff --git a/src/date-picker2/panels/time-panel.jsx b/src/date-picker2/panels/time-panel.jsx
@@ -14,7 +14,6 @@ class TimePanel extends React.PureComponent {
         locale: PT.object,
         value: SharedPT.date,
         timePanelProps: PT.object,
-        defaultValue: SharedPT.value,
         onSelect: PT.func,
     };