Merge branch 'dev'

Author: donaldshen

cypress/integration/v-model.spec.js

@@ -61,5 +61,7 @@ describe('测试 v-model 示例', function() {
     )
     cy.contains('reset').click()
     cy.contains(stringify(initState))
+    cy.contains('设置名字为小明').click()
+    cy.$getFormItemInput('name').should('have.value', '小明')
   })
 })

docs/v-model.md

@@ -3,6 +3,7 @@
   <el-form-renderer label-width="100px" :content="content" v-model="form" ref="form">
     <el-form-item>
       <el-button @click="resetForm">reset</el-button>
+      <el-button @click="setValue">设置名字为小明</el-button>
     </el-form-item>
     <pre>{{form}}</pre>
   </el-form-renderer>
@@ -130,7 +131,10 @@ export default {
   methods: {
     resetForm() {
       this.$refs.form.resetFields();
-    }
+    },
+    setValue() {
+      this.form.name = '小明'
+    },
   }
 }
 </script>

src/el-form-renderer.vue

@@ -90,8 +90,8 @@ export default {
   },
   watch: {
     form: {
-      handler(v, oldV) {
-        if (!v || _isequal(v, oldV)) return
+      handler(v) {
+        if (!v) return
         this.setValueFromModel()
       },
       immediate: true,
@@ -109,7 +109,7 @@ export default {
         if (!v || _isequal(v, oldV)) return
         this.$emit('input', transformOutputValue(v, this.innerContent))
       },
-      // deep: true, // 应该是没有必要的
+      // deep: true, // updateValue 是全量更新，所以不用
     },
   },
   mounted() {