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

swithc to form keyboard shortcut

Browse Source
This commit is contained in:
Jan Prochazka
2021-01-11 18:16:17 +01:00
parent 817efb1c72
commit 87fde4185a
5 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/web/src/datagrid/DataGridContextMenu.js
View File

@@ -14,6 +14,7 @@ export default function DataGridContextMenu({
openFreeTable,
openChartSelection,
openActiveChart,
switchToForm,
}) {
return (
<>
@@ -57,6 +58,11 @@ export default function DataGridContextMenu({
<DropDownMenuItem onClick={openFreeTable}>Open selection in free table editor</DropDownMenuItem>
<DropDownMenuItem onClick={openChartSelection}>Open chart from selection</DropDownMenuItem>
{openActiveChart && <DropDownMenuItem onClick={openActiveChart}>Open active chart</DropDownMenuItem>}
{!!switchToForm && (
<DropDownMenuItem onClick={switchToForm} keyText="F4">
Form view
</DropDownMenuItem>
)}
</>
);
}

18
packages/web/src/datagrid/DataGridCore.js
View File

@@ -382,6 +382,7 @@ export default function DataGridCore(props) {
openFreeTable={handleOpenFreeTable}
openChartSelection={handleOpenChart}
openActiveChart={openActiveChart}
switchToForm={handleSwitchToFormView}
/>
);
};
@@ -720,6 +721,11 @@ export default function DataGridCore(props) {
display.reload();
}
if (event.keyCode == keycodes.f4) {
event.preventDefault();
handleSwitchToFormView();
}
if (event.keyCode == keycodes.s && event.ctrlKey) {
event.preventDefault();
handleSave();
@@ -950,6 +956,17 @@ export default function DataGridCore(props) {
}
: null;
const handleSwitchToFormView =
formViewAvailable && display.baseTable && display.baseTable.primaryKey
? () => {
const cell = currentCell;
if (!isRegularCell(cell)) return;
const rowData = grider.getRowData(cell[0]);
if (!rowData) return;
display.switchToFormView(rowData);
}
: null;
// console.log('visibleRealColumnIndexes', visibleRealColumnIndexes);
// console.log(
// 'gridScrollAreaWidth / columnSizes.getVisibleScrollSizeSum()',
@@ -1090,6 +1107,7 @@ export default function DataGridCore(props) {
await axios.post('database-connections/refresh', { conid, database });
display.reload();
}}
switchToForm={handleSwitchToFormView}
/>,
props.toolbarPortalRef.current
)}

7
packages/web/src/datagrid/DataGridToolbar.js
View File

@@ -1,9 +1,14 @@
import React from 'react';
import ToolbarButton from '../widgets/ToolbarButton';
export default function DataGridToolbar({ reload, reconnect, grider, save }) {
export default function DataGridToolbar({ reload, reconnect, grider, save, switchToForm }) {
return (
<>
{switchToForm && (
<ToolbarButton onClick={switchToForm} icon="icon form">
Form view
</ToolbarButton>
)}
<ToolbarButton onClick={reload} icon="icon reload">
Refresh
</ToolbarButton>

5
packages/web/src/formview/FormView.js
View File

@@ -330,6 +330,11 @@ export default function FormView(props) {
onReload();
}
if (event.keyCode == keycodes.f4) {
event.preventDefault();
handleSwitchToTable();
}
if (
!event.ctrlKey &&
!event.altKey &&

20
packages/web/src/formview/FormViewContextMenu.js
View File

@@ -4,12 +4,22 @@ import { DropDownMenuItem, DropDownMenuDivider } from '../modals/DropDownMenu';
export default function FormViewContextMenu({ switchToTable, onNavigate }) {
return (
<>
<DropDownMenuItem onClick={switchToTable}>Table view</DropDownMenuItem>
<DropDownMenuItem onClick={switchToTable} keyText="F4">
Table view
</DropDownMenuItem>
<DropDownMenuDivider />
<DropDownMenuItem onClick={() => onNavigate('begin')}>Navigate to begin</DropDownMenuItem>
<DropDownMenuItem onClick={() => onNavigate('previous')}>Navigate to previous</DropDownMenuItem>
<DropDownMenuItem onClick={() => onNavigate('next')}>Navigate to next</DropDownMenuItem>
<DropDownMenuItem onClick={() => onNavigate('end')}>Navigate to end</DropDownMenuItem>
<DropDownMenuItem onClick={() => onNavigate('begin')} keyText="Ctrl+Home">
Navigate to begin
</DropDownMenuItem>
<DropDownMenuItem onClick={() => onNavigate('previous')} keyText="Ctrl+Up">
Navigate to previous
</DropDownMenuItem>
<DropDownMenuItem onClick={() => onNavigate('next')} keyText="Ctrl+Down">
Navigate to next
</DropDownMenuItem>
<DropDownMenuItem onClick={() => onNavigate('end')} keyText="Ctrl+End">
Navigate to end
</DropDownMenuItem>
</>
);
}