Skip to content

Fix tree shift multiple #2648

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

Closed
wants to merge 2 commits into from
Closed

Fix tree shift multiple #2648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58815ca
fix(bug): fix table height
ddmmy Jul 31, 2020
757f600
fix(tree): fix tree shift not multiple
ddmmy Aug 6, 2020
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
13 changes: 7 additions & 6 deletions components/tree/DirectoryTree.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,13 @@ export default {
newEvent.selectedNodes = convertDirectoryKeysToNodes(children, newSelectedKeys);
} else if (multiple && shiftPick) {
// Shift click
newSelectedKeys = Array.from(
new Set([
...(this.cachedSelectedKeys || []),
...calcRangeKeys(children, expandedKeys, eventKey, this.lastSelectedKey),
]),
);
// newSelectedKeys = Array.from(
// new Set([
// ...(this.cachedSelectedKeys || []),
// ...calcRangeKeys(children, expandedKeys, eventKey, this.lastSelectedKey),
// ]),
// );
newSelectedKeys = keys;
newEvent.selectedNodes = convertDirectoryKeysToNodes(children, newSelectedKeys);
} else {
// Single click
Expand Down
9 changes: 5 additions & 4 deletions components/vc-table/src/Table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,11 @@ export default {
bodyRows,
(acc, row) => {
const rowKey = row.getAttribute('data-row-key');
const height =
row.getBoundingClientRect().height ||
state.fixedColumnsBodyRowsHeight[rowKey] ||
'auto';
const height = 'auto';
// const height =
// row.getBoundingClientRect().height ||
// state.fixedColumnsBodyRowsHeight[rowKey] ||
// 'auto';
acc[rowKey] = height;
return acc;
},
Expand Down