fix(EasyFIeld): fix internal validators

qiqiboy · Mar 30, 2020 · a9a51be · a9a51be
1 parent f061697
commit a9a51be
Show file tree

Hide file tree

Showing 11 changed files with 160 additions and 5,455 deletions.
diff --git a/dist/react-formutil.cjs.development.js b/dist/react-formutil.cjs.development.js
@@ -2707,19 +2707,19 @@ var defaultValidators = [['required', function ($value, check, _ref) {
       checked = _ref$checked === void 0 ? true : _ref$checked;
   return __TYPE__ === 'checked' ? $value === checked : !isEmpty($value);
 }], ['maxLength', function ($value, len, props) {
-  return props.required && isEmpty($value) || $value.length <= len;
+  return 'required' in props.$validError || ($value !== null && $value !== void 0 ? $value : '').length <= len * 1;
 }], ['minLength', function ($value, len, props) {
-  return props.required && isEmpty($value) || $value.length >= len;
+  return 'required' in props.$validError || ($value !== null && $value !== void 0 ? $value : '').length >= len * 1;
 }], ['max', function ($value, limit, props) {
-  return props.required && isEmpty($value) || $value * 1 <= limit;
+  return 'required' in props.$validError || $value * 1 <= limit * 1;
 }], ['min', function ($value, limit, props) {
-  return props.required && isEmpty($value) || $value * 1 >= limit;
+  return 'required' in props.$validError || $value * 1 >= limit * 1;
 }], ['pattern', function ($value, regexp, props) {
-  return props.required && isEmpty($value) || regexp.test($value);
+  return 'required' in props.$validError || regexp.test($value);
 }], ['enum', function ($value, enumeration, props) {
-  return props.required && isEmpty($value) || enumeration.indexOf($value) > -1;
+  return 'required' in props.$validError || enumeration.indexOf($value) > -1;
 }], ['checker', function ($value, checker, props) {
-  return checker($value, props);
+  return 'required' in props.$validError || checker($value, props);
 }]].reduce(function ($validators, item) {
   var _item = slicedToArray(item, 2),
       validKey = _item[0],

diff --git a/dist/react-formutil.cjs.production.js b/dist/react-formutil.cjs.production.js
diff --git a/dist/react-formutil.esm.development.js b/dist/react-formutil.esm.development.js
@@ -2642,19 +2642,19 @@ var defaultValidators = [['required', function ($value, check, _ref) {
       checked = _ref$checked === void 0 ? true : _ref$checked;
   return __TYPE__ === 'checked' ? $value === checked : !isEmpty($value);
 }], ['maxLength', function ($value, len, props) {
-  return props.required && isEmpty($value) || $value.length <= len;
+  return 'required' in props.$validError || ($value !== null && $value !== void 0 ? $value : '').length <= len * 1;
 }], ['minLength', function ($value, len, props) {
-  return props.required && isEmpty($value) || $value.length >= len;
+  return 'required' in props.$validError || ($value !== null && $value !== void 0 ? $value : '').length >= len * 1;
 }], ['max', function ($value, limit, props) {
-  return props.required && isEmpty($value) || $value * 1 <= limit;
+  return 'required' in props.$validError || $value * 1 <= limit * 1;
 }], ['min', function ($value, limit, props) {
-  return props.required && isEmpty($value) || $value * 1 >= limit;
+  return 'required' in props.$validError || $value * 1 >= limit * 1;
 }], ['pattern', function ($value, regexp, props) {
-  return props.required && isEmpty($value) || regexp.test($value);
+  return 'required' in props.$validError || regexp.test($value);
 }], ['enum', function ($value, enumeration, props) {
-  return props.required && isEmpty($value) || enumeration.indexOf($value) > -1;
+  return 'required' in props.$validError || enumeration.indexOf($value) > -1;
 }], ['checker', function ($value, checker, props) {
-  return checker($value, props);
+  return 'required' in props.$validError || checker($value, props);
 }]].reduce(function ($validators, item) {
   var _item = _slicedToArray(item, 2),
       validKey = _item[0],

diff --git a/dist/react-formutil.esm.production.js b/dist/react-formutil.esm.production.js
diff --git a/dist/react-formutil.umd.development.js b/dist/react-formutil.umd.development.js
diff --git a/dist/react-formutil.umd.production.js b/dist/react-formutil.umd.production.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-formutil",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Happy to build the forms in React ^_^",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -37,6 +37,23 @@
       "react-app"
     ]
   },
+  "prettier": {
+    "printWidth": 120,
+    "tabWidth": 4,
+    "trailingComma": "none",
+    "jsxBracketSameLine": true,
+    "semi": true,
+    "arrowParens": "avoid",
+    "singleQuote": true,
+    "overrides": [
+      {
+        "files": "*.json",
+        "options": {
+          "tabWidth": 2
+        }
+      }
+    ]
+  },
   "homepage": "https://github.com/qiqiboy/react-formutil#readme",
   "peerDependencies": {
     "react": "^16.3.0",