From c9c363eb13c53db5f7abeb7fa2293d4cd3c8e461 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Mon, 16 Dec 2019 15:20:36 +0800
Subject: [PATCH] fix(v3): mp runtime relations

---
 packages/uni-app-plus/dist/index.v3.js                |  5 ++++-
 .../lib/mp-weixin/transform/file-transformer.js       |  8 +++++---
 packages/uni-mp-weixin/dist/mp.js                     | 11 ++++++-----
 src/core/runtime/mp/parser/behaviors-parser.js        | 10 +++++++---
 src/core/runtime/mp/polyfill/index.js                 |  2 +-
 src/core/runtime/mp/polyfill/methods.js               |  3 ++-
 .../app-plus/service/framework/plugins/vdom-sync.js   |  5 ++++-
 7 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/packages/uni-app-plus/dist/index.v3.js b/packages/uni-app-plus/dist/index.v3.js
index 62d6b8b84..ad110a7a6 100644
--- a/packages/uni-app-plus/dist/index.v3.js
+++ b/packages/uni-app-plus/dist/index.v3.js
@@ -12237,7 +12237,10 @@ var serviceContext = (function () {
     }
 
     removeVm (vm) {
-      delete this.vms[vm._$id];
+      const cid = vm._$id;
+      // 移除尚未同步的data
+      this.batchData = this.batchData.filter(data => data[1][0] !== cid);
+      delete this.vms[cid];
     }
 
     addElement (elm) {
diff --git a/packages/uni-migration/lib/mp-weixin/transform/file-transformer.js b/packages/uni-migration/lib/mp-weixin/transform/file-transformer.js
index a9501ea82..45dd0df5e 100644
--- a/packages/uni-migration/lib/mp-weixin/transform/file-transformer.js
+++ b/packages/uni-migration/lib/mp-weixin/transform/file-transformer.js
@@ -48,10 +48,12 @@ module.exports = function transformFile(input, options) {
   const styleCode = transformStyleFile(filepath + styleExtname, options, deps) || ''
   const scriptCode = transformScriptFile(filepath + '.js', jsCode, options, deps)
 
-  return [
+  const commentsCode = options.silent ? '' :
     `<!-- @dcloudio/uni-migration@${pkg.version} -->
-<!-- ${new Date().toLocaleString()} -->
-<template>
+<!-- ${new Date().toLocaleString()} -->
+`
+  return [
+    `${commentsCode}<template>
 ${templateCode}
 </template>
 ${wxsCode}
diff --git a/packages/uni-mp-weixin/dist/mp.js b/packages/uni-mp-weixin/dist/mp.js
index 83ca936c8..92c8f1abe 100644
--- a/packages/uni-mp-weixin/dist/mp.js
+++ b/packages/uni-mp-weixin/dist/mp.js
@@ -220,14 +220,14 @@ const BEHAVIORS = {
 
       const props = mpOptions.properties;
       // TODO form submit,reset
-      if (!props.name) {
+      if (!hasOwn(props, 'name')) {
         props.name = {
           type: String
         };
       }
-      if (!props.value) {
+      if (!hasOwn(props, 'value')) {
         props.value = {
-          type: String // 默认类型为 String,否则默认值为 null,导致一些自定义 input 显示不正确
+          type: String // 默认类型调整为 String,否则默认值为 null,导致一些自定义 input 显示不正确
         };
       }
     }
@@ -728,8 +728,9 @@ function initMethods (vm) {
     vm.triggerEvent(...args);
   };
   vm.getRelationNodes = (relationKey) => {
+    // 需要过滤已被销毁的vm
     /* eslint-disable  no-mixed-operators */
-    return vm._$relationNodes && vm._$relationNodes[relationKey] || []
+    return (vm._$relationNodes && vm._$relationNodes[relationKey] || []).filter(vm => !vm._isDestroyed)
   };
 
   vm._$updateProperties = updateProperties;
@@ -766,7 +767,7 @@ var polyfill = {
   mounted () {
     handleObservers(this);
   },
-  beforeDestroy () {
+  destroyed () {
     handleRelations(this, 'unlinked');
   }
 };
diff --git a/src/core/runtime/mp/parser/behaviors-parser.js b/src/core/runtime/mp/parser/behaviors-parser.js
index 9b913bcda..e5414c47b 100644
--- a/src/core/runtime/mp/parser/behaviors-parser.js
+++ b/src/core/runtime/mp/parser/behaviors-parser.js
@@ -1,3 +1,7 @@
+import {
+  hasOwn
+} from 'uni-shared'
+
 import {
   parseData
 } from './data-parser'
@@ -54,14 +58,14 @@ const BEHAVIORS = {
 
       const props = mpOptions.properties
       // TODO form submit,reset
-      if (!props.name) {
+      if (!hasOwn(props, 'name')) {
         props.name = {
           type: String
         }
       }
-      if (!props.value) {
+      if (!hasOwn(props, 'value')) {
         props.value = {
-          type: String // 默认类型为 String,否则默认值为 null,导致一些自定义 input 显示不正确
+          type: String // 默认类型调整为 String,否则默认值为 null,导致一些自定义 input 显示不正确
         }
       }
     }
diff --git a/src/core/runtime/mp/polyfill/index.js b/src/core/runtime/mp/polyfill/index.js
index 5b499bf4c..5296d7154 100644
--- a/src/core/runtime/mp/polyfill/index.js
+++ b/src/core/runtime/mp/polyfill/index.js
@@ -28,7 +28,7 @@ export default {
   mounted () {
     handleObservers(this)
   },
-  beforeDestroy () {
+  destroyed () {
     handleRelations(this, 'unlinked')
   }
 }
diff --git a/src/core/runtime/mp/polyfill/methods.js b/src/core/runtime/mp/polyfill/methods.js
index fba357969..af3b577d3 100644
--- a/src/core/runtime/mp/polyfill/methods.js
+++ b/src/core/runtime/mp/polyfill/methods.js
@@ -28,8 +28,9 @@ export function initMethods (vm) {
     vm.triggerEvent(...args)
   }
   vm.getRelationNodes = (relationKey) => {
+    // 需要过滤已被销毁的vm
     /* eslint-disable  no-mixed-operators */
-    return vm._$relationNodes && vm._$relationNodes[relationKey] || []
+    return (vm._$relationNodes && vm._$relationNodes[relationKey] || []).filter(vm => !vm._isDestroyed)
   }
 
   vm._$updateProperties = updateProperties
diff --git a/src/platforms/app-plus/service/framework/plugins/vdom-sync.js b/src/platforms/app-plus/service/framework/plugins/vdom-sync.js
index f6028f48c..465a83733 100644
--- a/src/platforms/app-plus/service/framework/plugins/vdom-sync.js
+++ b/src/platforms/app-plus/service/framework/plugins/vdom-sync.js
@@ -137,7 +137,10 @@ export class VDomSync {
   }
 
   removeVm (vm) {
-    delete this.vms[vm._$id]
+    const cid = vm._$id
+    // 移除尚未同步的data
+    this.batchData = this.batchData.filter(data => data[1][0] !== cid)
+    delete this.vms[cid]
   }
 
   addElement (elm) {
-- 
GitLab