feat: support use12hours close #151

ant-design · Dec 13, 2018 · 19f62e1 · 19f62e1
1 parent 0c26dc0
commit 19f62e1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/components/date-picker-view/demo/basic.tsx b/components/date-picker-view/demo/basic.tsx
@@ -6,17 +6,24 @@ import { DatePickerView } from '../../';
 export default class DatePickerViewExample extends React.Component {
   state = {
     value: undefined,
+    value12hours: undefined,
   };
   onChange = (value: any) => {
     console.log(value);
     this.setState({ value });
-  }
+  };
   onValueChange = (...args: any[]) => {
     console.log(args);
-  }
+  };
   render() {
     return (
       <View>
+        <Text style={{ margin: 16 }}>use12Hours</Text>
+        <DatePickerView
+          value={this.state.value12hours}
+          onChange={v => this.setState({ value12hours: v })}
+          use12Hours
+        />
         <Text style={{ margin: 16 }}>Start DateTime</Text>
         <DatePickerView
           value={this.state.value}

diff --git a/components/date-picker-view/index.en-US.md b/components/date-picker-view/index.en-US.md
@@ -16,6 +16,7 @@ Properties | Descrition | Type | Default
 | maxDate   | maximum date | Date  |  2030-1-1  |
 | minuteStep |   The amount of time, in minutes, between each minute item.    | Number | 1 |
 | locale   | international, can override the configuration of the global `[LocaleProvider](https://mobile.ant.design/components/locale-provider)` | Object: {DatePickerLocale: {year, month, day, hour, minute, am?, pm?}, okText, dismissText} |  -  |
-| disabled   | 是否不可用      | Boolean |    false  |
+| disabled   | disabled      | Boolean |    false  |
+| use12Hours   | 12 hours format      | Boolean |    false  |
 | onChange  | change handler | (date: Object): void |  -  |
 | onValueChange | fire when picker col change | (vals: any, index: number) => void | - |
diff --git a/components/date-picker-view/index.zh-CN.md b/components/date-picker-view/index.zh-CN.md
@@ -18,5 +18,6 @@ DatePickerView 的功能类似于 DatePicker ，但它是直接渲染在区域
 | minuteStep |  分钟数递增步长设置   | Number | 1 |
 | locale   | 国际化，可覆盖全局`[LocaleProvider](https://mobile.ant.design/components/locale-provider)`的配置 | Object: {DatePickerLocale: {year, month, day, hour, minute, am?, pm?}, okText, dismissText } | - |
 | disabled   | 是否不可用      | Boolean |    false  |
+| use12Hours   | 12小时制      | Boolean |    false  |
 | onChange   | 时间发生变化的回调函数  | (date: Object): void | - |
 | onValueChange | 每列 picker 改变时的回调 | (vals: any, index: number) => void | - |
diff --git a/components/date-picker/index.tsx b/components/date-picker/index.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import PickerStyles, { PickerStyle } from '../picker/style/index';
 import { WithTheme, WithThemeStyles } from '../style';
 import { getComponentLocale } from '../_util/getLocale';
-import RCDatePicker from './datepicker';
+import AntDatePicker from './datepicker';
 import PopupDatePicker from './datepicker/Popup';
 import { DatePickerPropsType } from './PropsType';
 import { formatProps } from './utils';
@@ -36,7 +36,7 @@ export default class DatePicker extends React.Component<DatePickerProps> {
     const { okText, dismissText, extra, DatePickerLocale } = locale;
 
     const dataPicker = (
-      <RCDatePicker
+      <AntDatePicker
         minuteStep={this.props.minuteStep}
         locale={DatePickerLocale}
         mode={this.props.mode}