diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 32d0e244de..c1efe75ec7 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -9375,6 +9375,14 @@ async function saveGridChangesFromShortcut() { return true; } +/// datetime/date/time 单元格编辑器会吃掉自身按键,保存快捷键由它转发成 save 事件后在这里补上保存(#10515)。 +async function onTemporalCellEditorSave() { + await nextTick(); + if (await saveGridChangesFromShortcut()) { + gridRef.value?.focus({ preventScroll: true }); + } +} + async function onCellEditKeydown(event: KeyboardEvent) { if (isSaveShortcut(event, settingsStore.editorSettings.shortcuts)) { event.preventDefault(); @@ -12870,6 +12878,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val cell-layout="transpose" @cancel="cancelEdit" @commit="commitGridEdit" + @save="onTemporalCellEditorSave" /> (hasPendingChanges.value || hasPendingDataEditorDraft.val :normalize-value="(value) => normalizeTemporalCellEditorValue(value, canvasEditingCell!.actualColIdx)" @cancel="cancelEdit" @commit="commitGridEdit" + @save="onTemporalCellEditorSave" /> (hasPendingChanges.value || hasPendingDataEditorDraft.val :normalize-value="(value) => normalizeTemporalCellEditorValue(value, col.actualColIdx)" @cancel="cancelEdit" @commit="commitGridEdit" + @save="onTemporalCellEditorSave" /> (hasPendingChanges.value || hasPendingDataEditorDraft.val @copy-value="copyDetailCurrentValue" @commit="commitDetailEdit" @cancel="cancelDetailEdit" + @save="onTemporalCellEditorSave" @set-null="setDetailNull" @copy-column-name="copyDetailColumnName" @copy-sql-condition="copyDetailSqlCondition" @@ -14146,6 +14158,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val :commit-on-close="false" @cancel="cancelValueEditorEdit" @commit="commitValueEditorEdit" + @save="onTemporalCellEditorSave" />
diff --git a/apps/desktop/src/components/grid/DataGridCellDetailPanel.vue b/apps/desktop/src/components/grid/DataGridCellDetailPanel.vue index a054e8317e..43038b851d 100644 --- a/apps/desktop/src/components/grid/DataGridCellDetailPanel.vue +++ b/apps/desktop/src/components/grid/DataGridCellDetailPanel.vue @@ -54,6 +54,7 @@ const emit = defineEmits<{ copyValue: []; commit: []; cancel: []; + save: []; setNull: []; copyColumnName: []; copySqlCondition: []; @@ -183,7 +184,7 @@ defineExpose({ openSearch });