diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue index fed18d1b11..70a71d4ab3 100644 --- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue +++ b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue @@ -188,7 +188,7 @@ const linkedShortcuts = (e: KeyboardEvent) => { try { e.target?.previousElementSibling?.focus() } catch (e) {} - } else if (e.key !== 'Tab' && e.key !== 'Shift' && e.key !== 'Enter' && e.key !== ' ') { + } else if (!expandedFormDlg.value && e.key !== 'Tab' && e.key !== 'Shift' && e.key !== 'Enter' && e.key !== ' ') { try { filterQueryRef.value?.focus() } catch (e) {} diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue index 65807ba959..4bee3c63b9 100644 --- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue +++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue @@ -230,6 +230,10 @@ const linkedShortcuts = (e: KeyboardEvent) => { try { e.target?.previousElementSibling?.focus() } catch (e) {} + } else if (!expandedFormDlg.value && e.key !== 'Tab' && e.key !== 'Shift' && e.key !== 'Enter' && e.key !== ' ') { + try { + filterQueryRef.value?.focus() + } catch (e) {} } }