From 9bf4a8e2917bdd5fd8f141872c1ec7aff67f6dd8 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Fri, 2 Feb 2024 01:29:21 +0800
Subject: [PATCH] =?UTF-8?q?:hammer:=20=E9=87=8D=E6=9E=84=E7=BB=88=E7=AB=AF?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/TerminalPreferenceModel.java        | 56 +++++++++++++++++++
 .../strategy/TerminalPreferenceStrategy.java  | 24 +++++++-
 .../src/store/modules/terminal/index.ts       |  2 +-
 .../components/layout/layout-header.vue       |  4 +-
 .../components/layout/main-content.vue        |  2 +-
 .../components/layout/terminal-panel.vue      |  6 +-
 6 files changed, 85 insertions(+), 9 deletions(-)

diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/TerminalPreferenceModel.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/TerminalPreferenceModel.java
index 5b911ca7..5dfbbf13 100644
--- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/TerminalPreferenceModel.java
+++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/TerminalPreferenceModel.java
@@ -162,6 +162,62 @@ public class TerminalPreferenceModel implements PreferenceModel {
 
     }
 
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class ActionBarSettingModel implements IJsonObject {
+
+        @Schema(description = "命令输入框")
+        private Boolean commandInput;
+
+        @Schema(description = "连接状态")
+        private Boolean connectStatus;
+
+        @Schema(description = "去顶部")
+        private Boolean toTop;
+
+        @Schema(description = "去底部")
+        private Boolean toBottom;
+
+        @Schema(description = "全选")
+        private Boolean selectAll;
+
+        @Schema(description = "搜索")
+        private Boolean search;
+
+        @Schema(description = "复制")
+        private Boolean copy;
+
+        @Schema(description = "粘贴")
+        private Boolean paste;
+
+        @Schema(description = "中断")
+        private Boolean interrupt;
+
+        @Schema(description = "回车")
+        private Boolean enter;
+
+        @Schema(description = "增大字号")
+        private Boolean fontSizePlus;
+
+        @Schema(description = "减小字号")
+        private Boolean fontSizeSubtract;
+
+        @Schema(description = "命令编辑器")
+        private Boolean commandEditor;
+
+        @Schema(description = "清空")
+        private Boolean clear;
+
+        @Schema(description = "断开连接")
+        private Boolean disconnect;
+
+        @Schema(description = "关闭终端")
+        private Boolean closeTab;
+
+    }
+
     @Data
     @Builder
     @NoArgsConstructor
diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java
index 6dbaa239..4e1e8ae1 100644
--- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java
+++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java
@@ -76,7 +76,27 @@ public class TerminalPreferenceStrategy implements IPreferenceStrategy<TerminalP
                         new TerminalPreferenceModel.ShortcutKeysModel("changeToNextTab", true, false, true, "ArrowRight", true),
                         new TerminalPreferenceModel.ShortcutKeysModel("openCopyTerminalTab", true, false, true, "KeyO", true),
                         new TerminalPreferenceModel.ShortcutKeysModel("openNewConnectTab", true, false, true, "KeyN", true)
-                        ))
+                ))
+                .build()
+                .toJsonString();
+        // 操作栏设置
+        String actionBarSetting = TerminalPreferenceModel.ActionBarSettingModel.builder()
+                .commandInput(false)
+                .connectStatus(true)
+                .toTop(true)
+                .toBottom(true)
+                .selectAll(false)
+                .search(true)
+                .copy(true)
+                .paste(true)
+                .interrupt(false)
+                .enter(false)
+                .fontSizePlus(false)
+                .fontSizeSubtract(false)
+                .commandEditor(true)
+                .clear(true)
+                .disconnect(false)
+                .closeTab(true)
                 .build()
                 .toJsonString();
         // 默认配置
@@ -84,7 +104,7 @@ public class TerminalPreferenceStrategy implements IPreferenceStrategy<TerminalP
                 .newConnectionType("group")
                 .theme(new JSONObject())
                 .displaySetting(JSONObject.parseObject(defaultDisplaySetting))
-                .actionBarSetting(new JSONObject())
+                .actionBarSetting(JSONObject.parseObject(actionBarSetting))
                 .rightMenuSetting(Lists.of("copy", "paste", "checkAll", "search", "clear"))
                 .interactSetting(JSONObject.parseObject(defaultInteractSetting))
                 .pluginsSetting(JSONObject.parseObject(defaultPluginsSetting))
diff --git a/orion-ops-ui/src/store/modules/terminal/index.ts b/orion-ops-ui/src/store/modules/terminal/index.ts
index 2a2871ad..95145b69 100644
--- a/orion-ops-ui/src/store/modules/terminal/index.ts
+++ b/orion-ops-ui/src/store/modules/terminal/index.ts
@@ -189,7 +189,7 @@ export default defineStore('terminal', {
         return;
       }
       // 获取会话
-      return this.sessionManager.getSession(tab.key);
+      return this.sessionManager.getSession(activeTab.key);
     },
 
   },
diff --git a/orion-ops-ui/src/views/host/terminal/components/layout/layout-header.vue b/orion-ops-ui/src/views/host/terminal/components/layout/layout-header.vue
index 4085f459..714dd3a4 100644
--- a/orion-ops-ui/src/views/host/terminal/components/layout/layout-header.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/layout/layout-header.vue
@@ -130,11 +130,11 @@
 
   .tab-title-wrapper {
     display: flex;
-    align-items: center;
+    align-items: stretch;
 
     .tab-title-icon {
       font-size: 16px;
-      margin-right: 4px;
+      margin-right: 6px;
     }
   }
 
diff --git a/orion-ops-ui/src/views/host/terminal/components/layout/main-content.vue b/orion-ops-ui/src/views/host/terminal/components/layout/main-content.vue
index c6093745..84c873b5 100644
--- a/orion-ops-ui/src/views/host/terminal/components/layout/main-content.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/layout/main-content.vue
@@ -71,7 +71,7 @@
       }
     } else {
       // 修改标题
-      document.title = '主机终端';
+      document.title = TerminalTabs.TERMINAL_PANEL.title;
     }
   });
 
diff --git a/orion-ops-ui/src/views/host/terminal/components/layout/terminal-panel.vue b/orion-ops-ui/src/views/host/terminal/components/layout/terminal-panel.vue
index 5c66befe..70146ec9 100644
--- a/orion-ops-ui/src/views/host/terminal/components/layout/terminal-panel.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/layout/terminal-panel.vue
@@ -37,7 +37,7 @@
     panel: ITerminalTabManager
   }>();
 
-  // FIXME 全部关闭则关闭
+  // FIXME 全部关闭展示新增
 
 </script>
 
@@ -49,11 +49,11 @@
 
   .tab-title-wrapper {
     display: flex;
-    align-items: center;
+    align-items: stretch;
 
     .tab-title-icon {
       font-size: 16px;
-      margin-right: 4px;
+      margin-right: 6px;
     }
   }