Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Tree): Still can check after disableChecked #925

Merged
merged 5 commits into from
Aug 5, 2019
Merged

fix(Tree): Still can check after disableChecked #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20ac774
fix(Tree): Still can check after disableChecked
myronliu347 Jul 26, 2019
fee18b8
test(Tree): add test
myronliu347 Jul 26, 2019
fc035b1
temp(*): add istanbul ignore
myronliu347 Jul 26, 2019
a7df8c5
style(Tree): eslint fix
myronliu347 Jul 30, 2019
210d84e
temp(Tree): delete repeat code, change method name
myronliu347 Aug 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/tree-select/tree-select.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,10 @@ export default class TreeSelect extends Component {

switch (treeCheckedStrategy) {
case 'parent':
keys = filterChildKey(keys, this._k2n);
keys = filterChildKey(keys, this._k2n, this._p2n);
break;
case 'child':
keys = filterParentKey(keys, this._k2n);
keys = filterParentKey(keys, this._k2n, this._p2n);
break;
default:
break;
Expand Down
79 changes: 66 additions & 13 deletions src/tree/view/tree.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable max-depth */
import React, { Component, Children, cloneElement } from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';
Expand All @@ -10,6 +11,8 @@ import {
filterChildKey,
filterParentKey,
getAllCheckedKeys,
forEachEnableNode,
isNodeChecked,
} from './util';

const { bindCtx, noop } = func;
Expand Down Expand Up @@ -703,19 +706,32 @@ export default class Tree extends Component {

const pos = this._k2n[key].pos;

const ps = Object.keys(this._p2n);
ps.forEach(p => {
if (isDescendantOrSelf(pos, p)) {
this.processKey(checkedKeys, this._p2n[p].key, check);
}
forEachEnableNode(this._k2n[key], node => {
if (node.checkable === false) return;
this.processKey(checkedKeys, node.key, check);
});

const ps = Object.keys(this._p2n);
// ps.forEach(p => {
// if (this._p2n[p].checkable !== false && !this._p2n[p].disabled && isDescendantOrSelf(pos, p)) {
// this.processKey(checkedKeys, this._p2n[p].key, check);
// }
// });

let currentPos = pos;
const nums = pos.split('-');
for (let i = nums.length; i > 2; i--) {
let parentCheck = true;

const parentPos = nums.slice(0, i - 1).join('-');
if (
this._p2n[parentPos].disabled ||
this._p2n[parentPos].checkboxDisabled ||
this._p2n[parentPos].checkable === false
) {
currentPos = parentPos;
continue;
}
const parentKey = this._p2n[parentPos].key;
const parentChecked = checkedKeys.indexOf(parentKey) > -1;
if (!check && !parentChecked) {
Expand All @@ -724,12 +740,34 @@ export default class Tree extends Component {

for (let j = 0; j < ps.length; j++) {
const p = ps[j];
if (isSiblingOrSelf(currentPos, p)) {
const k = this._p2n[p].key;
if (checkedKeys.indexOf(k) === -1) {
const pnode = this._p2n[p];
if (
isSiblingOrSelf(currentPos, p) &&
!pnode.disabled &&
!pnode.checkboxDisabled
) {
const k = pnode.key;
if (pnode.checkable === false) {
// eslint-disable-next-line max-depth
if (!pnode.children || pnode.children.length === 0)
continue;

// eslint-disable-next-line max-depth
for (let m = 0; m < pnode.children.length; m++) {
if (
!pnode.children.every(child =>
isNodeChecked(child, checkedKeys)
)
) {
parentCheck = false;
break;
}
}
} else if (checkedKeys.indexOf(k) === -1) {
parentCheck = false;
break;
}

if (!parentCheck) break;
}
}

Expand All @@ -749,10 +787,18 @@ export default class Tree extends Component {
let newCheckedKeys;
switch (checkedStrategy) {
case 'parent':
newCheckedKeys = filterChildKey(checkedKeys, this._k2n);
newCheckedKeys = filterChildKey(
checkedKeys,
this._k2n,
this._p2n
);
break;
case 'child':
newCheckedKeys = filterParentKey(checkedKeys, this._k2n);
newCheckedKeys = filterParentKey(
checkedKeys,
this._k2n,
this._p2n
);
break;
default:
newCheckedKeys = checkedKeys;
Expand Down Expand Up @@ -819,17 +865,24 @@ export default class Tree extends Component {
}

getIndeterminateKeys(checkedKeys) {
if (this.props.checkStrictly) {
return [];
}

const indeterminateKeys = [];

const poss = filterChildKey(
checkedKeys.filter(key => !!this._k2n[key]),
this._k2n
this._k2n,
this._p2n
).map(key => this._k2n[key].pos);
poss.forEach(pos => {
const nums = pos.split('-');
for (let i = nums.length; i > 2; i--) {
const parentPos = nums.slice(0, i - 1).join('-');
const parentKey = this._p2n[parentPos].key;
const parent = this._p2n[parentPos];
if (parent.disabled || parent.checkboxDisabled) break;
const parentKey = parent.key;
if (indeterminateKeys.indexOf(parentKey) === -1) {
indeterminateKeys.push(parentKey);
}
Expand Down
174 changes: 123 additions & 51 deletions src/tree/view/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,49 +10,109 @@ export function normalizeToArray(keys) {

return [];
}

/**
* 判断子节点是否是选中状态，如果 checkable={false} 则向下递归，
* @param {Node} child
* @param {Array} checkedKeys
*/
export function isNodeChecked(node, checkedKeys) {
if (node.disabled || parent.checkboxDisabled) return true;
/* istanbul ignore next */
if (node.checkable === false) {
return (
!node.children ||
node.children.length === 0 ||
node.children.every(c => isNodeChecked(c, checkedKeys))
);
}
return checkedKeys.indexOf(node.key) > -1;
}

/**
* 遍历所有可用的子节点
* @param {Node}
* @param {Function} callback
*/
export function forEachEnableNode(node, callback = () => {}) {
if (node.disabled || node.checkboxDisabled) return;
// eslint-disable-next-line callback-return
callback(node);
if (node.children && node.children.length > 0) {
node.children.forEach(child => forEachEnableNode(child, callback));
}
}
/**
* 判断节点是否禁用checked
* @param {Node} node
* @returns {Boolean}
*/
youluna marked this conversation as resolved.
Show resolved Hide resolved
export function isNodeDisabledChecked(node) {
if (node.disabled || node.checkboxDisabled) return true;
/* istanbul ignore next */
if (node.checkable === false) {
return (
!node.children ||
node.children.length === 0 ||
node.children.every(isNodeDisabledChecked)
);
}

return false;
}

/**
* 递归获取一个 checkable = {true} 的父节点，当 checkable={false} 时继续往上查找
* @param {Node} node
* @param {Map} _p2n
* @return {Node}
*/
youluna marked this conversation as resolved.
Show resolved Hide resolved
export function getCheckableParentNode(node, _p2n) {
let parentPos = node.pos.split(['-']);
if (parentPos.length === 2) return node;
parentPos.splice(parentPos.length - 1, 1);
parentPos = parentPos.join('-');
const parentNode = _p2n[parentPos];
if (parentNode.disabled || parentNode.checkboxDisabled) return false;
/* istanbul ignore next */
if (parentNode.checkable === false) {
return getCheckableParentNode(parentNode, _p2n);
}

return parentNode;
}
/**
* 过滤子节点
* @param {Array} keys
* @param {Object} _k2n
*/
export function filterChildKey(keys, _k2n) {
const newKeys = [...keys]
.filter(key => !!_k2n[key])
.sort((prev, next) => {
return getDepth(prev, _k2n) - getDepth(next, _k2n);
});

for (let i = 0; i < newKeys.length; i++) {
for (let j = 0; j < newKeys.length; j++) {
if (
i !== j &&
isDescendantOrSelf(_k2n[newKeys[i]].pos, _k2n[newKeys[j]].pos)
) {
newKeys.splice(j, 1);
j--;
}
export function filterChildKey(keys, _k2n, _p2n) {
const newKeys = [];
keys.forEach(key => {
const node = getCheckableParentNode(_k2n[key], _p2n);
if (
!node ||
node.checkable === false ||
node === _k2n[key] ||
keys.indexOf(node.key) === -1
) {
newKeys.push(key);
}
}

});
return newKeys;
}

export function filterParentKey(keys, _k2n) {
const newKeys = [...keys]
.filter(key => !!_k2n[key])
.sort((prev, next) => {
return getDepth(next, _k2n) - getDepth(prev, _k2n);
});
export function filterParentKey(keys, _k2n, _p2n) {
const newKeys = [];

for (let i = 0; i < newKeys.length; i++) {
for (let j = 0; j < newKeys.length; j++) {
if (
i !== j &&
isDescendantOrSelf(_k2n[newKeys[j]].pos, _k2n[newKeys[i]].pos)
) {
newKeys.splice(j, 1);
j--;
}
for (let i = 0; i < keys.length; i++) {
const node = _k2n[keys[i]];
if (
!node.children ||
node.children.length === 0 ||
node.children.every(isNodeDisabledChecked)
) {
newKeys.push(keys[i]);
}
}

Expand Down Expand Up @@ -91,10 +151,22 @@ export function isSiblingOrSelf(currentPos, targetPos) {
export function getAllCheckedKeys(checkedKeys, _k2n, _p2n) {
checkedKeys = normalizeToArray(checkedKeys);
const filteredKeys = checkedKeys.filter(key => !!_k2n[key]);
let flatKeys = filterChildKey(filteredKeys, _k2n);
const childChecked = child => flatKeys.indexOf(child.key) > -1;
const removeKey = child => flatKeys.splice(flatKeys.indexOf(child.key), 1);
const flatKeys = filterChildKey(filteredKeys, _k2n, _p2n);

const removeKey = child => {
if (child.disabled || child.checkboxDisabled) return;
if (
child.checkable === false &&
child.children &&
child.children.length > 0
) {
return child.children.forEach(removeKey);
}
flatKeys.splice(flatKeys.indexOf(child.key), 1);
};

const addParentKey = (i, parent) => flatKeys.splice(i, 0, parent.key);

const keys = [...flatKeys];
for (let i = 0; i < keys.length; i++) {
const pos = _k2n[keys[i]].pos;
Expand All @@ -105,7 +177,15 @@ export function getAllCheckedKeys(checkedKeys, _k2n, _p2n) {
for (let j = nums.length - 2; j > 0; j--) {
const parentPos = nums.slice(0, j + 1).join('-');
const parent = _p2n[parentPos];
const parentChecked = parent.children.every(childChecked);
if (
parent.checkable === false ||
parent.disabled ||
parent.checkboxDisabled
)
continue;
const parentChecked = parent.children.every(child =>
isNodeChecked(child, flatKeys)
);
if (parentChecked) {
parent.children.forEach(removeKey);
addParentKey(i, parent);
Expand All @@ -116,20 +196,12 @@ export function getAllCheckedKeys(checkedKeys, _k2n, _p2n) {
}

const newKeys = [];
if (flatKeys.length) {
flatKeys = flatKeys.reverse();
const ps = Object.keys(_p2n);
for (let i = 0; i < flatKeys.length; i++) {
const pos = _k2n[flatKeys[i]].pos;
for (let j = 0; j < ps.length; j++) {
if (isDescendantOrSelf(pos, ps[j])) {
newKeys.push(_p2n[ps[j]].key);
ps.splice(j, 1);
j--;
}
}
}
}
flatKeys.forEach(key => {
forEachEnableNode(_k2n[key], node => {
if (node.checkable === false) return;
newKeys.push(node.key);
});
});

return newKeys;
}
Expand Down
Loading