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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Jan Prochazka
2024-08-05 09:32:44 +02:00
parent db5f5a9153 c0c06a2099
commit de60f1b335
6 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"private": true, "private": true,
"version": "5.3.3", "version": "5.3.4",
"name": "dbgate-all", "name": "dbgate-all",
"workspaces": [ "workspaces": [
"packages/*", "packages/*",

6
packages/web/src/buttons/ToolStripContainer.svelte
View File

@@ -4,9 +4,13 @@
const thisInstance = get_current_component(); const thisInstance = get_current_component();
export const activator = createActivator('ToolStripContainer', false); export const activator = createActivator('ToolStripContainer', true);
$: isComponentActive = $isComponentActiveStore('ToolStripContainer', thisInstance); $: isComponentActive = $isComponentActiveStore('ToolStripContainer', thisInstance);
export function activate() {
activator?.activate();
}
</script> </script>
<div class="wrapper"> <div class="wrapper">

4
packages/web/src/tabs/JsonEditorTab.svelte
View File

@@ -32,6 +32,7 @@
export const activator = createActivator('JsonEditorTab', false); export const activator = createActivator('JsonEditorTab', false);
let domEditor; let domEditor;
let domToolStrip;
$: if ($tabVisible && domEditor) { $: if ($tabVisible && domEditor) {
domEditor?.getEditor()?.focus(); domEditor?.getEditor()?.focus();
@@ -72,13 +73,14 @@
} }
</script> </script>
<ToolStripContainer> <ToolStripContainer bind:this={domToolStrip}>
<AceEditor <AceEditor
value={$editorState.value || ''} value={$editorState.value || ''}
menu={createMenu()} menu={createMenu()}
on:input={e => setEditorData(e.detail)} on:input={e => setEditorData(e.detail)}
on:focus={() => { on:focus={() => {
activator.activate(); activator.activate();
domToolStrip?.activate();
invalidateCommands(); invalidateCommands();
}} }}
bind:this={domEditor} bind:this={domEditor}

4
packages/web/src/tabs/JsonLinesEditorTab.svelte
View File

@@ -86,6 +86,7 @@
export const activator = createActivator('JsonLinesEditorTab', false); export const activator = createActivator('JsonLinesEditorTab', false);
let domEditor; let domEditor;
let domToolStrip;
$: if ($tabVisible && domEditor) { $: if ($tabVisible && domEditor) {
domEditor?.getEditor()?.focus(); domEditor?.getEditor()?.focus();
@@ -172,7 +173,7 @@
} }
</script> </script>
<ToolStripContainer> <ToolStripContainer bind:this={domToolStrip}>
<VerticalSplitter isSplitter={jslid}> <VerticalSplitter isSplitter={jslid}>
<svelte:fragment slot="1"> <svelte:fragment slot="1">
<AceEditor <AceEditor
@@ -181,6 +182,7 @@
on:input={e => setEditorData(e.detail)} on:input={e => setEditorData(e.detail)}
on:focus={() => { on:focus={() => {
activator.activate(); activator.activate();
domToolStrip?.activate();
invalidateCommands(); invalidateCommands();
}} }}
bind:this={domEditor} bind:this={domEditor}

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

@@ -105,6 +105,7 @@
let resultCount; let resultCount;
let errorMessages; let errorMessages;
let domEditor; let domEditor;
let domToolStrip;
let intervalId; let intervalId;
onMount(() => { onMount(() => {
@@ -350,7 +351,7 @@
let isInitialized = false; let isInitialized = false;
</script> </script>
<ToolStripContainer> <ToolStripContainer bind:this={domToolStrip}>
<VerticalSplitter isSplitter={visibleResultTabs}> <VerticalSplitter isSplitter={visibleResultTabs}>
<svelte:fragment slot="1"> <svelte:fragment slot="1">
{#if driver?.databaseEngineTypes?.includes('sql')} {#if driver?.databaseEngineTypes?.includes('sql')}
@@ -370,6 +371,7 @@
}} }}
on:focus={() => { on:focus={() => {
activator.activate(); activator.activate();
domToolStrip?.activate();
invalidateCommands(); invalidateCommands();
setTimeout(() => { setTimeout(() => {
isInitialized = true; isInitialized = true;
@@ -388,6 +390,7 @@
on:input={e => setEditorData(e.detail)} on:input={e => setEditorData(e.detail)}
on:focus={() => { on:focus={() => {
activator.activate(); activator.activate();
domToolStrip?.activate();
invalidateCommands(); invalidateCommands();
}} }}
bind:this={domEditor} bind:this={domEditor}

4
packages/web/src/tabs/ShellTab.svelte
View File

@@ -74,6 +74,7 @@
let executeNumber = 0; let executeNumber = 0;
let domEditor; let domEditor;
let domToolStrip;
// const status = writable({ // const status = writable({
// busy, // busy,
@@ -221,7 +222,7 @@
} }
</script> </script>
<ToolStripContainer> <ToolStripContainer bind:this={domToolStrip}>
<VerticalSplitter> <VerticalSplitter>
<svelte:fragment slot="1"> <svelte:fragment slot="1">
<AceEditor <AceEditor
@@ -230,6 +231,7 @@
on:input={e => setEditorData(e.detail)} on:input={e => setEditorData(e.detail)}
on:focus={() => { on:focus={() => {
activator.activate(); activator.activate();
domToolStrip?.activate();
invalidateCommands(); invalidateCommands();
}} }}
bind:this={domEditor} bind:this={domEditor}