File tree Expand file tree Collapse file tree 2 files changed +16
-19
lines changed Expand file tree Collapse file tree 2 files changed +16
-19
lines changed Original file line number Diff line number Diff line change @@ -208,17 +208,15 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
208208 if ( ! date ) return now ;
209209 // When value is null and set showTime
210210 if ( ! mergedValue && showTime ) {
211+ let defaultDateObject ;
211212 if ( typeof showTime === 'object' ) {
212- return setDateTime (
213- generateConfig ,
214- Array . isArray ( date ) ? date [ 0 ] : date ,
215- showTime . defaultValue || now ,
216- ) ;
213+ defaultDateObject = showTime . defaultValue ;
214+ } else if ( defaultValue ) {
215+ defaultDateObject = defaultValue ;
216+ } else {
217+ defaultDateObject = now ;
217218 }
218- if ( defaultValue ) {
219- return setDateTime ( generateConfig , Array . isArray ( date ) ? date [ 0 ] : date , defaultValue ) ;
220- }
221- return setDateTime ( generateConfig , Array . isArray ( date ) ? date [ 0 ] : date , now ) ;
219+ return setDateTime ( generateConfig , Array . isArray ( date ) ? date [ 0 ] : date , defaultDateObject ) ;
222220 }
223221 return date ;
224222 } ,
Original file line number Diff line number Diff line change 1- import Picker , { PickerProps } from './Picker' ;
2- import PickerPanel , { PickerPanelProps } from './PickerPanel' ;
3- import RangePicker , { RangePickerProps } from './RangePicker' ;
1+ import Picker from './Picker' ;
2+ import PickerPanel from './PickerPanel' ;
3+ import RangePicker from './RangePicker' ;
4+ import type { PickerProps } from './Picker' ;
5+ import type { PickerPanelProps } from './PickerPanel' ;
6+ import type { RangePickerProps } from './RangePicker' ;
47
5- export {
6- PickerPanel ,
7- RangePicker ,
8- PickerProps ,
9- PickerPanelProps ,
10- RangePickerProps ,
11- } ;
8+ export { PickerPanel , RangePicker } ;
9+
10+ export type { PickerProps , PickerPanelProps , RangePickerProps } ;
1211
1312export default Picker ;
You can’t perform that action at this time.
0 commit comments