Merge branch 'master' into new-design-language

components/icon/index.md

@@ -30,6 +30,10 @@
 <i class="anticon anticon-${type}"></i>
 ```
 
+## 本地部署
+
+图标组件使用 [iconfont.cn](http://iconfont.cn)，默认公网可访问。如需本地部署，可参考 [示例](https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont)。
+
 ## 图标列表
 
 > 点击图标复制代码。

components/tree-select/demo/checkable.md

@@ -8,6 +8,7 @@
 
 ````jsx
 import { TreeSelect } from 'antd';
+const SHOW_PARENT = TreeSelect.SHOW_PARENT;
 
 const treeData = [{
   label: '节点一',
@@ -54,6 +55,7 @@ const Demo = React.createClass({
       onChange: this.onChange,
       multiple: true,
       treeCheckable: true,
+      showCheckedStrategy: SHOW_PARENT,
       searchPlaceholder: '请选择',
       style: {
         width: 300,

components/tree-select/index.jsx

 import React from 'react';
-import TreeSelect, { TreeNode } from 'rc-tree-select';
+import TreeSelect, { TreeNode, SHOW_ALL, SHOW_PARENT, SHOW_CHILD } from 'rc-tree-select';
 import classNames from 'classnames';
 
 const AntTreeSelect = React.createClass({
@@ -42,4 +42,7 @@ const AntTreeSelect = React.createClass({
 });
 
 AntTreeSelect.TreeNode = TreeNode;
+AntTreeSelect.SHOW_ALL = SHOW_ALL;
+AntTreeSelect.SHOW_PARENT = SHOW_PARENT;
+AntTreeSelect.SHOW_CHILD = SHOW_CHILD;
 export default AntTreeSelect;

components/tree-select/index.md

@@ -34,6 +34,7 @@
 | size    | 选择框大小，可选 `large` `small`  | String      |      default      |
 | showSearch | 在下拉中显示搜索框 | boolean | false |
 | disabled | 是否禁用 | boolean | false |
+| showCheckedStrategy | `TreeSelect.SHOW_ALL`: 显示所有选中节点(包括父节点). `TreeSelect.SHOW_PARENT`: 只显示父节点(当父节点下所有子节点都选中时). 默认只显示子节点. | enum{TreeSelect.SHOW_ALL, TreeSelect.SHOW_PARENT, TreeSelect.SHOW_CHILD } | TreeSelect.SHOW_CHILD |
 | treeDefaultExpandAll | 默认展开所有树节点 | bool | false |
 | treeCheckable | 显示checkbox | bool | false |
 | filterTreeNode | 是否根据输入项进行筛选，返回值true | function(treeNode) | - |

package.json

 {
   "name": "antd",
-  "version": "0.12.10",
+  "version": "0.12.11-beta",
   "title": "Ant Design",
   "description": "一个 UI 设计语言",
   "homepage": "http://ant.design/",
@@ -63,7 +63,7 @@
     "rc-time-picker": "~1.1.0",
     "rc-tooltip": "~3.3.1",
     "rc-tree": "~1.1.0",
-    "rc-tree-select": "~1.2.2",
+    "rc-tree-select": "~1.4.1",
     "rc-trigger": "~1.2.0",
     "rc-upload": "~1.8.0",
     "rc-util": "~3.1.2",