diff --git a/orion-ops-ui/src/utils/bell.ts b/orion-ops-ui/src/utils/bell.ts index b89e73e1..4791660d 100644 --- a/orion-ops-ui/src/utils/bell.ts +++ b/orion-ops-ui/src/utils/bell.ts @@ -3,7 +3,7 @@ * @param frequency 蜂鸣器频率Hz * @param duration 持续时间 */ -export const playBell = (frequency: number = 400, duration: number = .2) => { +export const playBell = (frequency: number = 400, duration: number = .15) => { try { // 创建 AudioContext 对象 const audioCtx = new (window.AudioContext)(); diff --git a/orion-ops-ui/src/views/host/terminal/components/view-setting/terminal-interact-block.vue b/orion-ops-ui/src/views/host/terminal/components/view-setting/terminal-interact-block.vue index ac985368..1885cf74 100644 --- a/orion-ops-ui/src/views/host/terminal/components/view-setting/terminal-interact-block.vue +++ b/orion-ops-ui/src/views/host/terminal/components/view-setting/terminal-interact-block.vue @@ -60,7 +60,7 @@ - + @@ -99,7 +99,7 @@ return; } // 同步 - updateTerminalPreference(TerminalPreferenceItem.INTERACT_SETTING, formModel.value, true); + updateTerminalPreference(TerminalPreferenceItem.INTERACT_SETTING, formModel.value); }, { deep: true }); diff --git a/orion-ops-ui/src/views/host/terminal/components/view-setting/terminal-plugins-block.vue b/orion-ops-ui/src/views/host/terminal/components/view-setting/terminal-plugins-block.vue index a1e4d437..36cc646f 100644 --- a/orion-ops-ui/src/views/host/terminal/components/view-setting/terminal-plugins-block.vue +++ b/orion-ops-ui/src/views/host/terminal/components/view-setting/terminal-plugins-block.vue @@ -54,7 +54,7 @@ return; } // 同步 - updateTerminalPreference(TerminalPreferenceItem.PLUGINS_SETTING, formModel.value, true); + updateTerminalPreference(TerminalPreferenceItem.PLUGINS_SETTING, formModel.value); }, { deep: true }); diff --git a/orion-ops-ui/src/views/host/terminal/components/view-setting/terminal-session-block.vue b/orion-ops-ui/src/views/host/terminal/components/view-setting/terminal-session-block.vue index 89e6b2f0..b29f805c 100644 --- a/orion-ops-ui/src/views/host/terminal/components/view-setting/terminal-session-block.vue +++ b/orion-ops-ui/src/views/host/terminal/components/view-setting/terminal-session-block.vue @@ -56,7 +56,7 @@ return; } // 同步 - updateTerminalPreference(TerminalPreferenceItem.SESSION_SETTING, formModel.value, true); + updateTerminalPreference(TerminalPreferenceItem.SESSION_SETTING, formModel.value); }, { deep: true }); 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 new file mode 100644 index 00000000..031b0702 --- /dev/null +++ b/orion-ops-ui/src/views/host/terminal/components/xterm/terminal-context-menu.vue @@ -0,0 +1,34 @@ + + + + + + + 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 cee6021f..3dc7cfbe 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 @@ -36,17 +36,19 @@ :text="getDictValue(connectStatusKey, session ? session.status : 0)" /> - -
-
- - -
+ + + +
+ +
+ + +
+ (); // TODO - // 右键菜单补充 启用右键菜单 enableRightClickMenu 粘贴逻辑 + // 右键菜单补充 enableRightClickMenu 粘贴逻辑 // 设置快捷键 粘贴逻辑 // 读取快捷键并且禁用快捷键 // 截屏 diff --git a/orion-ops-ui/src/views/host/terminal/handler/terminal-session.ts b/orion-ops-ui/src/views/host/terminal/handler/terminal-session.ts index 04ea24bd..37fd1391 100644 --- a/orion-ops-ui/src/views/host/terminal/handler/terminal-session.ts +++ b/orion-ops-ui/src/views/host/terminal/handler/terminal-session.ts @@ -113,12 +113,6 @@ export default class TerminalSession implements ITerminalSession { }); // 设置右键选项 dom.addEventListener('contextmenu', async (event) => { - // 如果开启了右键粘贴 右键选中 右键菜单 则关闭默认右键菜单 - if (preference.interactSetting.rightClickSelectsWord - || preference.interactSetting.rightClickPaste - || preference.interactSetting.enableRightClickMenu) { - event.preventDefault(); - } // 右键粘贴逻辑 if (preference.interactSetting.rightClickPaste) { if (!this.canWrite || !this.connected) { diff --git a/orion-ops-ui/src/views/host/terminal/index.vue b/orion-ops-ui/src/views/host/terminal/index.vue index 2847a447..c48d68e1 100644 --- a/orion-ops-ui/src/views/host/terminal/index.vue +++ b/orion-ops-ui/src/views/host/terminal/index.vue @@ -33,7 +33,7 @@