提交 80e7789b 编写于 作者: fxy060608's avatar fxy060608

build v3

上级 2cb1aa0e
...@@ -11434,6 +11434,40 @@ var serviceContext = (function () { ...@@ -11434,6 +11434,40 @@ var serviceContext = (function () {
return callHook(vm, hook, params) return callHook(vm, hook, params)
} }
function onMessage (pageId, arg) {
pageId = parseInt(pageId);
const page = getCurrentPages(true).find(page => page.$page.id === pageId);
if (!page) {
return
}
if (!page.$page.meta.isNVue) {
const target = page.$vm._$vd.elements.find(target => target.tagName === 'web-view' && target.events['message']);
if (!target) {
return
}
target.dispatchEvent('message', {
type: 'message',
target: Object.create(null),
currentTarget: Object.create(null),
timeStamp: Date.now(),
detail: {
data: [arg]
}
});
}
}
function onWebInvokeAppService ({
name,
arg
}, pageIds) {
if (name === 'postMessage') {
onMessage(pageIds[0], arg);
} else {
uni[name](arg);
}
}
function initOn (on, { function initOn (on, {
getApp, getApp,
getCurrentPages getCurrentPages
...@@ -11516,7 +11550,9 @@ var serviceContext = (function () { ...@@ -11516,7 +11550,9 @@ var serviceContext = (function () {
on('onNavigationBarSearchInputChanged', createCallCurrentPageHook('onNavigationBarSearchInputChanged')); on('onNavigationBarSearchInputChanged', createCallCurrentPageHook('onNavigationBarSearchInputChanged'));
on('onNavigationBarSearchInputConfirmed', createCallCurrentPageHook('onNavigationBarSearchInputConfirmed')); on('onNavigationBarSearchInputConfirmed', createCallCurrentPageHook('onNavigationBarSearchInputConfirmed'));
on('onNavigationBarSearchInputClicked', createCallCurrentPageHook('onNavigationBarSearchInputClicked')); on('onNavigationBarSearchInputClicked', createCallCurrentPageHook('onNavigationBarSearchInputClicked'));
on('onWebInvokeAppService', onWebInvokeAppService);
} }
function initSubscribe (subscribe, { function initSubscribe (subscribe, {
...@@ -11659,40 +11695,6 @@ var serviceContext = (function () { ...@@ -11659,40 +11695,6 @@ var serviceContext = (function () {
uni[method] && uni[method](args); uni[method] && uni[method](args);
} }
function onMessage (pageId, arg) {
pageId = parseInt(pageId);
const page = getCurrentPages(true).find(page => page.$page.id === pageId);
if (!page) {
return
}
if (!page.$page.meta.isNVue) {
const target = page.$vm._$vd.elements.find(target => target.tagName === 'web-view' && target.events['message']);
if (!target) {
return
}
target.dispatchEvent('message', {
type: 'message',
target: Object.create(null),
currentTarget: Object.create(null),
timeStamp: Date.now(),
detail: {
data: [arg]
}
});
}
}
function onWebInvokeAppService ({
name,
arg
}, pageIds) {
if (name === 'postMessage') {
onMessage(pageIds[0], arg);
} else {
uni[name](arg);
}
}
function onWxsInvokeCallMethod ({ function onWxsInvokeCallMethod ({
cid, cid,
method, method,
...@@ -11758,8 +11760,6 @@ var serviceContext = (function () { ...@@ -11758,8 +11760,6 @@ var serviceContext = (function () {
emit('onWebInvokeAppService', data, webviewIds); emit('onWebInvokeAppService', data, webviewIds);
}); });
on('onWebInvokeAppService', onWebInvokeAppService);
subscribe('onWxsInvokeCallMethod', onWxsInvokeCallMethod); subscribe('onWxsInvokeCallMethod', onWxsInvokeCallMethod);
subscribe(VD_SYNC, onVdSync); subscribe(VD_SYNC, onVdSync);
......
const compiler = require('../lib') const compiler = require('../lib')
const res = compiler.compile( const res = compiler.compile(
` `
<view data-a="1" :data-b="b"></view> <view class="custom-class"></view>
`, { `, {
miniprogram: true, miniprogram: true,
resourcePath: '/User/fxy/Documents/test.wxml', resourcePath: '/User/fxy/Documents/test.wxml',
...@@ -15,7 +15,7 @@ const res = compiler.compile( ...@@ -15,7 +15,7 @@ const res = compiler.compile(
platform: 'app-plus' platform: 'app-plus'
}, },
filterModules: ['swipe'], filterModules: ['swipe'],
service: true, // service: true,
view: true view: true
}) })
......
...@@ -21,9 +21,9 @@ const definePages = require('./define-pages') ...@@ -21,9 +21,9 @@ const definePages = require('./define-pages')
const appConfigService = require('./app-config-service') const appConfigService = require('./app-config-service')
const wxPageOrientationMapping = { const wxPageOrientationMapping = {
auto: ["portrait-primary", "portrait-secondary", "landscape-primary", "landscape-secondary"], auto: ['portrait-primary', 'portrait-secondary', 'landscape-primary', 'landscape-secondary'],
portrait: ["portrait-primary", "portrait-secondary"], portrait: ['portrait-primary', 'portrait-secondary'],
landscape: ["landscape-primary", "landscape-secondary"] landscape: ['landscape-primary', 'landscape-secondary']
} }
function parseConfig (appJson) { function parseConfig (appJson) {
...@@ -134,10 +134,10 @@ module.exports = function (pagesJson, userManifestJson) { ...@@ -134,10 +134,10 @@ module.exports = function (pagesJson, userManifestJson) {
} }
// 屏幕启动方向 // 屏幕启动方向
if (manifestJson.plus.screenOrientation) {// app平台优先使用 manifest 配置 if (manifestJson.plus.screenOrientation) { // app平台优先使用 manifest 配置
manifestJson.screenOrientation = manifestJson.plus.screenOrientation manifestJson.screenOrientation = manifestJson.plus.screenOrientation
delete manifestJson.plus.screenOrientation delete manifestJson.plus.screenOrientation
} else if (appJson.window && appJson.window.pageOrientation) {// 兼容微信小程序 } else if (appJson.window && appJson.window.pageOrientation) { // 兼容微信小程序
const pageOrientationValue = wxPageOrientationMapping[appJson.window.pageOrientation] const pageOrientationValue = wxPageOrientationMapping[appJson.window.pageOrientation]
if (pageOrientationValue) { if (pageOrientationValue) {
manifestJson.screenOrientation = pageOrientationValue manifestJson.screenOrientation = pageOrientationValue
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册