feat: 项目里跳转到首页调整

react-ui/src/app.tsx

@@ -20,7 +20,8 @@ import {
   setRemoteMenu,
 } from './services/session';
 import './styles/menu.less';
-import { needAuth } from './utils';
+import { isLoginPage, needAuth } from './utils';
+import { HomeUrl } from './utils/constant';
 import { closeAllModals } from './utils/modal';
 import { gotoLoginPage } from './utils/ui';
 export { requestConfig as request } from './requestConfig';
@@ -41,7 +42,7 @@ export async function getInitialState(): Promise<GlobalInitialState> {
       } as API.CurrentUser;
     } catch (error) {
       console.error('getInitialState', error);
-      gotoLoginPage();
+      gotoLoginPage(true);
     }
     return undefined;
   };
@@ -117,27 +118,29 @@ export const layout: RuntimeConfig['layout'] = ({ initialState }) => {
 };
 
 export const onRouteChange: RuntimeConfig['onRouteChange'] = async (e) => {
+  debugger;
   // console.log('onRouteChange');
 
   // 路由切换时，尤其是回退时，关闭打开的弹框
   closeAllModals();
 
   const { location } = e;
+  const pathname = location.pathname;
   const token = getAccessToken();
   // 没有 token，跳转到登录页面
-  if (!token && needAuth(location.pathname)) {
-    gotoLoginPage();
+  if (!token && needAuth(pathname)) {
+    gotoLoginPage(false);
     return;
   }
 
   // 有 token， 登录页面直接跳转到首页
-  if (token && !needAuth(location.pathname)) {
-    history.push('/');
+  if (token && isLoginPage(pathname)) {
+    history.push(HomeUrl);
   }
 
   const menus = getRemoteMenu();
   // 没有菜单，刷新页面
-  if (menus === null && needAuth(location.pathname)) {
+  if (menus === null && needAuth(pathname)) {
     history.go(0);
   }
 };

react-ui/src/components/ErrorBoundary/index.tsx

@@ -1,4 +1,5 @@
 import KFEmpty, { EmptyType } from '@/components/KFEmpty';
+import { HomeUrl } from '@/utils/constant';
 import { Button } from 'antd';
 import { Component, ReactNode } from 'react';
 
@@ -55,7 +56,7 @@ function ErrorBoundaryFallback({ error }: { error: Error | null }) {
             <Button
               type="default"
               onClick={() => {
-                window.history.pushState({}, '', '/');
+                window.history.pushState({}, '', HomeUrl);
                 window.location.reload();
               }}
             >

react-ui/src/components/RightContent/AvatarDropdown.tsx

@@ -87,7 +87,7 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
       const { logoutUri } = clientInfo;
       location.replace(logoutUri);
     } else {
-      gotoLoginPage();
+      gotoLoginPage(true);
     }
   };
   const actionClassName = useEmotionCss(({ token }) => {

react-ui/src/pages/404.tsx

@@ -1,4 +1,5 @@
 import KFEmpty, { EmptyType } from '@/components/KFEmpty';
+import { HomeUrl } from '@/utils/constant';
 import { useNavigate } from '@umijs/max';
 
 const NoFoundPage = () => {
@@ -12,7 +13,7 @@ const NoFoundPage = () => {
       content={'很抱歉，您访问的页面地址有误，\n或者该页面不存在。'}
       hasFooter={true}
       buttonTitle="返回首页"
-      onButtonClick={() => navigate('/')}
+      onButtonClick={() => navigate(HomeUrl)}
     ></KFEmpty>
   );
 };

react-ui/src/pages/Home/components/Intro/index.tsx

@@ -14,7 +14,7 @@ function IntroBlock() {
         以支持材料工程师、科学家和研究人员在材料设计、性能评估和工艺优化方面的工作。
       </div>
       <div className={styles['intro__button']} onClick={() => navigate('/workspace')}>
-        进入首页
+        开始使用
       </div>
       <StatisticsBlock></StatisticsBlock>
     </div>

react-ui/src/pages/Home/components/Service/index.tsx

@@ -46,7 +46,7 @@ function ServiceBlock() {
       <BlockTitle
         title="热门APP"
         style={{ marginBottom: '5rem' }}
-        onClick={() => navigate('dataset/modelDeployment')}
+        onClick={() => navigate('/dataset/modelDeployment')}
       ></BlockTitle>
       <Flex align="center" justify="space-between" style={{ width: '100%' }}>
         {serviceData.map((item) => {

react-ui/src/pages/User/Login/login.tsx

@@ -1,6 +1,7 @@
 import { clearSessionToken, setSessionToken } from '@/access';
 import { getCaptchaImg, login } from '@/services/system/auth';
 import { parseJsonText } from '@/utils';
+import { HomeUrl } from '@/utils/constant';
 import { safeInvoke } from '@/utils/functional';
 import LocalStorage from '@/utils/localStorage';
 import { to } from '@/utils/promise';
@@ -97,7 +98,7 @@ const Login = () => {
 
       await fetchUserInfo();
       const urlParams = new URL(window.location.href).searchParams;
-      history.replace(urlParams.get('redirect') || '/');
+      history.replace(urlParams.get('redirect') || HomeUrl);
     } else {
       if (error?.data?.code === 500 && error?.data?.msg === '验证码错误') {
         captchaInputRef.current?.focus({

react-ui/src/pages/missingPage.jsx

@@ -1,5 +1,6 @@
 import KFEmpty, { EmptyType } from '@/components/KFEmpty';
 import { useNavigate } from '@umijs/max';
+import { HomeUrl } from '@/utils/constant';
 
 const MissingPage = () => {
   const navigate = useNavigate();
@@ -12,7 +13,7 @@ const MissingPage = () => {
       content={'很抱歉，您访问的正在开发中，\n请耐心等待。'}
       hasFooter={true}
       buttonTitle="返回首页"
-      onButtonClick={() => navigate('/')}
+      onButtonClick={() => navigate(HomeUrl)}
     ></KFEmpty>
   );
 };

react-ui/src/utils/constant.ts

@@ -20,3 +20,6 @@ export const ServiceCreatedMessage = 'serviceCreated';
 
 // 实验完成
 export const ExperimentCompleted = 'ExperimentCompleted';
+
+// 首页地址
+export const HomeUrl = '/workspace';

react-ui/src/utils/index.ts

@@ -298,7 +298,17 @@ export const getGitUrl = (url?: string, branch?: string): string => {
  * @return {boolean} true if the pathname needs to be authorized, false otherwise
  */
 export const needAuth = (pathname: string): boolean => {
-  return !whiteList.includes(pathname);
+  return !whiteList.includes(pathname as PageEnum);
+};
+
+/**
+ * 是否是登录页
+ *
+ * @param {string} pathname - the pathname to be checked
+ * @return {boolean} true if the pathname needs to be authorized, false otherwise
+ */
+export const isLoginPage = (pathname: string): boolean => {
+  return pathname === PageEnum.LOGIN || pathname === PageEnum.Authorize;
 };
 
 /**