修复登录后未跳转的bug
This commit is contained in:
parent
c413e37a3a
commit
aeb60e0cc2
@ -1,5 +1,5 @@
|
||||
import React, {Suspense} from 'react';
|
||||
import {Outlet, Route, Routes, useNavigate} from "react-router-dom";
|
||||
import {Outlet, Route, Routes} from "react-router-dom";
|
||||
|
||||
import './App.css';
|
||||
import './Arco.css';
|
||||
@ -9,9 +9,6 @@ import UserLayout from "./layout/UserLayout";
|
||||
import NoMatch from "./components/NoMatch";
|
||||
import Landing from "./components/Landing";
|
||||
import NoPermission from "./components/NoPermission";
|
||||
import {useQuery} from "react-query";
|
||||
import accountApi from "./api/account";
|
||||
import {setCurrentUser} from "./service/permission";
|
||||
|
||||
const GuacdMonitor = React.lazy(() => import("./components/session/GuacdMonitor"));
|
||||
const GuacdPlayback = React.lazy(() => import("./components/session/GuacdPlayback"));
|
||||
@ -63,17 +60,6 @@ const LoginPolicy = React.lazy(() => import("./components/security/LoginPolicy")
|
||||
|
||||
const App = () => {
|
||||
|
||||
const navigate = useNavigate();
|
||||
|
||||
useQuery('getUserInfo', accountApi.getUserInfo, {
|
||||
onSuccess: (data) => {
|
||||
setCurrentUser(data);
|
||||
if (data?.type === 'user') {
|
||||
navigate('/my-asset');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return (
|
||||
<Routes>
|
||||
<Route element={
|
||||
|
@ -6,11 +6,15 @@ import {LockOutlined, LockTwoTone, UserOutlined} from '@ant-design/icons';
|
||||
import {setToken} from "../utils/utils";
|
||||
import brandingApi from "../api/branding";
|
||||
import strings from "../utils/strings";
|
||||
import {useNavigate} from "react-router-dom";
|
||||
import {setCurrentUser} from "../service/permission";
|
||||
|
||||
const {Title} = Typography;
|
||||
|
||||
const LoginForm = () => {
|
||||
|
||||
const navigate = useNavigate();
|
||||
|
||||
let [inLogin, setInLogin] = useState(false);
|
||||
let [branding, setBranding] = useState({});
|
||||
|
||||
@ -29,12 +33,13 @@ const LoginForm = () => {
|
||||
sessionStorage.removeItem('openKeys');
|
||||
setToken(data['token']);
|
||||
|
||||
let user = data['user'];
|
||||
let user = data['info'];
|
||||
setCurrentUser(user);
|
||||
if (user) {
|
||||
if (user['type'] === 'user') {
|
||||
window.location.href = "#/my-asset";
|
||||
navigate('/my-asset');
|
||||
} else {
|
||||
window.location.href = "#/";
|
||||
navigate('/');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -102,7 +102,6 @@ const OfflineSession = () => {
|
||||
key: 'option',
|
||||
render: (text, record, _, action) => {
|
||||
let disablePlayback = record['recording'] !== '1';
|
||||
let disableCmdRecord = record['commandCount'] === 0;
|
||||
return [
|
||||
<Show menu={'offline-session-playback'} key={'offline-session-playback'}>
|
||||
<Button
|
||||
|
Loading…
Reference in New Issue
Block a user