add resetValues

Author: MinJieLiu

README-zh_CN.md

@@ -16,6 +16,7 @@ Demo: [https://minjieliu.github.io/react-validate-framework](https://minjieliu.g
  1. 动态的验证
  1. 多表单组合
  1. 自定义规则
+ 1. 基于 `async` 语法，优雅的异步验证
 
 
 ## 开始使用
@@ -168,7 +169,8 @@ return (
 | validate | function | Promise => Boolean | true | 验证所有字段 |
 | validateByNames | function | Promise => Boolean | true | 通过 `name` 验证组件 |
 | addValues | function | this | true | 添加一个或多个值 |
-| removeValues | function | this | true | 删除一个或多个值 |
+| removeValues | function | this | true | 删除一个或多个值，无参数则删除所有 |
+| resetValues | function | this | true | 重置一个或多个值，无参数则重置所有 |
 | addSchemas | function | this | false | 添加一个或多个验证规则 |
-| removeSchemas | function | this | true | 删除一个或多个验证规则 |
-| formDidChange | function | | | 回调函数 |
+| removeSchemas | function | this | true | 删除一个或多个验证规则，无参数则删除所有 |
+| formDidChange | function | | | 表单改变回调 |

README.md

@@ -158,9 +158,10 @@ return (
 | validate | function | Promise => Boolean | true | Validate all fields |
 | validateByNames | function | Promise => Boolean | true | Validate the component through names |
 | addValues | function | this | true | Add one or more value |
-| removeValues | function | this | true | Remove one or more value |
+| removeValues | function | this | true | Remove one or more value, If there is no name, it will all be removed |
+| resetValues | function | this | true | Reset one or more value, If there is no name, it will all be init |
 | addSchemas | function | this | false | Add one or more validation rules |
-| removeSchemas | function | this | true | Remove one or more validation rules |
+| removeSchemas | function | this | true | Remove one or more validation rules, it will all be removed |
 | formDidChange | function | | | Callback |
 
 You can either pass in `values` as an argument, or call the `init` method when the form is initialized.

lib/FormControl.js

@@ -1,6 +1,6 @@
 {
   "name": "react-validate-framework",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "React validation framework.",
   "main": "lib/index.js",
   "scripts": {

lib/FormControl.js.map

@@ -38,6 +38,9 @@ export default (schemas, methods) => FormComponent => (
 
     schemas = Object.assign({}, schemas);
 
+    // Original
+    originalValues = {};
+
     constructor(props) {
       super(props);
       const {
@@ -141,7 +144,8 @@ export default (schemas, methods) => FormComponent => (
      */
     get isAllValid() {
       const { fields } = this.state;
-      return Object.keys(this.schemas)
+      return Object
+        .keys(this.schemas)
         .every(name => fields[name] && fields[name].result);
     }
 
@@ -161,6 +165,10 @@ export default (schemas, methods) => FormComponent => (
           className: this.props.classNames.static,
           value,
         };
+        // Only initialized once
+        if (this.originalValues[name] === undefined) {
+          this.originalValues[name] = value;
+        }
         // Synchronize values external state
         if (this.props.values) {
           this.props.values[name] = value;
@@ -304,7 +312,7 @@ export default (schemas, methods) => FormComponent => (
       this.setState({
         fields,
       });
-      this.formDidChange();
+      this.formDidChange({ [name]: theValue });
     };
 
     /**
@@ -321,7 +329,7 @@ export default (schemas, methods) => FormComponent => (
       this.setState({
         fields,
       });
-      this.formDidChange();
+      this.formDidChange(values);
       return this;
     };
 
@@ -336,12 +344,17 @@ export default (schemas, methods) => FormComponent => (
 
     /**
      * Delete one or more validation rules
+     * If there is no name, it will all be removed.
      * @param names
      */
     removeSchemas = (...names) => {
-      names.forEach((name) => {
-        delete this.schemas[name];
-      });
+      if (names.length) {
+        names.forEach((name) => {
+          delete this.schemas[name];
+        });
+      } else {
+        this.schemas = {};
+      }
       // Validate the deleted status
       this.validateByNames(...names);
       return this;
@@ -359,24 +372,62 @@ export default (schemas, methods) => FormComponent => (
       this.setState({
         fields,
       });
-      this.formDidChange();
+      this.formDidChange(values);
       return this;
     };
 
     /**
      * Deletes one or more fields
+     * If there is no name, it will all be removed.
      * @param names
      */
     removeValues = (...names) => {
       const { fields } = this.state;
-      names.forEach((name) => {
-        delete fields[name];
+      if (names.length) {
+        names.forEach((name) => {
+          delete fields[name];
+          if (this.props.values) {
+            delete this.props.values[name];
+          }
+        });
+      } else {
+        // Remove all
+        this.state.fields = {};
+        if (this.props.values) {
+          this.props.values = {};
+        }
+      }
+      // Update
+      this.setState({
+        fields,
       });
+      this.formDidChange({});
+      return this;
+    };
+
+    /**
+     * Reset one or more fields
+     * If there is no name, it will all be init.
+     * @param names
+     */
+    resetValues = (...names) => {
+      const { fields } = this.state;
+      const values = {};
+      if (names.length) {
+        names.forEach((name) => {
+          values[name] = this.originalValues[name];
+        });
+        this.init(values);
+      } else {
+        // Init all
+        Object.assign(values, this.originalValues);
+        this.init(values);
+      }
       // Update
       this.setState({
         fields,
       });
-      this.formDidChange();
+      this.formDidChange(values);
       return this;
     };
 
@@ -395,7 +446,10 @@ export default (schemas, methods) => FormComponent => (
       return result;
     };
 
-    // Validate all
+    /**
+     * Validate all
+     * @return {Boolean}
+     */
     validate = () => {
       const names = Object.keys(this.schemas);
       return this.validateByNames(...names);

package.json

@@ -109,6 +109,23 @@ describe('Test Form change validation', () => {
     expect(await app.node.validate()).to.equal(true);
   });
 
+  it('API resetValues executed correctly', async () => {
+    const app = mount(
+      <TestApp3 />,
+    );
+    // change values
+    app.node.changeValues({ sex: '1', city: '1', remarks: 'hello', hobby: ['1'] });
+    expect(await app.node.validateByNames('city', 'remarks')).to.equal(true);
+    expect(await app.node.validate()).to.equal(true);
+    app.node.resetValues('remarks');
+    expect(await app.node.validateByNames('remarks')).to.not.equal(true);
+    expect(await app.node.formValues.remarks).to.be.empty;
+    // reset all
+    app.node.resetValues();
+    expect(await app.node.formValues.hobby.length).to.be.equal(0);
+    expect(await app.node.formValues.city).to.be.empty;
+  });
+
 });