dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-28 19:56:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

nested incomplete loading fix

Browse Source
This commit is contained in:
Jan Prochazka
2022-07-24 15:16:02 +02:00
parent d48c34a4a5
commit 5395d1343b
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,12 @@ 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('MERGED', this.rows); // console.log(
// 'MERGED',
// this.rows.map(r =>
// r.incompleteRowsIndicator ? `************************************ ${r.incompleteRowsIndicator.join('|')}` : r.rowData.join('|')
// )
// );
} }
fillColumns(children: PerspectiveTreeNode[], parentNodes: PerspectiveTreeNode[]) { fillColumns(children: PerspectiveTreeNode[], parentNodes: PerspectiveTreeNode[]) {

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

@@ -34,23 +34,30 @@
...loadProps, ...loadProps,
topCount: counts[node.uniqueName] || 100, topCount: counts[node.uniqueName] || 100,
}); });
if (incomplete) {
rows = [
...rows,
{
incompleteRowsIndicator: [node.uniqueName],
},
];
}
// console.log('ROWS', rows, node.isRoot); // console.log('ROWS', rows, node.isRoot);
if (node.isRoot) { if (node.isRoot) {
parentRows.push(...rows); parentRows.push(...rows);
// console.log('PUSH PARENTROWS', parentRows); // console.log('PUSH PARENTROWS', parentRows);
if (incomplete) {
parentRows.push({
incompleteRowsIndicator: [node.uniqueName],
});
}
} else { } else {
let lastRowWithChildren = null;
for (const parentRow of parentRows) { for (const parentRow of parentRows) {
const childRows = rows.filter(row => node.matchChildRow(parentRow, row)); const childRows = rows.filter(row => node.matchChildRow(parentRow, row));
parentRow[node.fieldName] = childRows; parentRow[node.fieldName] = childRows;
if (childRows.length > 0) {
lastRowWithChildren = parentRow;
}
}
if (incomplete && lastRowWithChildren) {
lastRowWithChildren[node.fieldName].push({
incompleteRowsIndicator: [node.uniqueName],
});
} }
} }