From 1af0b60b2aa363dac338ed4b9bae2af154aa7947 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Tue, 13 Jul 2021 16:35:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(mp):=20=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?=E4=BD=9C=E7=94=A8=E5=9F=9F=E6=8F=92=E6=A7=BD=E5=B5=8C=E5=A5=97?=
 =?UTF-8?q?=E6=97=B6=E5=9C=A8=E6=96=B0=E7=89=88=E4=BD=9C=E7=94=A8=E5=9F=9F?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=A8=A1=E5=BC=8F=E7=BC=96=E8=AF=91=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__tests__/compiler-mp-weixin.spec.js                  | 8 ++++++++
 .../lib/script/traverse/resolve-scoped-slots.js           | 5 +++--
 2 files changed, 11 insertions(+), 2 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 345c51e99..2b41eef7b 100644
--- a/packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js
+++ b/packages/uni-template-compiler/__tests__/compiler-mp-weixin.spec.js
@@ -228,6 +228,14 @@ describe('mp:compiler-mp-weixin', () => {
         scopedSlotsCompiler: 'augmented'
       }
     )
+    assertCodegen(
+      '<my-component><template v-slot="{item}">{{item}}<my-component><template v-slot="{item}">{{item}}<template></my-component><template></my-component>',
+      '<my-component vue-id="551070e6-1" bind:__l="__l" vue-slots="{{[\'default\']}}"><block><block wx:if="{{$root.m0}}">{{$root.m1}}<my-component vue-id="{{(\'551070e6-2\')+\',\'+(\'551070e6-1\')}}" bind:__l="__l" vue-slots="{{[\'default\']}}"><block><block wx:if="{{$root.m2}}">{{$root.m3}}</block></block></my-component></block></block></my-component>',
+      'with(this){var m0=$hasScopedSlotsParams("551070e6-1");var m1=m0?$getScopedSlotsParams("551070e6-1","default","item"):null;var m2=$hasScopedSlotsParams("551070e6-2");var m3=m2?$getScopedSlotsParams("551070e6-2","default","item"):null;$mp.data=Object.assign({},{$root:{m0:m0,m1:m1,m2:m2,m3:m3}})}',
+      {
+        scopedSlotsCompiler: 'augmented'
+      }
+    )
   })
 
   it('generate scoped slot', () => {
diff --git a/packages/uni-template-compiler/lib/script/traverse/resolve-scoped-slots.js b/packages/uni-template-compiler/lib/script/traverse/resolve-scoped-slots.js
index 039a7f6ea..eb8af7b83 100644
--- a/packages/uni-template-compiler/lib/script/traverse/resolve-scoped-slots.js
+++ b/packages/uni-template-compiler/lib/script/traverse/resolve-scoped-slots.js
@@ -26,11 +26,12 @@ function needSlotMode (path, ids) {
 
 function replaceId (path, ids) {
   let replaced
+  const fnPath = path.parentPath
   path.traverse({
-    noScope: true,
+    noScope: false,
     Identifier (path) {
       const name = path.node.name
-      if (name in ids && path.key !== 'key' && (path.key !== 'property' || path.parent.computed)) {
+      if (name in ids && path.key !== 'key' && (path.key !== 'property' || path.parent.computed) && path.scope.path === fnPath) {
         path.replaceWith(ids[name])
         replaced = true
       }
-- 
GitLab