diff --git a/app/Rules/FormPropertyLogicRule.php b/app/Rules/FormPropertyLogicRule.php index 8e8f84a..1c3ed40 100644 --- a/app/Rules/FormPropertyLogicRule.php +++ b/app/Rules/FormPropertyLogicRule.php @@ -490,7 +490,7 @@ class FormPropertyLogicRule implements Rule, DataAwareRule if (is_array($conditions) && count($conditions) > 0) { foreach($conditions as $val){ if (!in_array($val, static::ACTIONS_VALUES) || - (in_array($this->field["type"], ['nf-text', 'nf-page-break', 'nf-divider', 'nf-image']) && !in_array($val, ['hide-block'])) || + (in_array($this->field["type"], ['nf-text', 'nf-code', 'nf-page-break', 'nf-divider', 'nf-image']) && !in_array($val, ['hide-block'])) || (isset($this->field["hidden"]) && $this->field["hidden"] && !in_array($val, ['show-block', 'require-answer'])) || (isset($this->field["required"]) && $this->field["required"] && !in_array($val, ['make-it-optional', 'hide-block'])) ) { diff --git a/resources/js/components/open/forms/OpenForm.vue b/resources/js/components/open/forms/OpenForm.vue index 7cdba83..16bf259 100644 --- a/resources/js/components/open/forms/OpenForm.vue +++ b/resources/js/components/open/forms/OpenForm.vue @@ -12,6 +12,9 @@
+
diff --git a/resources/js/components/open/forms/components/form-components/AddFormBlockModal.vue b/resources/js/components/open/forms/components/form-components/AddFormBlockModal.vue index 36ac0e4..9284700 100644 --- a/resources/js/components/open/forms/components/form-components/AddFormBlockModal.vue +++ b/resources/js/components/open/forms/components/form-components/AddFormBlockModal.vue @@ -196,6 +196,18 @@

Image Block

+ +
+
+ + + +
+

Code Block

+
@@ -242,6 +254,7 @@ export default { 'nf-page-break': 'Page Break', 'nf-divider': 'Divider', 'nf-image': 'Image', + 'nf-code': 'Code Block', } } }, @@ -292,6 +305,8 @@ export default { } else if (data.type === 'nf-page-break') { data.next_btn_text = 'Next' data.previous_btn_text = 'Previous' + } else if (data.type === 'nf-code') { + data.content = '
This is a code block.
' } return data }, diff --git a/resources/js/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue b/resources/js/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue index f792163..ac6e021 100644 --- a/resources/js/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue +++ b/resources/js/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue @@ -107,7 +107,7 @@ export default { }) }, actionOptions() { - if (['nf-text', 'nf-page-break', 'nf-divider', 'nf-image'].includes(this.field.type)) { + if (['nf-text', 'nf-code', 'nf-page-break', 'nf-divider', 'nf-image'].includes(this.field.type)) { return [{name: 'Hide Block', value: 'hide-block'}] } diff --git a/resources/js/components/open/forms/fields/FormBlockOptionsModal.vue b/resources/js/components/open/forms/fields/FormBlockOptionsModal.vue index a7be406..0059d88 100644 --- a/resources/js/components/open/forms/fields/FormBlockOptionsModal.vue +++ b/resources/js/components/open/forms/fields/FormBlockOptionsModal.vue @@ -115,6 +115,10 @@ :form="field" label="Upload Image" :required="false" />
+
+ +

No settings found.

@@ -137,10 +141,11 @@