dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-05-03 01:23:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

last row render fix

Browse Source
This commit is contained in:
Jan Prochazka
2022-07-28 18:46:33 +02:00
parent 3bdb5c0152
commit 66d15abcab
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/datalib/src/PerspectiveDisplay.ts
View File

@@ -95,10 +95,13 @@ export class PerspectiveDisplay {
// this.mergeRows(collectedRows); // this.mergeRows(collectedRows);
this.mergeRows(collectedRows); this.mergeRows(collectedRows);
// dbg('merged rows', this.rows); // dbg('merged rows', this.rows);
// console.log( // console.log(
// 'MERGED', // 'MERGED',
// this.rows.map(r => // this.rows.map(r =>
// r.incompleteRowsIndicator ? `************************************ ${r.incompleteRowsIndicator.join('|')}` : r.rowData.join('|') // r.incompleteRowsIndicator
// ? `************************************ ${r.incompleteRowsIndicator.join('|')}`
// : r.rowData.join('|')
// ) // )
// ); // );
} }
@@ -204,6 +207,14 @@ export class PerspectiveDisplay {
} }
rowIndex++; rowIndex++;
} }
// simulate row after last row
for (let i = 0; i < this.columns.length; i++) {
if (rowIndex - lastFilledColumns[i] > 1) {
this.rows[lastFilledColumns[i]].rowSpans[i] = rowIndex - lastFilledColumns[i];
}
lastFilledColumns[i] = rowIndex;
}
} }
mergeRows(collectedRows: CollectedPerspectiveDisplayRow[]) { mergeRows(collectedRows: CollectedPerspectiveDisplayRow[]) {

13
packages/web/src/perspectives/PerspectiveTable.svelte
View File

@@ -1,21 +1,12 @@
<script lang="ts"> <script lang="ts">
import { import { PerspectiveDisplay, PerspectiveTreeNode } from 'dbgate-datalib';
// groupPerspectiveLoadProps, import _ from 'lodash';
PerspectiveDataLoadProps,
PerspectiveDataLoadPropsWithNode,
PerspectiveDisplay,
PerspectiveTreeNode,
} from 'dbgate-datalib';
import _, { range } from 'lodash';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { prop_dev, tick } from 'svelte/internal';
import { sleep } from '../utility/common';
import resizeObserver from '../utility/resizeObserver'; import resizeObserver from '../utility/resizeObserver';
import PerspectiveIntersectionObserver from './PerspectiveIntersectionObserver.svelte'; import PerspectiveIntersectionObserver from './PerspectiveIntersectionObserver.svelte';
import debug from 'debug'; import debug from 'debug';
import contextMenu from '../utility/contextMenu'; import contextMenu from '../utility/contextMenu';
import DataFilterControl from '../datagrid/DataFilterControl.svelte'; import DataFilterControl from '../datagrid/DataFilterControl.svelte';
import { countVisibleRealColumns } from '../datagrid/gridutil';
const dbg = debug('dbgate:PerspectivaTable'); const dbg = debug('dbgate:PerspectivaTable');