Merge branch '3.0' of github.com:zuiidea/antd-admin into 3.0

This commit is contained in:
zuiidea
2017-01-12 21:57:02 +08:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -44,7 +44,7 @@ class Search extends React.Component {
{select && <Select ref='searchSelect' onChange={this.handeleSelectChange} size={size} {...selectProps}>
{selectOptions && selectOptions.map((item, key) => <Select.Option value={item.value} key={key}>{item.name || item.value}</Select.Option>)}
</Select>}
<Input ref='searchInput' size={size} onChange={this.handleInputChange} />
<Input ref='searchInput' size={size} onChange={this.handleInputChange} onPressEnter={this.handleSearch}/>
<Button size={size} type='primary' onClick={this.handleSearch}>搜索</Button>
{clearVisible && <Icon type='cross' onClick={this.handleClearInput} />}
</Input.Group>
+1 -1
View File
@@ -79,7 +79,7 @@ const SearchPage = () => <div className='content-inner'>
},
{
props: 'onSearch',
desciption: '点击搜索按钮或者点击清除时的回调',
desciption: '点击搜索按钮, 按Enter键或者点击清除时的回调',
type: 'Function({keyword:string,field:string})',
default: '-'
}]} />