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

perspective fixes

Browse Source
This commit is contained in:
Jan Prochazka
2022-08-28 07:52:36 +02:00
parent 4e799885b5
commit 894a864110
4 changed files with 88 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/web/src/perspectives/PerspectiveDesigner.svelte
View File

@@ -52,20 +52,30 @@
oldValue.nodes.map(node => {
const table = newValue.tables?.find(x => x.designerId == node.designerId);
const nodeChanged = {
...node,
};
if (table) {
nodeChanged.alias = table?.alias;
}
if (settings?.isCalledFromArrange) {
// when called from arrange, position must be set to prevent cycle
nodeChanged.position = { x: table?.left || 0, y: table?.top || 0 };
}
if (!table && settings?.removeTables) {
return null;
}
const nodeChanged = {
...node,
alias: table?.alias,
};
if (table && (table.left != node.position?.x || table.top != node.position?.y)) {
if (!settings?.isCalledFromArrange) {
isArranged = false;
}
nodeChanged.position = { x: table.left, y: table.top };
// nodeChanged.position = { x: table.left, y: table.top };
}
return nodeChanged;
})
),
@@ -94,7 +104,6 @@
async function detectAutoArrange(config: PerspectiveConfig, dbInfos) {
if (config.nodes.find(x => !x.position)) {
await tick();
console.log('ARRANGE', config.nodes.length);
runCommand('designer.arrange');
}
}

32
packages/web/src/perspectives/PerspectiveView.svelte
View File

@@ -37,6 +37,7 @@
PerspectiveTableColumnNode,
PerspectiveTableNode,
processPerspectiveDefaultColunns,
shouldProcessPerspectiveDefaultColunns,
} from 'dbgate-datalib';
import _ from 'lodash';
@@ -150,20 +151,23 @@
: null;
$: {
tick().then(() => {
const newConfig = processPerspectiveDefaultColunns(config, $dbInfos, conid, database);
if (newConfig) {
if (
newConfig.nodes.filter(x => x.defaultColumnsProcessed).length >
config.nodes.filter(x => x.defaultColumnsProcessed).length
) {
console.log('CONFIG CHANGED');
setConfig(() => newConfig);
} else {
console.warn('No new default columns', newConfig);
}
}
});
if (shouldProcessPerspectiveDefaultColunns(config, $dbInfos, conid, database)) {
setConfig(cfg => processPerspectiveDefaultColunns(cfg, $dbInfos, conid, database));
}
// tick().then(() => {
// const newConfig = processPerspectiveDefaultColunns(config, $dbInfos, conid, database);
// if (newConfig) {
// if (
// newConfig.nodes.filter(x => x.defaultColumnsProcessed).length >
// config.nodes.filter(x => x.defaultColumnsProcessed).length
// ) {
// console.log('CONFIG CHANGED');
// setConfig(() => newConfig);
// } else {
// console.warn('No new default columns', newConfig);
// }
// }
// });
}
</script>