diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx index 62c401d0..5a7ce75b 100644 --- a/src/layouts/index.tsx +++ b/src/layouts/index.tsx @@ -41,6 +41,7 @@ export default function () { const ws = useRef(null); const [socketMessage, setSocketMessage] = useState(); const [collapsed, setCollapsed] = useState(false); + const [initLoading, setInitLoading] = useState(true); const { enable: enableDarkMode, disable: disableDarkMode, @@ -64,7 +65,6 @@ export default function () { setSystemInfo(data); if (!data.isInitialized) { history.push('/initialization'); - setLoading(false); } else { getUser(); } @@ -72,7 +72,8 @@ export default function () { }) .catch((error) => { console.log(error); - }); + }) + .finally(() => setInitLoading(false)); }; const getUser = (needLoading = true) => { @@ -192,6 +193,10 @@ export default function () { }; }, []); + if (initLoading) { + return ; + } + if (['/login', '/initialization', '/error'].includes(location.pathname)) { document.title = `${ (config.documentTitleMap as any)[location.pathname]