👕 refactor(progress): change data prop to computed prop [ci skip]

src/components/validity/computed.js

@@ -1,21 +1,9 @@
 /* @flow */
 
 export default function (Vue: GlobalAPI): Object {
-  const { isPlainObject } = Vue.util
+ const { isPlainObject } = Vue.util
 
-  function invalid (): boolean {
-    return !this.valid
-  }
-
-  function pristine (): boolean {
-    return !this.dirty
-  }
-
-  function untouched (): boolean {
-    return !this.touched
-  }
-
-  function _setError (
+  function setError (
     result: ValidationResult,
     field: string,
     validator: string,
@@ -33,6 +21,37 @@ export default function (Vue: GlobalAPI): Object {
     result.errors.push(error)
   }
 
+  function walkProgresses (keys: Array<string>, target: any): string {
+    let progress = ''
+    for (let i = 0; i < keys.length; i++) {
+      const result = target[keys[i]]
+      if (typeof result === 'string' && result) {
+        progress = result
+        break
+      }
+      if (isPlainObject(result)) {
+        const nestedKeys = Object.keys(result)
+        progress = walkProgresses(nestedKeys, result)
+        if (!progress) {
+          break
+        }
+      }
+    }
+    return progress
+  }
+
+  function invalid (): boolean {
+    return !this.valid
+  }
+
+  function pristine (): boolean {
+    return !this.dirty
+  }
+
+  function untouched (): boolean {
+    return !this.touched
+  }
+
   function result (): ValidationResult {
     const ret: ValidationResult = {
       valid: this.valid,
@@ -51,11 +70,11 @@ export default function (Vue: GlobalAPI): Object {
         if (result) {
           ret[validator] = false
         } else {
-          _setError(ret, this.field, validator)
+          setError(ret, this.field, validator)
           ret[validator] = !result
         }
       } else if (typeof result === 'string') {
-        _setError(ret, this.field, validator, result)
+        setError(ret, this.field, validator, result)
         ret[validator] = result
       } else if (isPlainObject(result)) { // object
         const props: Array<string> = Object.keys(result)
@@ -66,11 +85,11 @@ export default function (Vue: GlobalAPI): Object {
             if (propRet) {
               ret[prop][validator] = false
             } else {
-              _setError(ret, this.field, validator, undefined, prop)
+              setError(ret, this.field, validator, undefined, prop)
               ret[prop][validator] = !propRet
             }
           } else if (typeof propRet === 'string') {
-            _setError(ret, this.field, validator, propRet, prop)
+            setError(ret, this.field, validator, propRet, prop)
             ret[prop][validator] = propRet
           } else {
             ret[prop][validator] = false
@@ -84,10 +103,20 @@ export default function (Vue: GlobalAPI): Object {
     return ret
   }
 
+  function progress (): string {
+    let ret = ''
+    ret = walkProgresses(
+      this._keysCached(this._uid.toString(), this.results),
+      this.progresses
+    )
+    return ret
+  }
+
   return {
     invalid,
     pristine,
     untouched,
-    result
+    result,
+    progress
   }
 }

src/components/validity/lifecycles.js

@@ -53,9 +53,6 @@ export default function (Vue: GlobalAPI): Object {
     // watch validation raw results
     this._watchValidationRawResults()
 
-    // watch validation raw progress
-    this._watchValidationRawProgresses()
-
     const validation = this.$options.propsData ? this.$options.propsData.validation : null
     if (validation) {
       const { instance, name } = validation
@@ -72,7 +69,6 @@ export default function (Vue: GlobalAPI): Object {
       instance.unregister(this.field, this, { named: name, group })
     }
 
-    this._unwatchValidationRawProgresses()
     this._unwatchValidationRawResults()
 
     this._elementable.unlistenInputableEvent()
@@ -88,7 +84,7 @@ export default function (Vue: GlobalAPI): Object {
     } else {
       // TODO: should be warn
     }
-
+    
     toggleClasses(this.$el, this.classes.untouched, addClass)
     toggleClasses(this.$el, this.classes.pristine, addClass)
   }

src/components/validity/methods-event.js

@@ -1,5 +1,4 @@
 /* @flow */
-import { MODEL_NOTIFY_EVENT } from '../../util'
 
 export default function (Vue: GlobalAPI): Object {
 

src/components/validity/methods-state.js

@@ -62,7 +62,6 @@ export default function (Vue: GlobalAPI): Object {
   }
 
   function reset (): void {
-    this._unwatchValidationRawProgresses()
     this._unwatchValidationRawResults()
     const keys: Array<string> = this._keysCached(this._uid.toString(), this.results)
     _initStates(keys, this.results, undefined)
@@ -79,9 +78,7 @@ export default function (Vue: GlobalAPI): Object {
     this.touched = false
     this.modified = false
     this._modified = false
-    this.progress = ''
     this._watchValidationRawResults()
-    this._watchValidationRawProgresses()
   }
 
   function _walkValid (keys: Array<string>, target: any): boolean {
@@ -131,40 +128,6 @@ export default function (Vue: GlobalAPI): Object {
     delete this._unwatchResults
   }
 
-  function _walkProgresses (keys: Array<string>, target: any): string {
-    let progress = ''
-    for (let i = 0; i < keys.length; i++) {
-      const result = target[keys[i]]
-      if (typeof result === 'string' && result) {
-        progress = result
-        break
-      }
-      if (isPlainObject(result)) {
-        const nestedKeys = Object.keys(result)
-        progress = _walkProgresses(nestedKeys, result)
-        if (!progress) {
-          break
-        }
-      }
-    }
-    return progress
-  }
-
-  function _watchValidationRawProgresses (): void {
-    this._unwatchProgresses = this.$watch('progresses', (val: any) => {
-      this.progress = _walkProgresses(
-        this._keysCached(this._uid.toString(), this.results),
-        this.progresses
-      )
-    }, { deep: true })
-  }
-
-  function _unwatchValidationRawProgresses (): void {
-    this._unwatchProgresses()
-    this._unwatchProgresses = undefined
-    delete this._unwatchProgresses
-  }
-
   return {
     getValue,
     checkModified,
@@ -176,8 +139,6 @@ export default function (Vue: GlobalAPI): Object {
     reset,
     _walkValid,
     _watchValidationRawResults,
-    _unwatchValidationRawResults,
-    _watchValidationRawProgresses,
-    _unwatchValidationRawProgresses
+    _unwatchValidationRawResults
   }
 }

src/components/validity/states.js

@@ -55,8 +55,7 @@ export default function (Vue: GlobalAPI): Object {
       dirty: false,
       touched: false,
       modified: false,
-      progresses: getInitialProgresses(validators),
-      progress: ''
+      progresses: getInitialProgresses(validators)
     }
   }