From 1776703e26c8082cd4f22bb0b679dcce0038d8dc Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 11 Apr 2025 06:24:40 +0200 Subject: [PATCH] feat: refs #7701 wip FormModel changes --- src/boot/defaults/qDialog.js | 4 ++++ src/boot/quasar.defaults.js | 1 + src/components/FormModel.vue | 4 ---- test/cypress/integration/client/clientWebAccess.spec.js | 2 ++ test/cypress/integration/item/itemBotanical.spec.js | 2 ++ 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 src/boot/defaults/qDialog.js diff --git a/src/boot/defaults/qDialog.js b/src/boot/defaults/qDialog.js new file mode 100644 index 000000000..c865f0acd --- /dev/null +++ b/src/boot/defaults/qDialog.js @@ -0,0 +1,4 @@ +import setDefault from './setDefault'; +import { QDialog } from 'quasar'; + +setDefault(QDialog, 'noRouteDismiss', true); diff --git a/src/boot/quasar.defaults.js b/src/boot/quasar.defaults.js index 9638e2057..773058e41 100644 --- a/src/boot/quasar.defaults.js +++ b/src/boot/quasar.defaults.js @@ -1,3 +1,4 @@ export * from './defaults/qTable'; export * from './defaults/qInput'; export * from './defaults/qSelect'; +export * from './defaults/qDialog'; diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 1222c7bec..378ab334c 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -194,13 +194,9 @@ watch( watch( () => formData.value, async (newData, oldData) => { - // console.log('Form data changed:', newData); - // console.log('formData: ', formData.value); if (JSON.stringify(newData) === JSON.stringify(oldData)) return; - // console.log('Current route query:', route.query); if (!$props.searchUrl) return; if (!newData) return; - // console.log('sigue'); const urlParams = JSON.stringify(newData); await nextTick(); router.replace({ diff --git a/test/cypress/integration/client/clientWebAccess.spec.js b/test/cypress/integration/client/clientWebAccess.spec.js index 970aab71c..b883665f7 100644 --- a/test/cypress/integration/client/clientWebAccess.spec.js +++ b/test/cypress/integration/client/clientWebAccess.spec.js @@ -4,6 +4,8 @@ describe('Client web-access', () => { cy.viewport(1280, 720); cy.login('developer'); }); + + //falla it('Should test buttons ', () => { cy.visit('#/customer/1101/web-access'); cy.get('.q-page').should('be.visible'); diff --git a/test/cypress/integration/item/itemBotanical.spec.js b/test/cypress/integration/item/itemBotanical.spec.js index 6105ef179..d70b8af85 100644 --- a/test/cypress/integration/item/itemBotanical.spec.js +++ b/test/cypress/integration/item/itemBotanical.spec.js @@ -13,6 +13,7 @@ describe('Item botanical', () => { cy.checkNotification('Data saved'); }); + //falla it('should create a new Genus', () => { cy.dataCy('Genus_icon').click(); cy.dataCy('Latin genus name_input').type('Test'); @@ -20,6 +21,7 @@ describe('Item botanical', () => { cy.checkNotification('Data created'); }); + //falla it('should create a new specie', () => { cy.dataCy('Species_icon').click(); cy.dataCy('Latin species name_input').type('Test specie');