Commit fccb97a8 authored by 杨思琦's avatar 杨思琦

fix: 集成登录修改

parent 642f7e24
Pipeline #79708 passed with stages
...@@ -115,9 +115,9 @@ ...@@ -115,9 +115,9 @@
"@wisdom-map/arcgismap": "1.4.0-199", "@wisdom-map/arcgismap": "1.4.0-199",
"@wisdom-map/basemap": "1.1.0-31", "@wisdom-map/basemap": "1.1.0-31",
"@wisdom-map/util": "^1.0.28-0", "@wisdom-map/util": "^1.0.28-0",
"@wisdom-utils/components": "0.1.326", "@wisdom-utils/components": "0.1.327",
"@wisdom-utils/runtime": "0.0.47", "@wisdom-utils/runtime": "0.0.47",
"@wisdom-utils/utils": "0.1.366", "@wisdom-utils/utils": "0.1.367",
"animate.css": "^4.1.1", "animate.css": "^4.1.1",
"antd": "4.21.2", "antd": "4.21.2",
"compression": "1.7.4", "compression": "1.7.4",
......
...@@ -555,10 +555,9 @@ const Layout = props => { ...@@ -555,10 +555,9 @@ const Layout = props => {
if (window.qiankunIsCache) { if (window.qiankunIsCache) {
store.set('event:refreshCurrentMenu', { store.set('event:refreshCurrentMenu', {
dropCache: true, dropCache: true,
// action: 'closeAllTabs' action: 'closeAllTabs'
}) })
} }
const cli = val.url?.indexOf('client=') >= 0 ? val.url.split('client=')[1] : ''; const cli = val.url?.indexOf('client=') >= 0 ? val.url.split('client=')[1] : '';
Cookies.set('client', cli, { Cookies.set('client', cli, {
expires: 86400000 / (24 * 60 * 60 * 1000), expires: 86400000 / (24 * 60 * 60 * 1000),
...@@ -575,10 +574,10 @@ const Layout = props => { ...@@ -575,10 +574,10 @@ const Layout = props => {
config.uiwidgets = []; config.uiwidgets = [];
config.widgets = []; config.widgets = [];
config.allWidgets = []; config.allWidgets = [];
window.qiankunStarted = false;
if (cli) { if (cli) {
config.client = cli; config.client = cli;
} }
props.instance && props.instance.updateConfig(config);
loginAction && loginAction.getUserInfoAndConfig('', true, val.type); loginAction && loginAction.getUserInfoAndConfig('', true, val.type);
// props.history.push(`/?client=${cli}`); // props.history.push(`/?client=${cli}`);
// props.updateCurrentIndex(0); // props.updateCurrentIndex(0);
......
...@@ -86,8 +86,9 @@ const Integration = props => { ...@@ -86,8 +86,9 @@ const Integration = props => {
config.uiwidgets = []; config.uiwidgets = [];
config.widgets = []; config.widgets = [];
config.allWidgets = []; config.allWidgets = [];
window.qiankunStarted = false;
if (cli) { if (cli) {
config.client = cli config.client = cli;
} }
props.instance && props.instance.updateConfig(config); props.instance && props.instance.updateConfig(config);
......
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