From aca09cf191e09ad7c2d90ab25c56a385e5166fd9 Mon Sep 17 00:00:00 2001
From: ioldfish <fish.wangl@alipay.com>
Date: Thu, 15 Oct 2015 10:38:14 +0800
Subject: [PATCH] update ant-tree

---
 components/tree/demo/special.md | 69 +++++++++++++++++++++++++++++++++
 components/tree/index.md        |  1 +
 package.json                    |  2 +-
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 components/tree/demo/special.md

diff --git a/components/tree/demo/special.md b/components/tree/demo/special.md
new file mode 100644
index 0000000000..2d3b959b22
--- /dev/null
+++ b/components/tree/demo/special.md
@@ -0,0 +1,69 @@
+# 接收外部传参
+
+- order: 2
+
+受控组件，外部传入参数，控制树对象节点
+
+---
+
+````jsx
+var Tree = antd.Tree;
+var TreeNode = Tree.TreeNode;
+var Button = antd.Button;
+
+class TreeDemo extends React.Component {
+  constructor(props) {
+    super(props);
+    ['handleClick', 'handleCheck', 'handleSelect'].forEach((m)=> {
+      this[m] = this[m].bind(this);
+    });
+    this.state = {
+      checkedKeys: [],
+      selectedKeys: []
+    }
+  }
+  handleClick() {
+    this.setState({
+      checkedKeys: ['p11'],
+      selectedKeys: ['p21', 'p11']
+    })
+  }
+  handleCheck(info) {
+    console.log('check: ', info);
+    this.setState({
+      checkedKeys: ['p21'],
+      selectedKeys: ['p1', 'p21']
+    })
+  }
+  handleSelect(info) {
+    console.log('selected: ', info);
+    this.setState({
+      checkedKeys: ['p21'],
+      selectedKeys: ['p21']
+    })
+  }
+  render() {
+    return (<div>
+        <Tree defaultExpandAll={true} checkable={true}
+              onCheck={this.handleCheck} checkedKeys={this.state.checkedKeys}
+              onSelect={this.handleSelect} selectedKeys={this.state.selectedKeys} multiple>
+          <TreeNode title="parent 1" key="p1">
+            <TreeNode key="p10" title="leaf"/>
+            <TreeNode title="parent 1-1" key="p11">
+              <TreeNode title="parent 2-1" key="p21">
+                <TreeNode>test</TreeNode>
+                <TreeNode title={<span>sss</span>}/>
+              </TreeNode>
+              <TreeNode key="p22" title="leaf"/>
+            </TreeNode>
+          </TreeNode>
+          <TreeNode key="p12" title="leaf"/>
+        </Tree>
+      <Button type="primary" size="sm" onClick={this.handleClick}>点此控制树节点</Button>
+    </div>);
+  }
+}
+
+React.render(<TreeDemo />, document.getElementById('components-tree-demo-special'));
+
+````
diff --git a/components/tree/index.md b/components/tree/index.md
index 38512de899..c850733327 100644
--- a/components/tree/index.md
+++ b/components/tree/index.md
@@ -23,6 +23,7 @@
 |defaultCheckedKeys | 默认选中复选框的树节点 | String[] | [] |
 |defaultSelectedKeys | 默认选中的树节点 | String[] | [] |
 |onCheck | 点击树节点或复选框触发 | function(e:{checked:bool,node,checkedKeys,event}) | - |
+|onSelect | 点击树节点触发 | function(e:{checked:bool,node,checkedKeys,event}) | - |
 
 ### TreeNode props
 
diff --git a/package.json b/package.json
index 428605a8ae..b72db5bd44 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "rc-table": "~3.2.0",
     "rc-tabs": "~5.3.2",
     "rc-tooltip": "~2.8.0",
-    "rc-tree": "~0.15.4",
+    "rc-tree": "~0.16.2",
     "rc-upload": "~1.6.4",
     "rc-util": "~2.0.3",
     "react-slick": "~0.7.0",