diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js index 0ac066a8485719bfed47a23867dab7c9a2a3f87d..82621c603b675a5e9b57b97e3dbbd0dec6aa401d 100644 --- a/packages/uni-app-plus/dist/index.js +++ b/packages/uni-app-plus/dist/index.js @@ -489,14 +489,17 @@ function processEventExtra (vm, extra) { } function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) { - if (isCustom && !args.length) { // 无参数,直接传入 detail 数组 - if (event.currentTarget && + if (isCustom) { // 自定义事件 + if ( + event.currentTarget && event.currentTarget.dataset && - event.currentTarget.dataset.comType === 'wx') { - // 使用了 wxcomponent 原生组件,传递原始 event 对象 + event.currentTarget.dataset.comType === 'wx' + ) { // wxcomponent 原生组件,传递原始 event 对象 return [event] } - return event.detail + if (!args.length) { // 无参数,直接传入 detail 数组 + return event.detail + } } const extraObj = processEventExtra(vm, extra); diff --git a/packages/uni-app-plus/package.json b/packages/uni-app-plus/package.json index c448bf447d3dca539438739cc39dae128ef32e12..7cfe670af02ba29208a7d46218f81fb6ee3f3c1c 100644 --- a/packages/uni-app-plus/package.json +++ b/packages/uni-app-plus/package.json @@ -1,6 +1,6 @@ { "name": "@dcloudio/uni-app-plus", - "version": "0.0.210", + "version": "0.0.211", "description": "uni-app app-plus", "main": "dist/index.js", "scripts": { diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js index a9078a7e20ca6427ba3be061bed777b9e2e6da53..da9b3d5cc02e3cf475ee04c868fe62f5df47bed7 100644 --- a/packages/uni-mp-weixin/dist/index.js +++ b/packages/uni-mp-weixin/dist/index.js @@ -516,14 +516,17 @@ function processEventExtra (vm, extra) { } function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) { - if (isCustom && !args.length) { // 无参数,直接传入 detail 数组 - if (event.currentTarget && + if (isCustom) { // 自定义事件 + if ( + event.currentTarget && event.currentTarget.dataset && - event.currentTarget.dataset.comType === 'wx') { - // 使用了 wxcomponent 原生组件,传递原始 event 对象 + event.currentTarget.dataset.comType === 'wx' + ) { // wxcomponent 原生组件,传递原始 event 对象 return [event] } - return event.detail + if (!args.length) { // 无参数,直接传入 detail 数组 + return event.detail + } } const extraObj = processEventExtra(vm, extra); diff --git a/packages/uni-mp-weixin/package.json b/packages/uni-mp-weixin/package.json index 6b288fe52b10c9c616e60d767a2e6be9f27867e9..f4c196fe44c784b5237dc528aac0c02a0af83b2c 100644 --- a/packages/uni-mp-weixin/package.json +++ b/packages/uni-mp-weixin/package.json @@ -1,6 +1,6 @@ { "name": "@dcloudio/uni-mp-weixin", - "version": "0.0.929", + "version": "0.0.930", "description": "uni-app mp-weixin", "main": "dist/index.js", "scripts": { diff --git a/src/core/runtime/wrapper/util.js b/src/core/runtime/wrapper/util.js index 19f1509f86986205bda03a17452271be859f44d5..c966919e4ef0cb27799c2d76d9e0c830fb197a61 100644 --- a/src/core/runtime/wrapper/util.js +++ b/src/core/runtime/wrapper/util.js @@ -197,14 +197,17 @@ function processEventExtra (vm, extra) { } function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) { - if (isCustom && !args.length) { // 无参数,直接传入 detail 数组 - if (event.currentTarget && + if (isCustom) { // 自定义事件 + if ( + event.currentTarget && event.currentTarget.dataset && - event.currentTarget.dataset.comType === 'wx') { - // 使用了 wxcomponent 原生组件,传递原始 event 对象 + event.currentTarget.dataset.comType === 'wx' + ) { // wxcomponent 原生组件,传递原始 event 对象 return [event] } - return event.detail + if (!args.length) { // 无参数,直接传入 detail 数组 + return event.detail + } } const extraObj = processEventExtra(vm, extra)