From 80a57faadb4ffec92f479c59651a07105656cf59 Mon Sep 17 00:00:00 2001
From: DCloud_LXH <283700113@qq.com>
Date: Wed, 7 Sep 2022 12:00:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(mp):=20arguments=20=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BC=A0=E9=80=92?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E7=B1=BB=E5=9E=8B=E6=97=B6=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/runtime/wrapper/util.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/core/runtime/wrapper/util.js b/src/core/runtime/wrapper/util.js
index 90539b4ee..ec1a8ba36 100644
--- a/src/core/runtime/wrapper/util.js
+++ b/src/core/runtime/wrapper/util.js
@@ -416,8 +416,6 @@ function getExtraValue (vm, dataPathsArray) {
 function processEventExtra (vm, extra, event, __args__) {
   const extraObj = {}
 
-  __args__ = event.detail.__args__ || __args__
-
   if (Array.isArray(extra) && extra.length) {
     /**
      *[
@@ -438,11 +436,7 @@ function processEventExtra (vm, extra, event, __args__) {
           if (dataPath === '$event') { // $event
             extraObj['$' + index] = event
           } else if (dataPath === 'arguments') {
-            if (event.detail && __args__) {
-              extraObj['$' + index] = __args__
-            } else {
-              extraObj['$' + index] = [event]
-            }
+            extraObj['$' + index] = event.detail ? event.detail.__args__ || __args__ : __args__
           } else if (dataPath.indexOf('$event.') === 0) { // $event.target.value
             extraObj['$' + index] = vm.__get_value(dataPath.replace('$event.', ''), event)
           } else {
@@ -471,7 +465,9 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
   let isCustomMPEvent = false // wxcomponent 组件，传递原始 event 对象
 
   // fixed 用户直接触发 mpInstance.triggerEvent
-  const __args__ = event.detail.__args__ || [event.detail]
+  const __args__ = isPlainObject(event.detail)
+    ? event.detail.__args__ || [event.detail]
+    : [event.detail]
 
   if (isCustom) { // 自定义事件
     isCustomMPEvent = event.currentTarget &&
-- 
GitLab