From 0bb7b5bc625dada20d29c1620f2e85a93ace1641 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Tue, 9 Jan 2024 01:19:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=88=E7=AB=AF=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E6=8C=87=E4=BB=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- orion-ops-ui/src/assets/style/global.less | 14 ++- .../host/terminal/assets/styles/layout.less | 5 + .../components/layout/icon-actions.vue | 6 +- .../components/xterm/terminal-view.vue | 119 +++++++++++++----- .../handler/terminal-output-processor.ts | 4 + .../host/terminal/handler/terminal-session.ts | 25 +++- .../host/terminal/types/terminal.const.ts | 21 +++- .../host/terminal/types/terminal.type.ts | 8 +- sql/init-2-schema-tables.sql | 2 +- sql/init-3-data.sql | 18 ++- 10 files changed, 173 insertions(+), 49 deletions(-) diff --git a/orion-ops-ui/src/assets/style/global.less b/orion-ops-ui/src/assets/style/global.less index 1843d421..13699293 100644 --- a/orion-ops-ui/src/assets/style/global.less +++ b/orion-ops-ui/src/assets/style/global.less @@ -252,7 +252,7 @@ body { } ::-webkit-scrollbar-track { - background-color: var(--color-neutral-1); + background-color: var(--color-fill-1); border-radius: 8px; } @@ -260,9 +260,13 @@ body { border: 1px solid transparent; background-clip: padding-box; border-radius: 8px; - background-color: var(--color-neutral-5); + background-color: var(--color-fill-4); - &:hover { - background-color: var(--color-neutral-6); - } + //&:hover { + // background-color: var(--color-neutral-6); + //} +} + +::-webkit-scrollbar-corner { + display: none; } diff --git a/orion-ops-ui/src/views/host/terminal/assets/styles/layout.less b/orion-ops-ui/src/views/host/terminal/assets/styles/layout.less index 9768e2e0..0c97fbac 100644 --- a/orion-ops-ui/src/views/host/terminal/assets/styles/layout.less +++ b/orion-ops-ui/src/views/host/terminal/assets/styles/layout.less @@ -189,7 +189,12 @@ body[terminal-theme='dark'] .host-layout { &:hover { background: var(--color-sidebar-icon-bg); } + + &.disabled-item { + cursor: not-allowed; + } } + } // 终端设置容器 diff --git a/orion-ops-ui/src/views/host/terminal/components/layout/icon-actions.vue b/orion-ops-ui/src/views/host/terminal/components/layout/icon-actions.vue index 823169d2..45080c08 100644 --- a/orion-ops-ui/src/views/host/terminal/components/layout/icon-actions.vue +++ b/orion-ops-ui/src/views/host/terminal/components/layout/icon-actions.vue @@ -7,10 +7,10 @@ content-class="terminal-tooltip-content" arrow-class="terminal-tooltip-arrow" :content="action.content"> -
+
+ :class="[iconClass, action.disabled !== false ? '' : 'disabled-item']" + @click="action.disabled !== false ? action.click() : false">
diff --git a/orion-ops-ui/src/views/host/terminal/components/xterm/terminal-view.vue b/orion-ops-ui/src/views/host/terminal/components/xterm/terminal-view.vue index 343e9b2a..c0cb1bd2 100644 --- a/orion-ops-ui/src/views/host/terminal/components/xterm/terminal-view.vue +++ b/orion-ops-ui/src/views/host/terminal/components/xterm/terminal-view.vue @@ -3,7 +3,7 @@
@@ -17,16 +17,27 @@
+ + + +
@@ -41,11 +52,11 @@