diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js index 7277a4064f746b9ca91d6aa3f225fd5fe303f0ce..1bf747541f8e5e0ffe75b6c8ee30b5e674f9f922 100644 --- a/packages/uni-app-plus/dist/index.js +++ b/packages/uni-app-plus/dist/index.js @@ -470,7 +470,7 @@ function getExtraValue (vm, dataPathsArray) { return context } -function processEventExtra (vm, extra) { +function processEventExtra (vm, extra, event) { const extraObj = {}; if (Array.isArray(extra) && extra.length) { @@ -490,7 +490,13 @@ function processEventExtra (vm, extra) { if (!dataPath) { // model,prop.sync extraObj['$' + index] = vm; } else { - extraObj['$' + index] = vm.__get_value(dataPath); + if (dataPath === '$event') { // $event + extraObj['$' + index] = event; + } else if (dataPath.indexOf('$event.') === 0) { // $event.target.value + extraObj['$' + index] = vm.__get_value(dataPath.replace('$event.', ''), event); + } else { + extraObj['$' + index] = vm.__get_value(dataPath); + } } } else { extraObj['$' + index] = getExtraValue(vm, dataPath); @@ -524,7 +530,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam } } - const extraObj = processEventExtra(vm, extra); + const extraObj = processEventExtra(vm, extra, event); const ret = []; args.forEach(arg => { diff --git a/packages/uni-app-plus/package.json b/packages/uni-app-plus/package.json index d8415d9801c9cdfca716e28ce53f84d93f7e4e1b..b1df8791de444e89c998fcaecdb777bc86494d30 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.219", + "version": "0.0.220", "description": "uni-app app-plus", "main": "dist/index.js", "scripts": { diff --git a/packages/uni-mp-baidu/dist/index.js b/packages/uni-mp-baidu/dist/index.js index d0077c83871548f70aafbcf2d8337fe53a177eee..bff99602ac86d8a28f63642c733536e9ebc1a2c2 100644 --- a/packages/uni-mp-baidu/dist/index.js +++ b/packages/uni-mp-baidu/dist/index.js @@ -615,7 +615,7 @@ function getExtraValue (vm, dataPathsArray) { return context } -function processEventExtra (vm, extra) { +function processEventExtra (vm, extra, event) { const extraObj = {}; if (Array.isArray(extra) && extra.length) { @@ -635,7 +635,13 @@ function processEventExtra (vm, extra) { if (!dataPath) { // model,prop.sync extraObj['$' + index] = vm; } else { - extraObj['$' + index] = vm.__get_value(dataPath); + if (dataPath === '$event') { // $event + extraObj['$' + index] = event; + } else if (dataPath.indexOf('$event.') === 0) { // $event.target.value + extraObj['$' + index] = vm.__get_value(dataPath.replace('$event.', ''), event); + } else { + extraObj['$' + index] = vm.__get_value(dataPath); + } } } else { extraObj['$' + index] = getExtraValue(vm, dataPath); @@ -669,7 +675,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam } } - const extraObj = processEventExtra(vm, extra); + const extraObj = processEventExtra(vm, extra, event); const ret = []; args.forEach(arg => { diff --git a/packages/uni-mp-baidu/package.json b/packages/uni-mp-baidu/package.json index aa2b959b82b7af13ca9917ffdb0e8d78715083c4..fcae15a74cedc65b6e0e27a79feb48859803930f 100644 --- a/packages/uni-mp-baidu/package.json +++ b/packages/uni-mp-baidu/package.json @@ -1,6 +1,6 @@ { "name": "@dcloudio/uni-mp-baidu", - "version": "0.0.814", + "version": "0.0.815", "description": "uni-app mp-baidu", "main": "dist/index.js", "scripts": { diff --git a/packages/uni-mp-toutiao/dist/index.js b/packages/uni-mp-toutiao/dist/index.js index 5ee649a89c8330d965176710c599f99315640d32..6350ea38df74c4b53a6699f9b0d3d3ecdec16f4c 100644 --- a/packages/uni-mp-toutiao/dist/index.js +++ b/packages/uni-mp-toutiao/dist/index.js @@ -650,7 +650,7 @@ function getExtraValue (vm, dataPathsArray) { return context } -function processEventExtra (vm, extra) { +function processEventExtra (vm, extra, event) { const extraObj = {}; if (Array.isArray(extra) && extra.length) { @@ -670,7 +670,13 @@ function processEventExtra (vm, extra) { if (!dataPath) { // model,prop.sync extraObj['$' + index] = vm; } else { - extraObj['$' + index] = vm.__get_value(dataPath); + if (dataPath === '$event') { // $event + extraObj['$' + index] = event; + } else if (dataPath.indexOf('$event.') === 0) { // $event.target.value + extraObj['$' + index] = vm.__get_value(dataPath.replace('$event.', ''), event); + } else { + extraObj['$' + index] = vm.__get_value(dataPath); + } } } else { extraObj['$' + index] = getExtraValue(vm, dataPath); @@ -704,7 +710,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam } } - const extraObj = processEventExtra(vm, extra); + const extraObj = processEventExtra(vm, extra, event); const ret = []; args.forEach(arg => { diff --git a/packages/uni-mp-toutiao/package.json b/packages/uni-mp-toutiao/package.json index c126f963f549448aade9049f7f8346681a81c4af..cbf535f2fd9e2ed4467d0baa2e41e722718beafc 100644 --- a/packages/uni-mp-toutiao/package.json +++ b/packages/uni-mp-toutiao/package.json @@ -1,6 +1,6 @@ { "name": "@dcloudio/uni-mp-toutiao", - "version": "0.0.314", + "version": "0.0.315", "description": "uni-app mp-toutiao", "main": "dist/index.js", "scripts": { diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js index 73114f3fe8e62cde68ba0f0f2baa263fa553a568..9575a0e2911e6f3ba1e3b6b0f1ec10147255e9a9 100644 --- a/packages/uni-mp-weixin/dist/index.js +++ b/packages/uni-mp-weixin/dist/index.js @@ -497,7 +497,7 @@ function getExtraValue (vm, dataPathsArray) { return context } -function processEventExtra (vm, extra) { +function processEventExtra (vm, extra, event) { const extraObj = {}; if (Array.isArray(extra) && extra.length) { @@ -517,7 +517,13 @@ function processEventExtra (vm, extra) { if (!dataPath) { // model,prop.sync extraObj['$' + index] = vm; } else { - extraObj['$' + index] = vm.__get_value(dataPath); + if (dataPath === '$event') { // $event + extraObj['$' + index] = event; + } else if (dataPath.indexOf('$event.') === 0) { // $event.target.value + extraObj['$' + index] = vm.__get_value(dataPath.replace('$event.', ''), event); + } else { + extraObj['$' + index] = vm.__get_value(dataPath); + } } } else { extraObj['$' + index] = getExtraValue(vm, dataPath); @@ -551,7 +557,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam } } - const extraObj = processEventExtra(vm, extra); + const extraObj = processEventExtra(vm, extra, event); const ret = []; args.forEach(arg => { diff --git a/packages/uni-mp-weixin/package.json b/packages/uni-mp-weixin/package.json index c3d1a22bcdc4f86f3f62f81bf9cbd4d2996b0792..c99796c5890b25ac7eb50605f67ebec4e1cb935f 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.938", + "version": "0.0.939", "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 bd366d9fd5fca2f2f205195d7bac01cd116b3e77..71316748bd543ae32e71d92d0cbd6260c4eb834e 100644 --- a/src/core/runtime/wrapper/util.js +++ b/src/core/runtime/wrapper/util.js @@ -176,7 +176,7 @@ function getExtraValue (vm, dataPathsArray) { return context } -function processEventExtra (vm, extra) { +function processEventExtra (vm, extra, event) { const extraObj = {} if (Array.isArray(extra) && extra.length) { @@ -196,7 +196,13 @@ function processEventExtra (vm, extra) { if (!dataPath) { // model,prop.sync extraObj['$' + index] = vm } else { - extraObj['$' + index] = vm.__get_value(dataPath) + if (dataPath === '$event') { // $event + extraObj['$' + index] = event + } else if (dataPath.indexOf('$event.') === 0) { // $event.target.value + extraObj['$' + index] = vm.__get_value(dataPath.replace('$event.', ''), event) + } else { + extraObj['$' + index] = vm.__get_value(dataPath) + } } } else { extraObj['$' + index] = getExtraValue(vm, dataPath) @@ -230,7 +236,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam } } - const extraObj = processEventExtra(vm, extra) + const extraObj = processEventExtra(vm, extra, event) const ret = [] args.forEach(arg => {