From 419b364c9e06e9fdd23cec6ad99ef1023e8824b7 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Tue, 16 Jan 2024 09:59:27 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=20=E5=8F=B3=E9=94=AE=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xterm/terminal-context-menu.vue           |  8 ++---
 .../components/xterm/terminal-view.vue        | 30 ++-----------------
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/orion-ops-ui/src/views/host/terminal/components/xterm/terminal-context-menu.vue b/orion-ops-ui/src/views/host/terminal/components/xterm/terminal-context-menu.vue
index 5683d530..cbc38158 100644
--- a/orion-ops-ui/src/views/host/terminal/components/xterm/terminal-context-menu.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/xterm/terminal-context-menu.vue
@@ -8,10 +8,10 @@
     <!-- 终端插槽 -->
     <slot />
     <!-- 右键菜单 -->
-    <template v-if="preference.interactSetting.enableRightClickMenu" #content>
+    <template v-if="session && preference.interactSetting.enableRightClickMenu" #content>
       <a-doption v-for="(action, index) in actions"
                  :key="index"
-                 :disabled="enabledStatus[action.item] === false"
+                 :disabled="!session.handler.enabledStatus(action.item)"
                  @click="emits('click', action.item)">
         <!-- 图标 -->
         <div class="action-icon">
@@ -31,12 +31,12 @@
 </script>
 
 <script lang="ts" setup>
-  import type { ContextMenuItem } from '../../types/terminal.type';
+  import type { ContextMenuItem, ITerminalSession } from '../../types/terminal.type';
   import { ActionBarItems } from '../../types/terminal.const';
   import { useTerminalStore } from '@/store';
 
   defineProps<{
-    enabledStatus: Record<string, boolean | undefined>
+    session: ITerminalSession | undefined
   }>();
 
   const emits = defineEmits(['click']);
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 bd892d41..57ad48a0 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
@@ -37,8 +37,8 @@
       </div>
     </div>
     <!-- 终端右键菜单 -->
-    <terminal-context-menu :enabled-status="actionsEnabledStatus"
-                           @click="action => actionsClickHandler[action] && actionsClickHandler[action]()">
+    <terminal-context-menu :session="session"
+                           @click="doTerminalHandle">
       <!-- 终端容器 -->
       <div class="terminal-wrapper"
            :style="{ background: preference.theme.schema.background }">
@@ -84,7 +84,7 @@
 
   const { copy } = useCopy();
   const { getDictValue } = useDictStore();
-  const { preference, tabManager, sessionManager } = useTerminalStore();
+  const { preference, sessionManager } = useTerminalStore();
 
   const editorModal = ref();
   const searchModal = ref();
@@ -123,36 +123,12 @@
     session.value?.find(word, next, options);
   };
 
-  // 操作启用状态
-  const actionsEnabledStatus = computed<Record<string, boolean | undefined>>(() => {
-    return {
-      paste: !!session.value?.canWrite,
-      interrupt: !!session.value?.canWrite,
-      enter: !!session.value?.canWrite,
-      commandEditor: !!session.value?.canWrite,
-      disconnect: !!session.value?.connected,
-    };
-  });
-
   // 执行终端操作
   const doTerminalHandle = (handle: string) => {
-    // 处理器
     const handler = session.value?.handler[handle as keyof ITerminalSessionHandler] as () => void;
     handler && handler.call(session.value?.handler);
   };
 
-  // 操作点击逻辑
-  const actionsClickHandler: Record<string, () => void> = {
-    // 搜索
-    search: () => searchModal.value.toggle(),
-    // 命令编辑器
-    commandEditor: () => editorModal.value.open('', ''),
-    // 断开连接
-    disconnect: () => session.value?.disconnect(),
-    // 关闭
-    close: () => tabManager.deleteTab(props.tab.key),
-  };
-
   // 右侧操作
   const rightActions = computed<Array<SidebarAction>>(() => {
     return ActionBarItems.map(s => {