Beautiful Open-Source Form Builder
Fix form input errors check
Julien Nahum4a46dacb9936
diff --git a/client/components/forms/FlatSelectInput.vue b/client/components/forms/FlatSelectInput.vueindex bfc727e28..4965f9d22 100644--- a/client/components/forms/FlatSelectInput.vue+++ b/client/components/forms/FlatSelectInput.vue@@ -8,7 +8,7 @@<Loader v-if="loading" key="loader" class="h-6 w-6 text-nt-blue mx-auto" /><div v-for="(option, index) in options" v-else :key="option[optionKey]" role="button"- :class="[theme.default.input,'cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-900 flex',{ 'mb-2': index !== options.length,'!ring-red-500 !ring-2': hasValidation && form.errors.has(name), '!cursor-not-allowed !bg-gray-200':disabled }]"+ :class="[theme.default.input,'cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-900 flex',{ 'mb-2': index !== options.length,'!ring-red-500 !ring-2': hasError, '!cursor-not-allowed !bg-gray-200':disabled }]"@click="onSelect(option[optionKey])"><p class="flex-grow">diff --git a/client/components/forms/ImageInput.vue b/client/components/forms/ImageInput.vueindex 524594419..26bbe076a 100644--- a/client/components/forms/ImageInput.vue+++ b/client/components/forms/ImageInput.vue@@ -8,7 +8,7 @@<span class="inline-block w-full rounded-md shadow-sm"><button type="button" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label"- class="cursor-pointer relative w-full" :class="[theme.default.input,{'ring-red-500 ring-2': hasValidation && form.errors.has(name)}]"+ class="cursor-pointer relative w-full" :class="[theme.default.input,{'ring-red-500 ring-2': hasError}]":style="inputStyle" @click.prevent="showUploadModal=true"><div v-if="currentUrl==null" class="h-6 text-gray-600 dark:text-gray-400">diff --git a/client/components/forms/PhoneInput.vue b/client/components/forms/PhoneInput.vueindex 297697beb..ddd7f0062 100644--- a/client/components/forms/PhoneInput.vue+++ b/client/components/forms/PhoneInput.vue@@ -10,7 +10,7 @@<v-select v-model="selectedCountryCode" class="w-[130px]" dropdown-class="w-[300px]" input-class="rounded-r-none":data="countries":disabled="(disabled || countries.length===1)?true:null" :searchable="true" :search-keys="['name']" :option-key="'code'" :color="color"- :has-error="hasValidation && form.errors.has(name)"+ :has-error="hasError":placeholder="'Select a country'" :uppercase-labels="true" :theme="theme" @update:model-value="onChangeCountryCode"><template #option="props">@@ -28,7 +28,7 @@</template></v-select><input v-model="inputVal" type="text" class="inline-flex-grow !border-l-0 !rounded-l-none" :disabled="disabled?true:null"- :class="[theme.default.input, { '!ring-red-500 !ring-2': hasValidation && form.errors.has(name), '!cursor-not-allowed !bg-gray-200': disabled }]"+ :class="[theme.default.input, { '!ring-red-500 !ring-2': hasError, '!cursor-not-allowed !bg-gray-200': disabled }]":placeholder="placeholder" :style="inputStyle" @input="onInput"></div>diff --git a/client/components/forms/RichTextAreaInput.client.vue b/client/components/forms/RichTextAreaInput.client.vueindex b4efc7e42..ccd1d0c01 100644--- a/client/components/forms/RichTextAreaInput.client.vue+++ b/client/components/forms/RichTextAreaInput.client.vue@@ -7,7 +7,7 @@</template><vue-editor :id="id?id:name" ref="editor" v-model="compVal" :disabled="disabled?true:null"- :placeholder="placeholder" :class="[{ '!ring-red-500 !ring-2': hasValidation && form.errors.has(name), '!cursor-not-allowed !bg-gray-200':disabled }, theme.RichTextAreaInput.input]"+ :placeholder="placeholder" :class="[{ '!ring-red-500 !ring-2': hasError, '!cursor-not-allowed !bg-gray-200':disabled }, theme.RichTextAreaInput.input]":editor-toolbar="editorToolbar" class="rich-editor resize-y":style="inputStyle"/>diff --git a/client/components/forms/SelectInput.vue b/client/components/forms/SelectInput.vueindex 9248c7519..5ac9e28e7 100644--- a/client/components/forms/SelectInput.vue+++ b/client/components/forms/SelectInput.vue@@ -18,7 +18,7 @@:placeholder="placeholder":uppercase-labels="uppercaseLabels":theme="theme"- :has-error="hasValidation && form.errors.has(name)"+ :has-error="hasError":allow-creation="allowCreation":disabled="disabled?true:null":help="help"diff --git a/client/components/forms/SignatureInput.vue b/client/components/forms/SignatureInput.vueindex d9dfeb6c2..c213a9dd6 100644--- a/client/components/forms/SignatureInput.vue+++ b/client/components/forms/SignatureInput.vue@@ -7,7 +7,7 @@</template><VueSignaturePad ref="signaturePad"- :class="[theme.default.input,{ '!ring-red-500 !ring-2': hasValidation && form.errors.has(name), '!cursor-not-allowed !bg-gray-200':disabled }]"+ :class="[theme.default.input,{ '!ring-red-500 !ring-2': hasError, '!cursor-not-allowed !bg-gray-200':disabled }]"height="150px":name="name":options="{ onEnd }"diff --git a/client/components/forms/TextAreaInput.vue b/client/components/forms/TextAreaInput.vueindex 6929602e4..757d7e878 100644--- a/client/components/forms/TextAreaInput.vue+++ b/client/components/forms/TextAreaInput.vue@@ -7,7 +7,7 @@</template><textarea :id="id?id:name" v-model="compVal" :disabled="disabled?true:null"- :class="[theme.default.input,{ '!ring-red-500 !ring-2': hasValidation && form.errors.has(name), '!cursor-not-allowed !bg-gray-200':disabled }]"+ :class="[theme.default.input,{ '!ring-red-500 !ring-2': hasError, '!cursor-not-allowed !bg-gray-200':disabled }]"class="resize-y":name="name" :style="inputStyle":placeholder="placeholder"diff --git a/client/components/forms/useFormInput.js b/client/components/forms/useFormInput.jsindex 68a5f197b..421e1bf04 100644--- a/client/components/forms/useFormInput.js+++ b/client/components/forms/useFormInput.js@@ -33,7 +33,7 @@ export function useFormInput (props, context, formPrefixKey = null) {})const hasError = computed(() => {- return hasValidation && props.form?.errors?.has(props.name)+ return hasValidation.value && props.form?.errors?.has(props.name)})const compVal = computed({