didadmin/docuseal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not skip required checkboxes

Browse Source
This commit is contained in:
Pete Matsyburka
2024-02-23 19:17:25 +02:00
parent 03db636d51
commit beb677734f
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/javascript/submission_form/form.vue
+12 -4
View File
@@ -608,7 +608,7 @@ export default {
return this.values[initialsField?.uuid] return this.values[initialsField?.uuid]
}, },
isAnonymousChecboxes () { isAnonymousChecboxes () {
return this.currentField.type === 'checkbox' && this.currentStepFields.every((e) => !e.name) && this.currentStepFields.length > 4 return this.currentField.type === 'checkbox' && this.currentStepFields.every((e) => !e.name && !e.required) && this.currentStepFields.length > 4
}, },
isButtonDisabled () { isButtonDisabled () {
if (this.recalculateButtonDisabledKey) { if (this.recalculateButtonDisabledKey) {
@@ -793,7 +793,7 @@ export default {
}) })
}, },
saveStep (formData) { saveStep (formData) {
const currentFieldUuid = this.currentField.uuid const currentFieldUuids = this.currentStepFields.map((f) => f.uuid)
if (this.isCompleted) { if (this.isCompleted) {
return Promise.resolve({}) return Promise.resolve({})
@@ -803,7 +803,9 @@ export default {
body: formData || new FormData(this.$refs.form) body: formData || new FormData(this.$refs.form)
}).then((response) => { }).then((response) => {
if (response.status === 200) { if (response.status === 200) {
this.submittedValues[currentFieldUuid] = this.values[currentFieldUuid] currentFieldUuids.forEach((fieldUuid) => {
this.submittedValues[fieldUuid] = this.values[fieldUuid]
})
} }
return response return response
@@ -825,7 +827,13 @@ export default {
stepPromise().then(async () => { stepPromise().then(async () => {
const emptyRequiredField = this.stepFields.find((fields, index) => { const emptyRequiredField = this.stepFields.find((fields, index) => {
return index < this.currentStep && fields[0].required && (fields[0].type === 'phone' || !this.allowToSkip) && isEmpty(this.submittedValues[fields[0].uuid]) if (index >= this.currentStep) {
return false
}
return fields.some((f) => {
return f.required && (f.type === 'phone' || !this.allowToSkip) && isEmpty(this.submittedValues[f.uuid])
})
}) })
const formData = new FormData(this.$refs.form) const formData = new FormData(this.$refs.form)