From 70c10ecbb44319e2e387edd127626ef3b51d3a58 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Wed, 6 Nov 2019 18:32:50 +0800 Subject: [PATCH] npm run build:runtime --- packages/uni-app-plus/dist/index.js | 12 +++++++----- packages/uni-mp-alipay/dist/index.js | 2 +- packages/uni-mp-baidu/dist/index.js | 12 +++++++----- packages/uni-mp-qq/dist/index.js | 12 +++++++----- packages/uni-mp-toutiao/dist/index.js | 12 +++++++----- packages/uni-mp-weixin/dist/index.js | 19 ++++++++++++++----- 6 files changed, 43 insertions(+), 26 deletions(-) diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js index 9b0680a72e..0547d3a205 100644 --- a/packages/uni-app-plus/dist/index.js +++ b/packages/uni-app-plus/dist/index.js @@ -245,7 +245,7 @@ function isSyncApi (name) { } function isCallbackApi (name) { - return CALLBACK_API_RE.test(name) + return CALLBACK_API_RE.test(name) && name !== 'onPush' } function handlePromise (promise) { @@ -1287,11 +1287,13 @@ function parseBaseComponent (vueComponentOptions, { } = {}) { let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions); + const options = { + multipleSlots: true, + addGlobalClass: true + }; + const componentOptions = { - options: { - multipleSlots: true, - addGlobalClass: true - }, + options, data: initData(vueOptions, Vue.prototype), behaviors: initBehaviors(vueOptions, initBehavior), properties: initProperties(vueOptions.props, false, vueOptions.__file), diff --git a/packages/uni-mp-alipay/dist/index.js b/packages/uni-mp-alipay/dist/index.js index 99b7f07c4d..089ae48399 100644 --- a/packages/uni-mp-alipay/dist/index.js +++ b/packages/uni-mp-alipay/dist/index.js @@ -245,7 +245,7 @@ function isSyncApi (name) { } function isCallbackApi (name) { - return CALLBACK_API_RE.test(name) + return CALLBACK_API_RE.test(name) && name !== 'onPush' } function handlePromise (promise) { diff --git a/packages/uni-mp-baidu/dist/index.js b/packages/uni-mp-baidu/dist/index.js index 7174e4e67d..532b7b652d 100644 --- a/packages/uni-mp-baidu/dist/index.js +++ b/packages/uni-mp-baidu/dist/index.js @@ -245,7 +245,7 @@ function isSyncApi (name) { } function isCallbackApi (name) { - return CALLBACK_API_RE.test(name) + return CALLBACK_API_RE.test(name) && name !== 'onPush' } function handlePromise (promise) { @@ -1420,11 +1420,13 @@ function parseBaseComponent (vueComponentOptions, { } = {}) { let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions); + const options = { + multipleSlots: true, + addGlobalClass: true + }; + const componentOptions = { - options: { - multipleSlots: true, - addGlobalClass: true - }, + options, data: initData(vueOptions, Vue.prototype), behaviors: initBehaviors(vueOptions, initBehavior), properties: initProperties(vueOptions.props, false, vueOptions.__file), diff --git a/packages/uni-mp-qq/dist/index.js b/packages/uni-mp-qq/dist/index.js index dd5be408fe..550c5722ed 100644 --- a/packages/uni-mp-qq/dist/index.js +++ b/packages/uni-mp-qq/dist/index.js @@ -245,7 +245,7 @@ function isSyncApi (name) { } function isCallbackApi (name) { - return CALLBACK_API_RE.test(name) + return CALLBACK_API_RE.test(name) && name !== 'onPush' } function handlePromise (promise) { @@ -1334,11 +1334,13 @@ function parseBaseComponent (vueComponentOptions, { } = {}) { let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions); + const options = { + multipleSlots: true, + addGlobalClass: true + }; + const componentOptions = { - options: { - multipleSlots: true, - addGlobalClass: true - }, + options, data: initData(vueOptions, Vue.prototype), behaviors: initBehaviors(vueOptions, initBehavior), properties: initProperties(vueOptions.props, false, vueOptions.__file), diff --git a/packages/uni-mp-toutiao/dist/index.js b/packages/uni-mp-toutiao/dist/index.js index d38842444e..03827351fb 100644 --- a/packages/uni-mp-toutiao/dist/index.js +++ b/packages/uni-mp-toutiao/dist/index.js @@ -245,7 +245,7 @@ function isSyncApi (name) { } function isCallbackApi (name) { - return CALLBACK_API_RE.test(name) + return CALLBACK_API_RE.test(name) && name !== 'onPush' } function handlePromise (promise) { @@ -1511,11 +1511,13 @@ function parseBaseComponent (vueComponentOptions, { } = {}) { let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions); + const options = { + multipleSlots: true, + addGlobalClass: true + }; + const componentOptions = { - options: { - multipleSlots: true, - addGlobalClass: true - }, + options, data: initData(vueOptions, Vue.prototype), behaviors: initBehaviors(vueOptions, initBehavior), properties: initProperties(vueOptions.props, false, vueOptions.__file), diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js index 9cf688e295..019d35b675 100644 --- a/packages/uni-mp-weixin/dist/index.js +++ b/packages/uni-mp-weixin/dist/index.js @@ -245,7 +245,7 @@ function isSyncApi (name) { } function isCallbackApi (name) { - return CALLBACK_API_RE.test(name) + return CALLBACK_API_RE.test(name) && name !== 'onPush' } function handlePromise (promise) { @@ -1275,11 +1275,20 @@ function parseBaseComponent (vueComponentOptions, { } = {}) { let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions); + const options = { + multipleSlots: true, + addGlobalClass: true + }; + + { + // 微信multipleSlots 部分情况有 bug，导致内容顺序错乱 如 u-list，提供覆盖选项 + if (vueOptions['mp-weixin'] && vueOptions['mp-weixin']['options']) { + Object.assign(options, vueOptions['mp-weixin']['options']); + } + } + const componentOptions = { - options: { - multipleSlots: true, - addGlobalClass: true - }, + options, data: initData(vueOptions, Vue.prototype), behaviors: initBehaviors(vueOptions, initBehavior), properties: initProperties(vueOptions.props, false, vueOptions.__file), -- GitLab