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

README.md

@@ -10,9 +10,9 @@ An enterprise-class UI design language and React-based implementation.
 
 ## Features
 
-- An enterprise-class graphical design language and framework for financial applications.
+- An enterprise-class design language and high quality UI style.
 - Rich library of UI components base on [React Component](http://react-component.github.io/badgeboard/).
-- A npm + webpack + babel workflow, supporting ES2015.
+- A npm + webpack + babel + dora [workflow](http://ant-tool.github.io/index.html).
 
 ## Install
 

components/icon/index.md

@@ -120,7 +120,7 @@ const CopyableIcon = React.createClass({
     });
   },
   render() {
-    const text = '<Icon type="' + this.props.type + '" />';
+    const text = '<Icon type="' + this.props.type + '" />';
     return (
       <CopyToClipboard text={text} onCopy={this.onCopied}>
         <li className={this.state.justCopied ? 'copied' : ''}>

components/select/demo/search.md

@@ -15,14 +15,16 @@ function handleChange(value) {
 }
 
 ReactDOM.render(
-  <Select defaultValue="lucy" showSearch style={{ width: 200 }}
+  <Select showSearch
-    notFoundContent="找不到呐！"
+    style={{ width: 200 }}
-    searchPlaceholder="输入"
+    placeholder="请选择人员"
+    optionFilterProp="children"
+    notFoundContent="无法找到"
+    searchPlaceholder="输入关键词"
     onChange={handleChange}>
-    <Option value="jack">jack</Option>
+    <Option value="jack">杰克</Option>
-    <Option value="lucy">lucy</Option>
+    <Option value="lucy">露西</Option>
-    <Option value="disabled" disabled>disabled</Option>
+    <Option value="tom">汤姆</Option>
-    <Option value="yiminghe">yiminghe</Option>
   </Select>
 , mountNode);
 ````

components/select/index.md

@@ -38,7 +38,7 @@
 | searchPlaceholder | 搜索框默认文字 | string | 无 |
 | notFoundContent | 当下拉列表为空时显示的内容 | string | 'Not Found' |
 | dropdownMatchSelectWidth | 下拉菜单和选择器同宽 | boolean | true |
-| optionFilterProp | 输入项过滤对应的 option 属性 | string | value |
+| optionFilterProp | 搜索时过滤对应的 option 属性，如设置为 children 表示对内嵌内容进行搜索 | string | value |
 | combobox | 输入框自动提示模式 | boolean | false |
 | size    | 选择框大小，可选 `large` `small`  | String      |      default      |
 | showSearch | 在下拉中显示搜索框 | boolean | false |