diff --git a/components/alert/index.jsx b/components/alert/index.jsx index a5cf1fa569251a554a89f8f86c84565a9a5e9a0b..91c0f8ad231f946f9309ef1d0bdc9c407884af3a 100644 --- a/components/alert/index.jsx +++ b/components/alert/index.jsx @@ -44,20 +44,20 @@ export default React.createClass({ let iconType = ''; switch (type) { - case 'success': - iconType = 'check-circle'; - break; - case 'info': - iconType = 'info-circle'; - break; - case 'error': - iconType = 'exclamation-circle'; - break; - case 'warn': - iconType = 'exclamation-circle'; - break; - default: - iconType = 'default'; + case 'success': + iconType = 'check-circle'; + break; + case 'info': + iconType = 'info-circle'; + break; + case 'error': + iconType = 'exclamation-circle'; + break; + case 'warn': + iconType = 'exclamation-circle'; + break; + default: + iconType = 'default'; } // use outline icon in alert with description diff --git a/components/date-picker/RangePicker.jsx b/components/date-picker/RangePicker.jsx index 6bda6ffc0ea10b12195328b26a86a37247296341..34fc598891fb7431762e8a61dbc2c194053c98f5 100644 --- a/components/date-picker/RangePicker.jsx +++ b/components/date-picker/RangePicker.jsx @@ -78,13 +78,13 @@ export default React.createClass({ const calendar = ( + className={calendarClassName} + timePicker={timePicker} + disabledDate={disabledDate} + dateInputPlaceholder={[startPlaceholder, endPlaceholder]} + locale={locale.lang} + defaultValue={defaultCalendarValue} + showClear /> ); const pickerClass = classNames({ diff --git a/components/date-picker/index.jsx b/components/date-picker/index.jsx index 091e6c25f29596b13e42f0e22861f4976872f80a..ad3d3af2b581be4632c9646e714d756f9d34ec9a 100644 --- a/components/date-picker/index.jsx +++ b/components/date-picker/index.jsx @@ -94,25 +94,25 @@ function createPicker(TheCalendar, defaultFormat) { return ( + disabled={this.props.disabled} + calendar={calendar} + value={this.state.value} + prefixCls="ant-calendar-picker-container" + style={this.props.popupStyle} + align={this.props.align} + onOpen={this.toggleOpen} + onClose={this.toggleOpen} + onChange={this.handleChange}> { ({ value }) => { return ( + onChange={this.handleInputChange} + value={value && this.getFormatter().format(value)} + placeholder={placeholder} + style={this.props.style} + className={'ant-calendar-picker-input ant-input' + sizeClass}/> ); diff --git a/components/input/index.jsx b/components/input/index.jsx index c699680d74a22b1f0e14382b9c3b9ce63a44c09d..9bb54870bdbedfdbd8ddf44512595b7b31f1653e 100644 --- a/components/input/index.jsx +++ b/components/input/index.jsx @@ -72,9 +72,9 @@ class Input extends React.Component { } switch (props.size) { - case 'small': inputClassName = prefixClsFn(prefixCls, 'input', 'input-sm'); break; - case 'large': inputClassName = prefixClsFn(prefixCls, 'input', 'input-lg'); break; - default: + case 'small': inputClassName = prefixClsFn(prefixCls, 'input', 'input-sm'); break; + case 'large': inputClassName = prefixClsFn(prefixCls, 'input', 'input-lg'); break; + default: } let placeholder = props.placeholder; if (placeholder && ieGT9()) { @@ -84,11 +84,14 @@ class Input extends React.Component { props.value = fixControlledValue(props.value); } switch (props.type) { - case 'textarea': - return