Merge branch 'SHITianhao-mac_select_all'

cloudreve · Apr 29, 2020 · d752e26 · d752e26
2 parents 19138ac + 80e0b6e
commit d752e26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/component/FileManager/Explorer.js b/src/component/FileManager/Explorer.js
@@ -16,6 +16,7 @@ import SadIcon from "@material-ui/icons/SentimentVeryDissatisfied";
 import classNames from "classnames";
 import ImgPreivew from "./ImgPreview";
 import pathHelper from "../../utils/page";
+import { isMac } from "../../utils"
 import { withRouter } from "react-router-dom";
 import {
     Table,
@@ -177,7 +178,7 @@ class ExplorerCompoment extends Component {
         super();
         this.keyMap = {
             DELETE_FILE: "del",
-            SELECT_ALL: "ctrl+a"
+            SELECT_ALL: `${isMac() ? 'command' : 'ctrl'}+a`
         };
 
         this.handlers = {

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -188,4 +188,8 @@ export function getNumber(base,conditions){
         }
     })
     return base
+}
+
+export const isMac = () => {
+  return "MACINTEL" === navigator.platform.toUpperCase()
 }