From 8345b0a480121dbfffd5150651bc981784290a74 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Mon, 3 Jun 2019 18:40:43 +0800 Subject: [PATCH] fix(app-plus-nvue): postMessage --- packages/uni-app-plus-nvue/dist/service.legacy.js | 5 +++-- src/platforms/app-plus-nvue/services/api/legacy/index.js | 2 +- src/platforms/app-plus-nvue/services/api/post-message.js | 3 ++- src/platforms/app-plus-nvue/services/api/sub-nvue.js | 6 ++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/uni-app-plus-nvue/dist/service.legacy.js b/packages/uni-app-plus-nvue/dist/service.legacy.js index 0c2aaf5da..c7c58c265 100644 --- a/packages/uni-app-plus-nvue/dist/service.legacy.js +++ b/packages/uni-app-plus-nvue/dist/service.legacy.js @@ -294,7 +294,8 @@ function initSubNVue (nvue, plus, BroadcastChannel) { } } -function initPostMessage (plus) { +function initPostMessage (nvue) { + const plus = nvue.requireModule('plus'); return { postMessage (data) { plus.postMessage(data, UNIAPP_SERVICE_NVUE_ID); @@ -568,7 +569,7 @@ function initUni (uni, nvue, plus, BroadcastChannel) { getSubNVueById, getCurrentSubNVue, requireNativePlugin: nvue.requireModule - }, initTitleNView(nvue), initPostMessage(plus)); + }, initTitleNView(nvue), initPostMessage(nvue)); if (typeof Proxy !== 'undefined') { return new Proxy({}, { diff --git a/src/platforms/app-plus-nvue/services/api/legacy/index.js b/src/platforms/app-plus-nvue/services/api/legacy/index.js index 977fb545c..654f40348 100644 --- a/src/platforms/app-plus-nvue/services/api/legacy/index.js +++ b/src/platforms/app-plus-nvue/services/api/legacy/index.js @@ -30,7 +30,7 @@ export default function initUni (uni, nvue, plus, BroadcastChannel) { getSubNVueById, getCurrentSubNVue, requireNativePlugin: nvue.requireModule - }, initTitleNView(nvue), initPostMessage(plus)) + }, initTitleNView(nvue), initPostMessage(nvue)) if (typeof Proxy !== 'undefined') { return new Proxy({}, { diff --git a/src/platforms/app-plus-nvue/services/api/post-message.js b/src/platforms/app-plus-nvue/services/api/post-message.js index 38b6007d5..63b5d4853 100644 --- a/src/platforms/app-plus-nvue/services/api/post-message.js +++ b/src/platforms/app-plus-nvue/services/api/post-message.js @@ -2,7 +2,8 @@ import { UNIAPP_SERVICE_NVUE_ID } from './util' -export function initPostMessage (plus) { +export function initPostMessage (nvue) { + const plus = nvue.requireModule('plus') return { postMessage (data) { plus.postMessage(data, UNIAPP_SERVICE_NVUE_ID) diff --git a/src/platforms/app-plus-nvue/services/api/sub-nvue.js b/src/platforms/app-plus-nvue/services/api/sub-nvue.js index cc13a3101..c17ba80a1 100644 --- a/src/platforms/app-plus-nvue/services/api/sub-nvue.js +++ b/src/platforms/app-plus-nvue/services/api/sub-nvue.js @@ -6,7 +6,9 @@ export function initSubNVue (nvue, plus, BroadcastChannel) { let origin const onMessageCallbacks = [] - + + const postMessage = nvue.requireModule('plus').postMessage + const onSubNVueMessage = function onSubNVueMessage (data) { onMessageCallbacks.forEach(callback => callback({ origin, @@ -45,7 +47,7 @@ export function initSubNVue (nvue, plus, BroadcastChannel) { to: isPopupNVue ? hostNVueId : popupNVueId }) } else { - plus.postMessage({ + postMessage({ type: 'UniAppSubNVue', data: data }, UNIAPP_SERVICE_NVUE_ID) -- GitLab