diff --git a/orion-ops-ui/src/assets/style/global.less b/orion-ops-ui/src/assets/style/global.less index 13699293..890ede99 100644 --- a/orion-ops-ui/src/assets/style/global.less +++ b/orion-ops-ui/src/assets/style/global.less @@ -94,6 +94,19 @@ body { border-color: rgb(var(--gray-2)); } +// 垂直 label +.vertical-form-label { + display: flex; + max-width: 100%; + color: var(--color-text-2); + font-size: 14px; + margin-bottom: 8px; + padding: 0; + line-height: 1.5715; + white-space: normal; + user-select: none; +} + .full { width: 100%; height: 100%; diff --git a/orion-ops-ui/src/store/modules/terminal/types.ts b/orion-ops-ui/src/store/modules/terminal/types.ts index abecedea..0dd78839 100644 --- a/orion-ops-ui/src/store/modules/terminal/types.ts +++ b/orion-ops-ui/src/store/modules/terminal/types.ts @@ -82,8 +82,12 @@ export interface TerminalShortcutKey { shiftKey: boolean; altKey: boolean; code: string; - // extra - edit: boolean; +} + +// 终端快捷键编辑 +export interface TerminalShortcutKeyEditable extends TerminalShortcutKey { + editable: boolean; content: string; type: number; + shortcutKey?: string; } diff --git a/orion-ops-ui/src/views/host/terminal/assets/styles/layout.less b/orion-ops-ui/src/views/host/terminal/assets/styles/layout.less index 0bb0e9e4..6015a3d8 100644 --- a/orion-ops-ui/src/views/host/terminal/assets/styles/layout.less +++ b/orion-ops-ui/src/views/host/terminal/assets/styles/layout.less @@ -147,6 +147,7 @@ body[terminal-theme='dark'] .arco-modal-container { --color-neutral-1: rgba(255, 255, 255, 0.04); --color-neutral-2: rgba(255, 255, 255, 0.08); --color-neutral-3: rgba(255, 255, 255, 0.12); + --color-neutral-4: rgba(255, 255, 255, 0.16); --color-text-1: rgba(255, 255, 255, 0.9); --color-text-2: rgba(255, 255, 255, 0.7); --color-text-3: rgba(255, 255, 255, 0.5); diff --git a/orion-ops-ui/src/views/host/terminal/components/setting/terminal-display-block.vue b/orion-ops-ui/src/views/host/terminal/components/setting/terminal-display-block.vue index f5acc2b0..a87aae19 100644 --- a/orion-ops-ui/src/views/host/terminal/components/setting/terminal-display-block.vue +++ b/orion-ops-ui/src/views/host/terminal/components/setting/terminal-display-block.vue @@ -79,7 +79,7 @@
- 预览效果 + 预览效果
-
功能
+
功能
@@ -35,7 +35,7 @@
-
菜单预览
+
菜单预览
@@ -121,18 +121,6 @@ display: flex; } - .setting-label { - display: flex; - max-width: 100%; - color: var(--color-text-2); - font-size: 14px; - margin-bottom: 8px; - padding: 0; - line-height: 1.5715; - white-space: normal; - user-select: none; - } - .actions-container { width: 418px; height: auto; diff --git a/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-action-block.vue b/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-action-block.vue new file mode 100644 index 00000000..1637f205 --- /dev/null +++ b/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-action-block.vue @@ -0,0 +1,69 @@ + + + + + + + diff --git a/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-block.vue b/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-block.vue deleted file mode 100644 index e95b0425..00000000 --- a/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-block.vue +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - diff --git a/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-keys-block.vue b/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-keys-block.vue new file mode 100644 index 00000000..5f528085 --- /dev/null +++ b/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-keys-block.vue @@ -0,0 +1,156 @@ + + + + + + + diff --git a/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-setting.vue b/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-setting.vue index b133af5e..5df50325 100644 --- a/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-setting.vue +++ b/orion-ops-ui/src/views/host/terminal/components/setting/terminal-shortcut-setting.vue @@ -3,8 +3,37 @@

快捷键设置

- - + + + + + + + + + + + + +
@@ -16,7 +45,199 @@ diff --git a/orion-ops-ui/src/views/host/terminal/handler/terminal-tab-manager.ts b/orion-ops-ui/src/views/host/terminal/handler/terminal-tab-manager.ts index 77f8fc93..2722d9bb 100644 --- a/orion-ops-ui/src/views/host/terminal/handler/terminal-tab-manager.ts +++ b/orion-ops-ui/src/views/host/terminal/handler/terminal-tab-manager.ts @@ -9,11 +9,8 @@ export default class TerminalTabManager implements ITerminalTabManager { public items: Array; constructor() { - // fixme - this.active = InnerTabs.SHORTCUT_SETTING.key; - this.items = [InnerTabs.SHORTCUT_SETTING]; - // this.active = InnerTabs.NEW_CONNECTION.key; - // this.items = [InnerTabs.NEW_CONNECTION]; + this.active = InnerTabs.NEW_CONNECTION.key; + this.items = [InnerTabs.NEW_CONNECTION]; } // 点击 tab