diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js index 9b0680a72e36ed751e9e933ccc054d6a45a88ffb..0547d3a2053961bc67cd3482c93b16592f125b8b 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 99b7f07c4d404a07256afc906f740f6552f82ddc..089ae48399d78f9a7041f0da344f864cfc4fef83 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 7174e4e67d995244817268fd03cca28a42ed1bfb..532b7b652d616c8ce731477b928a6e05b095d51e 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 dd5be408fefaf6cadbe82d542a77335c80f9445a..550c5722ed4e16844508949ec41b414ee21b033e 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 d38842444e9b7a742b12d48696e9f8a081604c97..03827351fb09c745ecc283ff36cf83630885457d 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 9cf688e2952aa23f4c81e519c8e766b003138418..019d35b675b77f51992de8b878212a3596039f8c 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),