8627-devToTest #1421

Merged
alexm merged 768 commits from 8627-devToTest into test 2025-02-18 12:37:37 +00:00
5 changed files with 8 additions and 8 deletions
Showing only changes of commit 2aabef2e11 - Show all commits

View File

@ -44,7 +44,7 @@ export default {
return; return;
} }
evt.preventDefault(); evt.preventDefault();
that.onSubmit({ ...evt, prevent: false }); that.onSubmit(false);
} }
}); });
}, },

View File

@ -113,7 +113,7 @@ const defaultButtons = computed(() => ({
color: 'primary', color: 'primary',
icon: 'save', icon: 'save',
label: 'globals.save', label: 'globals.save',
click: () => myForm.value.onSubmit({ prevent: false }), click: () => myForm.value.onSubmit(false),
type: 'submit', type: 'submit',
}, },
reset: { reset: {
@ -207,7 +207,7 @@ async function fetch() {
} }
} }
async function save({ prevent = true }) { async function save(prevent = true) {
if (prevent) return; if (prevent) return;
if ($props.observeFormChanges && !hasChanges.value) if ($props.observeFormChanges && !hasChanges.value)
return notify('globals.noChanges', 'negative'); return notify('globals.noChanges', 'negative');
@ -294,7 +294,7 @@ defineExpose({
<QForm <QForm
ref="myForm" ref="myForm"
v-if="formData" v-if="formData"
@submit="save" @submit="save(!!$event)"
@reset="reset" @reset="reset"
class="q-pa-md" class="q-pa-md"
:style="maxWidth ? 'max-width: ' + maxWidth : ''" :style="maxWidth ? 'max-width: ' + maxWidth : ''"

View File

@ -67,7 +67,7 @@ defineExpose({
<QBtn <QBtn
:label="t('globals.save')" :label="t('globals.save')"
:title="t('globals.save')" :title="t('globals.save')"
@click="formModelRef.save({ prevent: false })" @click="formModelRef.save(false)"
color="primary" color="primary"
class="q-ml-sm" class="q-ml-sm"
:disabled="isLoading" :disabled="isLoading"

View File

@ -304,7 +304,7 @@ async function getAmountPaid() {
:label="t('globals.save')" :label="t('globals.save')"
:loading="formModelRef.isLoading" :loading="formModelRef.isLoading"
color="primary" color="primary"
@click="formModelRef.save({ prevent: false })" @click="formModelRef.save(false)"
/> />
</div> </div>
</template> </template>

View File

@ -52,7 +52,7 @@ function deleteFile(dmsFk) {
invoiceInRef.value.formData.dmsFk = null; invoiceInRef.value.formData.dmsFk = null;
invoiceInRef.value.formData.dms = undefined; invoiceInRef.value.formData.dms = undefined;
invoiceInRef.value.hasChanges = true; invoiceInRef.value.hasChanges = true;
invoiceInRef.value.save({ prevent: false }); invoiceInRef.value.save(false);
}); });
} }
</script> </script>
@ -281,7 +281,7 @@ function deleteFile(dmsFk) {
invoiceInRef.formData.dmsFk = dmsData.id; invoiceInRef.formData.dmsFk = dmsData.id;
invoiceInRef.formData.dms = dmsData; invoiceInRef.formData.dms = dmsData;
invoiceInRef.hasChanges = true; invoiceInRef.hasChanges = true;
invoiceInRef.save({ prevent: false }); invoiceInRef.save(false);
} }
" "
/> />