From 3f2fe352e8816f14fb276831695c663975ee6efd Mon Sep 17 00:00:00 2001 From: Chirag Chhatrala <60499540+chiragchhatrala@users.noreply.github.com> Date: Wed, 19 Apr 2023 13:43:50 +0530 Subject: [PATCH] Field Help as Html text & Help Position (#115) * Field Help as Html text & Help Position * Re-organize field options modal * put margin for above help --- app/Http/Requests/UserFormRequest.php | 1 + .../js/components/forms/CheckboxInput.vue | 7 +++- resources/js/components/forms/CodeInput.vue | 2 +- resources/js/components/forms/ColorInput.vue | 2 +- resources/js/components/forms/DateInput.vue | 7 +++- resources/js/components/forms/FileInput.vue | 7 +++- .../js/components/forms/FlatSelectInput.vue | 7 +++- resources/js/components/forms/ImageInput.vue | 2 +- resources/js/components/forms/RatingInput.vue | 7 +++- .../js/components/forms/RichTextAreaInput.vue | 9 ++++- resources/js/components/forms/SelectInput.vue | 6 +-- .../js/components/forms/SignatureInput.vue | 7 +++- .../js/components/forms/TextAreaInput.vue | 11 ++++-- resources/js/components/forms/TextInput.vue | 11 ++++-- .../js/components/forms/ToggleSwitchInput.vue | 7 +++- .../components/forms/components/VSelect.vue | 11 +++++- .../js/components/open/forms/OpenForm.vue | 1 + .../forms/components/FormFieldsEditor.vue | 1 + .../form-components/AddFormBlockModal.vue | 1 + .../forms/fields/FormBlockOptionsModal.vue | 11 +++++- .../forms/fields/FormFieldOptionsModal.vue | 37 ++++++++++++++----- resources/js/mixins/forms/input.js | 3 +- resources/sass/app.scss | 6 +++ 23 files changed, 124 insertions(+), 40 deletions(-) diff --git a/app/Http/Requests/UserFormRequest.php b/app/Http/Requests/UserFormRequest.php index 20bbed8..f822269 100644 --- a/app/Http/Requests/UserFormRequest.php +++ b/app/Http/Requests/UserFormRequest.php @@ -82,6 +82,7 @@ abstract class UserFormRequest extends \Illuminate\Foundation\Http\FormRequest 'properties.*.placeholder' => 'sometimes|nullable', 'properties.*.prefill' => 'sometimes|nullable', 'properties.*.help' => 'sometimes|nullable', + 'properties.*.help_position' => ['sometimes', Rule::in(['below_input', 'above_input'])], 'properties.*.hidden' => 'boolean|nullable', 'properties.*.required' => 'boolean|nullable', 'properties.*.multiple' => 'boolean|nullable', diff --git a/resources/js/components/forms/CheckboxInput.vue b/resources/js/components/forms/CheckboxInput.vue index 406fafa..b960b03 100644 --- a/resources/js/components/forms/CheckboxInput.vue +++ b/resources/js/components/forms/CheckboxInput.vue @@ -1,12 +1,15 @@ diff --git a/resources/js/components/forms/ImageInput.vue b/resources/js/components/forms/ImageInput.vue index 617c7b2..5ecf20a 100644 --- a/resources/js/components/forms/ImageInput.vue +++ b/resources/js/components/forms/ImageInput.vue @@ -36,7 +36,7 @@ - {{ help }} + diff --git a/resources/js/components/forms/RatingInput.vue b/resources/js/components/forms/RatingInput.vue index 0e10a8a..f5080f2 100644 --- a/resources/js/components/forms/RatingInput.vue +++ b/resources/js/components/forms/RatingInput.vue @@ -6,6 +6,9 @@ {{ label }} * + + +
- - {{ help }} + +
diff --git a/resources/js/components/forms/RichTextAreaInput.vue b/resources/js/components/forms/RichTextAreaInput.vue index c1a6458..00b12f9 100644 --- a/resources/js/components/forms/RichTextAreaInput.vue +++ b/resources/js/components/forms/RichTextAreaInput.vue @@ -6,14 +6,19 @@ {{ label }} * +
+ + + +
- - {{ help }} + + diff --git a/resources/js/components/forms/SelectInput.vue b/resources/js/components/forms/SelectInput.vue index 5f14ac0..34beb0c 100644 --- a/resources/js/components/forms/SelectInput.vue +++ b/resources/js/components/forms/SelectInput.vue @@ -17,6 +17,8 @@ :has-error="hasValidation && form.errors.has(name)" :allowCreation="allowCreation" :disabled="disabled" + :help="help" + :help-position="helpPosition" @update-options="updateOptions" > @@ -55,9 +57,7 @@ - - {{ help }} - + diff --git a/resources/js/components/forms/SignatureInput.vue b/resources/js/components/forms/SignatureInput.vue index 5872812..a6e8699 100644 --- a/resources/js/components/forms/SignatureInput.vue +++ b/resources/js/components/forms/SignatureInput.vue @@ -6,6 +6,11 @@ {{ label }} * +
+ + + +
- + diff --git a/resources/js/components/forms/TextAreaInput.vue b/resources/js/components/forms/TextAreaInput.vue index 45b4d7b..a25e83a 100644 --- a/resources/js/components/forms/TextAreaInput.vue +++ b/resources/js/components/forms/TextAreaInput.vue @@ -6,6 +6,11 @@ {{ label }} * +
+ + + +