{
});
+ term.onData(data => {
+ let webSocket = this.state.webSocket;
+ if (webSocket !== undefined) {
+ webSocket.send(JSON.stringify({type: 'data', content: data}));
+ }
+ });
+
let token = getToken();
let webSocket = new WebSocket(wsServer + '/ssh?X-Auth-Token=' + token + '&' + paramStr);
- term.loadAddon(new AttachAddon(webSocket));
- this.props.appendWebsocket(webSocket);
+
+ this.props.appendWebsocket({'id': assetId, 'ws': webSocket});
webSocket.onopen = (e => {
- term.clear();
- term.focus();
-
- if (command !== '') {
- webSocket.send(command + String.fromCharCode(13));
- }
-
+ this.onWindowResize();
});
+ webSocket.onerror = (e) => {
+ term.writeln("Failed to connect to server.");
+ }
+ webSocket.onclose = (e) => {
+ term.writeln("Connection is closed.");
+ }
+
+ let executedCommand = false
+ webSocket.onmessage = (e) => {
+ let msg = JSON.parse(e.data);
+ switch (msg['type']) {
+ case 'data':
+ term.write(msg['content']);
+ break;
+ case 'closed':
+ term.writeln(`\x1B[1;3;31m${msg['content']}\x1B[0m `)
+ webSocket.close();
+ break;
+ }
+
+ if (!executedCommand) {
+ if (command !== '') {
+ let webSocket = this.state.webSocket;
+ if (webSocket !== undefined && webSocket.readyState === WebSocket.OPEN) {
+ webSocket.send(JSON.stringify({type: 'data', content: command + String.fromCharCode(13)}));
+ }
+ }
+ executedCommand = true;
+ }
+ }
this.setState({
term: term,
- containerWidth: width,
- containerHeight: height
+ fitAddon: fitAddon,
+ webSocket: webSocket,
+ width: width,
+ height: height
});
- // window.addEventListener('resize', this.onWindowResize);
+ window.addEventListener('resize', this.onWindowResize);
+ }
+
+ componentWillUnmount() {
+ let webSocket = this.state.webSocket;
+ if (webSocket) {
+ webSocket.close()
+ }
}
onWindowResize = (e) => {
let term = this.state.term;
- if (term) {
- const [cols, rows] = getGeometry(this.state.containerWidth, this.state.containerHeight);
- term.resize(cols, rows);
+ let fitAddon = this.state.fitAddon;
+ let webSocket = this.state.webSocket;
+ if (term && fitAddon && webSocket) {
+
+ let height = term.cols;
+ let width = term.rows;
+
+ try {
+ fitAddon.fit();
+ } catch (e) {
+ console.log(e);
+ }
+
+ term.focus();
+ if(webSocket.readyState === WebSocket.OPEN){
+ webSocket.send(JSON.stringify({type: 'resize', content: JSON.stringify({height, width})}));
+ }
}
};
render() {
return (
);
diff --git a/web/src/components/asset/Asset.js b/web/src/components/asset/Asset.js
index f54364b..be35b7b 100644
--- a/web/src/components/asset/Asset.js
+++ b/web/src/components/asset/Asset.js
@@ -249,6 +249,8 @@ class Asset extends Component {
} else {
asset['tags'] = asset['tags'].split(',');
}
+ }else {
+ asset['tags'] = [];
}
this.setState({
diff --git a/web/src/components/command/BatchCommand.js b/web/src/components/command/BatchCommand.js
index 840ed1d..18b9cd9 100644
--- a/web/src/components/command/BatchCommand.js
+++ b/web/src/components/command/BatchCommand.js
@@ -1,8 +1,10 @@
import React, {Component} from 'react';
-import {List, Card, Input, PageHeader} from "antd";
+import {Card, Input, List, PageHeader, Popconfirm} from "antd";
import Console from "../access/Console";
import {itemRender} from "../../utils/utils";
import Logout from "../user/Logout";
+import './Command.css'
+
const {Search} = Input;
const routes = [
{
@@ -25,7 +27,8 @@ class BatchCommand extends Component {
state = {
webSockets: [],
- assets: []
+ assets: [],
+ active: undefined,
}
componentDidMount() {
@@ -66,7 +69,13 @@ class BatchCommand extends Component {
{
for (let i = 0; i < this.state.webSockets.length; i++) {
- this.state.webSockets[i].send(value + String.fromCharCode(13))
+ let ws = this.state.webSockets[i]['ws'];
+ if (ws.readyState === WebSocket.OPEN) {
+ ws.send(JSON.stringify({
+ type: 'data',
+ content: value + String.fromCharCode(13)
+ }));
+ }
}
this.commandRef.current.setValue('');
}} enterButton='执行'/>
@@ -78,10 +87,23 @@ class BatchCommand extends Component {
dataSource={this.state.assets}
renderItem={item => (
-
+ {
+ if (this.state.active === item['id']) {
+ this.setState({
+ active: undefined
+ })
+ } else {
+ this.setState({
+ active: item['id']
+ })
+ }
+ }}
+ >
diff --git a/web/src/components/command/Command.css b/web/src/components/command/Command.css
new file mode 100644
index 0000000..cc9ebec
--- /dev/null
+++ b/web/src/components/command/Command.css
@@ -0,0 +1,4 @@
+.command-active {
+ box-shadow: 0 0 0 2px #1890FF;
+ outline: 2px solid #1890FF;
+}
\ No newline at end of file
diff --git a/web/src/utils/utils.js b/web/src/utils/utils.js
index f56f8d4..5e94a98 100644
--- a/web/src/utils/utils.js
+++ b/web/src/utils/utils.js
@@ -78,7 +78,7 @@ export const cloneObj = (obj, ignoreFields) => {
export function download(url) {
let aElement = document.createElement('a');
aElement.setAttribute('download', '');
- aElement.setAttribute('target', '_blank');
+ // aElement.setAttribute('target', '_blank');
aElement.setAttribute('href', url);
aElement.click();
}
@@ -176,4 +176,37 @@ export function difference(a, b) {
let aSet = new Set(a)
let bSet = new Set(b)
return Array.from(new Set(a.concat(b).filter(v => !aSet.has(v) || !bSet.has(v))))
+}
+
+export function requestFullScreen(element) {
+ // 判断各种浏览器，找到正确的方法
+ const requestMethod = element.requestFullScreen || //W3C
+ element.webkitRequestFullScreen || //FireFox
+ element.mozRequestFullScreen || //Chrome等
+ element.msRequestFullScreen; //IE11
+ if (requestMethod) {
+ requestMethod.call(element);
+ } else if (typeof window.ActiveXObject !== "undefined") { //for Internet Explorer
+ const wScript = new window.ActiveXObject("WScript.Shell");
+ if (wScript !== null) {
+ wScript.SendKeys("{F11}");
+ }
+ }
+}
+
+//退出全屏 判断浏览器种类
+export function exitFull() {
+ // 判断各种浏览器，找到正确的方法
+ const exitMethod = document.exitFullscreen || //W3C
+ document.mozCancelFullScreen || //FireFox
+ document.webkitExitFullscreen || //Chrome等
+ document.webkitExitFullscreen; //IE11
+ if (exitMethod) {
+ exitMethod.call(document);
+ } else if (typeof window.ActiveXObject !== "undefined") { //for Internet Explorer
+ const wScript = new window.ActiveXObject("WScript.Shell");
+ if (wScript !== null) {
+ wScript.SendKeys("{F11}");
+ }
+ }
}
\ No newline at end of file