Skip to content

U
uni-app

ripplebb / uni-app
与 Fork 源项目一致

Fork自 DCloud / uni-app

通知 1
Star 0
Fork 0
U
uni-app

体验新版 GitCode，发现更多精彩内容 >>

提交 9c99f06a 编写于 作者: Q qiang
浏览文件
操作

chore: build

上级 6a4fff34
展开全部 隐藏空白更改
内联 并排
Showing with 212 addition and 135 deletion
packages/uni-app-plus/dist/index.js
浏览文件 @ 9c99f06a
......@@ -1048,7 +1048,11 @@ const customize = cached((str) => {
function initTriggerEvent (mpInstance) {
const oldTriggerEvent = mpInstance.triggerEvent;
const newTriggerEvent = function (event, ...args) {
return oldTriggerEvent.apply(mpInstance, [customize(event), ...args])
// 事件名统一转驼峰格式，仅处理：当前组件为 vue 组件、当前组件为 vue 组件子组件
if (this.$vm || (this.dataset && this.dataset.comType)) {
event = customize(event);
}
return oldTriggerEvent.apply(this, [event, ...args])
};
try {
// 京东小程序 triggerEvent 为只读
......@@ -1220,7 +1224,7 @@ function initData (vueOptions, context) {
try {
// 对 data 格式化
data = JSON.parse(JSON.stringify(data));
} catch (e) {}
} catch (e) { }
}
if (!isPlainObject(data)) {
......@@ -1372,7 +1376,7 @@ function wrapper$2 (event) {
// TODO 又得兼容 mpvue 的 mp 对象
try {
event.mp = JSON.parse(JSON.stringify(event));
} catch (e) {}
} catch (e) { }
event.stopPropagation = noop;
event.preventDefault = noop;
......@@ -1443,7 +1447,7 @@ function getExtraValue (vm, dataPathsArray) {
return context
}
function processEventExtra (vm, extra, event) {
function processEventExtra (vm, extra, event, __args__) {
const extraObj = {};
if (Array.isArray(extra) && extra.length) {
......@@ -1466,11 +1470,7 @@ function processEventExtra (vm, extra, event) {
if (dataPath === '$event') { // $event
extraObj['$' + index] = event;
} else if (dataPath === 'arguments') {
if (event.detail && event.detail.__args__) {
extraObj['$' + index] = event.detail.__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 {
......@@ -1497,6 +1497,12 @@ function getObjByArray (arr) {
function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) {
let isCustomMPEvent = false; // wxcomponent 组件，传递原始 event 对象
// fixed 用户直接触发 mpInstance.triggerEvent
const __args__ = isPlainObject(event.detail)
? event.detail.__args__ || [event.detail]
: [event.detail];
if (isCustom) { // 自定义事件
isCustomMPEvent = event.currentTarget &&
event.currentTarget.dataset &&
......@@ -1505,11 +1511,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if (isCustomMPEvent) {
return [event]
}
return event.detail.__args__ || event.detail
return __args__
}
}
const extraObj = processEventExtra(vm, extra, event);
const extraObj = processEventExtra(vm, extra, event, __args__);
const ret = [];
args.forEach(arg => {
......@@ -1518,7 +1524,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
ret.push(event.target.value);
} else {
if (isCustom && !isCustomMPEvent) {
ret.push(event.detail.__args__[0]);
ret.push(__args__[0]);
} else { // wxcomponent 组件或内置组件
ret.push(event);
}
......
packages/uni-app-plus/dist/index.v3.js
浏览文件 @ 9c99f06a
......@@ -21812,6 +21812,7 @@ var serviceContext = (function () {
this._page = page;
this._queue = [];
this._queueCb = [];
this._nodesRef = null;
}
exec (callback) {
......@@ -21830,6 +21831,8 @@ var serviceContext = (function () {
});
isFn(callback) && callback.call(this, res);
});
return this._nodesRef
}
['in'] (component) {
......@@ -21839,15 +21842,15 @@ var serviceContext = (function () {
}
select (selector) {
return new NodesRef(this, this._component, selector, true)
return (this._nodesRef = new NodesRef(this, this._component, selector, true))
}
selectAll (selector) {
return new NodesRef(this, this._component, selector, false)
return (this._nodesRef = new NodesRef(this, this._component, selector, false))
}
selectViewport () {
return new NodesRef(this, 0, '', true)
return (this._nodesRef = new NodesRef(this, 0, '', true))
}
_push (selector, component, single, fields, callback) {
......
packages/uni-mp-alipay/dist/index.js
浏览文件 @ 9c99f06a
......@@ -2051,7 +2051,7 @@ function initData (vueOptions, context) {
try {
// 对 data 格式化
data = JSON.parse(JSON.stringify(data));
} catch (e) {}
} catch (e) { }
}
if (!isPlainObject(data)) {
......@@ -2199,7 +2199,7 @@ function wrapper$1 (event) {
// TODO 又得兼容 mpvue 的 mp 对象
try {
event.mp = JSON.parse(JSON.stringify(event));
} catch (e) {}
} catch (e) { }
event.stopPropagation = noop;
event.preventDefault = noop;
......@@ -2270,7 +2270,7 @@ function getExtraValue (vm, dataPathsArray) {
return context
}
function processEventExtra (vm, extra, event) {
function processEventExtra (vm, extra, event, __args__) {
const extraObj = {};
if (Array.isArray(extra) && extra.length) {
......@@ -2293,11 +2293,7 @@ function processEventExtra (vm, extra, event) {
if (dataPath === '$event') { // $event
extraObj['$' + index] = event;
} else if (dataPath === 'arguments') {
if (event.detail && event.detail.__args__) {
extraObj['$' + index] = event.detail.__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 {
......@@ -2324,6 +2320,12 @@ function getObjByArray (arr) {
function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) {
let isCustomMPEvent = false; // wxcomponent 组件，传递原始 event 对象
// fixed 用户直接触发 mpInstance.triggerEvent
const __args__ = isPlainObject(event.detail)
? event.detail.__args__ || [event.detail]
: [event.detail];
if (isCustom) { // 自定义事件
isCustomMPEvent = event.currentTarget &&
event.currentTarget.dataset &&
......@@ -2332,11 +2334,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if (isCustomMPEvent) {
return [event]
}
return event.detail.__args__ || event.detail
return __args__
}
}
const extraObj = processEventExtra(vm, extra, event);
const extraObj = processEventExtra(vm, extra, event, __args__);
const ret = [];
args.forEach(arg => {
......@@ -2345,7 +2347,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
ret.push(event.target.value);
} else {
if (isCustom && !isCustomMPEvent) {
ret.push(event.detail.__args__[0]);
ret.push(__args__[0]);
} else { // wxcomponent 组件或内置组件
ret.push(event);
}
......
packages/uni-mp-baidu/dist/index.js
浏览文件 @ 9c99f06a
......@@ -1512,7 +1512,11 @@ const customize = cached((str) => {
function initTriggerEvent (mpInstance) {
const oldTriggerEvent = mpInstance.triggerEvent;
const newTriggerEvent = function (event, ...args) {
return oldTriggerEvent.apply(mpInstance, [customize(event), ...args])
// 事件名统一转驼峰格式，仅处理：当前组件为 vue 组件、当前组件为 vue 组件子组件
if (this.$vm || (this.dataset && this.dataset.comType)) {
event = customize(event);
}
return oldTriggerEvent.apply(this, [event, ...args])
};
try {
// 京东小程序 triggerEvent 为只读
......@@ -1684,7 +1688,7 @@ function initData (vueOptions, context) {
try {
// 对 data 格式化
data = JSON.parse(JSON.stringify(data));
} catch (e) {}
} catch (e) { }
}
if (!isPlainObject(data)) {
......@@ -1852,7 +1856,7 @@ function wrapper$1 (event) {
// TODO 又得兼容 mpvue 的 mp 对象
try {
event.mp = JSON.parse(JSON.stringify(event));
} catch (e) {}
} catch (e) { }
event.stopPropagation = noop;
event.preventDefault = noop;
......@@ -1933,7 +1937,7 @@ function getExtraValue (vm, dataPathsArray) {
return context
}
function processEventExtra (vm, extra, event) {
function processEventExtra (vm, extra, event, __args__) {
const extraObj = {};
if (Array.isArray(extra) && extra.length) {
......@@ -1956,11 +1960,7 @@ function processEventExtra (vm, extra, event) {
if (dataPath === '$event') { // $event
extraObj['$' + index] = event;
} else if (dataPath === 'arguments') {
if (event.detail && event.detail.__args__) {
extraObj['$' + index] = event.detail.__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 {
......@@ -1987,6 +1987,12 @@ function getObjByArray (arr) {
function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) {
let isCustomMPEvent = false; // wxcomponent 组件，传递原始 event 对象
// fixed 用户直接触发 mpInstance.triggerEvent
const __args__ = isPlainObject(event.detail)
? event.detail.__args__ || [event.detail]
: [event.detail];
if (isCustom) { // 自定义事件
isCustomMPEvent = event.currentTarget &&
event.currentTarget.dataset &&
......@@ -1995,11 +2001,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if (isCustomMPEvent) {
return [event]
}
return event.detail.__args__ || event.detail
return __args__
}
}
const extraObj = processEventExtra(vm, extra, event);
const extraObj = processEventExtra(vm, extra, event, __args__);
const ret = [];
args.forEach(arg => {
......@@ -2008,7 +2014,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
ret.push(event.target.value);
} else {
if (isCustom && !isCustomMPEvent) {
ret.push(event.detail.__args__[0]);
ret.push(__args__[0]);
} else { // wxcomponent 组件或内置组件
ret.push(event);
}
......
packages/uni-mp-jd/dist/index.js
浏览文件 @ 9c99f06a
......@@ -1129,7 +1129,11 @@ const customize = cached((str) => {
function initTriggerEvent (mpInstance) {
const oldTriggerEvent = mpInstance.triggerEvent;
const newTriggerEvent = function (event, ...args) {
return oldTriggerEvent.apply(mpInstance, [customize(event), ...args])
// 事件名统一转驼峰格式，仅处理：当前组件为 vue 组件、当前组件为 vue 组件子组件
if (this.$vm || (this.dataset && this.dataset.comType)) {
event = customize(event);
}
return oldTriggerEvent.apply(this, [event, ...args])
};
try {
// 京东小程序 triggerEvent 为只读
......@@ -1301,7 +1305,7 @@ function initData (vueOptions, context) {
try {
// 对 data 格式化
data = JSON.parse(JSON.stringify(data));
} catch (e) {}
} catch (e) { }
}
if (!isPlainObject(data)) {
......@@ -1453,7 +1457,7 @@ function wrapper$1 (event) {
// TODO 又得兼容 mpvue 的 mp 对象
try {
event.mp = JSON.parse(JSON.stringify(event));
} catch (e) {}
} catch (e) { }
event.stopPropagation = noop;
event.preventDefault = noop;
......@@ -1524,7 +1528,7 @@ function getExtraValue (vm, dataPathsArray) {
return context
}
function processEventExtra (vm, extra, event) {
function processEventExtra (vm, extra, event, __args__) {
const extraObj = {};
if (Array.isArray(extra) && extra.length) {
......@@ -1547,11 +1551,7 @@ function processEventExtra (vm, extra, event) {
if (dataPath === '$event') { // $event
extraObj['$' + index] = event;
} else if (dataPath === 'arguments') {
if (event.detail && event.detail.__args__) {
extraObj['$' + index] = event.detail.__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 {
......@@ -1578,6 +1578,12 @@ function getObjByArray (arr) {
function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) {
let isCustomMPEvent = false; // wxcomponent 组件，传递原始 event 对象
// fixed 用户直接触发 mpInstance.triggerEvent
const __args__ = isPlainObject(event.detail)
? event.detail.__args__ || [event.detail]
: [event.detail];
if (isCustom) { // 自定义事件
isCustomMPEvent = event.currentTarget &&
event.currentTarget.dataset &&
......@@ -1586,11 +1592,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if (isCustomMPEvent) {
return [event]
}
return event.detail.__args__ || event.detail
return __args__
}
}
const extraObj = processEventExtra(vm, extra, event);
const extraObj = processEventExtra(vm, extra, event, __args__);
const ret = [];
args.forEach(arg => {
......@@ -1599,7 +1605,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
ret.push(event.target.value);
} else {
if (isCustom && !isCustomMPEvent) {
ret.push(event.detail.__args__[0]);
ret.push(__args__[0]);
} else { // wxcomponent 组件或内置组件
ret.push(event);
}
......
packages/uni-mp-kuaishou/dist/index.js
浏览文件 @ 9c99f06a
......@@ -1297,7 +1297,11 @@ const customize = cached((str) => {
function initTriggerEvent (mpInstance) {
const oldTriggerEvent = mpInstance.triggerEvent;
const newTriggerEvent = function (event, ...args) {
return oldTriggerEvent.apply(mpInstance, [customize(event), ...args])
// 事件名统一转驼峰格式，仅处理：当前组件为 vue 组件、当前组件为 vue 组件子组件
if (this.$vm || (this.dataset && this.dataset.comType)) {
event = customize(event);
}
return oldTriggerEvent.apply(this, [event, ...args])
};
try {
// 京东小程序 triggerEvent 为只读
......@@ -1469,7 +1473,7 @@ function initData (vueOptions, context) {
try {
// 对 data 格式化
data = JSON.parse(JSON.stringify(data));
} catch (e) {}
} catch (e) { }
}
if (!isPlainObject(data)) {
......@@ -1621,7 +1625,7 @@ function wrapper$1 (event) {
// TODO 又得兼容 mpvue 的 mp 对象
try {
event.mp = JSON.parse(JSON.stringify(event));
} catch (e) {}
} catch (e) { }
event.stopPropagation = noop;
event.preventDefault = noop;
......@@ -1692,7 +1696,7 @@ function getExtraValue (vm, dataPathsArray) {
return context
}
function processEventExtra (vm, extra, event) {
function processEventExtra (vm, extra, event, __args__) {
const extraObj = {};
if (Array.isArray(extra) && extra.length) {
......@@ -1715,11 +1719,7 @@ function processEventExtra (vm, extra, event) {
if (dataPath === '$event') { // $event
extraObj['$' + index] = event;
} else if (dataPath === 'arguments') {
if (event.detail && event.detail.__args__) {
extraObj['$' + index] = event.detail.__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 {
......@@ -1746,6 +1746,12 @@ function getObjByArray (arr) {
function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) {
let isCustomMPEvent = false; // wxcomponent 组件，传递原始 event 对象
// fixed 用户直接触发 mpInstance.triggerEvent
const __args__ = isPlainObject(event.detail)
? event.detail.__args__ || [event.detail]
: [event.detail];
if (isCustom) { // 自定义事件
isCustomMPEvent = event.currentTarget &&
event.currentTarget.dataset &&
......@@ -1754,11 +1760,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if (isCustomMPEvent) {
return [event]
}
return event.detail.__args__ || event.detail
return __args__
}
}
const extraObj = processEventExtra(vm, extra, event);
const extraObj = processEventExtra(vm, extra, event, __args__);
const ret = [];
args.forEach(arg => {
......@@ -1767,7 +1773,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
ret.push(event.target.value);
} else {
if (isCustom && !isCustomMPEvent) {
ret.push(event.detail.__args__[0]);
ret.push(__args__[0]);
} else { // wxcomponent 组件或内置组件
ret.push(event);
}
......
packages/uni-mp-lark/dist/index.js
浏览文件 @ 9c99f06a
......@@ -1347,7 +1347,11 @@ const customize = cached((str) => {
function initTriggerEvent (mpInstance) {
const oldTriggerEvent = mpInstance.triggerEvent;
const newTriggerEvent = function (event, ...args) {
return oldTriggerEvent.apply(mpInstance, [customize(event), ...args])
// 事件名统一转驼峰格式，仅处理：当前组件为 vue 组件、当前组件为 vue 组件子组件
if (this.$vm || (this.dataset && this.dataset.comType)) {
event = customize(event);
}
return oldTriggerEvent.apply(this, [event, ...args])
};
try {
// 京东小程序 triggerEvent 为只读
......@@ -1519,7 +1523,7 @@ function initData (vueOptions, context) {
try {
// 对 data 格式化
data = JSON.parse(JSON.stringify(data));
} catch (e) {}
} catch (e) { }
}
if (!isPlainObject(data)) {
......@@ -1678,7 +1682,7 @@ function wrapper$1 (event) {
// TODO 又得兼容 mpvue 的 mp 对象
try {
event.mp = JSON.parse(JSON.stringify(event));
} catch (e) {}
} catch (e) { }
event.stopPropagation = noop;
event.preventDefault = noop;
......@@ -1749,7 +1753,7 @@ function getExtraValue (vm, dataPathsArray) {
return context
}
function processEventExtra (vm, extra, event) {
function processEventExtra (vm, extra, event, __args__) {
const extraObj = {};
if (Array.isArray(extra) && extra.length) {
......@@ -1772,11 +1776,7 @@ function processEventExtra (vm, extra, event) {
if (dataPath === '$event') { // $event
extraObj['$' + index] = event;
} else if (dataPath === 'arguments') {
if (event.detail && event.detail.__args__) {
extraObj['$' + index] = event.detail.__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 {
......@@ -1803,6 +1803,12 @@ function getObjByArray (arr) {
function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) {
let isCustomMPEvent = false; // wxcomponent 组件，传递原始 event 对象
// fixed 用户直接触发 mpInstance.triggerEvent
const __args__ = isPlainObject(event.detail)
? event.detail.__args__ || [event.detail]
: [event.detail];
if (isCustom) { // 自定义事件
isCustomMPEvent = event.currentTarget &&
event.currentTarget.dataset &&
......@@ -1811,11 +1817,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if (isCustomMPEvent) {
return [event]
}
return event.detail.__args__ || event.detail
return __args__
}
}
const extraObj = processEventExtra(vm, extra, event);
const extraObj = processEventExtra(vm, extra, event, __args__);
const ret = [];
args.forEach(arg => {
......@@ -1824,7 +1830,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
ret.push(event.target.value);
} else {
if (isCustom && !isCustomMPEvent) {
ret.push(event.detail.__args__[0]);
ret.push(__args__[0]);
} else { // wxcomponent 组件或内置组件
ret.push(event);
}
......
packages/uni-mp-qq/dist/index.js
浏览文件 @ 9c99f06a
......@@ -1458,7 +1458,17 @@ const customize = cached((str) => {
function initTriggerEvent (mpInstance) {
const oldTriggerEvent = mpInstance.triggerEvent;
const newTriggerEvent = function (event, ...args) {
return oldTriggerEvent.apply(mpInstance, [customize(event), ...args])
// 事件名统一转驼峰格式，仅处理：当前组件为 vue 组件、当前组件为 vue 组件子组件
if (this.$vm || (this.dataset && this.dataset.comType)) {
event = customize(event);
} else {
// 针对微信/QQ小程序单独补充驼峰格式事件，以兼容历史项目
const newEvent = customize(event);
if (newEvent !== event) {
oldTriggerEvent.apply(this, [newEvent, ...args]);
}
}
return oldTriggerEvent.apply(this, [event, ...args])
};
try {
// 京东小程序 triggerEvent 为只读
......@@ -1630,7 +1640,7 @@ function initData (vueOptions, context) {
try {
// 对 data 格式化
data = JSON.parse(JSON.stringify(data));
} catch (e) {}
} catch (e) { }
}
if (!isPlainObject(data)) {
......@@ -1782,7 +1792,7 @@ function wrapper$1 (event) {
// TODO 又得兼容 mpvue 的 mp 对象
try {
event.mp = JSON.parse(JSON.stringify(event));
} catch (e) {}
} catch (e) { }
event.stopPropagation = noop;
event.preventDefault = noop;
......@@ -1853,7 +1863,7 @@ function getExtraValue (vm, dataPathsArray) {
return context
}
function processEventExtra (vm, extra, event) {
function processEventExtra (vm, extra, event, __args__) {
const extraObj = {};
if (Array.isArray(extra) && extra.length) {
......@@ -1876,11 +1886,7 @@ function processEventExtra (vm, extra, event) {
if (dataPath === '$event') { // $event
extraObj['$' + index] = event;
} else if (dataPath === 'arguments') {
if (event.detail && event.detail.__args__) {
extraObj['$' + index] = event.detail.__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 {
......@@ -1907,6 +1913,12 @@ function getObjByArray (arr) {
function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) {
let isCustomMPEvent = false; // wxcomponent 组件，传递原始 event 对象
// fixed 用户直接触发 mpInstance.triggerEvent
const __args__ = isPlainObject(event.detail)
? event.detail.__args__ || [event.detail]
: [event.detail];
if (isCustom) { // 自定义事件
isCustomMPEvent = event.currentTarget &&
event.currentTarget.dataset &&
......@@ -1915,11 +1927,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if (isCustomMPEvent) {
return [event]
}
return event.detail.__args__ || event.detail
return __args__
}
}
const extraObj = processEventExtra(vm, extra, event);
const extraObj = processEventExtra(vm, extra, event, __args__);
const ret = [];
args.forEach(arg => {
......@@ -1928,7 +1940,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
ret.push(event.target.value);
} else {
if (isCustom && !isCustomMPEvent) {
ret.push(event.detail.__args__[0]);
ret.push(__args__[0]);
} else { // wxcomponent 组件或内置组件
ret.push(event);
}
......
packages/uni-mp-toutiao/dist/index.js
浏览文件 @ 9c99f06a
......@@ -1550,7 +1550,11 @@ const customize = cached((str) => {
function initTriggerEvent (mpInstance) {
const oldTriggerEvent = mpInstance.triggerEvent;
const newTriggerEvent = function (event, ...args) {
return oldTriggerEvent.apply(mpInstance, [customize(event), ...args])
// 事件名统一转驼峰格式，仅处理：当前组件为 vue 组件、当前组件为 vue 组件子组件
if (this.$vm || (this.dataset && this.dataset.comType)) {
event = customize(event);
}
return oldTriggerEvent.apply(this, [event, ...args])
};
try {
// 京东小程序 triggerEvent 为只读
......@@ -1726,7 +1730,7 @@ function initData (vueOptions, context) {
try {
// 对 data 格式化
data = JSON.parse(JSON.stringify(data));
} catch (e) {}
} catch (e) { }
}
if (!isPlainObject(data)) {
......@@ -1885,7 +1889,7 @@ function wrapper$1 (event) {
// TODO 又得兼容 mpvue 的 mp 对象
try {
event.mp = JSON.parse(JSON.stringify(event));
} catch (e) {}
} catch (e) { }
event.stopPropagation = noop;
event.preventDefault = noop;
......@@ -1956,7 +1960,7 @@ function getExtraValue (vm, dataPathsArray) {
return context
}
function processEventExtra (vm, extra, event) {
function processEventExtra (vm, extra, event, __args__) {
const extraObj = {};
if (Array.isArray(extra) && extra.length) {
......@@ -1979,11 +1983,7 @@ function processEventExtra (vm, extra, event) {
if (dataPath === '$event') { // $event
extraObj['$' + index] = event;
} else if (dataPath === 'arguments') {
if (event.detail && event.detail.__args__) {
extraObj['$' + index] = event.detail.__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 {
......@@ -2010,6 +2010,12 @@ function getObjByArray (arr) {
function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) {
let isCustomMPEvent = false; // wxcomponent 组件，传递原始 event 对象
// fixed 用户直接触发 mpInstance.triggerEvent
const __args__ = isPlainObject(event.detail)
? event.detail.__args__ || [event.detail]
: [event.detail];
if (isCustom) { // 自定义事件
isCustomMPEvent = event.currentTarget &&
event.currentTarget.dataset &&
......@@ -2018,11 +2024,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if (isCustomMPEvent) {
return [event]
}
return event.detail.__args__ || event.detail
return __args__
}
}
const extraObj = processEventExtra(vm, extra, event);
const extraObj = processEventExtra(vm, extra, event, __args__);
const ret = [];
args.forEach(arg => {
......@@ -2031,7 +2037,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
ret.push(event.target.value);
} else {
if (isCustom && !isCustomMPEvent) {
ret.push(event.detail.__args__[0]);
ret.push(__args__[0]);
} else { // wxcomponent 组件或内置组件
ret.push(event);
}
......
packages/uni-mp-weixin/dist/index.js
浏览文件 @ 9c99f06a
......@@ -1280,7 +1280,17 @@ const customize = cached((str) => {
function initTriggerEvent (mpInstance) {
const oldTriggerEvent = mpInstance.triggerEvent;
const newTriggerEvent = function (event, ...args) {
return oldTriggerEvent.apply(mpInstance, [customize(event), ...args])
// 事件名统一转驼峰格式，仅处理：当前组件为 vue 组件、当前组件为 vue 组件子组件
if (this.$vm || (this.dataset && this.dataset.comType)) {
event = customize(event);
} else {
// 针对微信/QQ小程序单独补充驼峰格式事件，以兼容历史项目
const newEvent = customize(event);
if (newEvent !== event) {
oldTriggerEvent.apply(this, [newEvent, ...args]);
}
}
return oldTriggerEvent.apply(this, [event, ...args])
};
try {
// 京东小程序 triggerEvent 为只读
......@@ -1452,7 +1462,7 @@ function initData (vueOptions, context) {
try {
// 对 data 格式化
data = JSON.parse(JSON.stringify(data));
} catch (e) {}
} catch (e) { }
}
if (!isPlainObject(data)) {
......@@ -1616,7 +1626,7 @@ function wrapper$1 (event) {
// TODO 又得兼容 mpvue 的 mp 对象
try {
event.mp = JSON.parse(JSON.stringify(event));
} catch (e) {}
} catch (e) { }
event.stopPropagation = noop;
event.preventDefault = noop;
......@@ -1687,7 +1697,7 @@ function getExtraValue (vm, dataPathsArray) {
return context
}
function processEventExtra (vm, extra, event) {
function processEventExtra (vm, extra, event, __args__) {
const extraObj = {};
if (Array.isArray(extra) && extra.length) {
......@@ -1710,11 +1720,7 @@ function processEventExtra (vm, extra, event) {
if (dataPath === '$event') { // $event
extraObj['$' + index] = event;
} else if (dataPath === 'arguments') {
if (event.detail && event.detail.__args__) {
extraObj['$' + index] = event.detail.__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 {
......@@ -1741,6 +1747,12 @@ function getObjByArray (arr) {
function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) {
let isCustomMPEvent = false; // wxcomponent 组件，传递原始 event 对象
// fixed 用户直接触发 mpInstance.triggerEvent
const __args__ = isPlainObject(event.detail)
? event.detail.__args__ || [event.detail]
: [event.detail];
if (isCustom) { // 自定义事件
isCustomMPEvent = event.currentTarget &&
event.currentTarget.dataset &&
......@@ -1749,11 +1761,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if (isCustomMPEvent) {
return [event]
}
return event.detail.__args__ || event.detail
return __args__
}
}
const extraObj = processEventExtra(vm, extra, event);
const extraObj = processEventExtra(vm, extra, event, __args__);
const ret = [];
args.forEach(arg => {
......@@ -1762,7 +1774,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
ret.push(event.target.value);
} else {
if (isCustom && !isCustomMPEvent) {
ret.push(event.detail.__args__[0]);
ret.push(__args__[0]);
} else { // wxcomponent 组件或内置组件
ret.push(event);
}
......
packages/uni-mp-xhs/dist/index.js
浏览文件 @ 9c99f06a
......@@ -1127,7 +1127,11 @@ const customize = cached((str) => {
function initTriggerEvent (mpInstance) {
const oldTriggerEvent = mpInstance.triggerEvent;
const newTriggerEvent = function (event, ...args) {
return oldTriggerEvent.apply(mpInstance, [customize(event), ...args])
// 事件名统一转驼峰格式，仅处理：当前组件为 vue 组件、当前组件为 vue 组件子组件
if (this.$vm || (this.dataset && this.dataset.comType)) {
event = customize(event);
}
return oldTriggerEvent.apply(this, [event, ...args])
};
try {
// 京东小程序 triggerEvent 为只读
......@@ -1299,7 +1303,7 @@ function initData (vueOptions, context) {
try {
// 对 data 格式化
data = JSON.parse(JSON.stringify(data));
} catch (e) {}
} catch (e) { }
}
if (!isPlainObject(data)) {
......@@ -1451,7 +1455,7 @@ function wrapper$1 (event) {
// TODO 又得兼容 mpvue 的 mp 对象
try {
event.mp = JSON.parse(JSON.stringify(event));
} catch (e) {}
} catch (e) { }
event.stopPropagation = noop;
event.preventDefault = noop;
......@@ -1522,7 +1526,7 @@ function getExtraValue (vm, dataPathsArray) {
return context
}
function processEventExtra (vm, extra, event) {
function processEventExtra (vm, extra, event, __args__) {
const extraObj = {};
if (Array.isArray(extra) && extra.length) {
......@@ -1545,11 +1549,7 @@ function processEventExtra (vm, extra, event) {
if (dataPath === '$event') { // $event
extraObj['$' + index] = event;
} else if (dataPath === 'arguments') {
if (event.detail && event.detail.__args__) {
extraObj['$' + index] = event.detail.__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 {
......@@ -1576,6 +1576,12 @@ function getObjByArray (arr) {
function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) {
let isCustomMPEvent = false; // wxcomponent 组件，传递原始 event 对象
// fixed 用户直接触发 mpInstance.triggerEvent
const __args__ = isPlainObject(event.detail)
? event.detail.__args__ || [event.detail]
: [event.detail];
if (isCustom) { // 自定义事件
isCustomMPEvent = event.currentTarget &&
event.currentTarget.dataset &&
......@@ -1584,11 +1590,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if (isCustomMPEvent) {
return [event]
}
return event.detail.__args__ || event.detail
return __args__
}
}
const extraObj = processEventExtra(vm, extra, event);
const extraObj = processEventExtra(vm, extra, event, __args__);
const ret = [];
args.forEach(arg => {
......@@ -1597,7 +1603,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
ret.push(event.target.value);
} else {
if (isCustom && !isCustomMPEvent) {
ret.push(event.detail.__args__[0]);
ret.push(__args__[0]);
} else { // wxcomponent 组件或内置组件
ret.push(event);
}
......
packages/uni-quickapp-webview/dist/index.js
浏览文件 @ 9c99f06a
......@@ -1298,7 +1298,11 @@ const customize = cached((str) => {
function initTriggerEvent (mpInstance) {
const oldTriggerEvent = mpInstance.triggerEvent;
const newTriggerEvent = function (event, ...args) {
return oldTriggerEvent.apply(mpInstance, [customize(event), ...args])
// 事件名统一转驼峰格式，仅处理：当前组件为 vue 组件、当前组件为 vue 组件子组件
if (this.$vm || (this.dataset && this.dataset.comType)) {
event = customize(event);
}
return oldTriggerEvent.apply(this, [event, ...args])
};
try {
// 京东小程序 triggerEvent 为只读
......@@ -1470,7 +1474,7 @@ function initData (vueOptions, context) {
try {
// 对 data 格式化
data = JSON.parse(JSON.stringify(data));
} catch (e) {}
} catch (e) { }
}
if (!isPlainObject(data)) {
......@@ -1622,7 +1626,7 @@ function wrapper$1 (event) {
// TODO 又得兼容 mpvue 的 mp 对象
try {
event.mp = JSON.parse(JSON.stringify(event));
} catch (e) {}
} catch (e) { }
event.stopPropagation = noop;
event.preventDefault = noop;
......@@ -1693,7 +1697,7 @@ function getExtraValue (vm, dataPathsArray) {
return context
}
function processEventExtra (vm, extra, event) {
function processEventExtra (vm, extra, event, __args__) {
const extraObj = {};
if (Array.isArray(extra) && extra.length) {
......@@ -1716,11 +1720,7 @@ function processEventExtra (vm, extra, event) {
if (dataPath === '$event') { // $event
extraObj['$' + index] = event;
} else if (dataPath === 'arguments') {
if (event.detail && event.detail.__args__) {
extraObj['$' + index] = event.detail.__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 {
......@@ -1747,6 +1747,12 @@ function getObjByArray (arr) {
function processEventArgs (vm, event, args = [], extra = [], isCustom, methodName) {
let isCustomMPEvent = false; // wxcomponent 组件，传递原始 event 对象
// fixed 用户直接触发 mpInstance.triggerEvent
const __args__ = isPlainObject(event.detail)
? event.detail.__args__ || [event.detail]
: [event.detail];
if (isCustom) { // 自定义事件
isCustomMPEvent = event.currentTarget &&
event.currentTarget.dataset &&
......@@ -1755,11 +1761,11 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
if (isCustomMPEvent) {
return [event]
}
return event.detail.__args__ || event.detail
return __args__
}
}
const extraObj = processEventExtra(vm, extra, event);
const extraObj = processEventExtra(vm, extra, event, __args__);
const ret = [];
args.forEach(arg => {
......@@ -1768,7 +1774,7 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam
ret.push(event.target.value);
} else {
if (isCustom && !isCustomMPEvent) {
ret.push(event.detail.__args__[0]);
ret.push(__args__[0]);
} else { // wxcomponent 组件或内置组件
ret.push(event);
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或