From 287a8eb0f5675e2aa045e99fae9c0d5f7a19a7c7 Mon Sep 17 00:00:00 2001
From: dushixiang <798148596@qq.com>
Date: Mon, 18 Jan 2021 20:26:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E9=80=81=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E9=94=AE=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/access/Access.js          | 82 +++++++++++++-------
 web/src/components/asset/AssetModal.js       |  1 -
 web/src/components/session/OfflineSession.js |  2 -
 3 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/web/src/components/access/Access.js b/web/src/components/access/Access.js
index d671569..8dc2328 100644
--- a/web/src/components/access/Access.js
+++ b/web/src/components/access/Access.js
@@ -7,8 +7,10 @@ import {
     Card,
     Col,
     Drawer,
+    Dropdown,
     Form,
     Input,
+    Menu,
     message,
     Modal,
     Row,
@@ -21,22 +23,26 @@ import qs from "qs";
 import request from "../../common/request";
 import {server, wsServer} from "../../common/constants";
 import {
+    AppstoreTwoTone,
     CloudDownloadOutlined,
     CloudUploadOutlined,
+    CopyOutlined,
     DeleteOutlined,
+    DesktopOutlined,
+    FileZipOutlined,
     FolderAddOutlined,
     LoadingOutlined,
     ReloadOutlined,
     UploadOutlined
 } from '@ant-design/icons';
-import CopyOutlined from "@ant-design/icons/lib/icons/CopyOutlined";
-import FolderOpenOutlined from "@ant-design/icons/lib/icons/FolderOpenOutlined";
 import Upload from "antd/es/upload";
 import {download, getToken} from "../../utils/utils";
 import './Access.css'
+import Draggable from 'react-draggable';
 
 const {TextArea} = Input;
 const {DirectoryTree} = Tree;
+const {SubMenu} = Menu;
 
 const STATE_IDLE = 0;
 const STATE_CONNECTING = 1;
@@ -339,6 +345,7 @@ class Access extends Component {
             return true;
         }
 
+        console.log(keysym)
         this.state.client.sendKeyEvent(1, keysym);
         if (keysym === 65288) {
             return false;
@@ -763,6 +770,15 @@ class Access extends Component {
         });
     }
 
+    sendCombinationKey = (keys) => {
+        for (let i = 0; i < keys.length; i++) {
+            this.state.client.sendKeyEvent(1, keys[i]);
+        }
+        for (let j = 0; j < keys.length; j++) {
+            this.state.client.sendKeyEvent(0, keys[j]);
+        }
+    }
+
     render() {
 
         const title = (
@@ -799,6 +815,23 @@ class Access extends Component {
             </Row>
         );
 
+        const menu = (
+            <Menu>
+                <Menu.Item key="1" icon={<CopyOutlined/>} onClick={this.showClipboard}>
+                    剪贴板
+                </Menu.Item>
+                <Menu.Item key="2" icon={<FileZipOutlined/>} onClick={this.showFileSystem}>
+                    文件管理
+                </Menu.Item>
+                <SubMenu title="发送快捷键" icon={<DesktopOutlined/>}>
+                    <Menu.Item
+                        onClick={() => this.sendCombinationKey(['65507', '65513', '65535'])}>Ctrl+Alt+Delete</Menu.Item>
+                    <Menu.Item
+                        onClick={() => this.sendCombinationKey(['65507', '65513', '65288'])}>Ctrl+Alt+Backspace</Menu.Item>
+                </SubMenu>
+            </Menu>
+        );
+
         return (
             <div>
 
@@ -850,32 +883,29 @@ class Access extends Component {
                     </Upload>
                 </Modal>
 
-                <Affix style={{position: 'absolute', top: 50, right: 100}}>
-                    <Button
-                        shape="circle"
-                        icon={<CopyOutlined/>}
-                        onClick={() => {
-                            this.showClipboard();
-                        }}
-                    >
-                    </Button>
 
-                </Affix>
+                <Draggable>
+                    <Affix style={{position: 'absolute', top: 50, right: 100}}>
+                        <Dropdown overlay={menu} trigger={['click']} placement="bottomLeft">
+                            <Button icon={<AppstoreTwoTone/>}/>
+                        </Dropdown>
+                    </Affix>
+                </Draggable>
 
-                {
-                    this.state.protocol === 'ssh' || this.state.protocol === 'rdp' ?
-                        <Affix style={{position: 'absolute', top: 50, right: 50}}>
-                            <Button
-                                shape="circle"
-                                icon={<FolderOpenOutlined/>}
-                                onClick={() => {
-                                    this.showFileSystem();
-                                }}
-                            >
-                            </Button>
-                        </Affix>
-                        : null
-                }
+                {/*{*/}
+                {/*    this.state.protocol === 'ssh' || this.state.protocol === 'rdp' ?*/}
+                {/*        <Affix style={{position: 'absolute', top: 50, right: 50}}>*/}
+                {/*            <Button*/}
+                {/*                shape="circle"*/}
+                {/*                icon={<FolderOpenOutlined/>}*/}
+                {/*                onClick={() => {*/}
+                {/*                    this.showFileSystem();*/}
+                {/*                }}*/}
+                {/*            >*/}
+                {/*            </Button>*/}
+                {/*        </Affix>*/}
+                {/*        : null*/}
+                {/*}*/}
 
 
                 <Drawer
diff --git a/web/src/components/asset/AssetModal.js b/web/src/components/asset/AssetModal.js
index cc7427a..79cbda6 100644
--- a/web/src/components/asset/AssetModal.js
+++ b/web/src/components/asset/AssetModal.js
@@ -1,6 +1,5 @@
 import React, {useState} from 'react';
 import {Form, Input, InputNumber, Modal, Radio, Select, Tooltip} from "antd/lib/index";
-import {isEmpty} from "../../utils/utils";
 
 const {TextArea} = Input;
 const {Option} = Select;
diff --git a/web/src/components/session/OfflineSession.js b/web/src/components/session/OfflineSession.js
index 6a5cf15..d923d09 100644
--- a/web/src/components/session/OfflineSession.js
+++ b/web/src/components/session/OfflineSession.js
@@ -281,10 +281,8 @@ class OfflineSession extends Component {
                 key: 'action',
                 render: (text, record) => {
                     let disabled = true;
-                    let color = '#d9d9d9'
                     if (record['recording'] && record['recording'] === '1') {
                         disabled = false
-                        color = ''
                     }
 
                     return (