From b1d6f9dd9c82d42a98de3d446fa938ffde1a3809 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 5 Feb 2025 16:34:14 +0100
Subject: [PATCH] fix: refs #8372 rollback

---
 src/boot/qformMixin.js       | 3 ++-
 src/components/FormModel.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index ed21c4137ba..cb31391b33d 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -31,7 +31,7 @@ export default {
             console.error(error);
         }
         form.addEventListener('keyup', function (evt) {
-            if (evt.key === 'Enter') {
+            if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
                 const input = evt.target;
                 if (input.type == 'textarea' && evt.shiftKey) {
                     evt.preventDefault();
@@ -44,6 +44,7 @@ export default {
                     return;
                 }
                 evt.preventDefault();
+                that.onSubmit();
             }
         });
     },
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 747f52a4552..8a8a4ce8efc 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -288,7 +288,7 @@ defineExpose({
         <QForm
             ref="myForm"
             v-if="formData"
-            @submit="save"
+            @submit.prevent="save"
             @reset="reset"
             class="q-pa-md"
             :style="maxWidth ? 'max-width: ' + maxWidth : ''"