Merge branch 'master' of github.com:ant-design/ant-design

components/select/demo/combobox.md

 # combobox
 
-- order: 2
+- order: 1
 
-combobox
+功能基本与 suggest 类似。（Google的搜索提示）
 
 ---
 

components/select/demo/multiple.md

 # 多选
 
-- order: 1
+- order: 2
 
-多选（scroll the menu）
+多选，从已有条目中选择（scroll the menu）
 
 ---
 

components/select/demo/tags.md

@@ -2,7 +2,7 @@
 
 - order: 3
 
-tags select（scroll the menu）
+tags select，随意输入的内容（scroll the menu）
 
 ---
 

components/select/index.jsx

 'use strict';
 
+var React = require('react');
 var Select = require('rc-select');
 
-module.exports = Select;
+module.exports = React.createClass({
+  getDefaultProps: function() {
+    return {
+      prefixCls: 'ant-select'
+    };
+  },
+  render: function() {
+    return (
+      <Select {...this.props} />
+    );
+  }
+});

components/select/index.md

@@ -22,13 +22,12 @@
 
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|----------------|----------|--------------|
-| value    | specify the default selected item(s) | string/Array<String>   |  无  |
-| multiple   | can select more than one option |   | false |
-| filterOption | whether filter options by input value |  | true     |
-| tags | when tagging is enabled the user can select from pre-existing options or create a new tag by picking the first choice, which is what the user has typed into the search box so far. | |false |
-| allowClear | show clear button | | false |
-| combobox | enable combobox mode(can not set multiple at the same time) | | false |
-| onSelect | called when a option is selected. param is option's value | function | 无   |
-| onDeselect | called when a option is deselected. param is option's value. only called for multiple or tags | function | 无   |
-| onChange | called when select an option or input value change(combobox) | function | 无 |
-
+| value    | 指定默认选中的条目 | string/Array<String>   |  无  |
+| multiple   | 支持多选 |   | false |
+| filterOption | 是否根据输入项进行筛选 |  | true     |
+| tags | 可以把随意输入的条目作为tag，输入项不需要与下拉选项匹配 | |false |
+| combobox | 搜索提示，输入项不需要与下拉选项匹配 | | false |
+| onSelect | 被选中时调用，参数为选中的option value值 | function | 无   |
+| onDeselect | 取消选中时调用，参数为选中的option value值，仅在multiple或tags模式下生效 | function | 无   |
+| onChange | 选中option，或input的value变化(combobox模式下)时，调用此函数 | function | 无 |
+| allowClear | 显示清除按钮 | | false |

style/components/select.less

-@selectPrefixCls: rc-select;
+@selectPrefixCls: ant-select;
 
 //mixin
 .selection__clear(){