From 6831637c3c0251084bf59d70ffc40b4112d0c33a Mon Sep 17 00:00:00 2001 From: qiang Date: Mon, 13 Apr 2020 20:29:38 +0800 Subject: [PATCH] build runtime --- packages/uni-app-plus/dist/index.js | 28 +++++++++-------- packages/uni-mp-alipay/dist/index.js | 34 +++++++++++++-------- packages/uni-mp-baidu/dist/index.js | 28 +++++++++-------- packages/uni-mp-qq/dist/index.js | 28 +++++++++-------- packages/uni-mp-toutiao/dist/index.js | 28 +++++++++-------- packages/uni-mp-weixin/dist/index.js | 28 +++++++++-------- packages/uni-quickapp-light/dist/index.js | 28 +++++++++-------- src/core/view/components/textarea/index.vue | 2 +- 8 files changed, 119 insertions(+), 85 deletions(-) diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js index f309127324..328cf3f105 100644 --- a/packages/uni-app-plus/dist/index.js +++ b/packages/uni-app-plus/dist/index.js @@ -901,6 +901,10 @@ function wrapper$2 (event) { event.detail = {}; } + if (!('markerId' in event.detail) && 'markerId' in event) { + event.detail.markerId = event.markerId; + } + if (isPlainObject(event.detail)) { event.target = Object.assign({}, event.target, event.detail); } @@ -1085,18 +1089,18 @@ function handleEvent (event) { handlerCtx.$parent.$parent ) { // mp-weixin,mp-toutiao 抽象节点模拟 scoped slots handlerCtx = handlerCtx.$parent.$parent; - } - if (methodName === '$emit') { - handlerCtx.$emit.apply(handlerCtx, - processEventArgs( - this.$vm, - event, - eventArray[1], - eventArray[2], - isCustom, - methodName - )); - return + } + if (methodName === '$emit') { + handlerCtx.$emit.apply(handlerCtx, + processEventArgs( + this.$vm, + event, + eventArray[1], + eventArray[2], + isCustom, + methodName + )); + return } const handler = handlerCtx[methodName]; if (!isFn(handler)) { diff --git a/packages/uni-mp-alipay/dist/index.js b/packages/uni-mp-alipay/dist/index.js index 8d1a9d4d73..ce39dd841d 100644 --- a/packages/uni-mp-alipay/dist/index.js +++ b/packages/uni-mp-alipay/dist/index.js @@ -1363,6 +1363,10 @@ function wrapper$1 (event) { event.detail = {}; } + if (!('markerId' in event.detail) && 'markerId' in event) { + event.detail.markerId = event.markerId; + } + if (isPlainObject(event.detail)) { event.target = Object.assign({}, event.target, event.detail); } @@ -1547,18 +1551,18 @@ function handleEvent (event) { handlerCtx.$parent.$parent ) { // mp-weixin,mp-toutiao 抽象节点模拟 scoped slots handlerCtx = handlerCtx.$parent.$parent; - } - if (methodName === '$emit') { - handlerCtx.$emit.apply(handlerCtx, - processEventArgs( - this.$vm, - event, - eventArray[1], - eventArray[2], - isCustom, - methodName - )); - return + } + if (methodName === '$emit') { + handlerCtx.$emit.apply(handlerCtx, + processEventArgs( + this.$vm, + event, + eventArray[1], + eventArray[2], + isCustom, + methodName + )); + return } const handler = handlerCtx[methodName]; if (!isFn(handler)) { @@ -1807,6 +1811,12 @@ function initSpecialMethods (mpInstance) { specialMethods.forEach(method => { if (isFn(mpInstance.$vm[method])) { mpInstance[method] = function (event) { + if (!hasOwn(event, 'detail')) { + event.detail = {}; + } + if (!('markerId' in event.detail) && 'markerId' in event) { + event.detail.markerId = event.markerId; + } // TODO normalizeEvent mpInstance.$vm[method](event); }; diff --git a/packages/uni-mp-baidu/dist/index.js b/packages/uni-mp-baidu/dist/index.js index abeef9e891..148ab0b834 100644 --- a/packages/uni-mp-baidu/dist/index.js +++ b/packages/uni-mp-baidu/dist/index.js @@ -1031,6 +1031,10 @@ function wrapper$1 (event) { event.detail = {}; } + if (!('markerId' in event.detail) && 'markerId' in event) { + event.detail.markerId = event.markerId; + } + { // mp-baidu，checked=>value if ( isPlainObject(event.detail) && @@ -1225,18 +1229,18 @@ function handleEvent (event) { handlerCtx.$parent.$parent ) { // mp-weixin,mp-toutiao 抽象节点模拟 scoped slots handlerCtx = handlerCtx.$parent.$parent; - } - if (methodName === '$emit') { - handlerCtx.$emit.apply(handlerCtx, - processEventArgs( - this.$vm, - event, - eventArray[1], - eventArray[2], - isCustom, - methodName - )); - return + } + if (methodName === '$emit') { + handlerCtx.$emit.apply(handlerCtx, + processEventArgs( + this.$vm, + event, + eventArray[1], + eventArray[2], + isCustom, + methodName + )); + return } const handler = handlerCtx[methodName]; if (!isFn(handler)) { diff --git a/packages/uni-mp-qq/dist/index.js b/packages/uni-mp-qq/dist/index.js index 1417391993..db0066f88d 100644 --- a/packages/uni-mp-qq/dist/index.js +++ b/packages/uni-mp-qq/dist/index.js @@ -956,6 +956,10 @@ function wrapper$1 (event) { event.detail = {}; } + if (!('markerId' in event.detail) && 'markerId' in event) { + event.detail.markerId = event.markerId; + } + if (isPlainObject(event.detail)) { event.target = Object.assign({}, event.target, event.detail); } @@ -1140,18 +1144,18 @@ function handleEvent (event) { handlerCtx.$parent.$parent ) { // mp-weixin,mp-toutiao 抽象节点模拟 scoped slots handlerCtx = handlerCtx.$parent.$parent; - } - if (methodName === '$emit') { - handlerCtx.$emit.apply(handlerCtx, - processEventArgs( - this.$vm, - event, - eventArray[1], - eventArray[2], - isCustom, - methodName - )); - return + } + if (methodName === '$emit') { + handlerCtx.$emit.apply(handlerCtx, + processEventArgs( + this.$vm, + event, + eventArray[1], + eventArray[2], + isCustom, + methodName + )); + return } const handler = handlerCtx[methodName]; if (!isFn(handler)) { diff --git a/packages/uni-mp-toutiao/dist/index.js b/packages/uni-mp-toutiao/dist/index.js index 57670e2799..8cf89eed12 100644 --- a/packages/uni-mp-toutiao/dist/index.js +++ b/packages/uni-mp-toutiao/dist/index.js @@ -1048,6 +1048,10 @@ function wrapper$1 (event) { event.detail = {}; } + if (!('markerId' in event.detail) && 'markerId' in event) { + event.detail.markerId = event.markerId; + } + if (isPlainObject(event.detail)) { event.target = Object.assign({}, event.target, event.detail); } @@ -1232,18 +1236,18 @@ function handleEvent (event) { handlerCtx.$parent.$parent ) { // mp-weixin,mp-toutiao 抽象节点模拟 scoped slots handlerCtx = handlerCtx.$parent.$parent; - } - if (methodName === '$emit') { - handlerCtx.$emit.apply(handlerCtx, - processEventArgs( - this.$vm, - event, - eventArray[1], - eventArray[2], - isCustom, - methodName - )); - return + } + if (methodName === '$emit') { + handlerCtx.$emit.apply(handlerCtx, + processEventArgs( + this.$vm, + event, + eventArray[1], + eventArray[2], + isCustom, + methodName + )); + return } const handler = handlerCtx[methodName]; if (!isFn(handler)) { diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js index 0c2c001850..88ee240103 100644 --- a/packages/uni-mp-weixin/dist/index.js +++ b/packages/uni-mp-weixin/dist/index.js @@ -913,6 +913,10 @@ function wrapper$1 (event) { event.detail = {}; } + if (!('markerId' in event.detail) && 'markerId' in event) { + event.detail.markerId = event.markerId; + } + if (isPlainObject(event.detail)) { event.target = Object.assign({}, event.target, event.detail); } @@ -1097,18 +1101,18 @@ function handleEvent (event) { handlerCtx.$parent.$parent ) { // mp-weixin,mp-toutiao 抽象节点模拟 scoped slots handlerCtx = handlerCtx.$parent.$parent; - } - if (methodName === '$emit') { - handlerCtx.$emit.apply(handlerCtx, - processEventArgs( - this.$vm, - event, - eventArray[1], - eventArray[2], - isCustom, - methodName - )); - return + } + if (methodName === '$emit') { + handlerCtx.$emit.apply(handlerCtx, + processEventArgs( + this.$vm, + event, + eventArray[1], + eventArray[2], + isCustom, + methodName + )); + return } const handler = handlerCtx[methodName]; if (!isFn(handler)) { diff --git a/packages/uni-quickapp-light/dist/index.js b/packages/uni-quickapp-light/dist/index.js index 5ede2af666..57e7ec6c0e 100644 --- a/packages/uni-quickapp-light/dist/index.js +++ b/packages/uni-quickapp-light/dist/index.js @@ -897,6 +897,10 @@ function wrapper$1 (event) { event.detail = {}; } + if (!('markerId' in event.detail) && 'markerId' in event) { + event.detail.markerId = event.markerId; + } + if (isPlainObject(event.detail)) { event.target = Object.assign({}, event.target, event.detail); } @@ -1081,18 +1085,18 @@ function handleEvent (event) { handlerCtx.$parent.$parent ) { // mp-weixin,mp-toutiao 抽象节点模拟 scoped slots handlerCtx = handlerCtx.$parent.$parent; - } - if (methodName === '$emit') { - handlerCtx.$emit.apply(handlerCtx, - processEventArgs( - this.$vm, - event, - eventArray[1], - eventArray[2], - isCustom, - methodName - )); - return + } + if (methodName === '$emit') { + handlerCtx.$emit.apply(handlerCtx, + processEventArgs( + this.$vm, + event, + eventArray[1], + eventArray[2], + isCustom, + methodName + )); + return } const handler = handlerCtx[methodName]; if (!isFn(handler)) { diff --git a/src/core/view/components/textarea/index.vue b/src/core/view/components/textarea/index.vue index b4d3a4b9f2..b2f727de86 100644 --- a/src/core/view/components/textarea/index.vue +++ b/src/core/view/components/textarea/index.vue @@ -17,7 +17,7 @@ ref="line" class="uni-textarea-line" > -  +