fix locale of default value

components/timepicker/index.jsx

@@ -2,7 +2,9 @@ import React from 'react';
 import DateTimeFormat from 'gregorian-calendar-format';
 import TimePicker from 'rc-time-picker/lib/TimePicker';
 
-// import defaultLocale from './locale';
+import objectAssign from 'object-assign';
+import defaultLocale from './locale/zh_CN';
+import GregorianCalendar from 'gregorian-calendar';
 import TimePickerLocale from 'rc-time-picker/lib/locale/zh_CN';
 
 const AntTimepicker = React.createClass({
@@ -27,6 +29,20 @@ const AntTimepicker = React.createClass({
     };
   },
 
+  getInitialState() {
+    return {
+      value: this.parseTimeFromValue(this.props.value || this.props.defaultValue)
+    };
+  },
+
+  componentWillReceiveProps(nextProps) {
+    if ('value' in nextProps) {
+      this.setState({
+        value: this.parseTimeFromValue(nextProps.value)
+      });
+    }
+  },
+
   /**
    * 获得输入框的 className
    */
@@ -47,33 +63,65 @@ const AntTimepicker = React.createClass({
     const defaultValue = this.props.defaultValue;
     if (defaultValue) {
       return formatter.parse(defaultValue, {
-        locale: defaultValue.locale,
+        locale: this.getLocale(),
         obeyCount: true,
       });
     }
     return undefined;
   },
 
+  getLocale() {
+    // 统一合并为完整的 Locale
+    let locale = objectAssign({}, defaultLocale, this.props.locale);
+    locale.lang = objectAssign({}, defaultLocale.lang, this.props.locale.lang);
+    return locale;
+  },
+
+  getFormatter() {
+    const formats = this.formats = this.formats || {};
+    const format = this.props.format;
+    if (formats[format]) {
+      return formats[format];
+    }
+    formats[format] = new DateTimeFormat(format, this.getLocale().lang.format);
+    return formats[format];
+  },
+
+  parseTimeFromValue(value) {
+    if (value) {
+      if (typeof value === 'string') {
+        return this.getFormatter().parse(value, {locale: this.getLocale()});
+      } else if (value instanceof Date) {
+        let date = new GregorianCalendar(this.getLocale());
+        date.setTime(value);
+        return date;
+      }
+    } else if (value === null) {
+      return value;
+    }
+    return undefined;
+  },
+
   render() {
-    const { format, placeholder, align, disabled, hourOptions, minuteOptions, secondOptions, placement, transitionName } = this.props;
+    const { placeholder, align, disabled, hourOptions, minuteOptions, secondOptions, placement, transitionName, onChange } = this.props;
     const prefixCls = 'ant-timepicker';
-    const formatter = new DateTimeFormat(format);
 
     return (
       <TimePicker
         prefixCls={prefixCls}
         locale={TimePickerLocale}
-        formatter={formatter}
+        formatter={this.getFormatter()}
         hourOptions={hourOptions}
         minuteOptions={minuteOptions}
         secondOptions={secondOptions}
         disabled={disabled}
         align={align}
         placeholder={placeholder}
         inputClassName={`ant-input ${this.getSizeClass()}`}
-        defaultValue={this.getDefaultValue(formatter)}
+        defaultValue={this.state.value}
         placement={placement}
         transitionName={transitionName}
+        onChange={onChange}
       />
     );
   }

components/timepicker/locale/en_US.js

@@ -0,0 +1,12 @@
+import objectAssign from 'object-assign';
+import GregorianCalendarLocale from 'gregorian-calendar/lib/locale/en_US';
+import TimepickerLocale from 'rc-time-picker/lib/locale/en_US';
+
+// 统一合并为完整的 Locale
+let locale = objectAssign({}, GregorianCalendarLocale);
+locale.lang = objectAssign({}, TimepickerLocale);
+
+// All settings at:
+// https://github.com/ant-design/ant-design/issues/424
+
+export default locale;

components/timepicker/locale/zh_CN.js

@@ -0,0 +1,12 @@
+import objectAssign from 'object-assign';
+import GregorianCalendarLocale from 'gregorian-calendar/lib/locale/zh_CN';
+import TimepickerLocale from 'rc-time-picker/lib/locale/zh_CN';
+
+// 统一合并为完整的 Locale
+let locale = objectAssign({}, GregorianCalendarLocale);
+locale.lang = objectAssign({}, TimepickerLocale);
+
+// All settings at:
+// https://github.com/ant-design/ant-design/issues/424
+
+export default locale;