From 42e78dd3a49f52a69f778747e15c14142cb0623c Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Thu, 1 Jul 2021 15:50:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(mp):=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E4=BD=9C=E7=94=A8=E5=9F=9F=E6=8F=92=E6=A7=BD=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=B5=8C=E5=A5=97=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20question/126058?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__tests__/compiler-mp-weixin.spec.js            |  8 ++++++++
 .../mp-weixin/runtime/wrapper/app-base-parser.js    | 13 ++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js b/packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js
index 6eab4f18d..345c51e99 100644
--- a/packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js
+++ b/packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js
@@ -196,6 +196,14 @@ describe('mp:compiler-mp-weixin', () => {
         scopedSlotsCompiler: 'augmented'
       }
     )
+    assertCodegen(
+      '<my-component1><my-component2><template v-slot="{item}">{{getValue(item)}}<template></my-component2></my-component1>',
+      '<my-component1 vue-id="551070e6-1" bind:__l="__l" vue-slots="{{[\'default\']}}"><my-component2 vue-id="{{(\'551070e6-2\')+\',\'+(\'551070e6-1\')}}" bind:__l="__l" vue-slots="{{[\'default\']}}"><block><block wx:if="{{$root.m0}}">{{$root.m1}}</block></block></my-component2></my-component1>',
+      'with(this){var m0=$hasScopedSlotsParams("551070e6-2");var m1=m0?getValue($getScopedSlotsParams("551070e6-2","default","item")):null;$mp.data=Object.assign({},{$root:{m0:m0,m1:m1}})}',
+      {
+        scopedSlotsCompiler: 'augmented'
+      }
+    )
     assertCodegen(
       '<view><slot :item="item"><slot></view>',
       '<view><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><slot></slot></block></view>',
diff --git a/src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js b/src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js
index ed8b57f18..0ed4a85e6 100644
--- a/src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js
+++ b/src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js
@@ -74,11 +74,14 @@ function initScopedSlotsParams () {
   }
 
   Vue.prototype.$setScopedSlotsParams = function (name, value) {
-    const vueId = this.$options.propsData.vueId
-    const object = center[vueId] = center[vueId] || {}
-    object[name] = value
-    if (parents[vueId]) {
-      parents[vueId].$forceUpdate()
+    const vueIds = this.$options.propsData.vueId
+    if (vueIds) {
+      const vueId = vueIds.split(',')[0]
+      const object = center[vueId] = center[vueId] || {}
+      object[name] = value
+      if (parents[vueId]) {
+        parents[vueId].$forceUpdate()
+      }
     }
   }
 
-- 
GitLab