Merge pull request #1360 from Meituan-Dianping/fix/render

增量更新diff算法bugfix

Author: hucq

src/core/observer/index.js

@@ -121,8 +121,6 @@ export function observe (value: any, asRootData: ?boolean, key: any): Observer |
     !value._isVue
   ) {
     ob = new Observer(value, key)
-    ob.__keyPath = ob.__keyPath ? ob.__keyPath : {}
-    ob.__keyPath[key] = true
   }
   if (asRootData && ob) {
     ob.vmCount++
@@ -186,8 +184,12 @@ export function defineReactive (
       }
       childOb = !shallow && observe(newVal, undefined, key)
       dep.notify()
-      obj.__keyPath = obj.__keyPath ? obj.__keyPath : {}
-      obj.__keyPath[key] = true
+
+      const ob = obj.__ob__
+      if (!ob.__keyPath) {
+        def(ob, '__keyPath', {}, false)
+      }
+      ob.__keyPath[key] = true
     }
   })
 }
@@ -222,7 +224,7 @@ export function set (target: Array<any> | Object, key: any, val: any): any {
   defineReactive(ob.value, key, val)
   // Vue.set 添加对象属性，渲染时候把 val 传给小程序渲染
   if (!target.__keyPath) {
-    target.__keyPath = {}
+    def(target, '__keyPath', {}, false)
   }
   target.__keyPath[key] = true
   ob.dep.notify()
@@ -253,7 +255,7 @@ export function del (target: Array<any> | Object, key: any) {
     return
   }
   if (!target.__keyPath) {
-    target.__keyPath = {}
+    def(target, '__keyPath', {}, false)
   }
   // Vue.del 删除对象属性，渲染时候把这个属性设置为 undefined
   target.__keyPath[key] = 'del'

src/platforms/mp/runtime/diff-data.js

@@ -108,7 +108,7 @@ export function diffData (vm, data) {
   // console.log(rootKey)
 
   // 值类型变量不考虑优化，还是直接更新
-  const __keyPathOnThis = vmData.__keyPath || vm.__keyPath || {}
+  const __keyPathOnThis = getDeepData(['__ob__', '__keyPath'], vmData) || getDeepData(['__ob__', '__keyPath'], vm) || {}
   delete vm.__keyPath
   delete vmData.__keyPath
   delete vmProps.__keyPath
@@ -117,7 +117,6 @@ export function diffData (vm, data) {
     Object.keys(vmData).forEach((vmDataItemKey) => {
       if (vmData[vmDataItemKey] instanceof Object) {
         // 引用类型
-        if (vmDataItemKey === '__keyPath') { return }
         minifyDeepData(rootKey, vmDataItemKey, vmData[vmDataItemKey], data, vm._mpValueSet, vm)
       } else if (vmData[vmDataItemKey] !== undefined) {
         // _data上的值属性只有要更新的时候才赋值
@@ -130,7 +129,6 @@ export function diffData (vm, data) {
     Object.keys(vmProps).forEach((vmPropsItemKey) => {
       if (vmProps[vmPropsItemKey] instanceof Object) {
         // 引用类型
-        if (vmPropsItemKey === '__keyPath') { return }
         minifyDeepData(rootKey, vmPropsItemKey, vmProps[vmPropsItemKey], data, vm._mpValueSet, vm)
       } else if (vmProps[vmPropsItemKey] !== undefined) {
         data[rootKey + '.' + vmPropsItemKey] = vmProps[vmPropsItemKey]

src/platforms/mp/runtime/events.js

@@ -81,12 +81,14 @@ function getWebEventByMP (e) {
   return event
 }
 
+
+const KEY_SEP = '_'
 export function handleProxyWithVue (e) {
   const rootVueVM = this.$root
   const { type, target = {}, currentTarget } = e
   const { dataset = {} } = currentTarget || target
   const { comkey = '', eventid } = dataset
-  const vm = getVM(rootVueVM, comkey.split(','))
+  const vm = getVM(rootVueVM, comkey.split(KEY_SEP))
 
   if (!vm) {
     return