fix #2393 #2459 #2401

Conflicts:
	package.json

components/tree-select/demo/checkable.md

@@ -17,10 +17,6 @@ const treeData = [{
     label: '子节点一',
     value: '0-0-0',
     key: '0-0-0',
-  }, {
-    label: '子节点二',
-    value: '0-0-1',
-    key: '0-0-1',
   }],
 }, {
   label: '节点二',
@@ -34,6 +30,10 @@ const treeData = [{
     label: '子节点四',
     value: '0-1-1',
     key: '0-1-1',
+  }, {
+    label: '子节点五',
+    value: '0-1-2',
+    key: '0-1-2',
   }],
 }];
 

components/tree-select/index.md

@@ -39,7 +39,7 @@ english: TreeSelect
 | filterTreeNode | 是否根据输入项进行筛选，默认用 treeNodeFilterProp 的值作为要筛选的 TreeNode 的属性值 | bool/Function(inputValue:string, treeNode:TreeNode) (函数需要返回bool值) | Function |
 | treeNodeFilterProp | 输入项过滤对应的 treeNode 属性 | String | 'value' |
 | treeNodeLabelProp | 作为显示的prop设置 | String | 'title' |
-| treeData | treeNodes数据，如果设置则不需要手动构造TreeNode节点（value在整个树范围内唯一）| array<{value, label, children, [disabled]}> | [] |
+| treeData | treeNodes数据，如果设置则不需要手动构造TreeNode节点（value在整个树范围内唯一）| array<{value, label, children, [disabled,selectable]}> | [] |
 |treeDataSimpleMode | 使用简单格式的treeData，具体设置参考可设置的类型 (此时treeData应变为这样的数据结构: [{"id":1, "pId":0, "label":"test1"},...], `pId`是父节点的id) | bool/object{id:'id', pId:'pId', rootPId:null} | false |
 | loadData | 异步加载数据 | function(node) | - |
 

package.json

@@ -62,10 +62,10 @@
     "rc-switch": "~1.4.2",
     "rc-table": "~4.4.0",
     "rc-tabs": "~5.9.2",
-    "rc-time-picker": "~1.1.5",
-    "rc-tooltip": "~3.4.1",
-    "rc-tree": "~1.3.5",
-    "rc-tree-select": "~1.7.5",
+    "rc-time-picker": "~1.1.6",
+    "rc-tooltip": "~3.4.2",
+    "rc-tree": "~1.3.6",
+    "rc-tree-select": "~1.7.9",
     "rc-upload": "~1.13.3",
     "rc-util": "~3.3.0",
     "react-addons-pure-render-mixin": "^15.0.0",