Comparing version 0.20.4 to 0.20.5
@@ -31,3 +31,5 @@ 'use strict'; | ||
// sorted array ['0-0','0-1', '0-0-1', '0-1-1'] => ['0-0', '0-1'] | ||
var splitPos = function splitPos(pos) { | ||
return pos.split('-'); | ||
}; | ||
var filterMin = function filterMin(arr) { | ||
@@ -37,3 +39,3 @@ var a = []; | ||
var b = a.filter(function (i) { | ||
return item.indexOf(i) === 0; | ||
return item.indexOf(i) === 0 && (item[i.length] === '-' || !item[i.length]); | ||
}); | ||
@@ -46,2 +48,3 @@ if (!b.length) { | ||
}; | ||
// console.log(filterMin(['0-0','0-1', '0-10', '0-0-1', '0-1-1', '0-10-0'])); | ||
@@ -61,15 +64,8 @@ var Tree = (function (_React$Component) { | ||
this.defaultExpandAll = props.defaultExpandAll; | ||
var expandedKeys = props.defaultExpandedKeys; | ||
var checkedKeys = props.defaultCheckedKeys; | ||
if ('checkedKeys' in props) { | ||
checkedKeys = props.checkedKeys || []; | ||
} | ||
var selectedKeys = props.multiple ? [].concat(_toConsumableArray(props.defaultSelectedKeys)) : [props.defaultSelectedKeys[0]]; | ||
if ('selectedKeys' in props) { | ||
selectedKeys = props.multiple ? [].concat(_toConsumableArray(props.selectedKeys)) : [props.selectedKeys[0]]; | ||
} | ||
this.contextmenuKeys = []; | ||
this.state = { | ||
expandedKeys: expandedKeys, | ||
checkedKeys: checkedKeys, | ||
selectedKeys: selectedKeys, | ||
expandedKeys: props.defaultExpandedKeys, | ||
checkedKeys: this.getDefaultCheckedKeys(props), | ||
selectedKeys: this.getDefaultSelectedKeys(props), | ||
dragNodesKeys: '', | ||
@@ -79,19 +75,30 @@ dragOverNodeKey: '', | ||
}; | ||
this.contextmenuKeys = []; | ||
} | ||
_createClass(Tree, [{ | ||
key: 'componentDidMount', | ||
value: function componentDidMount() {} | ||
}, { | ||
key: 'componentWillReceiveProps', | ||
value: function componentWillReceiveProps(nextProps) { | ||
var props = {}; | ||
if ('checkedKeys' in nextProps) { | ||
props.checkedKeys = nextProps.checkedKeys; | ||
this.setState({ | ||
expandedKeys: nextProps.defaultExpandedKeys, | ||
checkedKeys: this.getDefaultCheckedKeys(nextProps), | ||
selectedKeys: this.getDefaultSelectedKeys(nextProps) | ||
}); | ||
} | ||
}, { | ||
key: 'getDefaultCheckedKeys', | ||
value: function getDefaultCheckedKeys(props) { | ||
var checkedKeys = props.defaultCheckedKeys; | ||
if ('checkedKeys' in props) { | ||
checkedKeys = props.checkedKeys || []; | ||
} | ||
if ('selectedKeys' in nextProps) { | ||
props.selectedKeys = nextProps.multiple ? nextProps.selectedKeys : [nextProps.selectedKeys[0]]; | ||
return checkedKeys; | ||
} | ||
}, { | ||
key: 'getDefaultSelectedKeys', | ||
value: function getDefaultSelectedKeys(props) { | ||
var selectedKeys = props.multiple ? [].concat(_toConsumableArray(props.defaultSelectedKeys)) : [props.defaultSelectedKeys[0]]; | ||
if ('selectedKeys' in props) { | ||
selectedKeys = props.multiple ? [].concat(_toConsumableArray(props.selectedKeys)) : [props.selectedKeys[0]]; | ||
} | ||
this.setState(props); | ||
return selectedKeys; | ||
} | ||
@@ -358,5 +365,2 @@ }, { | ||
} | ||
var splitPos = function splitPos(pos) { | ||
return pos.split('-'); | ||
}; | ||
// stripTail('x-xx-sss-xx') | ||
@@ -363,0 +367,0 @@ var stripTail = function stripTail(str) { |
{ | ||
"name": "rc-tree", | ||
"version": "0.20.4", | ||
"version": "0.20.5", | ||
"description": "tree ui component for react", | ||
@@ -47,2 +47,3 @@ "keywords": [ | ||
"rc-tooltip": "3.x", | ||
"rc-trigger": "^1.0.6", | ||
"react": "^0.14.0", | ||
@@ -49,0 +50,0 @@ "react-addons-test-utils": "^0.14.0", |
@@ -110,3 +110,8 @@ # rc-tree | ||
## License | ||
rc-tree is released under the MIT license. | ||
rc-tree is released under the MIT license. | ||
## other tree view | ||
- [ztree](http://www.ztree.me/) | ||
- [jqTree](http://mbraak.github.io/jqTree/) | ||
- [jquery.treeselect](http://travistidwell.com/jquery.treeselect.js/) | ||
- [angular Select Tree](http://a5hik.github.io/angular-multi-select-tree/) |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
54966
11
1385
117
11