diff --git a/src/boot/keyShortcut.js b/src/boot/keyShortcut.js index 5afb5b74a..6da06c8bf 100644 --- a/src/boot/keyShortcut.js +++ b/src/boot/keyShortcut.js @@ -1,6 +1,6 @@ export default { - mounted: function (el, binding) { - const shortcut = binding.value ?? '+'; + mounted(el, binding) { + const shortcut = binding.value || '+'; const { key, ctrl, alt, callback } = typeof shortcut === 'string' @@ -8,25 +8,24 @@ export default { key: shortcut, ctrl: true, alt: true, - callback: () => - document - .querySelector(`button[shortcut="${shortcut}"]`) - ?.click(), + callback: () => el?.click(), } : binding.value; + if (!el.hasAttribute('shortcut')) { + el.setAttribute('shortcut', key); + } + const handleKeydown = (event) => { if (event.key === key && (!ctrl || event.ctrlKey) && (!alt || event.altKey)) { callback(); } }; - // Attach the event listener to the window window.addEventListener('keydown', handleKeydown); - el._handleKeydown = handleKeydown; }, - unmounted: function (el) { + unmounted(el) { if (el._handleKeydown) { window.removeEventListener('keydown', el._handleKeydown); } diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue index dc2a34435..48f607a30 100644 --- a/src/components/ItemsFilterPanel.vue +++ b/src/components/ItemsFilterPanel.vue @@ -282,7 +282,7 @@ const setCategoryList = (data) => { @@ -647,7 +647,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) { color="primary" fab icon="add" - shortcut="+" + v-shortcut="'+'" data-cy="vnTableCreateBtn" /> diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue index 59a4f9f90..424781a26 100644 --- a/src/components/common/VnDmsList.vue +++ b/src/components/common/VnDmsList.vue @@ -413,7 +413,7 @@ defineExpose({ fab color="primary" icon="add" - shortcut="+" + v-shortcut @click="showFormDialog()" class="fill-icon" > diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index 2a84e5aa1..3ad1c79bc 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -2,7 +2,7 @@ import Navbar from 'src/components/NavBar.vue'; diff --git a/test/cypress/integration/vnComponent/VnShortcut.spec.js b/test/cypress/integration/vnComponent/VnShortcut.spec.js index b49b4e964..e08c44635 100644 --- a/test/cypress/integration/vnComponent/VnShortcut.spec.js +++ b/test/cypress/integration/vnComponent/VnShortcut.spec.js @@ -28,6 +28,17 @@ describe('VnShortcuts', () => { }); cy.url().should('include', module); + if (['monitor', 'claim'].includes(module)) { + return; + } + cy.waitForElement('.q-page').should('exist'); + cy.dataCy('vnTableCreateBtn').should('exist'); + cy.get('.q-page').trigger('keydown', { + ctrlKey: true, + altKey: true, + key: '+', + }); + cy.get('#formModel').should('exist'); }); } });