提交 7c3b4346 编写于 作者: fxy060608's avatar fxy060608

build:all

上级 7847267d
...@@ -698,10 +698,10 @@ function initVueComponent (Vue, vueOptions) { ...@@ -698,10 +698,10 @@ function initVueComponent (Vue, vueOptions) {
let VueComponent; let VueComponent;
if (isFn(vueOptions)) { if (isFn(vueOptions)) {
VueComponent = vueOptions; VueComponent = vueOptions;
vueOptions = VueComponent.extendOptions;
} else { } else {
VueComponent = Vue.extend(vueOptions); VueComponent = Vue.extend(vueOptions);
} }
vueOptions = VueComponent.options;
return [VueComponent, vueOptions] return [VueComponent, vueOptions]
} }
...@@ -897,11 +897,12 @@ function wrapper$2 (event) { ...@@ -897,11 +897,12 @@ function wrapper$2 (event) {
event.target = event.target || {}; event.target = event.target || {};
if (!hasOwn(event, 'detail') || !event.detail) { if (!hasOwn(event, 'detail')) {
event.detail = {}; event.detail = {};
} }
if (!('markerId' in event.detail) && 'markerId' in event) { if (hasOwn(event, 'markerId')) {
event.detail = typeof event.detail === 'object' ? event.detail : {};
event.detail.markerId = event.markerId; event.detail.markerId = event.markerId;
} }
...@@ -1386,6 +1387,10 @@ function parseBaseComponent (vueComponentOptions, { ...@@ -1386,6 +1387,10 @@ function parseBaseComponent (vueComponentOptions, {
__e: handleEvent __e: handleEvent
} }
}; };
// externalClasses
if (vueOptions.externalClasses) {
componentOptions.externalClasses = vueOptions.externalClasses;
}
if (Array.isArray(vueOptions.wxsCallMethods)) { if (Array.isArray(vueOptions.wxsCallMethods)) {
vueOptions.wxsCallMethods.forEach(callMethod => { vueOptions.wxsCallMethods.forEach(callMethod => {
......
...@@ -1167,10 +1167,10 @@ function initVueComponent (Vue, vueOptions) { ...@@ -1167,10 +1167,10 @@ function initVueComponent (Vue, vueOptions) {
let VueComponent; let VueComponent;
if (isFn(vueOptions)) { if (isFn(vueOptions)) {
VueComponent = vueOptions; VueComponent = vueOptions;
vueOptions = VueComponent.extendOptions;
} else { } else {
VueComponent = Vue.extend(vueOptions); VueComponent = Vue.extend(vueOptions);
} }
vueOptions = VueComponent.options;
return [VueComponent, vueOptions] return [VueComponent, vueOptions]
} }
...@@ -1356,11 +1356,12 @@ function wrapper$1 (event) { ...@@ -1356,11 +1356,12 @@ function wrapper$1 (event) {
event.target = event.target || {}; event.target = event.target || {};
if (!hasOwn(event, 'detail') || !event.detail) { if (!hasOwn(event, 'detail')) {
event.detail = {}; event.detail = {};
} }
if (!('markerId' in event.detail) && 'markerId' in event) { if (hasOwn(event, 'markerId')) {
event.detail = typeof event.detail === 'object' ? event.detail : {};
event.detail.markerId = event.markerId; event.detail.markerId = event.markerId;
} }
...@@ -1808,10 +1809,8 @@ function initSpecialMethods (mpInstance) { ...@@ -1808,10 +1809,8 @@ function initSpecialMethods (mpInstance) {
specialMethods.forEach(method => { specialMethods.forEach(method => {
if (isFn(mpInstance.$vm[method])) { if (isFn(mpInstance.$vm[method])) {
mpInstance[method] = function (event) { mpInstance[method] = function (event) {
if (!hasOwn(event, 'detail') || !event.detail) { if (hasOwn(event, 'markerId')) {
event.detail = {}; event.detail = typeof event.detail === 'object' ? event.detail : {};
}
if (!('markerId' in event.detail) && 'markerId' in event) {
event.detail.markerId = event.markerId; event.detail.markerId = event.markerId;
} }
// TODO normalizeEvent // TODO normalizeEvent
......
...@@ -812,10 +812,10 @@ function initVueComponent (Vue, vueOptions) { ...@@ -812,10 +812,10 @@ function initVueComponent (Vue, vueOptions) {
let VueComponent; let VueComponent;
if (isFn(vueOptions)) { if (isFn(vueOptions)) {
VueComponent = vueOptions; VueComponent = vueOptions;
vueOptions = VueComponent.extendOptions;
} else { } else {
VueComponent = Vue.extend(vueOptions); VueComponent = Vue.extend(vueOptions);
} }
vueOptions = VueComponent.options;
return [VueComponent, vueOptions] return [VueComponent, vueOptions]
} }
...@@ -1027,11 +1027,12 @@ function wrapper$1 (event) { ...@@ -1027,11 +1027,12 @@ function wrapper$1 (event) {
event.target = event.target || {}; event.target = event.target || {};
if (!hasOwn(event, 'detail') || !event.detail) { if (!hasOwn(event, 'detail')) {
event.detail = {}; event.detail = {};
} }
if (!('markerId' in event.detail) && 'markerId' in event) { if (hasOwn(event, 'markerId')) {
event.detail = typeof event.detail === 'object' ? event.detail : {};
event.detail.markerId = event.markerId; event.detail.markerId = event.markerId;
} }
...@@ -1522,6 +1523,10 @@ function parseBaseComponent (vueComponentOptions, { ...@@ -1522,6 +1523,10 @@ function parseBaseComponent (vueComponentOptions, {
__e: handleEvent __e: handleEvent
} }
}; };
// externalClasses
if (vueOptions.externalClasses) {
componentOptions.externalClasses = vueOptions.externalClasses;
}
if (Array.isArray(vueOptions.wxsCallMethods)) { if (Array.isArray(vueOptions.wxsCallMethods)) {
vueOptions.wxsCallMethods.forEach(callMethod => { vueOptions.wxsCallMethods.forEach(callMethod => {
......
...@@ -753,10 +753,10 @@ function initVueComponent (Vue, vueOptions) { ...@@ -753,10 +753,10 @@ function initVueComponent (Vue, vueOptions) {
let VueComponent; let VueComponent;
if (isFn(vueOptions)) { if (isFn(vueOptions)) {
VueComponent = vueOptions; VueComponent = vueOptions;
vueOptions = VueComponent.extendOptions;
} else { } else {
VueComponent = Vue.extend(vueOptions); VueComponent = Vue.extend(vueOptions);
} }
vueOptions = VueComponent.options;
return [VueComponent, vueOptions] return [VueComponent, vueOptions]
} }
...@@ -952,11 +952,12 @@ function wrapper$1 (event) { ...@@ -952,11 +952,12 @@ function wrapper$1 (event) {
event.target = event.target || {}; event.target = event.target || {};
if (!hasOwn(event, 'detail') || !event.detail) { if (!hasOwn(event, 'detail')) {
event.detail = {}; event.detail = {};
} }
if (!('markerId' in event.detail) && 'markerId' in event) { if (hasOwn(event, 'markerId')) {
event.detail = typeof event.detail === 'object' ? event.detail : {};
event.detail.markerId = event.markerId; event.detail.markerId = event.markerId;
} }
...@@ -1445,6 +1446,10 @@ function parseBaseComponent (vueComponentOptions, { ...@@ -1445,6 +1446,10 @@ function parseBaseComponent (vueComponentOptions, {
__e: handleEvent __e: handleEvent
} }
}; };
// externalClasses
if (vueOptions.externalClasses) {
componentOptions.externalClasses = vueOptions.externalClasses;
}
if (Array.isArray(vueOptions.wxsCallMethods)) { if (Array.isArray(vueOptions.wxsCallMethods)) {
vueOptions.wxsCallMethods.forEach(callMethod => { vueOptions.wxsCallMethods.forEach(callMethod => {
......
...@@ -845,10 +845,10 @@ function initVueComponent (Vue, vueOptions) { ...@@ -845,10 +845,10 @@ function initVueComponent (Vue, vueOptions) {
let VueComponent; let VueComponent;
if (isFn(vueOptions)) { if (isFn(vueOptions)) {
VueComponent = vueOptions; VueComponent = vueOptions;
vueOptions = VueComponent.extendOptions;
} else { } else {
VueComponent = Vue.extend(vueOptions); VueComponent = Vue.extend(vueOptions);
} }
vueOptions = VueComponent.options;
return [VueComponent, vueOptions] return [VueComponent, vueOptions]
} }
...@@ -1044,11 +1044,12 @@ function wrapper$1 (event) { ...@@ -1044,11 +1044,12 @@ function wrapper$1 (event) {
event.target = event.target || {}; event.target = event.target || {};
if (!hasOwn(event, 'detail') || !event.detail) { if (!hasOwn(event, 'detail')) {
event.detail = {}; event.detail = {};
} }
if (!('markerId' in event.detail) && 'markerId' in event) { if (hasOwn(event, 'markerId')) {
event.detail = typeof event.detail === 'object' ? event.detail : {};
event.detail.markerId = event.markerId; event.detail.markerId = event.markerId;
} }
...@@ -1610,6 +1611,10 @@ function parseBaseComponent (vueComponentOptions, { ...@@ -1610,6 +1611,10 @@ function parseBaseComponent (vueComponentOptions, {
__e: handleEvent __e: handleEvent
} }
}; };
// externalClasses
if (vueOptions.externalClasses) {
componentOptions.externalClasses = vueOptions.externalClasses;
}
if (Array.isArray(vueOptions.wxsCallMethods)) { if (Array.isArray(vueOptions.wxsCallMethods)) {
vueOptions.wxsCallMethods.forEach(callMethod => { vueOptions.wxsCallMethods.forEach(callMethod => {
......
...@@ -710,10 +710,10 @@ function initVueComponent (Vue, vueOptions) { ...@@ -710,10 +710,10 @@ function initVueComponent (Vue, vueOptions) {
let VueComponent; let VueComponent;
if (isFn(vueOptions)) { if (isFn(vueOptions)) {
VueComponent = vueOptions; VueComponent = vueOptions;
vueOptions = VueComponent.extendOptions;
} else { } else {
VueComponent = Vue.extend(vueOptions); VueComponent = Vue.extend(vueOptions);
} }
vueOptions = VueComponent.options;
return [VueComponent, vueOptions] return [VueComponent, vueOptions]
} }
...@@ -909,11 +909,12 @@ function wrapper$1 (event) { ...@@ -909,11 +909,12 @@ function wrapper$1 (event) {
event.target = event.target || {}; event.target = event.target || {};
if (!hasOwn(event, 'detail') || !event.detail) { if (!hasOwn(event, 'detail')) {
event.detail = {}; event.detail = {};
} }
if (!('markerId' in event.detail) && 'markerId' in event) { if (hasOwn(event, 'markerId')) {
event.detail = typeof event.detail === 'object' ? event.detail : {};
event.detail.markerId = event.markerId; event.detail.markerId = event.markerId;
} }
...@@ -1398,6 +1399,10 @@ function parseBaseComponent (vueComponentOptions, { ...@@ -1398,6 +1399,10 @@ function parseBaseComponent (vueComponentOptions, {
__e: handleEvent __e: handleEvent
} }
}; };
// externalClasses
if (vueOptions.externalClasses) {
componentOptions.externalClasses = vueOptions.externalClasses;
}
if (Array.isArray(vueOptions.wxsCallMethods)) { if (Array.isArray(vueOptions.wxsCallMethods)) {
vueOptions.wxsCallMethods.forEach(callMethod => { vueOptions.wxsCallMethods.forEach(callMethod => {
......
...@@ -694,10 +694,10 @@ function initVueComponent (Vue, vueOptions) { ...@@ -694,10 +694,10 @@ function initVueComponent (Vue, vueOptions) {
let VueComponent; let VueComponent;
if (isFn(vueOptions)) { if (isFn(vueOptions)) {
VueComponent = vueOptions; VueComponent = vueOptions;
vueOptions = VueComponent.extendOptions;
} else { } else {
VueComponent = Vue.extend(vueOptions); VueComponent = Vue.extend(vueOptions);
} }
vueOptions = VueComponent.options;
return [VueComponent, vueOptions] return [VueComponent, vueOptions]
} }
...@@ -893,11 +893,12 @@ function wrapper$1 (event) { ...@@ -893,11 +893,12 @@ function wrapper$1 (event) {
event.target = event.target || {}; event.target = event.target || {};
if (!hasOwn(event, 'detail') || !event.detail) { if (!hasOwn(event, 'detail')) {
event.detail = {}; event.detail = {};
} }
if (!('markerId' in event.detail) && 'markerId' in event) { if (hasOwn(event, 'markerId')) {
event.detail = typeof event.detail === 'object' ? event.detail : {};
event.detail.markerId = event.markerId; event.detail.markerId = event.markerId;
} }
...@@ -1440,6 +1441,10 @@ function parseBaseComponent (vueComponentOptions, { ...@@ -1440,6 +1441,10 @@ function parseBaseComponent (vueComponentOptions, {
__e: handleEvent __e: handleEvent
} }
}; };
// externalClasses
if (vueOptions.externalClasses) {
componentOptions.externalClasses = vueOptions.externalClasses;
}
if (Array.isArray(vueOptions.wxsCallMethods)) { if (Array.isArray(vueOptions.wxsCallMethods)) {
vueOptions.wxsCallMethods.forEach(callMethod => { vueOptions.wxsCallMethods.forEach(callMethod => {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册