From 58815ca0a90fbf3b737a5417b016ebaa15bf6122 Mon Sep 17 00:00:00 2001 From: labike Date: Fri, 31 Jul 2020 13:35:44 +0800 Subject: [PATCH 1/3] fix(bug): fix table height --- components/vc-table/src/Table.jsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/components/vc-table/src/Table.jsx b/components/vc-table/src/Table.jsx index 90dce9b5c4..912138895b 100644 --- a/components/vc-table/src/Table.jsx +++ b/components/vc-table/src/Table.jsx @@ -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; }, From 757f600fe2b3d36d3b3bc78cda70421349259a7c Mon Sep 17 00:00:00 2001 From: labike Date: Thu, 6 Aug 2020 09:37:18 +0800 Subject: [PATCH 2/3] fix(tree): fix tree shift not multiple --- components/tree/DirectoryTree.jsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/components/tree/DirectoryTree.jsx b/components/tree/DirectoryTree.jsx index 727d13ba1e..ce96bc2eb4 100644 --- a/components/tree/DirectoryTree.jsx +++ b/components/tree/DirectoryTree.jsx @@ -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 From 32f9f11db67b1107f33d8496249a658aabc836d4 Mon Sep 17 00:00:00 2001 From: labike Date: Thu, 6 Aug 2020 14:19:22 +0800 Subject: [PATCH 3/3] fix(tree): tree can not multiple when event shift --- components/tree/DirectoryTree.jsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/components/tree/DirectoryTree.jsx b/components/tree/DirectoryTree.jsx index ce96bc2eb4..37e6170d91 100644 --- a/components/tree/DirectoryTree.jsx +++ b/components/tree/DirectoryTree.jsx @@ -155,13 +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 = keys; + this.cachedSelectedKeys = keys; + newSelectedKeys = Array.from( + new Set([ + ...(this.cachedSelectedKeys || []), + ...calcRangeKeys(children, expandedKeys, eventKey, this.lastSelectedKey), + ]), + ); newEvent.selectedNodes = convertDirectoryKeysToNodes(children, newSelectedKeys); } else { // Single click