fix(Tree.js): * CheckStrickly为false时,onCheck返回数据bug
This commit is contained in:
izbz wh
parent
b18ec77cdc
commit
3b8390aeff
|
|
@ -356,14 +356,13 @@ var TreeNode = function (_React$Component) {
|
|||
isLeaf = _props.isLeaf,
|
||||
loadData = _props.loadData;
|
||||
|
||||
|
||||
var hasChildren = this.getNodeChildren().length !== 0;
|
||||
|
||||
if (isLeaf === false) {
|
||||
return false;
|
||||
var rs = isLeaf;
|
||||
if (rs === false || rs === true) {
|
||||
return rs;
|
||||
} else {
|
||||
var hasChildren = this.getNodeChildren().length !== 0;
|
||||
return !loadData && !hasChildren;
|
||||
}
|
||||
|
||||
return isLeaf || !loadData && !hasChildren;
|
||||
};
|
||||
|
||||
TreeNode.prototype.render = function render() {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "bee-tree",
|
||||
"version": "2.0.10-beta.1",
|
||||
"version": "2.0.11-beta.1",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
@ -266,7 +266,7 @@
|
|||
"bee-form-control": "^2.0.1",
|
||||
"bee-icon": "^1.0.10",
|
||||
"bee-locale": "^0.0.13",
|
||||
"bee-modal": "^2.0.10",
|
||||
"bee-modal": "^2.0.13",
|
||||
"bee-tooltip": "^2.0.4",
|
||||
"classnames": "^2.2.5",
|
||||
"clipboard": "^1.6.1",
|
||||
|
|
@ -282,6 +282,42 @@
|
|||
"core-js": "^2.4.0",
|
||||
"regenerator-runtime": "^0.11.0"
|
||||
}
|
||||
},
|
||||
"bee-modal": {
|
||||
"version": "2.0.13",
|
||||
"resolved": "https://registry.npmjs.org/bee-modal/-/bee-modal-2.0.13.tgz",
|
||||
"integrity": "sha512-hPXgWvxHA0KvA5sYocKsJRAq/RT3EkZ0S6tKyi1kfsNJDufX73n1fQBWyJ731l9Csq4XLZ2MwhI5uB9nUGp5+A==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"bee-datepicker": "^2.0.6",
|
||||
"bee-dnd": "^1.1.2",
|
||||
"bee-loading": "^1.0.9",
|
||||
"bee-overlay-modal": "^0.0.1",
|
||||
"bee-popconfirm": "^2.0.0",
|
||||
"bee-select": "^2.0.4",
|
||||
"bee-transition": "^0.2.2",
|
||||
"classnames": "^2.2.5",
|
||||
"dom-helpers": "3.0.0",
|
||||
"re-resizable": "^4.11.0",
|
||||
"tinper-bee-core": "^2.0.28"
|
||||
}
|
||||
},
|
||||
"bee-transition": {
|
||||
"version": "0.2.4",
|
||||
"resolved": "https://registry.npmjs.org/bee-transition/-/bee-transition-0.2.4.tgz",
|
||||
"integrity": "sha1-wwBNv1M5nUYnVu4Yn5TkmV3C0Xc=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"classnames": "^2.2.5",
|
||||
"dom-helpers": "^3.0.0",
|
||||
"tinper-bee-core": "^2.0.28"
|
||||
}
|
||||
},
|
||||
"dom-helpers": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.0.0.tgz",
|
||||
"integrity": "sha1-EkhpzqPwnb/4Qlb+3n82YWzP7iM=",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -438,14 +474,14 @@
|
|||
}
|
||||
},
|
||||
"bee-modal": {
|
||||
"version": "2.0.10",
|
||||
"resolved": "https://registry.npmjs.org/bee-modal/-/bee-modal-2.0.10.tgz",
|
||||
"integrity": "sha512-3z3UYA1aH1Jx4plQtyNRktIrcxX8/XUYgyp77V7rnOjWyMWccv7vVu3an/5E1HbGg4dO+2sinwDxs/XRagIg1A==",
|
||||
"version": "2.0.13",
|
||||
"resolved": "https://registry.npmjs.org/bee-modal/-/bee-modal-2.0.13.tgz",
|
||||
"integrity": "sha512-hPXgWvxHA0KvA5sYocKsJRAq/RT3EkZ0S6tKyi1kfsNJDufX73n1fQBWyJ731l9Csq4XLZ2MwhI5uB9nUGp5+A==",
|
||||
"requires": {
|
||||
"bee-datepicker": "^2.0.6",
|
||||
"bee-dnd": "^1.1.2",
|
||||
"bee-loading": "^1.0.9",
|
||||
"bee-overlay": "^1.0.2",
|
||||
"bee-overlay-modal": "^0.0.1",
|
||||
"bee-popconfirm": "^2.0.0",
|
||||
"bee-select": "^2.0.4",
|
||||
"bee-transition": "^0.2.2",
|
||||
|
|
@ -520,6 +556,29 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"bee-overlay-modal": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/bee-overlay-modal/-/bee-overlay-modal-0.0.1.tgz",
|
||||
"integrity": "sha512-u5fNX/IqGIkI9e2fGq/Pnn/l0+R/p41r00knMviLc3yAPRzXBgr7Obuix1G28qtsMl84Tno9dTvui5kMrPvX4w==",
|
||||
"requires": {
|
||||
"bee-animate": "^1.0.0",
|
||||
"classnames": "^2.2.5",
|
||||
"dom-helpers": "^3.0.0",
|
||||
"tinper-bee-core": "^2.0.28",
|
||||
"warning": "^3.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"bee-animate": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/bee-animate/-/bee-animate-1.0.0.tgz",
|
||||
"integrity": "sha1-jknIkVIbSmpu9eUAmDI2Uv0FxPE=",
|
||||
"requires": {
|
||||
"classnames": "^2.2.5",
|
||||
"tinper-bee-core": "^2.0.28"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"bee-panel": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/bee-panel/-/bee-panel-2.0.1.tgz",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "bee-tree",
|
||||
"version": "2.0.11",
|
||||
"version": "2.0.12",
|
||||
"description": "Tree ui component for react",
|
||||
"keywords": [
|
||||
"react",
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
"babel-runtime": "^6.23.0",
|
||||
"bee-animate": "^1.0.0",
|
||||
"bee-checkbox": "latest",
|
||||
"bee-modal": "^2.0.10",
|
||||
"bee-modal": "^2.0.13",
|
||||
"classnames": "^2.2.5",
|
||||
"tinper-bee-core": "latest"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -311,17 +311,16 @@ class TreeNode extends React.Component {
|
|||
* @memberof TreeNode
|
||||
*/
|
||||
checkIsLeaf(){
|
||||
const { isLeaf, loadData } = this.props;
|
||||
|
||||
const hasChildren = this.getNodeChildren().length !== 0;
|
||||
|
||||
if (isLeaf === false) {
|
||||
return false;
|
||||
const { isLeaf, loadData } = this.props;
|
||||
let rs = isLeaf
|
||||
if (rs === false || rs === true) {
|
||||
return rs;
|
||||
}else{
|
||||
const hasChildren = this.getNodeChildren().length !== 0;
|
||||
return (!loadData && !hasChildren);
|
||||
}
|
||||
|
||||
return (
|
||||
isLeaf || (!loadData && !hasChildren)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
render() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue