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

arrange fix

Browse Source
This commit is contained in:
Jan Prochazka
2022-08-28 08:09:54 +02:00
parent 894a864110
commit 0813f4387d
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@
if (!settings?.isCalledFromArrange) { if (!settings?.isCalledFromArrange) {
isArranged = false; isArranged = false;
} }
// nodeChanged.position = { x: table.left, y: table.top }; nodeChanged.position = { x: table.left, y: table.top };
} }
return nodeChanged; return nodeChanged;

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

@@ -12,16 +12,16 @@
onClick: () => getCurrentEditor().defineCustomJoin(), onClick: () => getCurrentEditor().defineCustomJoin(),
}); });
registerCommand({ // registerCommand({
id: 'perspective.arrange', // id: 'perspective.arrange',
category: 'Perspective', // category: 'Perspective',
icon: 'icon arrange', // icon: 'icon arrange',
name: 'Arrange', // name: 'Arrange',
toolbar: true, // toolbar: true,
isRelatedToTab: true, // isRelatedToTab: true,
testEnabled: () => getCurrentEditor()?.canArrange(), // testEnabled: () => getCurrentEditor()?.canArrange(),
onClick: () => getCurrentEditor().arrange(), // onClick: () => getCurrentEditor().arrange(),
}); // });
</script> </script>
<script lang="ts"> <script lang="ts">
@@ -110,17 +110,17 @@
}); });
} }
export function canArrange() { // export function canArrange() {
return !config.isArranged; // return !config.isArranged;
} // }
export function arrange() { // export function arrange() {
// setConfig(cfg => ({ // // setConfig(cfg => ({
// ...cfg, // // ...cfg,
// isArranged: true, // // isArranged: true,
// })); // // }));
runCommand('designer.arrange'); // runCommand('designer.arrange');
} // }
let perspectiveDatabases = extractPerspectiveDatabases({ conid, database }, config); let perspectiveDatabases = extractPerspectiveDatabases({ conid, database }, config);
$: { $: {

5
packages/web/src/tabs/PerspectiveTab.svelte
View File

@@ -134,7 +134,10 @@
/> />
<svelte:fragment slot="toolstrip"> <svelte:fragment slot="toolstrip">
<ToolStripCommandButton command="perspective.arrange" /> <ToolStripCommandButton
command="designer.arrange"
buttonLabel={$modelState.value?.isArranged ? '(Arranged)' : 'Arrange'}
/>
<ToolStripCommandButton command="perspective.refresh" /> <ToolStripCommandButton command="perspective.refresh" />
<ToolStripCommandButton command="perspective.customJoin" /> <ToolStripCommandButton command="perspective.customJoin" />
<ToolStripSaveButton idPrefix="perspective" /> <ToolStripSaveButton idPrefix="perspective" />