release 1.2.0

codTango · Apr 6, 2016 · 81ebf39 · 81ebf39
1 parent f3d3d43
commit 81ebf39
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,9 +1,9 @@
 # History
 ---
 
-## 1.2.0 / 2016-04-03
+## 1.2.0 / 2016-04-06
 - improve performance.
-- add `checkStrictly` api.
+- add `checkStrictly`/`halfCheckedKeys` api.
 
 ## 1.1.0 / 2016-01-25
 - change `onDrop` params (from `originExpandedKeys` to `rawExpandedKeys`)

diff --git a/README.md b/README.md
@@ -68,11 +68,12 @@ see examples
 |defaultExpandedKeys | expand specific treeNodes | String[] | - |
 |expandedKeys | Controlled expand specific treeNodes | String[] | - |
 |autoExpandParent | whether auto expand parent treeNodes | bool | true |
+|defaultCheckedKeys | default checked treeNodes | String[] | [] |
 |checkedKeys | Controlled checked treeNodes(After setting, defaultCheckedKeys will not work). Note: parent and children nodes are associated, if the parent node's key exists, it all children node will be checked, and vice versa. | String[] | [] |
+|halfCheckedKeys | when set checkStrictly, it works | String[] | [] |
 |checkStrictly| check node precisely, parent and children nodes are not associated| bool | false |
-|defaultCheckedKeys | default checked treeNodes | String[] | [] |
-|selectedKeys | Controlled selected treeNodes(After setting, defaultSelectedKeys will not work) | String[] | [] |
 |defaultSelectedKeys | default selected treeNodes | String[] | [] |
+|selectedKeys | Controlled selected treeNodes(After setting, defaultSelectedKeys will not work) | String[] | [] |
 |onExpand | fire on treeNode expand or not | function(node, expanded, expandedKeys) | - |
 |onCheck | click the treeNode/checkbox to fire | function(checkedKeys, e:{checked: bool, checkedNodes, node, event}) | - |
 |onSelect | click the treeNode to fire | function(selectedKeys, e:{selected: bool, selectedNodes, node, event}) | - |

diff --git a/examples/basic-controlled.js b/examples/basic-controlled.js
@@ -49,6 +49,7 @@ const Demo = React.createClass({
     // console.log(checkedNodesPositions.filter(i => pps.indexOf(i.pos) > -1).map(i => i.node.key));
     this.setState({
       checkedKeys,
+      halfCheckedKeys: ['0-0-key'],
     });
   },
   onSelect(selectedKeys, info) {
@@ -90,7 +91,8 @@ const Demo = React.createClass({
       <h2>checkStrictly</h2>
       <Tree checkable multiple={this.props.multiple} defaultExpandAll
             onExpand={this.onExpand} expandedKeys={this.state.expandedKeys}
-            onCheck={this.onCheckStrictly} checkedKeys={this.state.checkedKeys}
+            onCheck={this.onCheckStrictly}
+            checkedKeys={this.state.checkedKeys} halfCheckedKeys={this.state.halfCheckedKeys}
             checkStrictly>
         {loop(gData)}
       </Tree>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rc-tree",
-  "version": "1.2.0-beta.3",
+  "version": "1.2.0",
   "description": "tree ui component for react",
   "keywords": [
     "react",

diff --git a/src/Tree.jsx b/src/Tree.jsx
@@ -455,8 +455,16 @@ class Tree extends React.Component {
       cloneProps.checkable = props.checkable;
       cloneProps.checked = (props.checkStrictly ? state.checkedKeys : this.checkedKeys).
         indexOf(key) !== -1;
-      cloneProps.checkPart = props.checkStrictly ? false : this.checkPartKeys.
-        indexOf(key) !== -1;
+      if (props.checkStrictly) {
+        if (props.halfCheckedKeys) {
+          cloneProps.checkPart = props.halfCheckedKeys.indexOf(key) !== -1 || false;
+        } else {
+          cloneProps.checkPart = false;
+        }
+      } else {
+        cloneProps.checkPart = this.checkPartKeys.indexOf(key) !== -1;
+      }
+
       if (this.treeNodesStates[pos]) {
         assign(cloneProps, this.treeNodesStates[pos].siblingPosition);
       }
@@ -543,12 +551,13 @@ Tree.propTypes = {
   draggable: PropTypes.bool,
   autoExpandParent: PropTypes.bool,
   defaultExpandAll: PropTypes.bool,
-  expandedKeys: PropTypes.arrayOf(PropTypes.string),
   defaultExpandedKeys: PropTypes.arrayOf(PropTypes.string),
-  checkedKeys: PropTypes.arrayOf(PropTypes.string),
+  expandedKeys: PropTypes.arrayOf(PropTypes.string),
   defaultCheckedKeys: PropTypes.arrayOf(PropTypes.string),
-  selectedKeys: PropTypes.arrayOf(PropTypes.string),
+  checkedKeys: PropTypes.arrayOf(PropTypes.string),
+  halfCheckedKeys: PropTypes.arrayOf(PropTypes.string),
   defaultSelectedKeys: PropTypes.arrayOf(PropTypes.string),
+  selectedKeys: PropTypes.arrayOf(PropTypes.string),
   onExpand: PropTypes.func,
   onCheck: PropTypes.func,
   onSelect: PropTypes.func,