blackteay/fes.js
1
0
Fork 0
mirror of https://github.com/WeBankFinTech/fes.js.git synced 2025-04-06 03:59:53 +08:00
Code Issues Projects Releases Wiki Activity

fix: mountElementId改为app，不带#

Browse Source
This commit is contained in:
万纯 2021-03-24 19:36:51 +08:00
parent d31e4d7613
commit 444ac52e93
8 changed files with 9 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/fes-plugin-qiankun/src/constants.js
View File

@ -1,4 +1,4 @@
export const defaultMainRootId = '#root-master';
export const defaultMainRootId = 'root-master';
export const defaultHistoryType = 'hash';
export const qiankunStateForMicroModelNamespace = 'qiankunStateForMicro';
export const qiankunStateFromMainModelNamespace = 'qiankunStateFromMain';

85
packages/fes-plugin-qiankun/src/main/runtime/runtime.tpl
View File

@ -1,85 +0,0 @@
// import { deferred } from '@@/plugin-qiankun/qiankunDefer.js';
// import '@@/plugin-qiankun/qiankunRootExports.js';
// import subAppConfig from '@@/plugin-qiankun/subAppsConfig.json';
// import { registerMicroApps, start } from 'qiankun';
// import { createApp, h } from 'vue';
// import { plugin, ApplyPluginsType } from '@@/core/coreExports';
// import { defaultMountContainerId, testPathWithPrefix, toArray } from '../common';
// async function getMasterRuntime() {
// const config = plugin.applyPlugins({
// key: 'qiankun',
// type: ApplyPluginsType.modify,
// initialValue: {},
// async: true
// });
// const { master } = config;
// return master || config;
// }
// export async function render(oldRender) {
// oldRender();
// function isAppActive(location, history, base) {
// const baseConfig = toArray(base);
// switch (history.type || history) {
// case 'hash':
// return baseConfig.some(pathPrefix => testPathWithPrefix(`#${pathPrefix}`, location.hash));
// case 'browser':
// return baseConfig.some(pathPrefix => testPathWithPrefix(pathPrefix, location.pathname));
// default:
// return false;
// }
// }
// const runtimeConfig = await getMasterRuntime();
// const {
// apps, jsSandbox = false, prefetch = true, defer = false, lifeCycles, masterHistory, ...otherConfigs
// } = {
// ...subAppConfig,
// ...runtimeConfig
// };
// assert(apps && apps.length, 'sub apps must be config when using fes-plugin-qiankun');
// registerMicroApps(apps.map(({
// name, entry, base, history = masterHistory, mountElementId = defaultMountContainerId, props
// }) => ({
// name,
// entry,
// activeRule: location => isAppActive(location, history, base),
// render: ({ appContent, loading }) => {
// if (process.env.NODE_ENV === 'development') {
// console.info(`app ${name} loading ${loading}`);
// }
// if (mountElementId) {
// const container = document.getElementById(mountElementId);
// if (container) {
// const subApp = {
// setup() {
// },
// render() {
// h('div', {
// dangerouslySetInnerHTML: {
// __html: appContent
// }
// });
// }
// };
// const app = createApp();
// app.mount(subApp, container);
// }
// }
// },
// props: {
// base,
// history,
// ...props
// }
// })), lifeCycles);
// if (defer) {
// await deferred.promise;
// }
// start({ jsSandbox, prefetch, ...otherConfigs });
// }

4
packages/fes-plugin-qiankun/src/micro/index.js
View File

@ -164,8 +164,8 @@ export default function (api) {
api.addEntryCode(
() => `
export const bootstrap = qiankun_genBootstrap(completeClientRender, app);
export const mount = qiankun_genMount('${api.config.mountElementId}');
export const unmount = qiankun_genUnmount('${api.config.mountElementId}');
export const mount = qiankun_genMount('#${api.config.mountElementId}');
export const unmount = qiankun_genUnmount('#${api.config.mountElementId}');
export const update = qiankun_genUpdate();
if (!window.__POWERED_BY_QIANKUN__) {

12
packages/fes-plugin-qiankun/src/micro/runtime/runtime.tpl
View File

@ -1,12 +0,0 @@
// import { h } from 'vue';
// import qiankunRender from './lifecycles';
// export function rootContainer(container) {
// const value = typeof window !== 'undefined' ? window.g_rootExports : {};
// const { Context } = require('@@/plugin-qiankun/qiankunContext');
// return h(Context.Provider, { value }, container);
// }
// export const render = oldRender => qiankunRender().then(() => {
// oldRender();
// });

6
packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js
View File

@ -13,12 +13,12 @@ export default async function createHtmlWebpackConfig({
isProd
}) {
const htmlOptions = {
title: 'fes.js',
filename: '[name].html',
...config.html,
templateParameters: resolveDefine(null, true)
templateParameters: resolveDefine(null, true),
mountElementId: config.mountElementId
};
htmlOptions.title = htmlOptions.title || 'fes.js';
if (isProd) {
Object.assign(htmlOptions, {

2
packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index-default.html
View File

@ -7,6 +7,6 @@
<title><%= htmlWebpackPlugin.options.title %></title>
</head>
<body>
<div id="app"></div>
<div id="<%= htmlWebpackPlugin.options.mountElementId %>"></div>
</body>
</html>

2
packages/fes-preset-built-in/src/plugins/features/mountElementId.js
View File

@ -3,7 +3,7 @@ export default (api) => {
api.describe({
key: 'mountElementId',
config: {
default: '#app',
default: 'app',
schema(joi) {
return joi.string().allow('');
}

2
packages/fes-preset-built-in/src/plugins/generateFiles/fes/index.js
View File

@ -26,7 +26,7 @@ export default function (api) {
enableTitle: api.config.title !== false,
defaultTitle: api.config.title || '',
runtimePath,
rootElement: api.config.mountElementId || '#app',
rootElement: `#${api.config.mountElementId || 'app'}`,
entryCode: (
await api.applyPlugins({
key: 'addEntryCode',