Fix: 导航处理get参数时的错误

This commit is contained in:
HFO4 2019-11-24 14:04:44 +08:00
parent 5fe8fc788f
commit 849b37606a
3 changed files with 9 additions and 3 deletions

View File

@ -50,12 +50,12 @@ export default function App() {
<AuthRoute exact path={path}>
我是私有页面
</AuthRoute>
<AuthRoute path={`${path}Home`}>
<AuthRoute path={`${path}home`}>
<Suspense fallback={<div>Loading...</div>}>
<FileManager/>
</Suspense>
</AuthRoute>
<Route path={`${path}Login`}>
<Route path={`${path}login`}>
<Suspense fallback={<div>Loading...</div>}>
<LoginForm />
</Suspense>

View File

@ -25,6 +25,7 @@ import {
setSelectedTarget,
openCreateFolderDialog,
openShareDialog,
drawerToggleAction,
} from "../../actions/index"
import API from '../../middleware/Api'
import {setCookie,setGetParameter,fixUrlHash} from "../../untils/index"
@ -86,6 +87,9 @@ const mapDispatchToProps = dispatch => {
openShareDialog:()=>{
dispatch(openShareDialog())
},
handleDesktopToggle: open => {
dispatch(drawerToggleAction(open))
},
}
}
@ -161,6 +165,8 @@ class NavigatorCompoment extends Component {
componentDidMount = ()=>{
this.renderPath();
// 如果是在个人文件管理页,首次加载时打开侧边栏
this.props.handleDesktopToggle(true);
// 后退操作时重新导航
window.onpopstate = (event)=>{
var url = new URL(fixUrlHash(window.location.href));

View File

@ -301,7 +301,7 @@ class NavbarCompoment extends Component {
}
loadUploader() {
if (this.props.location.pathname=="/Home") {
if (pathHelper.isHomePage(this.props.location.pathname)) {
return (<Uploader queueChange={queued => this.updateQueueStatus(queued)} ref={this.UploaderRef} />)
}
}