From 3a8eac4d4a322f4dfb7001e1eba83cfc799f6526 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Tue, 23 Jul 2024 10:47:59 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E9=87=8D=E6=9E=84=E7=BB=88=E7=AB=AF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../host/terminal/enums/OutputTypeEnum.java | 6 +-- .../resources/mapper/HostConfigMapper.xml | 45 ------------------- .../components/layout/terminal-panel.vue | 18 ++++++-- .../display/terminal-display-block.vue | 6 ++- .../host/terminal/components/ssh/ssh-view.vue | 4 +- 5 files changed, 25 insertions(+), 54 deletions(-) delete mode 100644 orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostConfigMapper.xml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/OutputTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/OutputTypeEnum.java index ac768b04..413e56ca 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/OutputTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/OutputTypeEnum.java @@ -43,7 +43,7 @@ public enum OutputTypeEnum { /** * SFTP 文件列表 */ - SFTP_LIST("ls", "${type}|${sessionId}|${path}|${result}|${body}"), + SFTP_LIST("ls", "${type}|${sessionId}|${path}|${result}|${msg}|${body}"), /** * SFTP 创建文件夹 @@ -78,12 +78,12 @@ public enum OutputTypeEnum { /** * SFTP 下载文件夹展开文件 */ - SFTP_DOWNLOAD_FLAT_DIRECTORY("df", "${type}|${sessionId}|${currentPath}|${body}"), + SFTP_DOWNLOAD_FLAT_DIRECTORY("df", "${type}|${sessionId}|${currentPath}|${result}|${msg}|${body}"), /** * SFTP 获取文件内容 */ - SFTP_GET_CONTENT("gc", "${type}|${sessionId}|${path}|${result}|${content}"), + SFTP_GET_CONTENT("gc", "${type}|${sessionId}|${path}|${result}|${msg}|${content}"), /** * SFTP 修改文件内容 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostConfigMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostConfigMapper.xml deleted file mode 100644 index c55c6962..00000000 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostConfigMapper.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - id, host_id, type, status, config, version, create_time, update_time, creator, updater, deleted - - - - UPDATE host_config - SET version = version + 1, - config = JSON_REMOVE(config, '$.keyId') - WHERE deleted = 0 - - JSON_CONTAINS(config, JSON_OBJECT('keyId', #{item})) - - - - - UPDATE host_config - SET version = version + 1, - config = JSON_REMOVE(config, '$.identityId') - WHERE deleted = 0 - - JSON_CONTAINS(config, JSON_OBJECT('identityId', #{item})) - - - - diff --git a/orion-visor-ui/src/views/host/terminal/components/layout/terminal-panel.vue b/orion-visor-ui/src/views/host/terminal/components/layout/terminal-panel.vue index b14961cf..f9a5c2b8 100644 --- a/orion-visor-ui/src/views/host/terminal/components/layout/terminal-panel.vue +++ b/orion-visor-ui/src/views/host/terminal/components/layout/terminal-panel.vue @@ -119,12 +119,12 @@ margin-right: 8px; .extra-icon { - color: var(--color-panel-text-2); + color: var(--color-panel-text-1); transition: 0.2s; font-size: 16px; cursor: pointer; - width: 20px; - height: 20px; + width: 24px; + height: 24px; display: flex; align-items: center; justify-content: center; @@ -149,6 +149,18 @@ &::-webkit-scrollbar { display: none; } + + .arco-tabs-content-list { + height: 100%; + } + + .arco-tabs-content-item { + height: 100%; + } + + .arco-tabs-pane { + height: 100%; + } } } diff --git a/orion-visor-ui/src/views/host/terminal/components/setting/display/terminal-display-block.vue b/orion-visor-ui/src/views/host/terminal/components/setting/display/terminal-display-block.vue index 05d34cf9..3ca331d3 100644 --- a/orion-visor-ui/src/views/host/terminal/components/setting/display/terminal-display-block.vue +++ b/orion-visor-ui/src/views/host/terminal/components/setting/display/terminal-display-block.vue @@ -119,9 +119,10 @@ import type { TerminalDisplaySetting } from '@/store/modules/terminal/types'; import { ref, watch, onMounted } from 'vue'; import { useDictStore, useTerminalStore } from '@/store'; - import { fontFamilyKey, fontSizeKey, fontWeightKey, fontFamilySuffix, cursorStyleKey } from '../../../types/terminal.const'; + import { fontFamilyKey, fontSizeKey, fontWeightKey, cursorStyleKey } from '../../../types/terminal.const'; import { labelFilter } from '@/types/form'; import { TerminalPreferenceItem } from '@/store/modules/terminal'; + import { defaultFontFamily } from '@/types/xterm'; import TerminalExample from '../terminal-example.vue'; const { toOptions, toRadioOptions } = useDictStore(); @@ -142,7 +143,8 @@ // 修改预览终端配置 Object.keys(v).forEach(key => { if (key === 'fontFamily') { - options[key] = (formModel.value as any)[key] + fontFamilySuffix; + const fontFamily = (formModel.value as any)[key]; + options[key] = fontFamily === '_' ? defaultFontFamily : `${fontFamily}, ${defaultFontFamily}`; } else { options[key] = (formModel.value as any)[key]; } diff --git a/orion-visor-ui/src/views/host/terminal/components/ssh/ssh-view.vue b/orion-visor-ui/src/views/host/terminal/components/ssh/ssh-view.vue index dd2ff59e..a4249241 100644 --- a/orion-visor-ui/src/views/host/terminal/components/ssh/ssh-view.vue +++ b/orion-visor-ui/src/views/host/terminal/components/ssh/ssh-view.vue @@ -157,7 +157,7 @@ .ssh-container { width: 100%; - height: calc(100vh - var(--header-height) - var(--panel-nav-height)); + height: 100%; position: relative; } @@ -183,6 +183,7 @@ height: 100%; display: inline-flex; align-items: center; + user-select: none; .address-copy { display: none; @@ -207,6 +208,7 @@ .command-input { width: 36%; + user-select: none; } }