From f482d4530f9ecc2f0d97d199967f8f77f7b481ca Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Thu, 23 May 2019 12:42:21 +0800 Subject: [PATCH] build uni runtime(@regionchange) --- packages/uni-app-plus/dist/index.js | 21 ++++++++++++++++----- packages/uni-app-plus/package.json | 2 +- packages/uni-mp-alipay/dist/index.js | 13 ++++++++++++- packages/uni-mp-alipay/package.json | 2 +- packages/uni-mp-baidu/dist/index.js | 21 ++++++++++++++++----- packages/uni-mp-baidu/package.json | 2 +- packages/uni-mp-toutiao/dist/index.js | 21 ++++++++++++++++----- packages/uni-mp-toutiao/package.json | 2 +- packages/uni-mp-weixin/dist/index.js | 21 ++++++++++++++++----- packages/uni-mp-weixin/package.json | 2 +- src/core/runtime/wrapper/util.js | 13 ++++++++++++- 11 files changed, 93 insertions(+), 27 deletions(-) diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js index 7b8420edd..4738a61e4 100644 --- a/packages/uni-app-plus/dist/index.js +++ b/packages/uni-app-plus/dist/index.js @@ -737,6 +737,17 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam const ONCE = '~'; const CUSTOM = '^'; +function isMatchEventType (eventType, optType) { + return (eventType === optType) || + ( + optType === 'regionchange' && + ( + eventType === 'begin' || + eventType === 'end' + ) + ) +} + function handleEvent (event) { event = wrapper$2(event); @@ -757,7 +768,7 @@ function handleEvent (event) { const isOnce = type.charAt(0) === ONCE; type = isOnce ? type.slice(1) : type; - if (eventsArray && eventType === type) { + if (eventsArray && isMatchEventType(eventType, type)) { eventsArray.forEach(eventArray => { const methodName = eventArray[0]; if (methodName) { @@ -1150,10 +1161,10 @@ if (typeof Proxy !== 'undefined') { } }); } - -wx.createApp = createApp; -wx.createPage = createPage; -wx.createComponent = createComponent; + +wx.createApp = createApp; +wx.createPage = createPage; +wx.createComponent = createComponent; var uni$1 = uni; diff --git a/packages/uni-app-plus/package.json b/packages/uni-app-plus/package.json index fc9ca72f9..1e0c7d1cc 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.236", + "version": "0.0.237", "description": "uni-app app-plus", "main": "dist/index.js", "scripts": { diff --git a/packages/uni-mp-alipay/dist/index.js b/packages/uni-mp-alipay/dist/index.js index ce8db8c89..008819be1 100644 --- a/packages/uni-mp-alipay/dist/index.js +++ b/packages/uni-mp-alipay/dist/index.js @@ -1047,6 +1047,17 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam const ONCE = '~'; const CUSTOM = '^'; +function isMatchEventType (eventType, optType) { + return (eventType === optType) || + ( + optType === 'regionchange' && + ( + eventType === 'begin' || + eventType === 'end' + ) + ) +} + function handleEvent (event) { event = wrapper$1(event); @@ -1067,7 +1078,7 @@ function handleEvent (event) { const isOnce = type.charAt(0) === ONCE; type = isOnce ? type.slice(1) : type; - if (eventsArray && eventType === type) { + if (eventsArray && isMatchEventType(eventType, type)) { eventsArray.forEach(eventArray => { const methodName = eventArray[0]; if (methodName) { diff --git a/packages/uni-mp-alipay/package.json b/packages/uni-mp-alipay/package.json index b519e75d2..3e1c21d44 100644 --- a/packages/uni-mp-alipay/package.json +++ b/packages/uni-mp-alipay/package.json @@ -1,6 +1,6 @@ { "name": "@dcloudio/uni-mp-alipay", - "version": "0.0.808", + "version": "0.0.809", "description": "uni-app mp-alipay", "main": "dist/index.js", "scripts": { diff --git a/packages/uni-mp-baidu/dist/index.js b/packages/uni-mp-baidu/dist/index.js index fc1bd7b90..9a52ab2c6 100644 --- a/packages/uni-mp-baidu/dist/index.js +++ b/packages/uni-mp-baidu/dist/index.js @@ -864,6 +864,17 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam const ONCE = '~'; const CUSTOM = '^'; +function isMatchEventType (eventType, optType) { + return (eventType === optType) || + ( + optType === 'regionchange' && + ( + eventType === 'begin' || + eventType === 'end' + ) + ) +} + function handleEvent (event) { event = wrapper$1(event); @@ -884,7 +895,7 @@ function handleEvent (event) { const isOnce = type.charAt(0) === ONCE; type = isOnce ? type.slice(1) : type; - if (eventsArray && eventType === type) { + if (eventsArray && isMatchEventType(eventType, type)) { eventsArray.forEach(eventArray => { const methodName = eventArray[0]; if (methodName) { @@ -1303,10 +1314,10 @@ if (typeof Proxy !== 'undefined') { } }); } - -swan.createApp = createApp; -swan.createPage = createPage; -swan.createComponent = createComponent; + +swan.createApp = createApp; +swan.createPage = createPage; +swan.createComponent = createComponent; var uni$1 = uni; diff --git a/packages/uni-mp-baidu/package.json b/packages/uni-mp-baidu/package.json index 286abe454..319a65e4b 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.834", + "version": "0.0.835", "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 361594350..3ee4026ed 100644 --- a/packages/uni-mp-toutiao/dist/index.js +++ b/packages/uni-mp-toutiao/dist/index.js @@ -883,6 +883,17 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam const ONCE = '~'; const CUSTOM = '^'; +function isMatchEventType (eventType, optType) { + return (eventType === optType) || + ( + optType === 'regionchange' && + ( + eventType === 'begin' || + eventType === 'end' + ) + ) +} + function handleEvent (event) { event = wrapper$1(event); @@ -903,7 +914,7 @@ function handleEvent (event) { const isOnce = type.charAt(0) === ONCE; type = isOnce ? type.slice(1) : type; - if (eventsArray && eventType === type) { + if (eventsArray && isMatchEventType(eventType, type)) { eventsArray.forEach(eventArray => { const methodName = eventArray[0]; if (methodName) { @@ -1378,10 +1389,10 @@ if (typeof Proxy !== 'undefined') { } }); } - -tt.createApp = createApp; -tt.createPage = createPage; -tt.createComponent = createComponent; + +tt.createApp = createApp; +tt.createPage = createPage; +tt.createComponent = createComponent; var uni$1 = uni; diff --git a/packages/uni-mp-toutiao/package.json b/packages/uni-mp-toutiao/package.json index e87821d5a..1cabd6136 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.334", + "version": "0.0.335", "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 0e91e57af..83ed48fc0 100644 --- a/packages/uni-mp-weixin/dist/index.js +++ b/packages/uni-mp-weixin/dist/index.js @@ -740,6 +740,17 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam const ONCE = '~'; const CUSTOM = '^'; +function isMatchEventType (eventType, optType) { + return (eventType === optType) || + ( + optType === 'regionchange' && + ( + eventType === 'begin' || + eventType === 'end' + ) + ) +} + function handleEvent (event) { event = wrapper$1(event); @@ -760,7 +771,7 @@ function handleEvent (event) { const isOnce = type.charAt(0) === ONCE; type = isOnce ? type.slice(1) : type; - if (eventsArray && eventType === type) { + if (eventsArray && isMatchEventType(eventType, type)) { eventsArray.forEach(eventArray => { const methodName = eventArray[0]; if (methodName) { @@ -1138,10 +1149,10 @@ if (typeof Proxy !== 'undefined') { } }); } - -wx.createApp = createApp; -wx.createPage = createPage; -wx.createComponent = createComponent; + +wx.createApp = createApp; +wx.createPage = createPage; +wx.createComponent = createComponent; var uni$1 = uni; diff --git a/packages/uni-mp-weixin/package.json b/packages/uni-mp-weixin/package.json index 4daaf9102..00124352a 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.956", + "version": "0.0.957", "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 fea82a825..03b92ca15 100644 --- a/src/core/runtime/wrapper/util.js +++ b/src/core/runtime/wrapper/util.js @@ -394,6 +394,17 @@ function processEventArgs (vm, event, args = [], extra = [], isCustom, methodNam const ONCE = '~' const CUSTOM = '^' +function isMatchEventType (eventType, optType) { + return (eventType === optType) || + ( + optType === 'regionchange' && + ( + eventType === 'begin' || + eventType === 'end' + ) + ) +} + export function handleEvent (event) { event = wrapper(event) @@ -414,7 +425,7 @@ export function handleEvent (event) { const isOnce = type.charAt(0) === ONCE type = isOnce ? type.slice(1) : type - if (eventsArray && eventType === type) { + if (eventsArray && isMatchEventType(eventType, type)) { eventsArray.forEach(eventArray => { const methodName = eventArray[0] if (methodName) { -- GitLab