pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(sqllab): resultset disappeared on switching tabs (#21741)

This commit is contained in:
JUST.in DO IT 2022-10-10 10:06:34 -07:00 committed by GitHub
parent 91f0de0c5d
commit d7ee443a13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
superset-frontend/src/components/FilterableTable/index.tsx
View File

@ -332,7 +332,6 @@ const FilterableTable = ({
.map(key => widthsForColumnsByKey[key])
.reduce((curr, next) => curr + next),
);
const totalTableHeight = useRef(height);
const container = useRef<HTMLDivElement>(null);
const fitTableToWidthIfNeeded = () => {
@ -563,15 +562,13 @@ const FilterableTable = ({
};
const renderGrid = () => {
totalTableHeight.current = height;
if (
// exclude the height of the horizontal scroll bar from the height of the table
// and the height of the table container if the content overflows
const totalTableHeight =
container.current &&
totalTableWidth.current > container.current.clientWidth
) {
// exclude the height of the horizontal scroll bar from the height of the table
// and the height of the table container if the content overflows
totalTableHeight.current -= SCROLL_BAR_HEIGHT;
}
? height - SCROLL_BAR_HEIGHT
: height;
const getColumnWidth = ({ index }: { index: number }) =>
widthsForColumnsByKey[orderedColumnKeys[index]];
@ -600,7 +597,7 @@ const FilterableTable = ({
cellRenderer={renderGridCell}
columnCount={orderedColumnKeys.length}
columnWidth={getColumnWidth}
height={totalTableHeight.current - rowHeight}
height={totalTableHeight - rowHeight}
onScroll={onScroll}
overscanColumnCount={overscanColumnCount}
overscanRowCount={overscanRowCount}
@ -644,15 +641,13 @@ const FilterableTable = ({
);
}
totalTableHeight.current = height;
if (
// exclude the height of the horizontal scroll bar from the height of the table
// and the height of the table container if the content overflows
const totalTableHeight =
container.current &&
totalTableWidth.current > container.current.clientWidth
) {
// exclude the height of the horizontal scroll bar from the height of the table
// and the height of the table container if the content overflows
totalTableHeight.current -= SCROLL_BAR_HEIGHT;
}
? height - SCROLL_BAR_HEIGHT
: height;
const rowGetter = ({ index }: { index: number }) =>
getDatum(sortedAndFilteredList, index);
@ -665,7 +660,7 @@ const FilterableTable = ({
{fitted && (
<Table
headerHeight={headerHeight}
height={totalTableHeight.current}
height={totalTableHeight}
overscanRowCount={overscanRowCount}
rowClassName={rowClassName}
rowHeight={rowHeight}