From 70e7b1d544081ed1f19d1af08bfa61602eabef03 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Wed, 7 Aug 2024 10:18:39 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E6=94=B9=E7=BB=88=E7=AB=AF?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A2=9C=E8=89=B2=E6=98=BE=E7=A4=BA.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/host/jsch/SessionStores.java      |  2 ++
 .../components/exec/log/panel/log-item.vue    |  2 +-
 .../{xtrem => xterm}/search-modal/index.vue   |  0
 orion-visor-ui/src/types/xterm.ts             |  2 +-
 .../components/layout/layout-header.vue       |  1 +
 .../components/layout/terminal-panel.vue      | 33 ++++++++++++++++---
 .../display/terminal-display-block.vue        |  4 +--
 .../setting/extra/label-setting-form.vue      |  2 +-
 .../host/terminal/components/ssh/ssh-view.vue | 23 ++++---------
 .../src/views/host/terminal/index.vue         |  6 ++--
 10 files changed, 47 insertions(+), 28 deletions(-)
 rename orion-visor-ui/src/components/{xtrem => xterm}/search-modal/index.vue (100%)

diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionStores.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionStores.java
index 117d2bc0..08879f71 100644
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionStores.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionStores.java
@@ -5,6 +5,7 @@ import com.orion.lang.exception.argument.InvalidArgumentException;
 import com.orion.lang.utils.Exceptions;
 import com.orion.lang.utils.Strings;
 import com.orion.net.host.SessionHolder;
+import com.orion.net.host.SessionLogger;
 import com.orion.net.host.SessionStore;
 import com.orion.visor.framework.common.constant.Const;
 import com.orion.visor.framework.common.utils.CryptoUtils;
