aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMG12 <wuzhao.mail@gmail.com>2015-11-17 23:29:27 +0800
committerMG12 <wuzhao.mail@gmail.com>2015-11-17 23:29:27 +0800
commit15bb18d90f02d146141cdde45a5a2b5a6a575202 (patch)
tree1b03ceb96373ad2047760e0714c9b6836550c3b7
parent4acbf95c7d2693d73b0c8c021ad892b6529d4c06 (diff)
downloadtime-picker-15bb18d90f02d146141cdde45a5a2b5a6a575202.tar.gz
time-picker-15bb18d90f02d146141cdde45a5a2b5a6a575202.tar.zst
time-picker-15bb18d90f02d146141cdde45a5a2b5a6a575202.zip
fix bugs0.3.3
-rw-r--r--HISTORY.md5
-rw-r--r--package.json2
-rw-r--r--src/TimePicker.jsx6
3 files changed, 10 insertions, 3 deletions
diff --git a/HISTORY.md b/HISTORY.md
index 28516bc..d6edd4e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,11 @@ History
3 3
4--- 4---
5 5
60.3.2 / 2015-11-17
7------------------
8
9`fix` fix some bugs.
10
60.3.0 / 2015-11-17 110.3.0 / 2015-11-17
7------------------ 12------------------
8 13
diff --git a/package.json b/package.json
index 520005e..0ead0b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
1{ 1{
2 "name": "rc-time-picker", 2 "name": "rc-time-picker",
3 "version": "0.3.0", 3 "version": "0.3.2",
4 "description": "React TimePicker", 4 "description": "React TimePicker",
5 "keywords": [ 5 "keywords": [
6 "react", 6 "react",
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
index 27a793e..f0a3316 100644
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@ -2,7 +2,7 @@ import React, {PropTypes} from 'react';
2import ReactDOM from 'react-dom'; 2import ReactDOM from 'react-dom';
3import Trigger from 'rc-trigger'; 3import Trigger from 'rc-trigger';
4import {createChainedFunction} from 'rc-util'; 4import {createChainedFunction} from 'rc-util';
5import Panel from 'rc-time-picker/src/module/Panel'; 5import Panel from './module/Panel';
6import placements from './util/placements'; 6import placements from './util/placements';
7import CommonMixin from './mixin/CommonMixin'; 7import CommonMixin from './mixin/CommonMixin';
8 8
@@ -85,9 +85,10 @@ const Picker = React.createClass({
85 }, 85 },
86 86
87 getPanel() { 87 getPanel() {
88 const { value, locale, formatter, placeholder, hourOptions, minuteOptions, secondOptions } = this.props; 88 const { prefixCls, value, locale, formatter, placeholder, hourOptions, minuteOptions, secondOptions } = this.props;
89 return ( 89 return (
90 <Panel 90 <Panel
91 prefixCls={prefixCls}
91 defaultValue={value} 92 defaultValue={value}
92 locale={locale} 93 locale={locale}
93 formatter={formatter} 94 formatter={formatter}
@@ -147,6 +148,7 @@ const Picker = React.createClass({
147 > 148 >
148 <span className={`${prefixCls}-picker`}> 149 <span className={`${prefixCls}-picker`}>
149 <input ref="picker" type="text" placeholder="请选择时间" readOnly disabled={disabled} value={value && formatter.format(value)} /> 150 <input ref="picker" type="text" placeholder="请选择时间" readOnly disabled={disabled} value={value && formatter.format(value)} />
151 <span className={`${prefixCls}-picker-icon`} />
150 </span> 152 </span>
151 </Trigger> 153 </Trigger>
152 ); 154 );