doph-js 0.4.30 → 0.4.31

package/dist/dophJs.js

@@ -2713,27 +2713,33 @@ class ri {
     let n = "";
     if (t) {
       let a = !1;
-      for (let o in t)
-        if (!a)
-          switch (o) {
+      const o = !e || e.trim() === "";
+      if (t.required && (n = nt.RulesRequired.validate(e) ? "" : nt.RulesRequired.message(t.required?.message ? t.required.message : "required"), a = n !== ""), o && !t.required)
+        return "";
+      if (a || o)
+        return n;
+      for (let s in t)
+        if (!a && s !== "required")
+          switch (s) {
             case "url":
-              n = nt.RulesUrl.validate(e, "https") || e.length === 0 ? "" : nt.RulesUrl.message("url", t[o]?.message ? t[o]?.message : "url_incorrect"), a = n !== "";
-              break;
-            case "required":
-              n = nt.RulesRequired.validate(e) ? "" : nt.RulesRequired.message(t[o]?.message ? t[o]?.message : "required"), a = n !== "";
+              n = nt.RulesUrl.validate(e, "https") || e.length === 0 ? "" : nt.RulesUrl.message("url", t[s]?.message ? t[s]?.message : "url_incorrect"), a = n !== "";
               break;
+            // case 'required':
+            //     error = Rules.RulesRequired.validate(value) ? '' : Rules.RulesRequired.message(rules[rule]?.message ? rules[rule]?.message : 'required')
+            //     hasErrors = error !== ''
+            //     break
             case "min":
-              n = nt.RulesMin.validate(e, t[o]?.value) ? "" : nt.RulesMin.message(t[o]?.message ? t[o]?.message : "very_small"), a = n !== "";
+              n = nt.RulesMin.validate(e, t[s]?.value) ? "" : nt.RulesMin.message(t[s]?.message ? t[s]?.message : "very_small"), a = n !== "";
               break;
             case "max":
-              n = nt.RulesMax.validate(e, t[o]?.value) ? "" : nt.RulesMax.message(t[o]?.message ? t[o]?.message : "vary_large"), a = n !== "";
+              n = nt.RulesMax.validate(e, t[s]?.value) ? "" : nt.RulesMax.message(t[s]?.message ? t[s]?.message : "vary_large"), a = n !== "";
               break;
             case "email":
-              n = nt.RulesEmail.validate(e) ? "" : nt.RulesMax.message(t[o]?.message ? t[o]?.message : "email_incorrect"), a = n !== "";
+              n = nt.RulesEmail.validate(e) ? "" : nt.RulesEmail.message(t[s]?.message ? t[s]?.message : "email_incorrect"), a = n !== "";
               break;
             case "number":
               n = nt.RulesNumber.validate(e) ? "" : nt.RulesNumber.message(
-                t[o]?.message ? t[o]?.message : "number_incorrect"
+                t[s]?.message ? t[s]?.message : "number_incorrect"
               ), a = n !== "";
               break;
           }