Beautiful Open-Source Form Builder
Enhance form data handling and mention support in logic conditions (#1157)
Chirag Chhatrala60bdf5ead619
diff --git a/client/components/open/forms/BlockRenderer.vue b/client/components/open/forms/BlockRenderer.vueindex 97e45c28b..7235aadcb 100644--- a/client/components/open/forms/BlockRenderer.vue+++ b/client/components/open/forms/BlockRenderer.vue@@ -334,7 +334,7 @@ const boundProps = computed(() => {inputProperties.currency = field.currency// Parse amount with mentions - field.amount may contain mention HTMLconst parsedAmount = useParseMention(field.amount, true, form.value, dataForm.value)- const sanitizedAmount = parsedAmount+ const sanitizedAmount = String(parsedAmount ?? '').replace(/<[^>]*>/g, '').replace(/,/g, '').trim()@@ -346,11 +346,11 @@ const boundProps = computed(() => {// Parse prefill fields with mentionsif (field.prefill_name) {const parsed = useParseMention(field.prefill_name, true, form.value, dataForm.value)- inputProperties.prefillName = parsed.replace(/<[^>]*>/g, '').trim()+ inputProperties.prefillName = String(parsed ?? '').replace(/<[^>]*>/g, '').trim()}if (field.prefill_email) {const parsed = useParseMention(field.prefill_email, true, form.value, dataForm.value)- inputProperties.prefillEmail = parsed.replace(/<[^>]*>/g, '').trim()+ inputProperties.prefillEmail = String(parsed ?? '').replace(/<[^>]*>/g, '').trim()}if (props.formManager?.payment) {try { inputProperties.paymentData = props.formManager.payment.getPaymentData(field) } catch (e) { console.error(e) }diff --git a/client/composables/components/useParseMention.js b/client/composables/components/useParseMention.jsindex a07450b92..ae6ef4029 100644--- a/client/composables/components/useParseMention.js+++ b/client/composables/components/useParseMention.js@@ -89,7 +89,16 @@ export function useParseMention(content, mentionsAllowed, form, formData, computreturn content}- // Early return for empty/falsy content+ // Early return for null/undefined only (0 and false are valid values)+ if (content == null) {+ return content+ }++ // Coerce non-string content (e.g. numeric payment amounts) — mentions only exist in strings+ if (typeof content !== 'string') {+ return String(content)+ }+if (!content) {return content}