refs: #6911-saveOnEnter

src/boot/qformMixin.js

@@ -1,31 +1,50 @@
 import { getCurrentInstance } from 'vue';
 
-const filterAvailableInput = (element) =>
+const filterAvailableInput = (element) => {
-    element.classList.contains('q-field__native') && !element.disabled;
+    return element.classList.contains('q-field__native') && !element.disabled;
-const filterAvailableText = (element) =>
+};
-    element.__vueParentComponent.type.name === 'QInput' &&
+const filterAvailableText = (element) => {
-    element.__vueParentComponent?.attrs?.class !== 'vn-input-date';
+    return (
+        element.__vueParentComponent.type.name === 'QInput' &&
+        element.__vueParentComponent?.attrs?.class !== 'vn-input-date'
+    );
+};
 
 export default {
     mounted: function () {
         const vm = getCurrentInstance();
-        if (vm.type.name === 'QForm')
+        if (vm.type.name === 'QForm') {
             if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
                 // AUTOFOCUS
                 const elementsArray = Array.from(this.$el.elements);
-                const firstInputElement = elementsArray
+                const availableInputs = elementsArray.filter(filterAvailableInput);
-                    .filter(filterAvailableInput)
+                const firstInputElement = availableInputs.find(filterAvailableText);
-                    .find(filterAvailableText);
 
                 if (firstInputElement) {
                     firstInputElement.focus();
                 }
                 const that = this;
-                document.addEventListener('keyup', function (evt) {
+                for (const availableInput of availableInputs) {
-                    if (evt.key === 'Enter') {
+                    availableInput.addEventListener('keydown', (evt) => {
-                        that.onSubmit();
+                        if (evt.key === 'Enter') {
-                    }
+                            const input = evt.target;
-                });
+                            console.log('input', input);
+                            if (input.type == 'textarea' && evt.shiftKey) {
+                                evt.preventDefault();
+                                let { selectionStart, selectionEnd } = input;
+                                input.value =
+                                    input.value.substring(0, selectionStart) +
+                                    '\n' +
+                                    input.value.substring(selectionEnd);
+                                selectionStart = selectionEnd = selectionStart + 1;
+                                return;
+                            }
+                            evt.preventDefault();
+                            that.onSubmit();
+                        }
+                    });
+                }
             }
+        }
     },
 };

src/components/ui/VnNotes.vue

@@ -48,12 +48,12 @@ async function insert() {
                 size="lg"
                 autogrow
                 autofocus
-                @keyup.ctrl.enter.stop="insert"
+                @keyup.enter.stop="insert"
                 clearable
             >
-                <template #append
+                <template #append>
-                    ><QBtn
+                    <QBtn
-                        :title="t('Save (ctrl + Enter)')"
+                        :title="t('Save (Enter)')"
                         icon="save"
                         color="primary"
                         flat

src/pages/Claim/Card/ClaimBasicData.vue

@@ -155,7 +155,13 @@ const statesFilter = {
                         v-model.number="data.packages"
                         :label="t('globals.packages')"
                         :rules="validate('claim.packages')"
-                        type="number"
+                        type="textarea"
+                    />
+                    <QInput
+                        v-model.number="data.packages"
+                        :label="t('globals.packages')"
+                        :rules="validate('claim.packages')"
+                        type="text"
                     />
                 </div>
                 <div class="col">