@fecp/mobile 1.0.18 → 1.0.20

package/lib/packages/mobile/src/utils/formRule.js

@@ -5,18 +5,32 @@ const parseRule = ({ label, isRequired, ruleType }) => {
   if (isRequired) {
     ruleList.push({ required: true, message: `请填写${label}` });
   }
+  const errorMessage = `请填写正确的${label}`;
+  const validateEmpty = false;
   switch (ruleType) {
     case "email":
       var pattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "phone":
       var pattern = /^((\+?86)|(\(\+86\)))?(1[3-9]\d{9})$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "mobile":
       var pattern = /^([0-9]{3,4}-)?[0-9]{7,8}$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "mobilephone":
       let validatorMobilephone = function(value) {
@@ -25,10 +39,14 @@ const parseRule = ({ label, isRequired, ruleType }) => {
         if (isMob.test(value) || isPhone.test(value)) {
           return true;
         } else {
-          return `请填写正确的${label}`;
+          return false;
         }
       };
-      ruleList.push({ validator: validatorMobilephone });
+      ruleList.push({
+        validator: validatorMobilephone,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "idNo":
       let validatorIdNo = function(value) {
@@ -37,26 +55,46 @@ const parseRule = ({ label, isRequired, ruleType }) => {
         if (reg15.test(value) || reg18.test(value)) {
           return true;
         } else {
-          return `请填写正确的${label}`;
+          return false;
         }
       };
-      ruleList.push({ validator: validatorIdNo });
+      ruleList.push({
+        validator: validatorIdNo,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "usci":
       var pattern = /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "postcode":
       var pattern = /^[0-9]{6}$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "fax":
       var pattern = /^([0-9]{3,4}-)?[0-9]{7,8}$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "bankcard":
       var pattern = /^[1-9]\d{7,29}$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
   }
   return ruleList;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/mobile",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "main": "lib/packages/mobile/index.js",
   "module": "es/packages/mobile/index.mjs",
   "files": [