diff --git a/packages/vue-cli-plugin-uni/lib/split-chunks.js b/packages/vue-cli-plugin-uni/lib/split-chunks.js index 4029fa05321c30e7387cf46c59869e9e002d41c8..12c8df8463a47786614b6a273633c4fafe6218fa 100644 --- a/packages/vue-cli-plugin-uni/lib/split-chunks.js +++ b/packages/vue-cli-plugin-uni/lib/split-chunks.js @@ -166,7 +166,7 @@ module.exports = function getSplitChunks () { if (module.resource && module.reasons) { for (let index = 0; index < module.reasons.length; index++) { const m = module.reasons[index] - + if (m.module && m.module.resource) { const resource = normalizePath(m.module.resource) if ( @@ -202,8 +202,7 @@ module.exports = function getSplitChunks () { matchSubPackages.has(root + '/') && !hasMainPackage(chunks) && !hasMainPackageComponent(module, matchSubPackages.values().next().value) - ) { - + ) { if (process.env.UNI_OPT_TRACE) { console.log(root, module.resource, chunks.map(chunk => chunk.name)) } diff --git a/packages/webpack-uni-pages-loader/lib/platforms/h5.js b/packages/webpack-uni-pages-loader/lib/platforms/h5.js index cea4c10f24451ac20380a52a894a1fb7651866c4..1dd4fb8bcf91cd3b90cd3210e90137610ac361ae 100644 --- a/packages/webpack-uni-pages-loader/lib/platforms/h5.js +++ b/packages/webpack-uni-pages-loader/lib/platforms/h5.js @@ -154,10 +154,11 @@ const getPageComponents = function (inputDir, pagesJson) { isTabBar, tabBarIndex, isQuit: isEntry || isTabBar, - windowTop, - topWindow: pageStyle.topWindow, - leftWindow: pageStyle.leftWindow, - rightWindow: pageStyle.rightWindow + windowTop, + topWindow: pageStyle.topWindow, + leftWindow: pageStyle.leftWindow, + rightWindow: pageStyle.rightWindow, + maxWidth: pageStyle.maxWidth } }).filter(pageComponents => !!pageComponents) } @@ -214,10 +215,11 @@ const genPageRoutes = function (pageComponents) { isEntry, isTabBar, windowTop, - tabBarIndex, - topWindow, - leftWindow, - rightWindow + tabBarIndex, + topWindow, + leftWindow, + rightWindow, + maxWidth }) => { return ` { @@ -228,7 +230,7 @@ component: { 'Page', { props: Object.assign({ - ${isQuit ? 'isQuit:true,\n' : ''}${isEntry ? 'isEntry:true,\n' : ''}${isTabBar ? 'isTabBar:true,\n' : ''} + ${isQuit ? 'isQuit:true,\n' : ''}${isEntry ? 'isEntry:true,\n' : ''}${isTabBar ? 'isTabBar:true,\n' : ''} ${topWindow === false ? 'topWindow:false,\n' : ''}${leftWindow === false ? 'leftWindow:false,\n' : ''}${rightWindow === false ? 'rightWindow:false,\n' : ''} ${isTabBar ? ('tabBarIndex:' + tabBarIndex) : ''} },__uniConfig.globalStyle,${JSON.stringify(props)}) @@ -243,7 +245,7 @@ component: { }, meta:{${isQuit ? '\nid:' + (id++) + ',' : ''} name:'${name}', - isNVue:${isNVue},${topWindow === false ? 'topWindow:false,\n' : ''}${leftWindow === false ? 'leftWindow:false,\n' : ''}${rightWindow === false ? 'rightWindow:false,\n' : ''} + isNVue:${isNVue},maxWidth:${maxWidth || 0},${topWindow === false ? 'topWindow:false,\n' : ''}${leftWindow === false ? 'leftWindow:false,\n' : ''}${rightWindow === false ? 'rightWindow:false,\n' : ''} pagePath:'${route}'${isQuit ? ',\nisQuit:true' : ''}${isEntry ? ',\nisEntry:true' : ''}${isTabBar ? ',\nisTabBar:true' : ''}${tabBarIndex !== -1 ? (',\ntabBarIndex:' + tabBarIndex) : ''}, windowTop:${windowTop} } diff --git a/src/platforms/h5/components/app/index.vue b/src/platforms/h5/components/app/index.vue index 551b94deff196e099323577ed2d4f5f50ec44b44..4fe64d306519f653f0c7989a4429b779f410eb00 100644 --- a/src/platforms/h5/components/app/index.vue +++ b/src/platforms/h5/components/app/index.vue @@ -1,9 +1,10 @@