From 457809008d19cee99581415a56a2eac54807eed0 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Sat, 30 Nov 2019 19:57:36 +0800 Subject: [PATCH] =?UTF-8?q?Feat:=20=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=92=8C?= =?UTF-8?q?=E9=9D=9E=E4=B8=AA=E4=BA=BA=E6=96=87=E4=BB=B6=E9=A1=B5=E7=A6=81?= =?UTF-8?q?=E6=AD=A2=E6=8B=96=E6=8B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/FileManager/ObjectIcon.js | 9 ++++++++- src/component/Login/LoginForm.js | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/component/FileManager/ObjectIcon.js b/src/component/FileManager/ObjectIcon.js index 1018880..9e3fc86 100644 --- a/src/component/FileManager/ObjectIcon.js +++ b/src/component/FileManager/ObjectIcon.js @@ -11,7 +11,7 @@ import { openMusicDialog, toggleSnackbar } from "../../actions/index"; -import Folder from "./Folder"; +import statusHelper from "../../untils/page" import FileIcon from "./FileIcon"; import SmallIcon from "./SmallIcon"; import TableItem from "./TableRow"; @@ -22,6 +22,9 @@ import { makeStyles } from "@material-ui/core"; import { useDrag } from "react-dnd"; import { getEmptyImage } from 'react-dnd-html5-backend' import DropWarpper from "./DnD/DropWarpper" +import { + useLocation + } from "react-router-dom"; const useStyles = makeStyles(theme => ({ container: { @@ -41,6 +44,7 @@ export default function ObjectIcon(props) { const viewMethod = useSelector( state => state.viewUpdate.explorerViewMethod ); + let location = useLocation(); const dispatch = useDispatch(); const ContextMenu = useCallback( @@ -208,6 +212,9 @@ export default function ObjectIcon(props) { console.log(item.object,dropResult.folder); } }, + canDrag: () =>{ + return !statusHelper.isMobile() && statusHelper.isHomePage(location.pathname); + }, collect: monitor => ({ isDragging: monitor.isDragging() }) diff --git a/src/component/Login/LoginForm.js b/src/component/Login/LoginForm.js index cc8432e..36c6ff3 100644 --- a/src/component/Login/LoginForm.js +++ b/src/component/Login/LoginForm.js @@ -107,7 +107,7 @@ function LoginForm (){ if (loginCaptcha){ refreshCaptcha() } - + },[]) const login = e=>{