mirrors/dbgate
1
0
Fork 0
mirror of https://github.com/dbgate/dbgate synced 2024-11-07 20:26:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Jan Prochazka 2022-08-25 18:31:55 +02:00
parent 5e4ae3208b
commit 1bd4b77744
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,6 +154,11 @@ export abstract class PerspectiveTreeNode {
return this.dbs?.[this.databaseConfig.conid]?.[this.databaseConfig.database];
}
hasDesignerIdInIncestors(designerId: string): boolean {
if (designerId == this.designerId) return true;
return this.parentNode?.hasDesignerIdInIncestors(designerId) || false;
}
getChildMatchColumns() {
return [];
}
@ -940,7 +945,9 @@ function findDesignerIdForNode<T extends PerspectiveTreeNode>(
x.columns.map(x => x.target)
)
);
if (ref1) return nodeCreateFunc(ref1.targetId);
if (ref1 && !parentNode.hasDesignerIdInIncestors(ref1.targetId)) {
return nodeCreateFunc(ref1.targetId);
}
const ref2 = config.references.find(
x =>
@ -954,7 +961,9 @@ function findDesignerIdForNode<T extends PerspectiveTreeNode>(
x.columns.map(x => x.target)
)
);
if (ref2) return nodeCreateFunc(ref2.sourceId);
if (ref2 && !parentNode.hasDesignerIdInIncestors(ref2.sourceId)) {
return nodeCreateFunc(ref2.sourceId);
}
return node;
}