@@ -40,6 +41,7 @@ public class SessionStores {
             CURRENT_ADDRESS.set(address);
             // 创建会话
             SessionHolder sessionHolder = SessionHolder.create();
+            sessionHolder.setLogger(SessionLogger.INFO);
             SessionStore session = createSessionStore(conn, sessionHolder);
             // 连接
             session.connect();
diff --git a/orion-visor-ui/src/components/exec/log/panel/log-item.vue b/orion-visor-ui/src/components/exec/log/panel/log-item.vue
index 6c68ea84..4ea0ff37 100644
--- a/orion-visor-ui/src/components/exec/log/panel/log-item.vue
+++ b/orion-visor-ui/src/components/exec/log/panel/log-item.vue
@@ -175,7 +175,7 @@
   import { downloadExecCommandLogFile } from '@/api/exec/exec-command-log';
   import { downloadExecJobLogFile } from '@/api/job/exec-job-log';
   import { downloadFile } from '@/utils/file';
-  import XtermSearchModal from '@/components/xtrem/search-modal/index.vue';
+  import XtermSearchModal from '@/components/xterm/search-modal/index.vue';
   import '@xterm/xterm/css/xterm.css';
 
   const props = defineProps<{
diff --git a/orion-visor-ui/src/components/xtrem/search-modal/index.vue b/orion-visor-ui/src/components/xterm/search-modal/index.vue
similarity index 100%
rename from orion-visor-ui/src/components/xtrem/search-modal/index.vue
rename to orion-visor-ui/src/components/xterm/search-modal/index.vue
diff --git a/orion-visor-ui/src/types/xterm.ts b/orion-visor-ui/src/types/xterm.ts
index 5263574b..7553d814 100644
--- a/orion-visor-ui/src/types/xterm.ts
+++ b/orion-visor-ui/src/types/xterm.ts
@@ -8,7 +8,7 @@ import type { ImageAddon } from '@xterm/addon-image';
 import type { Unicode11Addon } from '@xterm/addon-unicode11';
 
 // 默认字体
-export const defaultFontFamily = 'Courier New, Monaco, courier, monospace';
+export const defaultFontFamily = 'Consolas, Courier New, Monaco, courier, monospace';
 
 // 默认主题
 export const defaultTheme = {
diff --git a/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue b/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue
index fc502550..3d8fccef 100644
--- a/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue
@@ -199,6 +199,7 @@
       height: var(--header-height);
       display: flex;
       align-items: center;
+      transition: all .3s;
 
       &::before {
         display: none;
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 5d31bf94..77eaac7b 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
@@ -11,7 +11,10 @@
       <!-- 右侧按钮 -->
       <template #extra>
         <a-space class="panel-extra">
-          <span class="extra-icon" @click="close">
+          <!-- 关闭 -->
+          <span class="extra-icon"
+                title="关闭面板"
+                @click="close">
             <icon-close />
           </span>
         </a-space>
@@ -21,7 +24,10 @@
         <!-- 标题 -->
         <template #title>
           <span class="tab-title-wrapper usn"
-                :style="{ 'border-bottom': `2px ${tab.color || 'transparent'} solid` }"
+                :style="{
+                  '--color': getDictValue(tabColorKey, tab.color, 'color', 'transparent'),
+                  '--bg': panel.active === tab.key ? getDictValue(tabColorKey, tab.color, 'bg', 'transparent') : 'transparent',
+                }"
                 @dblclick="copySession(tab, index)">
             <span class="tab-title-icon">
               <component :is="tab.icon" />
@@ -47,8 +53,8 @@
 <script lang="ts" setup>
   import type { ISshSession, ITerminalTabManager, TerminalPanelTabItem } from '../../types/define';
   import { watch } from 'vue';
-  import { useTerminalStore } from '@/store';
-  import { PanelSessionType } from '../../types/const';
+  import { useDictStore, useTerminalStore } from '@/store';
+  import { tabColorKey, PanelSessionType } from '../../types/const';
   import SshView from '../ssh/ssh-view.vue';
   import SftpView from '../sftp/sftp-view.vue';
 
@@ -60,6 +66,7 @@
   const emits = defineEmits(['close', 'openNewConnect']);
 
   const { sessionManager, copySession } = useTerminalStore();
+  const { getDictValue } = useDictStore();
 
   // 监听 tab 切换
   watch(() => props.panel.active, (active, before) => {
@@ -107,12 +114,28 @@
     display: flex;
     align-items: center;
     padding: 11px 18px 9px 14px;
-    margin: 0 2px;
+    background: var(--bg);
+    position: relative;
+    transition: all .3s;
 
     .tab-title-icon {
       font-size: 16px;
       margin-right: 6px;
     }
+
+    &:hover{
+      filter: brightness(1.04);
+    }
+
+    &::after {
+      content: '';
+      width: calc(100% - 3px);
+      height: 2px;
+      background: var(--color);
+      position: absolute;
+      left: 1px;
+      bottom: -1px;
+    }
   }
 
   .panel-extra {
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 dcfbd38f..5c4ca5a5 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
@@ -22,11 +22,11 @@
                         :filter-option="labelFilter">
                 <!-- label -->
                 <template #label="{ data }">
-                  <span :style="{ fontFamily: data.value }">{{ data.label }}</span>
+                  <span :style="{ fontFamily: data.value === '_' ? defaultFontFamily : data.value }">{{ data.label }}</span>
                 </template>
                 <!-- 选项 -->
                 <template #option="{ data }">
-                  <span :style="{ fontFamily: data.value }">{{ data.label }}</span>
+                  <span :style="{ fontFamily: data.value === '_' ? defaultFontFamily : data.value }">{{ data.label }}</span>
                 </template>
               </a-select>
             </a-form-item>
diff --git a/orion-visor-ui/src/views/host/terminal/components/setting/extra/label-setting-form.vue b/orion-visor-ui/src/views/host/terminal/components/setting/extra/label-setting-form.vue
index fd5e7356..94f83366 100644
--- a/orion-visor-ui/src/views/host/terminal/components/setting/extra/label-setting-form.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/setting/extra/label-setting-form.vue
@@ -17,7 +17,7 @@
       <template v-for="color in toOptions(tabColorKey)">
         <div class="color-wrapper"
              :class="[formModel.color === color.value ? 'selected-color' : '']"
-             :style="{ '--color': `${color.value}` }"
+             :style="{ '--color': `${color.color}` }"
              @click="clickColor(color.value as string)">
           <div class="color-item">
             <div class="color-item-dot" />
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 fb308e1e..c6490247 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
@@ -6,9 +6,10 @@
       <div class="ssh-header-left">
         <!-- 主机地址 -->
         <span class="address-wrapper">
-          {{ tab.address }}
-          <span class="address-copy copy-right" title="复制" @click="copy(tab.address as string)">
-            <icon-copy />
+          <span class="text-copy"
+                :title="tab.address"
+                @click="copy(tab.address as string, true)">
+            {{ tab.address }}
           </span>
         </span>
       </div>
@@ -79,7 +80,7 @@
   import IconActions from '../layout/icon-actions.vue';
   import SshContextMenu from './ssh-context-menu.vue';
   import SftpUploadModal from '../sftp/sftp-upload-modal.vue';
-  import XtermSearchModal from '@/components/xtrem/search-modal/index.vue';
+  import XtermSearchModal from '@/components/xterm/search-modal/index.vue';
 
   const props = defineProps<{
     tab: TerminalPanelTabItem;
@@ -182,7 +183,7 @@
     }
 
     &-left {
-      width: 34%;
+      width: 25%;
 
       .address-wrapper {
         height: 100%;
@@ -190,16 +191,6 @@
         align-items: center;
         user-select: none;
 
-        .address-copy {
-          display: none;
-        }
-
-        &:hover {
-          .address-copy {
-            display: unset;
-          }
-        }
-
         &:before {
           content: 'IP:';
           padding-right: 4px;
@@ -208,7 +199,7 @@
     }
 
     &-right {
-      width: 66%;
+      width: 75%;
       justify-content: flex-end;
 
       .command-input {
diff --git a/orion-visor-ui/src/views/host/terminal/index.vue b/orion-visor-ui/src/views/host/terminal/index.vue
index 85eb5790..bb1fa5f9 100644
--- a/orion-visor-ui/src/views/host/terminal/index.vue
+++ b/orion-visor-ui/src/views/host/terminal/index.vue
@@ -157,12 +157,14 @@
   onUnmounted(() => {
     // 卸载时清除 cache
     useCacheStore().reset('authorizedHostKeys', 'authorizedHostIdentities', 'commandSnippetGroups', 'pathBookmarkGroups');
-    // 移除关闭视口事件
-    window.removeEventListener('beforeunload', handleBeforeUnload);
     // 去除 body style
     document.body.removeAttribute('terminal-theme');
     // 重置 title
     document.title = originTitle;
+    // 移除关闭视口事件
+    if (!debug) {
+      window.removeEventListener('beforeunload', handleBeforeUnload);
+    }
   });
 
 </script>