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

node checked & column checked distuingish

Browse Source
This commit is contained in:
Jan Prochazka
2022-08-27 16:02:15 +02:00
parent 2b68a6e1de
commit b6a0fe6713
2 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,21 +125,14 @@ export class PerspectiveDisplay {
fillColumns(children: PerspectiveTreeNode[], parentNodes: PerspectiveTreeNode[]) {
for (const child of children) {
if (child.isChecked) {
if (child.isCheckedColumn || child.isCheckedNode) {
this.processColumn(child, parentNodes);
}
}
}
processColumn(node: PerspectiveTreeNode, parentNodes: PerspectiveTreeNode[]) {
if (node.isExpandable) {
const countBefore = this.columns.length;
this.fillColumns(node.childNodes, [...parentNodes, node]);
if (this.columns.length > countBefore) {
this.columns[countBefore].colSpanAtLevel[parentNodes.length] = this.columns.length - countBefore;
}
} else {
if (node.isCheckedColumn) {
const column = new PerspectiveDisplayColumn(this);
column.title = node.columnTitle;
column.dataField = node.dataField;
@@ -149,6 +142,15 @@ export class PerspectiveDisplay {
column.dataNode = node;
this.columns.push(column);
}
if (node.isExpandable && node.isCheckedNode) {
const countBefore = this.columns.length;
this.fillColumns(node.childNodes, [...parentNodes, node]);
if (this.columns.length > countBefore) {
this.columns[countBefore].colSpanAtLevel[parentNodes.length] = this.columns.length - countBefore;
}
}
}
findColumnIndexFromNode(node: PerspectiveTreeNode) {
@@ -165,8 +167,8 @@ export class PerspectiveDisplay {
collectRows(sourceRows: any[], nodes: PerspectiveTreeNode[]): CollectedPerspectiveDisplayRow[] {
// console.log('********** COLLECT ROWS', sourceRows);
const columnNodes = nodes.filter(x => x.isChecked && !x.isExpandable);
const treeNodes = nodes.filter(x => x.isChecked && x.isExpandable);
const columnNodes = nodes.filter(x => x.isCheckedColumn);
const treeNodes = nodes.filter(x => x.isCheckedNode);
// console.log('columnNodes', columnNodes);
// console.log('treeNodes', treeNodes);