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

focus UX

Browse Source
This commit is contained in:
Jan Prochazka
2024-12-12 16:29:12 +01:00
parent d3cc3a92c1
commit 1571295ab6
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/web/src/appobj/AppObjectCore.svelte
View File

@@ -86,6 +86,7 @@
draggable={true} draggable={true}
on:click={handleClick} on:click={handleClick}
on:mouseup={handleMouseUp} on:mouseup={handleMouseUp}
on:mousedown
on:dblclick on:dblclick
use:contextMenu={disableContextMenu ? null : menu} use:contextMenu={disableContextMenu ? null : menu}
on:dragstart={e => { on:dragstart={e => {

21
packages/web/src/appobj/ConnectionAppObject.svelte
View File

@@ -178,11 +178,11 @@
}; };
const handleClick = async e => { const handleClick = async e => {
focusedConnectionOrDatabase.set({ // focusedConnectionOrDatabase.set({
conid: data?._id, // conid: data?._id,
connection: data, // connection: data,
database: data.singleDatabase ? data.defaultDatabase : null, // database: data.singleDatabase ? data.defaultDatabase : null,
}); // });
const config = getCurrentConfig(); const config = getCurrentConfig();
@@ -206,6 +206,14 @@
} }
}; };
const handleMouseDown = () => {
focusedConnectionOrDatabase.set({
conid: data?._id,
connection: data,
database: data.singleDatabase ? data.defaultDatabase : null,
});
};
const handleSqlRestore = () => { const handleSqlRestore = () => {
showModal(ImportDatabaseDumpModal, { showModal(ImportDatabaseDumpModal, {
connection: data, connection: data,
@@ -382,6 +390,7 @@
colorMark={passProps?.connectionColorFactory && passProps?.connectionColorFactory({ conid: data._id })} colorMark={passProps?.connectionColorFactory && passProps?.connectionColorFactory({ conid: data._id })}
menu={getContextMenu} menu={getContextMenu}
on:click={handleClick} on:click={handleClick}
on:mousedown={handleMouseDown}
on:dblclick on:dblclick
on:expand on:expand
on:dblclick={handleDoubleClick} on:dblclick={handleDoubleClick}
@@ -395,4 +404,4 @@
? $focusedConnectionOrDatabase?.database == data.defaultDatabase ? $focusedConnectionOrDatabase?.database == data.defaultDatabase
: !$focusedConnectionOrDatabase?.database)} : !$focusedConnectionOrDatabase?.database)}
disableBoldScroll={!!$focusedConnectionOrDatabase} disableBoldScroll={!!$focusedConnectionOrDatabase}
/> />

4
packages/web/src/appobj/DatabaseAppObject.svelte
View File

@@ -525,11 +525,13 @@ await dbgateApi.dropAllDbObjects(${JSON.stringify(
}} }}
on:click={() => { on:click={() => {
// switchCurrentDatabase(data); // switchCurrentDatabase(data);
$focusedConnectionOrDatabase = { conid: data.connection?._id, database: data.name, connection: data.connection };
if (getDatabaseClickActionSetting() == 'switch') { if (getDatabaseClickActionSetting() == 'switch') {
switchCurrentDatabase(data); switchCurrentDatabase(data);
} }
}} }}
on:mousedown={() => {
$focusedConnectionOrDatabase = { conid: data.connection?._id, database: data.name, connection: data.connection };
}}
on:dragstart on:dragstart
on:dragenter on:dragenter
on:dragend on:dragend

4
packages/web/src/appobj/DatabaseObjectAppObject.svelte
View File

@@ -923,7 +923,6 @@
export let passProps; export let passProps;
function handleClick({ forceNewTab = false, tabPreviewMode = false, focusTab = false } = {}) { function handleClick({ forceNewTab = false, tabPreviewMode = false, focusTab = false } = {}) {
$selectedDatabaseObjectAppObject = _.pick(data, ['conid', 'database', 'objectTypeField', 'pureName', 'schemaName']);
handleDatabaseObjectClick(data, { forceNewTab, tabPreviewMode, focusTab }); handleDatabaseObjectClick(data, { forceNewTab, tabPreviewMode, focusTab });
} }
@@ -966,4 +965,7 @@
on:dragenter on:dragenter
on:dragend on:dragend
on:drop on:drop
on:mousedown={() => {
$selectedDatabaseObjectAppObject = _.pick(data, ['conid', 'database', 'objectTypeField', 'pureName', 'schemaName']);
}}
/> />