From 04327c19e307daa8b3da98b1c22ed65a1b783ee4 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Wed, 18 Dec 2024 09:49:59 +0800
Subject: [PATCH] =?UTF-8?q?:hammer:=20=E5=91=BD=E4=BB=A4=E5=8F=91=E9=80=81?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/store/modules/terminal/index.ts       | 11 +++++
 .../terminal/components/command-bar/index.vue | 47 +++++++++++++++----
 2 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/orion-visor-ui/src/store/modules/terminal/index.ts b/orion-visor-ui/src/store/modules/terminal/index.ts
index 75088f2c..60371420 100644
--- a/orion-visor-ui/src/store/modules/terminal/index.ts
+++ b/orion-visor-ui/src/store/modules/terminal/index.ts
@@ -274,6 +274,17 @@ export default defineStore('terminal', {
       }
     },
 
+    // 粘贴命令到会话
+    pasteCommandToSession(session: ISshSession | undefined, command: string, newLine: boolean = false) {
+      const handler = session?.handler;
+      if (handler && handler.enabledStatus('pasteOrigin')) {
+        if (newLine) {
+          command = `${command}\r\n`;
+        }
+        handler.pasteOrigin(command);
+      }
+    },
+
   },
 
 });
diff --git a/orion-visor-ui/src/views/host/terminal/components/command-bar/index.vue b/orion-visor-ui/src/views/host/terminal/components/command-bar/index.vue
index bd9d323a..fbc2dfff 100644
--- a/orion-visor-ui/src/views/host/terminal/components/command-bar/index.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/command-bar/index.vue
@@ -3,15 +3,26 @@
     <div class="command-header">
       <!-- 左侧按钮 -->
       <div class="command-header-left">
-        <!-- 粘贴 -->
+        <!-- 发送 -->
         <a-button size="mini"
                   class="mr8"
-                  @click="paste">
-          粘贴
+                  title="直接发送到终端"
+                  @click="write(false)">
+          发送
           <template #icon>
             <icon-send />
           </template>
         </a-button>
+        <!-- 执行 -->
+        <a-button size="mini"
+                  class="mr8"
+                  title="拼接 \r\n 后发送到终端"
+                  @click="write(true)">
+          执行
+          <template #icon>
+            <icon-thunderbolt />
+          </template>
+        </a-button>
         <!-- 清空 -->
         <a-button size="mini" @click="clear">
           清空
@@ -34,8 +45,8 @@
       <!-- 命令框 -->
       <div class="command-input">
         <a-textarea v-model="text"
-                    :auto-size="{ minRows: 3, maxRows: 3 }"
                     placeholder="输入命令, F8 发送"
+                    :auto-size="{ minRows: 3, maxRows: 3 }"
                     @keyup="checkCommandKey" />
       </div>
     </div>
@@ -49,19 +60,37 @@
 </script>
 
 <script lang="ts" setup>
+  import type { ISshSession } from '@/views/host/terminal/types/define';
   import { ref } from 'vue';
   import { useTerminalStore } from '@/store';
+  import { PanelSessionType } from '@/views/host/terminal/types/const';
+  import { Message } from '@arco-design/web-vue';
 
-  const { layoutState, appendCommandToCurrentSession } = useTerminalStore();
+  const { layoutState, sessionManager, getCurrentSession, pasteCommandToSession } = useTerminalStore();
 
   const text = ref('');
 
-  // 粘贴
-  const paste = () => {
-    appendCommandToCurrentSession(text.value);
+  // 写入
+  const write = (newLine: boolean) => {
+    if (!text.value) {
+      Message.warning('请选择输入命令');
+      return;
+    }
+    // 写入
+    writeToSession(text.value, newLine);
     text.value = '';
   };
 
+  // 写入到会话
+  const writeToSession = (command: string, newLine: boolean) => {
+    // 当前会话
+    const session = getCurrentSession(PanelSessionType.SSH.type, false);
+    // 粘贴
+    if (session) {
+      pasteCommandToSession((session as ISshSession), command, newLine);
+    }
+  };
+
   // 清空
   const clear = () => {
     text.value = '';
@@ -70,7 +99,7 @@
   // 检查命令快捷键
   const checkCommandKey = async (e: KeyboardEvent) => {
     if (text.value && e.code === 'F8') {
-      paste();
+      write(false);
     }
   };