mirrors/dbgate
1
0
Fork 0
mirror of https://github.com/dbgate/dbgate synced 2024-11-07 20:26:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

imrpoved editing data with keyboard #331

Browse Source
This commit is contained in:
Jan Prochazka 2022-08-07 12:01:02 +02:00
parent f3a7e3af74
commit 00df20e350
2 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
packages/web/src/datagrid/DataGridCore.svelte
View File

@ -1194,7 +1194,7 @@
// console.log('event', event.nativeEvent);
}
if (event.keyCode == keycodes.f2) {
if (event.keyCode == keycodes.f2 || event.keyCode == keycodes.enter) {
// @ts-ignore
dispatchInsplaceEditor({ type: 'show', cell: currentCell, selectAll: true });
}
@ -1257,8 +1257,10 @@
if (currentCell[0] == 0) return focusFilterEditor(currentCell[1]);
return moveCurrentCell(currentCell[0] - 1, currentCell[1], event);
case keycodes.downArrow:
case keycodes.enter:
return moveCurrentCell(currentCell[0] + 1, currentCell[1], event);
case keycodes.enter:
if (!grider.editable) return moveCurrentCell(currentCell[0] + 1, currentCell[1], event);
break;
case keycodes.leftArrow:
return moveCurrentCell(currentCell[0], currentCell[1] - 1, event);
case keycodes.rightArrow:
@ -1272,25 +1274,31 @@
case keycodes.pageDown:
return moveCurrentCell(currentCell[0] + visibleRowCountLowerBound, currentCell[1], event);
case keycodes.tab: {
if (event.shiftKey) {
if (currentCell[1] > 0) {
return moveCurrentCell(currentCell[0], currentCell[1] - 1, event);
} else {
return moveCurrentCell(currentCell[0] - 1, columnSizes.realCount - 1, event);
}
} else {
if (currentCell[1] < columnSizes.realCount - 1) {
return moveCurrentCell(currentCell[0], currentCell[1] + 1, event);
} else {
return moveCurrentCell(currentCell[0] + 1, 0, event);
}
}
return moveCurrentCellWithTabKey(event.shiftKey);
}
}
}
return null;
}
function moveCurrentCellWithTabKey(isShift) {
if (!isRegularCell(currentCell)) return null;
if (isShift) {
if (currentCell[1] > 0) {
return moveCurrentCell(currentCell[0], currentCell[1] - 1, event);
} else {
return moveCurrentCell(currentCell[0] - 1, columnSizes.realCount - 1, event);
}
} else {
if (currentCell[1] < columnSizes.realCount - 1) {
return moveCurrentCell(currentCell[0], currentCell[1] + 1, event);
} else {
return moveCurrentCell(currentCell[0] + 1, 0, event);
}
}
}
function setCellValue(cell, value) {
grider.setCellValue(cell[0], realColumnUniqueNames[cell[1]], value);
}
@ -1431,10 +1439,24 @@
selectAll: action.selectAll,
};
case 'close': {
const [row, col] = currentCell || [];
if (domFocusField) domFocusField.focus();
// @ts-ignore
if (action.mode == 'enter' && row) setTimeout(() => moveCurrentCell(row + 1, col), 0);
if (action.mode == 'enter' || action.mode == 'tab' || action.mode == 'shiftTab') {
setTimeout(() => {
if (isRegularCell(currentCell)) {
switch (action.mode) {
case 'enter':
moveCurrentCell(currentCell[0] + 1, currentCell[1]);
break;
case 'tab':
moveCurrentCellWithTabKey(false);
break;
case 'shiftTab':
moveCurrentCellWithTabKey(true);
break;
}
}
}, 0);
}
// if (action.mode == 'save') setTimeout(handleSave, 0);
return {};
}

12
packages/web/src/datagrid/InplaceEditor.svelte
View File

@ -36,18 +36,26 @@
break;
case keycodes.enter:
if (isChangedRef.get()) {
// grider.setCellValue(rowIndex, uniqueName, editor.value);
onSetValue(parseCellValue(domEditor.value));
isChangedRef.set(false);
}
domEditor.blur();
event.preventDefault();
dispatchInsplaceEditor({ type: 'close', mode: 'enter' });
break;
case keycodes.tab:
if (isChangedRef.get()) {
onSetValue(parseCellValue(domEditor.value));
isChangedRef.set(false);
}
domEditor.blur();
event.preventDefault();
dispatchInsplaceEditor({ type: 'close', mode: event.shiftKey ? 'shiftTab' : 'tab' });
break;
case keycodes.s:
if (isCtrlOrCommandKey(event)) {
if (isChangedRef.get()) {
onSetValue(parseCellValue(domEditor.value));
// grider.setCellValue(rowIndex, uniqueName, editor.value);
isChangedRef.set(false);
}
event.preventDefault();