evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复接入时弹出文件管理导致无法输出的bug

Browse Source
This commit is contained in:
dushixiang 2021-02-12 19:58:57 +08:00
parent a6a97ad502
commit e1f76105e7
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go.sum
View File

@ -184,6 +184,7 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E= github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E=
github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk= github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk=

26
web/src/common/constants.js
View File

@ -1,19 +1,19 @@
// prod // prod
let wsPrefix; // let wsPrefix;
if (window.location.protocol === 'https:') { // if (window.location.protocol === 'https:') {
wsPrefix = 'wss:' // wsPrefix = 'wss:'
} else { // } else {
wsPrefix = 'ws:' // wsPrefix = 'ws:'
} // }
//
export const server = ''; // export const server = '';
export const wsServer = wsPrefix + window.location.host; // export const wsServer = wsPrefix + window.location.host;
export const prefix = window.location.protocol + '//' + window.location.host; // export const prefix = window.location.protocol + '//' + window.location.host;
// dev // dev
// export const server = '//127.0.0.1:8088'; export const server = '//127.0.0.1:8088';
// export const wsServer = 'ws://127.0.0.1:8088'; export const wsServer = 'ws://127.0.0.1:8088';
// export const prefix = ''; export const prefix = '';
export const PROTOCOL_COLORS = { export const PROTOCOL_COLORS = {
'rdp': 'red', 'rdp': 'red',

10
web/src/components/access/Access.js
View File

@ -47,7 +47,8 @@ class Access extends Component {
uploadLoading: false, uploadLoading: false,
startTime: new Date(), startTime: new Date(),
fullScreen: false, fullScreen: false,
fullScreenBtnText: '进入全屏' fullScreenBtnText: '进入全屏',
sink: undefined
}; };
async componentDidMount() { async componentDidMount() {
@ -434,6 +435,7 @@ class Access extends Component {
containerWidth: width, containerWidth: width,
containerHeight: height, containerHeight: height,
keyboard: keyboard, keyboard: keyboard,
sink: sink
}); });
} }
@ -622,6 +624,9 @@ class Access extends Component {
closable={true} closable={true}
// maskClosable={false} // maskClosable={false}
onClose={() => { onClose={() => {
if (this.state.sink) {
this.state.sink.focus();
}
this.setState({ this.setState({
fileSystemVisible: false fileSystemVisible: false
}); });
@ -666,6 +671,9 @@ class Access extends Component {
}} }}
confirmLoading={this.state.confirmLoading} confirmLoading={this.state.confirmLoading}
onCancel={() => { onCancel={() => {
if (this.state.sink) {
this.state.sink.focus();
}
this.setState({ this.setState({
clipboardVisible: false clipboardVisible: false
}) })

2
web/src/components/session/OnlineSession.js
View File

@ -280,7 +280,7 @@ class OnlineSession extends Component {
return ( return (
<div> <div>
<Button type="link" size='small' onClick={() => { <Button type="link" size='small' disabled={record['mode'] === 'naive'} onClick={() => {
this.showMonitor(record) this.showMonitor(record)
}}>监控</Button> }}>监控</Button>
<Button type="link" size='small' onClick={async () => { <Button type="link" size='small' onClick={async () => {