fix: Fix allValid & values issue.

jaywcjlove · Dec 10, 2021 · 3ef8131 · 3ef8131
1 parent be6b22d
commit 3ef8131
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/packages/core/__tests__/index.test.ts b/packages/core/__tests__/index.test.ts
@@ -17,12 +17,19 @@ it('validator.tool', async () => {
   expect(validator.errorMessages).toEqual({ });
   expect(validator.fieldValid('email')).toBeTruthy();
   expect(validator.getForm()).toBeUndefined();
-  expect(validator.reset()).toBeUndefined();
+  expect(validator.reset()).toEqual({});
   expect(validator.setValues({ email: 'test' })).toBeUndefined();
   expect(validator.fieldValid('email')).toBeTruthy();
   expect(validator.values.email).toEqual('test');
 });
 
+it('validator.tool values test case', async () => {
+  const validator = new Validator({
+    initValues: { username: 'user' }
+  });
+  expect(validator.values).toEqual({ username: 'user' });
+});
+
 it('validator.tool options validate', async () => {
   const validator = new Validator({
     validate: (value: string) => {

diff --git a/packages/core/dist/validator.js b/packages/core/dist/validator.js
diff --git a/packages/core/dist/validator.js.map b/packages/core/dist/validator.js.map
diff --git a/packages/core/dist/validator.min.js b/packages/core/dist/validator.min.js
diff --git a/packages/core/dist/validator.min.js.map b/packages/core/dist/validator.min.js.map
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -23,6 +23,7 @@ export default class Validator {
     this.rules = rules || {};
     this.validate = validate;
     if (initValues) {
+      this.values = { ...initValues };
       this.initValues = { ...initValues };
     }
     if (form) {
@@ -121,6 +122,9 @@ export default class Validator {
    * @returns Boolean
    */
   allValid() {
+    for (var key in this.values) {
+      this.message(key, this.values[key], this.rules[key]);
+    }
     for (let key in this.fields) {
       if (this.fieldValid(key) === false) {
         return false;