Pārlūkot izejas kodu

退出登录至登录页,登录更新currentUser

hanxin 2 gadi atpakaļ
vecāks
revīzija
d145bba80b

+ 1 - 1
src/components/UserDropdown/index.tsx

@@ -14,7 +14,7 @@ const items: MenuProps['items'] = [
   },
   {
     key: '2',
-    label: <a href="/logout">退出登录</a>,
+    label: <a href="/login">退出登录</a>,
     icon: <LogoutOutlined />,
   },
 ];

+ 2 - 1
src/models/userInfo.ts

@@ -3,7 +3,7 @@ import { useRequest } from '@umijs/max';
 import { queryCurrentV2, queryUserRole } from '@/services/user';
 
 const useUser = () => {
-  const { data: user, loading } = useRequest(queryCurrentV2, {
+  const { data: user, loading, run } = useRequest(queryCurrentV2, {
     cacheKey: 'queryCurrent',
   });
   // const { data: roleData, loading } = useRequest(() => queryUserRole(user.ID), {
@@ -28,6 +28,7 @@ const useUser = () => {
       // roleList: roleList,
     },
     loading,
+    run
   };
 };
 

+ 7 - 1
src/pages/Login/index.js

@@ -1,6 +1,7 @@
-import React, { useRef, useState } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import { connect, useNavigate } from 'umi';
 import { Form, Select, Input, Button, message } from 'antd';
+import { useModel } from '@umijs/max';
 import { queryDepList } from '@/services/user';
 import styles from './index.less';
 import { UserOutlined, LockOutlined } from '@ant-design/icons';
@@ -13,6 +14,7 @@ function Login(props) {
     params,
     dispatch,
   } = props;
+  const { run } = useModel('userInfo');
   const [depList, setDepList] = useState([]);
   const [hasName, setHasName] = useState(false);
   const formRef = useRef();
@@ -47,10 +49,14 @@ function Login(props) {
       },
       callback: (token) => {
         storeToken(token);
+        run();
         navigate("/home");
       },
     });
   };
+  useEffect(() => {
+    storeToken('');
+  }, []);
   return (
     <div className={styles.main}>
       <div className={styles.content}>