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

components/select/demo/combobox.md

@@ -32,9 +32,11 @@ var Test = React.createClass({
     });
   },
   render() {
+  // filterOption 需要设置为 false，数据是动态设置的
     return <Select combobox
       style={{width:200}}
       onChange={this.handleChange}
+      filterOption={false}
       searchPlaceholder="请输入账户名">
       {this.state.options}
     </Select>;