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

SYNC: fixes

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-03-31 13:09:55 +02:00
committed by Diflow
parent 97357f082d
commit fde257c722
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/tools/src/structureTools.ts
View File

@@ -9,16 +9,17 @@ import type {
import _flatten from 'lodash/flatten';
import _uniq from 'lodash/uniq';
import _keys from 'lodash/keys';
import _compact from 'lodash/compact';
export function addTableDependencies(db: DatabaseInfo): DatabaseInfo {
if (!db.tables) {
return db;
}
const allForeignKeys = _flatten(db.tables.map(x => x.foreignKeys || []));
const allForeignKeys = _flatten(db.tables.map(x => x?.foreignKeys || []));
return {
...db,
tables: db.tables.map(table => ({
tables: _compact(db.tables).map(table => ({
...table,
dependencies: allForeignKeys.filter(x => x.refSchemaName == table.schemaName && x.refTableName == table.pureName),
})),

31
packages/web/src/designer/Designer.svelte
View File

@@ -140,12 +140,14 @@
onChange(current => {
let newTables = current.tables || [];
for (const table of current.tables || []) {
const dbTable = (db.tables || []).find(x => x.pureName == table.pureName && x.schemaName == table.schemaName);
const dbTable = (db.tables || []).find(
x => x?.pureName == table?.pureName && x?.schemaName == table?.schemaName
);
if (
stableStringify(_.pick(dbTable, ['columns', 'primaryKey', 'foreignKeys'])) !=
stableStringify(_.pick(table, ['columns', 'primaryKey', 'foreignKeys']))
) {
newTables = newTables.map(x =>
newTables = _.compact(newTables).map(x =>
x == table
? {
...table,
@@ -628,11 +630,13 @@
...current,
tables: (current.tables || []).map(x => {
const domTable = domTables[x.designerId] as any;
const rect = domTable.getRect();
return {
...x,
isSelectedTable: rectanglesHaveIntersection(rect, bounds),
};
if (domTable) {
const rect = domTable.getRect();
return {
...x,
isSelectedTable: rectanglesHaveIntersection(rect, bounds),
};
}
}),
}),
true
@@ -676,9 +680,14 @@
const rect = domTable.getRect();
graph.addNode(
table.designerId,
rect.right - rect.left,
rect.bottom - rect.top,
arrangeAll || table.needsArrange ? null : { x: (rect.left + rect.right) / 2, y: (rect.top + rect.bottom) / 2 }
(rect.right - rect.left) / zoomKoef,
(rect.bottom - rect.top) / zoomKoef,
arrangeAll || table.needsArrange
? null
: {
x: (rect.left + rect.right) / 2 / zoomKoef,
y: (rect.top + rect.bottom) / 2 / zoomKoef,
}
);
}
@@ -718,7 +727,7 @@
current => {
return {
...current,
tables: (current?.tables || []).map(table => {
tables: _.compact(current?.tables || []).map(table => {
const node = layout.nodes[table.designerId];
// console.log('POSITION', position);
return node