From fc81c788490e3745a6731aee1f17de5efcfc7bf1 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Fri, 8 Dec 2023 19:05:00 +0800
Subject: [PATCH] =?UTF-8?q?feat.=20=E7=BB=88=E7=AB=AF=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infra/enums/PreferenceTypeEnum.java       |  5 ++
 ...eModel.java => SystemPreferenceModel.java} |  2 +-
 .../model/TerminalPreferenceModel.java        | 32 +++++++++
 .../strategy/SystemPreferenceStrategy.java    |  8 +--
 .../strategy/TerminalPreferenceStrategy.java  | 26 +++++++
 orion-ops-ui/src/store/index.ts               |  2 +
 orion-ops-ui/src/store/modules/cache/index.ts |  2 -
 .../src/store/modules/terminal/index.ts       | 68 +++++++++++++++++++
 .../src/store/modules/terminal/types.ts       | 50 ++++++++++++++
 .../components/layout/icon-actions.vue        |  2 +-
 .../components/layout/terminal-content.vue    | 20 ++----
 .../components/layout/terminal-header.vue     |  2 +-
 .../layout/terminal-left-sidebar.vue          | 11 +--
 .../layout/terminal-right-sidebar.vue         |  2 +-
 .../{ => theme-setting}/terminal-example.vue  | 10 +--
 .../terminal-theme-setting.vue                | 51 ++++++++------
 .../src/views/host-ops/terminal/index.vue     | 55 ++++++---------
 .../{terminal.type.ts => terminal.const.ts}   | 15 +---
 .../host-ops/terminal/types/terminal.theme.ts | 45 +++---------
 .../src/views/system/dict-value/index.vue     |  1 -
 20 files changed, 267 insertions(+), 142 deletions(-)
 rename orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/{AppPreferenceModel.java => SystemPreferenceModel.java} (94%)
 create mode 100644 orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/TerminalPreferenceModel.java
 create mode 100644 orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java
 create mode 100644 orion-ops-ui/src/store/modules/terminal/index.ts
 create mode 100644 orion-ops-ui/src/store/modules/terminal/types.ts
 rename orion-ops-ui/src/views/host-ops/terminal/components/{ => theme-setting}/terminal-example.vue (82%)
 rename orion-ops-ui/src/views/host-ops/terminal/components/{ => theme-setting}/terminal-theme-setting.vue (80%)
 rename orion-ops-ui/src/views/host-ops/terminal/types/{terminal.type.ts => terminal.const.ts} (78%)

diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/enums/PreferenceTypeEnum.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/enums/PreferenceTypeEnum.java
index aa720287..671d29dd 100644
--- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/enums/PreferenceTypeEnum.java
+++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/enums/PreferenceTypeEnum.java
@@ -20,6 +20,11 @@ public enum PreferenceTypeEnum {
      */
     SYSTEM("systemPreferenceStrategy"),
 
+    /**
+     * 终端偏好
+     */
+    TERMINAL("terminalPreferenceStrategy"),
+
     ;
 
     PreferenceTypeEnum(String beanName) {
diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/AppPreferenceModel.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/SystemPreferenceModel.java
similarity index 94%
rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/AppPreferenceModel.java
rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/SystemPreferenceModel.java
index 4d5a4c06..5dc25a95 100644
--- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/AppPreferenceModel.java
+++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/SystemPreferenceModel.java
@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class AppPreferenceModel implements PreferenceModel {
+public class SystemPreferenceModel implements PreferenceModel {
 
     @Schema(description = "是否使用侧边菜单")
     private Boolean menu;
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
new file mode 100644
index 00000000..a9da8430
--- /dev/null
+++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/model/TerminalPreferenceModel.java
@@ -0,0 +1,32 @@
+package com.orion.ops.module.infra.handler.preference.model;
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 终端偏好模型
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/12/8 14:46
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TerminalPreferenceModel implements PreferenceModel {
+
+    @Schema(description = "暗色主题")
+    private String darkTheme;
+
+    @Schema(description = "终端主题")
+    private JSONObject terminalTheme;
+
+    @Schema(description = "显示设置")
+    private JSONObject viewSetting;
+
+}
diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java
index 7770466a..41cf4481 100644
--- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java
+++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java
@@ -1,6 +1,6 @@
 package com.orion.ops.module.infra.handler.preference.strategy;
 
-import com.orion.ops.module.infra.handler.preference.model.AppPreferenceModel;
+import com.orion.ops.module.infra.handler.preference.model.SystemPreferenceModel;
 import org.springframework.stereotype.Component;
 
 /**
@@ -11,11 +11,11 @@ import org.springframework.stereotype.Component;
  * @since 2023/10/8 13:48
  */
 @Component
-public class SystemPreferenceStrategy implements IPreferenceStrategy<AppPreferenceModel> {
+public class SystemPreferenceStrategy implements IPreferenceStrategy<SystemPreferenceModel> {
 
     @Override
-    public AppPreferenceModel getDefault() {
-        return AppPreferenceModel.builder()
+    public SystemPreferenceModel getDefault() {
+        return SystemPreferenceModel.builder()
                 .menu(true)
                 .topMenu(false)
                 .navbar(true)
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
new file mode 100644
index 00000000..4be57b60
--- /dev/null
+++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java
@@ -0,0 +1,26 @@
+package com.orion.ops.module.infra.handler.preference.strategy;
+
+import com.alibaba.fastjson.JSONObject;
+import com.orion.ops.module.infra.handler.preference.model.TerminalPreferenceModel;
+import org.springframework.stereotype.Component;
+
+/**
+ * 终端偏好处理策略
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/12/8 14:46
+ */
+@Component
+public class TerminalPreferenceStrategy implements IPreferenceStrategy<TerminalPreferenceModel> {
+
+    @Override
+    public TerminalPreferenceModel getDefault() {
+        return TerminalPreferenceModel.builder()
+                .darkTheme("dark")
+                .terminalTheme(new JSONObject())
+                .viewSetting(new JSONObject())
+                .build();
+    }
+
+}
diff --git a/orion-ops-ui/src/store/index.ts b/orion-ops-ui/src/store/index.ts
index 97ed6920..5d570f6f 100644
--- a/orion-ops-ui/src/store/index.ts
+++ b/orion-ops-ui/src/store/index.ts
@@ -6,6 +6,7 @@ import useTabBarStore from './modules/tab-bar';
 import useCacheStore from './modules/cache';
 import useTipsStore from './modules/tips';
 import useDictStore from './modules/dict';
+import useTerminalStore from './modules/terminal';
 
 const pinia = createPinia();
 
@@ -17,6 +18,7 @@ export {
   useCacheStore,
   useTipsStore,
   useDictStore,
+  useTerminalStore,
 };
 
 export default pinia;
diff --git a/orion-ops-ui/src/store/modules/cache/index.ts b/orion-ops-ui/src/store/modules/cache/index.ts
index 840bf218..5dad2009 100644
--- a/orion-ops-ui/src/store/modules/cache/index.ts
+++ b/orion-ops-ui/src/store/modules/cache/index.ts
@@ -19,8 +19,6 @@ export type CacheType = 'users' | 'menus' | 'roles'
 export default defineStore('cache', {
   state: (): CacheState => ({}),
 
-  getters: {},
-
   actions: {
     // 设置
     set(name: CacheType, value: any) {
diff --git a/orion-ops-ui/src/store/modules/terminal/index.ts b/orion-ops-ui/src/store/modules/terminal/index.ts
new file mode 100644
index 00000000..ad43bae7
--- /dev/null
+++ b/orion-ops-ui/src/store/modules/terminal/index.ts
@@ -0,0 +1,68 @@
+import type { TerminalPreference, TerminalState, TerminalTheme } from './types';
+import { DarkTheme } from './types';
+import { defineStore } from 'pinia';
+import { getPreference, updatePreferencePartial } from '@/api/user/preference';
+import { Message } from '@arco-design/web-vue';
+import { useDark } from '@vueuse/core';
+import { DEFAULT_SCHEMA } from '@/views/host-ops/terminal/types/terminal.theme';
+
+export default defineStore('terminal', {
+  state: (): TerminalState => ({
+    isDarkTheme: useDark({
+      selector: 'body',
+      attribute: 'terminal-theme',
+      valueDark: DarkTheme.DARK,
+      valueLight: DarkTheme.LIGHT,
+      initialValue: DarkTheme.DARK as any,
+      storageKey: null
+    }),
+    preference: {
+      darkTheme: 'auto',
+      terminalTheme: {} as TerminalTheme,
+    }
+  }),
+
+  actions: {
+    // 修改暗色主题
+    changeDarkTheme(dark: boolean) {
+      this.isDarkTheme = dark;
+    },
+
+    // 加载终端偏好
+    async fetchPreference() {
+      try {
+        const { data } = await getPreference<TerminalPreference>('TERMINAL');
+        // 设置默认终端主题
+        if (!data.config.terminalTheme?.name) {
+          data.config.terminalTheme = DEFAULT_SCHEMA;
+        }
+        this.preference = data.config;
+        // 设置暗色主题
+        const userDarkTheme = data.config.darkTheme;
+        if (userDarkTheme === DarkTheme.AUTO) {
+          this.isDarkTheme = data.config.terminalTheme?.dark === true;
+        } else {
+          this.isDarkTheme = userDarkTheme === DarkTheme.DARK;
+        }
+      } catch (e) {
+        Message.error('配置加载失败');
+      }
+    },
+
+    // 更新终端偏好
+    async updatePreference(preference: TerminalPreference) {
+      try {
+        // 修改配置
+        await updatePreferencePartial({
+          type: 'TERMINAL',
+          config: preference
+        });
+        this.preference = preference;
+        Message.success('同步成功');
+      } catch (e) {
+        Message.error('同步失败');
+      }
+    },
+
+  },
+});
diff --git a/orion-ops-ui/src/store/modules/terminal/types.ts b/orion-ops-ui/src/store/modules/terminal/types.ts
new file mode 100644
index 00000000..da6409a3
--- /dev/null
+++ b/orion-ops-ui/src/store/modules/terminal/types.ts
@@ -0,0 +1,50 @@
+import type { Ref } from 'vue';
+
+export interface TerminalState {
+  isDarkTheme: Ref<boolean>;
+  preference: TerminalPreference;
+}
+
+// 终端配置
+export interface TerminalPreference {
+  darkTheme: string,
+  terminalTheme: TerminalTheme,
+}
+
+// 暗色主题
+export const DarkTheme = {
+  DARK: 'dark',
+  LIGHT: 'light',
+  AUTO: 'auto'
+};
+
+// 终端主题
+export interface TerminalTheme {
+  name: string;
+  dark: boolean;
+  background: string;
+  foreground: string;
+  cursor: string;
+  cursorAccent?: string;
+  selectionInactiveBackground?: string;
+  selectionBackground?: string;
+  selectionForeground?: string;
+  black: string;
+  red: string;
+  green: string;
+  yellow: string;
+  blue: string;
+  magenta: string;
+  cyan: string;
+  white: string;
+  brightBlack: string;
+  brightRed: string;
+  brightGreen: string;
+  brightYellow: string;
+  brightBlue: string;
+  brightMagenta: string;
+  brightCyan: string;
+  brightWhite: string;
+
+  [key: string]: unknown;
+}
diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/layout/icon-actions.vue b/orion-ops-ui/src/views/host-ops/terminal/components/layout/icon-actions.vue
index 349aea54..41973e4f 100644
--- a/orion-ops-ui/src/views/host-ops/terminal/components/layout/icon-actions.vue
+++ b/orion-ops-ui/src/views/host-ops/terminal/components/layout/icon-actions.vue
@@ -27,7 +27,7 @@
 </script>
 
 <script lang="ts" setup>
-  import type { SidebarAction } from '../../types/terminal.type';
+  import type { SidebarAction } from '../../types/terminal.const';
   import type { PropType } from 'vue';
 
   defineProps({
diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-content.vue b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-content.vue
index ea17bf52..c026a4b5 100644
--- a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-content.vue
+++ b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-content.vue
@@ -8,9 +8,7 @@
         <!-- 设置 -->
         <template v-if="tab.type === TabType.SETTING">
           <!-- 主题设置 -->
-          <terminal-theme-setting v-if="tab.key === InnerTabs.THEME_SETTING.key"
-                                  :preference="preference"
-                                  @emitter="dispatchEmitter" />
+          <terminal-theme-setting v-if="tab.key === InnerTabs.THEME_SETTING.key" />
           <span v-else>
             {{ tab.title }}
           </span>
@@ -35,11 +33,11 @@
 
 <script lang="ts" setup>
   import type { PropType } from 'vue';
-  import type { TabItem, TerminalPreference } from '../../types/terminal.type';
+  import type { TabItem } from '../../types/terminal.const';
+  import type { TerminalPreference } from '@/store/modules/terminal/types';
   import { computed } from 'vue';
-  import { TabType, InnerTabs } from '../../types/terminal.type';
-  import useEmitter from '@/hooks/emitter';
-  import TerminalThemeSetting from '../terminal-theme-setting.vue';
+  import { TabType, InnerTabs } from '../../types/terminal.const';
+  import TerminalThemeSetting from '../theme-setting/terminal-theme-setting.vue';
 
   const props = defineProps({
     modelValue: {
@@ -50,16 +48,8 @@
       type: Array as PropType<Array<TabItem>>,
       required: true
     },
-    preference: {
-      type: Object as PropType<TerminalPreference>,
-      required: true
-    },
   });
 
-  const emits = defineEmits(['changeDarkTheme']);
-
-  const { dispatchEmitter } = useEmitter(emits);
-
   const activeKey = computed<String>({
     get() {
       return props.modelValue;
diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-header.vue b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-header.vue
index c018cd74..b9f4cea9 100644
--- a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-header.vue
+++ b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-header.vue
@@ -46,7 +46,7 @@
 </script>
 
 <script lang="ts" setup>
-  import type { SidebarAction, TabItem } from '../../types/terminal.type';
+  import type { SidebarAction, TabItem } from '../../types/terminal.const';
   import type { PropType } from 'vue';
   import { useFullscreen } from '@vueuse/core';
   import { computed } from 'vue';
diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-left-sidebar.vue b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-left-sidebar.vue
index 28937449..0ed30972 100644
--- a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-left-sidebar.vue
+++ b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-left-sidebar.vue
@@ -18,8 +18,8 @@
 </script>
 
 <script lang="ts" setup>
-  import type { SidebarAction, } from '../../types/terminal.type';
-  import { InnerTabs } from '../../types/terminal.type';
+  import type { SidebarAction } from '../../types/terminal.const';
+  import { InnerTabs } from '../../types/terminal.const';
   import IconActions from './icon-actions.vue';
 
   const emits = defineEmits(['switchTab', 'copyAddress']);
@@ -47,14 +47,9 @@
     },
     {
       icon: 'icon-palette',
-      content: '主题设置',
+      content: '外观设置',
       click: () => emits('switchTab', InnerTabs.THEME_SETTING)
     },
-    {
-      icon: 'icon-tool',
-      content: '显示设置',
-      click: () => emits('switchTab', InnerTabs.VIEW_SETTING)
-    },
   ];
 
 </script>
diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-right-sidebar.vue b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-right-sidebar.vue
index eb37ac79..ff4529e9 100644
--- a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-right-sidebar.vue
+++ b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-right-sidebar.vue
@@ -18,7 +18,7 @@
 </script>
 
 <script lang="ts" setup>
-  import type { SidebarAction } from '../../types/terminal.type';
+  import type { SidebarAction } from '../../types/terminal.const';
   import IconActions from './icon-actions.vue';
 
   const emits = defineEmits(['openSnippet', 'openSftp', 'openTransfer', 'openHistory', 'screenshot']);
diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/terminal-example.vue b/orion-ops-ui/src/views/host-ops/terminal/components/theme-setting/terminal-example.vue
similarity index 82%
rename from orion-ops-ui/src/views/host-ops/terminal/components/terminal-example.vue
rename to orion-ops-ui/src/views/host-ops/terminal/components/theme-setting/terminal-example.vue
index 32754b17..3e18b454 100644
--- a/orion-ops-ui/src/views/host-ops/terminal/components/terminal-example.vue
+++ b/orion-ops-ui/src/views/host-ops/terminal/components/theme-setting/terminal-example.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="" class="terminal-example" ref="terminal"></div>
+  <div class="terminal-example" ref="terminal"></div>
 </template>
 
 <script lang="ts">
@@ -9,9 +9,9 @@
 </script>
 
 <script lang="ts" setup>
+  import type { TerminalTheme } from '@/store/modules/terminal/types';
   import { Terminal } from '@xterm/xterm';
   import { onMounted, onUnmounted, ref } from 'vue';
-  import { TerminalTheme } from '../types/terminal.theme';
 
   const props = defineProps<{
     theme: TerminalTheme
@@ -22,13 +22,13 @@
 
   onMounted(() => {
     term.value = new Terminal({
-      theme: props.theme,
+      theme: { ...props.theme, cursor: props.theme.background },
       cols: 47,
       rows: 6,
       fontSize: 15,
       convertEol: true,
       cursorBlink: false,
-      cursorInactiveStyle: 'none'
+      cursorInactiveStyle: 'none',
     });
     term.value.open(terminal.value);
 
@@ -42,6 +42,8 @@
     );
   });
 
+  defineExpose({ term });
+
   onUnmounted(() => {
     term.value?.dispose();
   });
diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/terminal-theme-setting.vue b/orion-ops-ui/src/views/host-ops/terminal/components/theme-setting/terminal-theme-setting.vue
similarity index 80%
rename from orion-ops-ui/src/views/host-ops/terminal/components/terminal-theme-setting.vue
rename to orion-ops-ui/src/views/host-ops/terminal/components/theme-setting/terminal-theme-setting.vue
index 2f19b64a..550e9dcf 100644
--- a/orion-ops-ui/src/views/host-ops/terminal/components/terminal-theme-setting.vue
+++ b/orion-ops-ui/src/views/host-ops/terminal/components/theme-setting/terminal-theme-setting.vue
@@ -1,16 +1,25 @@
 <template>
   <div class="terminal-setting-container theme-setting-container">
     <div class="theme-setting-wrapper">
-      <!-- 大标题 -->
+      <!-- 主标题 -->
       <h2 class="terminal-setting-title">
-        主题设置
+        外观设置
       </h2>
-      <!-- 切换主题 -->
+      <!-- 基础设置 -->
       <div class="terminal-setting-block">
         <!-- 顶部 -->
         <div class="theme-subtitle-wrapper">
           <h3 class="terminal-setting-subtitle">
-            主题选择
+            字体设置
+          </h3>
+        </div>
+      </div>
+      <!-- 主题设置 -->
+      <div class="terminal-setting-block">
+        <!-- 顶部 -->
+        <div class="theme-subtitle-wrapper">
+          <h3 class="terminal-setting-subtitle">
+            主题设置
           </h3>
           <a-radio-group :default-value="preference.darkTheme"
                          size="mini"
@@ -59,38 +68,38 @@
 </script>
 
 <script lang="ts" setup>
-  import type { TerminalTheme } from '../types/terminal.theme';
-  import type { TerminalPreference } from '../types/terminal.type';
-  import { DarkTheme, darkThemeKey } from '../types/terminal.type';
-  import ThemeSchema from '../types/terminal.theme';
-  import useEmitter from '@/hooks/emitter';
+  import type { TerminalPreference, TerminalTheme } from '@/store/modules/terminal/types';
+  import { DarkTheme, DarkThemeChangeSymbol, darkThemeKey } from '../../types/terminal.const';
+  import ThemeSchema from '../../types/terminal.theme';
   import { useDebounceFn } from '@vueuse/core';
   import { useDictStore } from '@/store';
   import { Message } from '@arco-design/web-vue';
   import TerminalExample from './terminal-example.vue';
   import { updatePreferencePartial } from '@/api/user/preference';
+  import { inject, ref } from 'vue';
 
-  const props = defineProps<{
-    preference: TerminalPreference
-  }>();
+  const preference = ref<TerminalPreference>({
+    darkTheme: 'auto',
+    terminalTheme: {} as TerminalTheme,
+  });
 
   const emits = defineEmits(['emitter']);
+  const changeLayoutTheme = inject(DarkThemeChangeSymbol) as (s: boolean) => void;
 
-  const { bubblesEmitter } = useEmitter(emits);
   const { toOptions } = useDictStore();
 
   // 修改暗色主题
   const changeDarkTheme = (value: string) => {
-    props.preference.darkTheme = value;
+    preference.value.darkTheme = value;
     if (value === DarkTheme.DARK) {
       // 暗色
-      bubblesEmitter('changeDarkTheme', true);
+      changeLayoutTheme(true);
     } else if (value === DarkTheme.LIGHT) {
       // 亮色
-      bubblesEmitter('changeDarkTheme', false);
+      changeLayoutTheme(false);
     } else if (value === DarkTheme.AUTO) {
       // 自动配色
-      bubblesEmitter('changeDarkTheme', props.preference.terminalTheme.dark);
+      changeLayoutTheme(preference.value.terminalTheme.dark);
     }
     // 同步用户偏好
     sync();
@@ -98,10 +107,10 @@
 
   // 选择终端主题
   const checkTheme = (theme: TerminalTheme) => {
-    props.preference.terminalTheme = theme;
+    preference.value.terminalTheme = theme;
     // 切换主题配色
-    if (props.preference.darkTheme === DarkTheme.AUTO) {
-      bubblesEmitter('changeDarkTheme', theme.dark);
+    if (preference.value.darkTheme === DarkTheme.AUTO) {
+      changeLayoutTheme(theme.dark);
     }
     // 同步用户偏好
     sync();
@@ -112,7 +121,7 @@
     try {
       await updatePreferencePartial({
         type: 'TERMINAL',
-        config: props.preference
+        config: preference
       });
       Message.success('同步成功');
     } catch (e) {
diff --git a/orion-ops-ui/src/views/host-ops/terminal/index.vue b/orion-ops-ui/src/views/host-ops/terminal/index.vue
index daac9d71..64416f1c 100644
--- a/orion-ops-ui/src/views/host-ops/terminal/index.vue
+++ b/orion-ops-ui/src/views/host-ops/terminal/index.vue
@@ -16,9 +16,7 @@
       <!-- 内容区域 -->
       <div class="host-layout-content">
         <terminal-content v-model="activeKey"
-                          :tabs="tabs"
-                          :preference="preference as TerminalPreference"
-                          @change-dark-theme="changeLayoutTheme" />
+                          :tabs="tabs" />
       </div>
       <!-- 右侧操作栏 -->
       <div class="host-layout-right">
@@ -35,12 +33,13 @@
 </script>
 
 <script lang="ts" setup>
-  import type { TabItem, TerminalPreference } from './types/terminal.type';
-  import { ref, onBeforeMount } from 'vue';
+  import type { TerminalPreference } from '@/store/modules/terminal/types';
+  import type { TabItem } from './types/terminal.const';
+  import { ref, onBeforeMount, provide } from 'vue';
   import { useDark } from '@vueuse/core';
-  import { TabType, InnerTabs, DarkTheme, dictKeys } from './types/terminal.type';
+  import { TabType, InnerTabs, DarkTheme, dictKeys, DarkThemeChangeSymbol } from './types/terminal.const';
   import { DEFAULT_SCHEMA } from './types/terminal.theme';
-  import { useDictStore } from '@/store';
+  import { useDictStore, useTerminalStore } from '@/store';
   import { getPreference } from '@/api/user/preference';
   import { Message } from '@arco-design/web-vue';
   import TerminalHeader from './components/layout/terminal-header.vue';
@@ -51,14 +50,15 @@
   import '@xterm/xterm/css/xterm.css';
 
   // 系统主题
-  const darkTheme = useDark({
-    selector: 'body',
-    attribute: 'terminal-theme',
-    valueDark: DarkTheme.DARK,
-    valueLight: DarkTheme.LIGHT,
-    initialValue: DarkTheme.DARK as any,
-    storageKey: null
-  });
+  // const darkTheme = useDark({
+  //   selector: 'body',
+  //   attribute: 'terminal-theme',
+  //   valueDark: DarkTheme.DARK,
+  //   valueLight: DarkTheme.LIGHT,
+  //   initialValue: DarkTheme.DARK as any,
+  //   storageKey: null
+  // });
+  const terminalStore = useTerminalStore();
   const dictStore = useDictStore();
 
   const render = ref(false);
@@ -75,9 +75,11 @@
 
   // 切换系统主题
   const changeLayoutTheme = (dark: boolean) => {
-    darkTheme.value = dark;
+    terminalStore.changeDarkTheme(dark);
   };
 
+  provide(DarkThemeChangeSymbol, changeLayoutTheme);
+
   // 点击 tab
   const clickTab = (key: string) => {
     activeKey.value = key;
@@ -104,24 +106,8 @@
 
   // 加载用户终端偏好
   onBeforeMount(async () => {
-    try {
-      const { data } = await getPreference<TerminalPreference>('TERMINAL');
-      // 设置默认终端主题
-      if (!data.config.terminalTheme?.name) {
-        data.config.terminalTheme = DEFAULT_SCHEMA;
-      }
-      preference.value = data.config;
-      // 设置暗色主题
-      const userDarkTheme = data.config.darkTheme;
-      if (userDarkTheme === DarkTheme.AUTO) {
-        changeLayoutTheme(data.config.terminalTheme?.dark === true);
-      } else {
-        changeLayoutTheme(userDarkTheme === DarkTheme.DARK);
-      }
-      render.value = true;
-    } catch (e) {
-      Message.error('配置加载失败');
-    }
+    await terminalStore.fetchPreference();
+    render.value = true;
   });
 
   // 加载字典值
@@ -136,6 +122,7 @@
     width: 100%;
     height: 100vh;
     position: relative;
+    color: var(--color-content-text-2);
 
     &-header {
       width: 100%;
diff --git a/orion-ops-ui/src/views/host-ops/terminal/types/terminal.type.ts b/orion-ops-ui/src/views/host-ops/terminal/types/terminal.const.ts
similarity index 78%
rename from orion-ops-ui/src/views/host-ops/terminal/types/terminal.type.ts
rename to orion-ops-ui/src/views/host-ops/terminal/types/terminal.const.ts
index cda38674..b6115eb7 100644
--- a/orion-ops-ui/src/views/host-ops/terminal/types/terminal.type.ts
+++ b/orion-ops-ui/src/views/host-ops/terminal/types/terminal.const.ts
@@ -1,5 +1,4 @@
 import type { CSSProperties } from 'vue';
-import type { TerminalTheme } from './terminal.theme';
 
 // 暗色主题
 export const DarkTheme = {
@@ -8,12 +7,6 @@ export const DarkTheme = {
   AUTO: 'auto'
 };
 
-// 用户终端偏好
-export interface TerminalPreference {
-  darkTheme: string,
-  terminalTheme: TerminalTheme
-}
-
 // sidebar 操作类型
 export interface SidebarAction {
   icon: string;
@@ -46,11 +39,6 @@ export const InnerTabs = {
     title: '主题设置',
     type: TabType.SETTING
   },
-  VIEW_SETTING: {
-    key: 'viewSetting',
-    title: '显示设置',
-    type: TabType.SETTING
-  },
 };
 
 // tab 元素
@@ -62,6 +50,9 @@ export interface TabItem {
   [key: string]: unknown;
 }
 
+// 暗色主题切换标识
+export const DarkThemeChangeSymbol = Symbol('DARK_THEME_CHANGE');
+
 // 终端暗色模式 字典项
 export const darkThemeKey = 'terminalDarkTheme';
 
diff --git a/orion-ops-ui/src/views/host-ops/terminal/types/terminal.theme.ts b/orion-ops-ui/src/views/host-ops/terminal/types/terminal.theme.ts
index 466e714b..3423d223 100644
--- a/orion-ops-ui/src/views/host-ops/terminal/types/terminal.theme.ts
+++ b/orion-ops-ui/src/views/host-ops/terminal/types/terminal.theme.ts
@@ -1,37 +1,8 @@
-// 主题
-export interface TerminalTheme {
-  name: string;
-  dark: boolean;
-  background: string;
-  foreground: string;
-  cursor: string;
-  cursorAccent?: string;
-  selectionInactiveBackground?: string;
-  selectionBackground?: string;
-  selectionForeground?: string;
-  black: string;
-  red: string;
-  green: string;
-  yellow: string;
-  blue: string;
-  magenta: string;
-  cyan: string;
-  white: string;
-  brightBlack: string;
-  brightRed: string;
-  brightGreen: string;
-  brightYellow: string;
-  brightBlue: string;
-  brightMagenta: string;
-  brightCyan: string;
-  brightWhite: string;
-
-  [key: string]: unknown;
-}
+import type { TerminalTheme } from '@/store/modules/terminal/types';
 
 // 默认配色
 export const DEFAULT_SCHEMA = {
-  name: 'frappe',
+  name: 'Frappe',
   dark: true,
   background: '#303446',
   foreground: '#C6D0F5',
@@ -61,7 +32,7 @@ export const DEFAULT_SCHEMA = {
 export default [
   DEFAULT_SCHEMA,
   {
-    name: 'latte',
+    name: 'Latte',
     dark: false,
     background: '#EFF1F5',
     foreground: '#4C4F69',
@@ -88,7 +59,7 @@ export default [
     brightWhite: '#BCC0CC'
   },
   {
-    name: 'macchiato',
+    name: 'Macchiato',
     dark: true,
     background: '#24273A',
     foreground: '#CAD3F5',
@@ -115,7 +86,7 @@ export default [
     brightWhite: '#A5ADCB'
   },
   {
-    name: 'mocha',
+    name: 'Mocha',
     dark: true,
     background: '#1E1E2E',
     foreground: '#CDD6F4',
@@ -142,7 +113,7 @@ export default [
     brightWhite: '#A6ADC8'
   },
   {
-    name: 'AtomOneLight',
+    name: 'Atom One Light',
     dark: false,
     background: '#F9F9F9',
     foreground: '#2A2C33',
@@ -164,7 +135,7 @@ export default [
     brightWhite: '#FFFFFF'
   },
   {
-    name: 'OneHalfDark',
+    name: 'One Half Dark',
     dark: true,
     background: '#282C34',
     foreground: '#DCDFE4',
@@ -186,7 +157,7 @@ export default [
     brightWhite: '#DCDFE4'
   },
   {
-    name: 'dracula',
+    name: 'Dracula',
     dark: true,
     background: '#282A36',
     foreground: '#F8F8F2',
diff --git a/orion-ops-ui/src/views/system/dict-value/index.vue b/orion-ops-ui/src/views/system/dict-value/index.vue
index f3b9350d..49b769bd 100644
--- a/orion-ops-ui/src/views/system/dict-value/index.vue
+++ b/orion-ops-ui/src/views/system/dict-value/index.vue
@@ -60,5 +60,4 @@
 </script>
 
 <style lang="less" scoped>
-
 </style>