From 4f224106d9870ff438ebe5b142c5a2b641f45107 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 4 Mar 2021 16:11:11 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9Etermail=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/cli/console.vue | 3 +- .../components/common/bottomBox/bottomBox.vue | 6 +- .../bottomBox/tabs/terminalLogMonitorTab.vue | 343 ++++++++++++++++++ .../components/common/project/topologyL5.vue | 4 +- .../components/page/config/terminallog.vue | 20 +- 5 files changed, 367 insertions(+), 9 deletions(-) create mode 100644 nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue diff --git a/nezha-fronted/src/components/cli/console.vue b/nezha-fronted/src/components/cli/console.vue index bee884e55..c6fbbf33e 100644 --- a/nezha-fronted/src/components/cli/console.vue +++ b/nezha-fronted/src/components/cli/console.vue @@ -276,7 +276,8 @@ export default { //关闭 this.terminalSocket.onclose = () =>{ //报错sorry的,还没来得及看信息就关闭 - this.$emit("closeConsole",this.terminal.name);//应该调用父窗口 + // this.$emit("closeConsole",this.terminal.name);// + this.term.setOption('disableStdin',true); }; diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue index d7b9ace0b..b46f87067 100644 --- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue +++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue @@ -34,6 +34,8 @@ + + @@ -45,6 +47,7 @@ import endpointTab from "./tabs/endpointTab"; import panelTab from "./tabs/panelTab"; import terminalLogRecordTab from "./tabs/terminalLogRecordTab"; + import terminalLogMonitorTab from "./tabs/terminalLogMonitorTab"; import terminalLogCMDTab from "./tabs/terminalLogCMDTab"; export default { @@ -56,7 +59,8 @@ 'endpoint-tab': endpointTab, 'panel-tab': panelTab, terminalLogRecordTab, - 'terminal-log-cmd-tab': terminalLogCMDTab + 'terminal-log-cmd-tab': terminalLogCMDTab, + terminalLogMonitorTab }, props: { isFullScreen: false, //是否全屏 diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue new file mode 100644 index 000000000..75abf0c3e --- /dev/null +++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue @@ -0,0 +1,343 @@ + + + + + diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index d2056bc5a..3b5601fa2 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -375,7 +375,7 @@ -
+
@@ -1477,7 +1477,7 @@ case 'space': case 'scale': case 'translate': - this.getNodesArr(); + this.getNodesArr(); // if(!this.timer2){ // this.timer2=setTimeout(()=>{ // this.getNodesArr(); diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue index 1bc108b89..78d925e51 100644 --- a/nezha-fronted/src/components/page/config/terminallog.vue +++ b/nezha-fronted/src/components/page/config/terminallog.vue @@ -64,7 +64,7 @@