🐛 Make html validation at the end (#1196)

* 🐛 Make html validation at the end * 🚨 Fix linter warning
homeday-de · Sep 19, 2023 · 7713b21 · 7713b21
1 parent 8930e5a
commit 7713b21
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/components/form/HdInput.vue b/src/components/form/HdInput.vue
@@ -200,10 +200,6 @@ export default {
       return true;
     },
     validate(value = this.value) {
-      if (!this.$refs.input.checkValidity()) {
-        return this.showError(this.customErrorMessage || this.t.FORM.VALIDATION.GENERAL);
-      }
-
       if (this.required && !this.isFilled) {
         return this.showError(this.t.FORM.VALIDATION.REQUIRED);
       }
@@ -220,6 +216,10 @@ export default {
         if (this.customRules.length) {
           return this.validateCustomRules(value);
         }
+
+        if (!this.$refs.input.checkValidity()) {
+          return this.showError(this.customErrorMessage || this.t.FORM.VALIDATION.GENERAL);
+        }
       }
 
       return this.hideError();