diff --git a/examples/basic.tsx b/examples/basic.tsx index 3347239..0f49d68 100644 --- a/examples/basic.tsx +++ b/examples/basic.tsx @@ -71,6 +71,7 @@ class BasicDemo extends React.Component<{}, { {this.renderBtn('选择日期时间区间', 'Select DateTime Range', { pickTime: true })} {this.renderBtn('选择日期', 'Select Date', { type: 'one' })} {this.renderBtn('选择日期时间', 'Select DateTime', { type: 'one', pickTime: true })} + {this.renderBtn('选择日期时间(24小时制)', 'Select DateTime', { type: 'one', pickTime: true, use12Hours: false })} {this.renderBtn('选择日期区间(快捷)', 'Select Date Range (Shortcut)', { showShortcut: true })} {this.renderBtn('选择日期时间区间(快捷)', 'Select DateTime Range (Shortcut)', { pickTime: true, showShortcut: true })} {this.renderBtn('水平进入', 'Horizontal Enter Aniamtion', { enterDirection: 'horizontal' })} diff --git a/src/Calendar.tsx b/src/Calendar.tsx index e263a2d..dc079f0 100644 --- a/src/Calendar.tsx +++ b/src/Calendar.tsx @@ -38,6 +38,7 @@ export default class Calendar extends React.PureComponent prefixCls: 'rmc-calendar', type: 'range', defaultTimeValue: new Date(2000, 0, 1, 8), + use12Hours: true } as PropsType; constructor(props: PropsType) { @@ -191,7 +192,7 @@ export default class Calendar extends React.PureComponent type, locale = {} as Models.Locale, prefixCls, visible, pickTime, showShortcut, renderHeader, infiniteOpt, initalMonths, defaultDate, minDate, maxDate, getDateExtra, rowSize, defaultTimeValue, renderShortcut, enterDirection, timePickerPrefixCls, timePickerPickerPrefixCls, - style, + style, use12Hours } = this.props; const { showTimePicker, timePickerTitle, @@ -247,6 +248,7 @@ export default class Calendar extends React.PureComponent minDate={minDate} maxDate={maxDate} clientHeight={clientHight} + use12Hours={use12Hours} /> } { diff --git a/src/CalendarProps.ts b/src/CalendarProps.ts index ad773ee..959e6e3 100644 --- a/src/CalendarProps.ts +++ b/src/CalendarProps.ts @@ -59,4 +59,5 @@ export default interface PropsType { defaultTimeValue?: Date; timePickerPrefixCls?: string; timePickerPickerPrefixCls?: string; + use12Hours?: boolean; } diff --git a/src/TimePicker.tsx b/src/TimePicker.tsx index 6092d8a..0ac5ae9 100644 --- a/src/TimePicker.tsx +++ b/src/TimePicker.tsx @@ -10,10 +10,10 @@ export interface PropsType { defaultValue?: Date; value?: Date; onValueChange?: (time: Date) => void; - minDate?: Date; maxDate?: Date; clientHeight?: number; + use12Hours?: boolean; } export interface StateType { } @@ -54,7 +54,7 @@ export default class TimePicker extends React.PureComponent );