@kp-ui/lowcode 1.0.25 → 1.0.27

package/src/utils/validators.js

@@ -1,6 +1,6 @@
 import { isNull } from "./util.js";
-const getRegExp = function(e) {
-  return {
+const getRegExp = function(validatorName2) {
+  const commonRegExp = {
     number: "/^[-]?\\d+(\\.\\d+)?$/",
     letter: "/^[A-Za-z]+$/",
     letterAndNumber: "/^[A-Za-z0-9]+$/",
@@ -10,69 +10,74 @@ const getRegExp = function(e) {
     chinese: "/^[一-龥]+$/",
     email: "/^([-_A-Za-z0-9.]+)@([_A-Za-z0-9]+\\.)+[A-Za-z0-9]{2,3}$/",
     url: "/^([hH][tT]{2}[pP]:\\/\\/|[hH][tT]{2}[pP][sS]:\\/\\/)(([A-Za-z0-9-~]+)\\.)+([A-Za-z0-9-~\\/])+$/"
-  }[e];
-}, validateFn = function(validatorName, rule, value, defaultErrorMsg) {
+  };
+  return commonRegExp[validatorName2];
+};
+const validateFn = function(validatorName, rule, value, defaultErrorMsg) {
   console.log("rule: ", rule);
   try {
-    if (isNull(value) || value.length <= 0)
+    if (isNull(value) || value.length <= 0) {
       return Promise.resolve();
+    }
     const reg = eval(getRegExp(validatorName));
-    if (reg.test(value))
+    if (!reg.test(value)) {
+      const errTxt = rule.errorMsg || defaultErrorMsg;
+      console.log("errTxt: ", errTxt);
+      return Promise.reject(errTxt);
+    } else {
       return Promise.resolve();
-    {
-      const e = rule.errorMsg || defaultErrorMsg;
-      return console.log("errTxt: ", e), Promise.reject(e);
     }
-  } catch (e) {
+  } catch (error) {
     return Promise.resolve();
   }
-}, FormValidators = {
+};
+const FormValidators = {
   /* 数字 */
-  number(e, r) {
-    return validateFn("number", e, r, "[" + e.label + "]包含非数字字符");
+  number(rule2, value2) {
+    return validateFn("number", rule2, value2, "[" + rule2.label + "]包含非数字字符");
   },
   /* 字母 */
-  letter(e, r) {
-    return validateFn("letter", e, r, "[" + e.label + "]包含非字母字符");
+  letter(rule2, value2) {
+    return validateFn("letter", rule2, value2, "[" + rule2.label + "]包含非字母字符");
   },
   /* 字母和数字 */
-  letterAndNumber(e, r) {
-    return validateFn("letterAndNumber", e, r, "[" + e.label + "]只能输入字母或数字");
+  letterAndNumber(rule2, value2) {
+    return validateFn("letterAndNumber", rule2, value2, "[" + rule2.label + "]只能输入字母或数字");
   },
   /* 手机号码 */
-  mobilePhone(e, r) {
-    return validateFn("mobilePhone", e, r, "[" + e.label + "]手机号码格式有误");
+  mobilePhone(rule2, value2) {
+    return validateFn("mobilePhone", rule2, value2, "[" + rule2.label + "]手机号码格式有误");
   },
   /* 禁止空白字符开头 */
-  noBlankStart(e, r) {
+  noBlankStart(rule2, value2) {
   },
   /* 禁止空白字符结尾 */
-  noBlankEnd(e, r) {
+  noBlankEnd(rule2, value2) {
   },
   /* 字母开头，仅可包含数字 */
-  letterStartNumberIncluded(e, r) {
+  letterStartNumberIncluded(rule2, value2) {
     return validateFn(
       "letterStartNumberIncluded",
-      e,
-      r,
-      "[" + e.label + "]必须以字母开头，可包含数字"
+      rule2,
+      value2,
+      "[" + rule2.label + "]必须以字母开头，可包含数字"
     );
   },
   /* 禁止中文输入 */
-  noChinese(e, r) {
-    return validateFn("noChinese", e, r, "[" + e.label + "]不可输入中文字符");
+  noChinese(rule2, value2) {
+    return validateFn("noChinese", rule2, value2, "[" + rule2.label + "]不可输入中文字符");
   },
   /* 必须中文输入 */
-  chinese(e, r) {
-    return validateFn("chinese", e, r, "[" + e.label + "]只能输入中文字符");
+  chinese(rule2, value2) {
+    return validateFn("chinese", rule2, value2, "[" + rule2.label + "]只能输入中文字符");
   },
   /* 电子邮箱 */
-  email(e, r) {
-    return validateFn("email", e, r, "[" + e.label + "]邮箱格式有误");
+  email(rule2, value2) {
+    return validateFn("email", rule2, value2, "[" + rule2.label + "]邮箱格式有误");
   },
   /* URL网址 */
-  url(e, r) {
-    return validateFn("url", e, r, "[" + e.label + "]URL格式有误");
+  url(rule2, value2) {
+    return validateFn("url", rule2, value2, "[" + rule2.label + "]URL格式有误");
   },
   /*测试
     test(rule, value) {
@@ -89,14 +94,15 @@ const getRegExp = function(e) {
     },
     */
   regExp(rule, value) {
-    if (isNull(value) || value.length <= 0)
+    if (isNull(value) || value.length <= 0) {
       return Promise.resolve();
+    }
     const pattern = eval(rule.regExp);
-    if (pattern.test(value))
+    if (!pattern.test(value)) {
+      const errTxt = rule.errorMsg || "[" + rule.label + "]invalid value";
+      return Promise.reject(errTxt);
+    } else {
       return Promise.resolve();
-    {
-      const e = rule.errorMsg || "[" + rule.label + "]invalid value";
-      return Promise.reject(e);
     }
   }
 };