提交 70c10ecb 编写于 作者: fxy060608's avatar fxy060608

npm run build:runtime

上级 f924a856
...@@ -245,7 +245,7 @@ function isSyncApi (name) { ...@@ -245,7 +245,7 @@ function isSyncApi (name) {
} }
function isCallbackApi (name) { function isCallbackApi (name) {
return CALLBACK_API_RE.test(name) return CALLBACK_API_RE.test(name) && name !== 'onPush'
} }
function handlePromise (promise) { function handlePromise (promise) {
...@@ -1287,11 +1287,13 @@ function parseBaseComponent (vueComponentOptions, { ...@@ -1287,11 +1287,13 @@ function parseBaseComponent (vueComponentOptions, {
} = {}) { } = {}) {
let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions); let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions);
const options = {
multipleSlots: true,
addGlobalClass: true
};
const componentOptions = { const componentOptions = {
options: { options,
multipleSlots: true,
addGlobalClass: true
},
data: initData(vueOptions, Vue.prototype), data: initData(vueOptions, Vue.prototype),
behaviors: initBehaviors(vueOptions, initBehavior), behaviors: initBehaviors(vueOptions, initBehavior),
properties: initProperties(vueOptions.props, false, vueOptions.__file), properties: initProperties(vueOptions.props, false, vueOptions.__file),
......
...@@ -245,7 +245,7 @@ function isSyncApi (name) { ...@@ -245,7 +245,7 @@ function isSyncApi (name) {
} }
function isCallbackApi (name) { function isCallbackApi (name) {
return CALLBACK_API_RE.test(name) return CALLBACK_API_RE.test(name) && name !== 'onPush'
} }
function handlePromise (promise) { function handlePromise (promise) {
......
...@@ -245,7 +245,7 @@ function isSyncApi (name) { ...@@ -245,7 +245,7 @@ function isSyncApi (name) {
} }
function isCallbackApi (name) { function isCallbackApi (name) {
return CALLBACK_API_RE.test(name) return CALLBACK_API_RE.test(name) && name !== 'onPush'
} }
function handlePromise (promise) { function handlePromise (promise) {
...@@ -1420,11 +1420,13 @@ function parseBaseComponent (vueComponentOptions, { ...@@ -1420,11 +1420,13 @@ function parseBaseComponent (vueComponentOptions, {
} = {}) { } = {}) {
let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions); let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions);
const options = {
multipleSlots: true,
addGlobalClass: true
};
const componentOptions = { const componentOptions = {
options: { options,
multipleSlots: true,
addGlobalClass: true
},
data: initData(vueOptions, Vue.prototype), data: initData(vueOptions, Vue.prototype),
behaviors: initBehaviors(vueOptions, initBehavior), behaviors: initBehaviors(vueOptions, initBehavior),
properties: initProperties(vueOptions.props, false, vueOptions.__file), properties: initProperties(vueOptions.props, false, vueOptions.__file),
......
...@@ -245,7 +245,7 @@ function isSyncApi (name) { ...@@ -245,7 +245,7 @@ function isSyncApi (name) {
} }
function isCallbackApi (name) { function isCallbackApi (name) {
return CALLBACK_API_RE.test(name) return CALLBACK_API_RE.test(name) && name !== 'onPush'
} }
function handlePromise (promise) { function handlePromise (promise) {
...@@ -1334,11 +1334,13 @@ function parseBaseComponent (vueComponentOptions, { ...@@ -1334,11 +1334,13 @@ function parseBaseComponent (vueComponentOptions, {
} = {}) { } = {}) {
let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions); let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions);
const options = {
multipleSlots: true,
addGlobalClass: true
};
const componentOptions = { const componentOptions = {
options: { options,
multipleSlots: true,
addGlobalClass: true
},
data: initData(vueOptions, Vue.prototype), data: initData(vueOptions, Vue.prototype),
behaviors: initBehaviors(vueOptions, initBehavior), behaviors: initBehaviors(vueOptions, initBehavior),
properties: initProperties(vueOptions.props, false, vueOptions.__file), properties: initProperties(vueOptions.props, false, vueOptions.__file),
......
...@@ -245,7 +245,7 @@ function isSyncApi (name) { ...@@ -245,7 +245,7 @@ function isSyncApi (name) {
} }
function isCallbackApi (name) { function isCallbackApi (name) {
return CALLBACK_API_RE.test(name) return CALLBACK_API_RE.test(name) && name !== 'onPush'
} }
function handlePromise (promise) { function handlePromise (promise) {
...@@ -1511,11 +1511,13 @@ function parseBaseComponent (vueComponentOptions, { ...@@ -1511,11 +1511,13 @@ function parseBaseComponent (vueComponentOptions, {
} = {}) { } = {}) {
let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions); let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions);
const options = {
multipleSlots: true,
addGlobalClass: true
};
const componentOptions = { const componentOptions = {
options: { options,
multipleSlots: true,
addGlobalClass: true
},
data: initData(vueOptions, Vue.prototype), data: initData(vueOptions, Vue.prototype),
behaviors: initBehaviors(vueOptions, initBehavior), behaviors: initBehaviors(vueOptions, initBehavior),
properties: initProperties(vueOptions.props, false, vueOptions.__file), properties: initProperties(vueOptions.props, false, vueOptions.__file),
......
...@@ -245,7 +245,7 @@ function isSyncApi (name) { ...@@ -245,7 +245,7 @@ function isSyncApi (name) {
} }
function isCallbackApi (name) { function isCallbackApi (name) {
return CALLBACK_API_RE.test(name) return CALLBACK_API_RE.test(name) && name !== 'onPush'
} }
function handlePromise (promise) { function handlePromise (promise) {
...@@ -1275,11 +1275,20 @@ function parseBaseComponent (vueComponentOptions, { ...@@ -1275,11 +1275,20 @@ function parseBaseComponent (vueComponentOptions, {
} = {}) { } = {}) {
let [VueComponent, vueOptions] = initVueComponent(Vue, 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 = { const componentOptions = {
options: { options,
multipleSlots: true,
addGlobalClass: true
},
data: initData(vueOptions, Vue.prototype), data: initData(vueOptions, Vue.prototype),
behaviors: initBehaviors(vueOptions, initBehavior), behaviors: initBehaviors(vueOptions, initBehavior),
properties: initProperties(vueOptions.props, false, vueOptions.__file), properties: initProperties(vueOptions.props, false, vueOptions.__file),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册