Commit 89def242 authored by 杨思琦's avatar 杨思琦

fix: 更新qiankun版本

parent 3a532f97
Pipeline #73237 passed with stages
......@@ -141,7 +141,7 @@
"pinyin-match": "^1.1.1",
"promise.prototype.finally": "^3.1.2",
"prop-types": "15.7.2",
"qiankun": "2.7.8",
"qiankun": "2.7.10",
"qrcode.react": "^1.0.0",
"rc-cascader": "^2.3.2",
"rc-queue-anim": "^2.0.0",
......
......@@ -353,6 +353,7 @@ const Layout = props => {
// 至少2个行业才能回到引导页
const Industries = props.global.get('userInfo.Industries');
if (Industries && Industries.length > 1) {
window.qiankunIsCache = false;
history.push('/Industry');
}
};
......@@ -411,11 +412,11 @@ const Layout = props => {
}
}
const getParams = pathname => {
let ret = {};
let url = pathname ? pathname : decodeURIComponent(window.location.pathname);
const ret = {};
const url = pathname || decodeURIComponent(window.location.pathname);
if (url.indexOf('|') > -1) {
let params = url.split('|')[1];
const params = url.split('|')[1];
params.split('&').map(function(item) {
return (ret[item.split('=')[0]] = item.split('=')[1]);
});
......@@ -428,9 +429,8 @@ const Layout = props => {
const params = getParams();
if (params.loadMap === 'true') {
return true;
} else {
return false;
}
return false;
};
return (
<SecurityLayout {...props}>
......
......@@ -261,7 +261,10 @@ export const initMicroApps = (url) => {
start(Configuration);
runAfterFirstMounted(() => {
event.emit('loading', false);
prefetchApps(micro);
const time = micro.length > 3 ? 3000 : 500;
setTimeout(() => {
prefetchApps(micro);
}, time)
Logger.info('[MainApp] first app mounted');
});
addGlobalUncaughtErrorHandler(event => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment