From 66ab7a7637a3c97d1657de7385b9e3888ce318e4 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Wed, 31 Jan 2024 19:02:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E7=BF=BB=E9=87=8D=E6=9D=A5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../style/host-space-layout.less} | 12 +- .../src/router/routes/modules/host-audit.ts | 18 ++ .../src/router/routes/modules/host-review.ts | 18 -- .../src/router/routes/modules/host.ts | 6 +- .../components/connect-log-table.vue | 2 +- .../connect-log/index.vue | 2 +- .../connect-log/types/const.ts | 0 .../connect-log/types/table.columns.ts | 0 .../host/space/components/icon-actions.vue | 46 ++++ .../host/space/components/layout-header.vue | 231 ++++++++++++++++++ orion-ops-ui/src/views/host/space/index.vue | 153 ++++++++++++ .../src/views/host/space/types/const.ts | 0 .../terminal-shortcut-action-block.vue | 2 +- .../src/views/host/terminal/index.vue | 6 +- .../host/terminal/types/terminal.const.ts | 2 +- 15 files changed, 464 insertions(+), 34 deletions(-) rename orion-ops-ui/src/{views/host/terminal/assets/styles/layout.less => assets/style/host-space-layout.less} (97%) create mode 100644 orion-ops-ui/src/router/routes/modules/host-audit.ts delete mode 100644 orion-ops-ui/src/router/routes/modules/host-review.ts rename orion-ops-ui/src/views/{host-review => host-audit}/connect-log/components/connect-log-table.vue (99%) rename orion-ops-ui/src/views/{host-review => host-audit}/connect-log/index.vue (96%) rename orion-ops-ui/src/views/{host-review => host-audit}/connect-log/types/const.ts (100%) rename orion-ops-ui/src/views/{host-review => host-audit}/connect-log/types/table.columns.ts (100%) create mode 100644 orion-ops-ui/src/views/host/space/components/icon-actions.vue create mode 100644 orion-ops-ui/src/views/host/space/components/layout-header.vue create mode 100644 orion-ops-ui/src/views/host/space/index.vue create mode 100644 orion-ops-ui/src/views/host/space/types/const.ts diff --git a/orion-ops-ui/src/views/host/terminal/assets/styles/layout.less b/orion-ops-ui/src/assets/style/host-space-layout.less similarity index 97% rename from orion-ops-ui/src/views/host/terminal/assets/styles/layout.less rename to orion-ops-ui/src/assets/style/host-space-layout.less index 557501a6..0e51a5a5 100644 --- a/orion-ops-ui/src/views/host/terminal/assets/styles/layout.less +++ b/orion-ops-ui/src/assets/style/host-space-layout.less @@ -22,7 +22,7 @@ body { } // 暗色主题配色常量 -body[terminal-theme='dark'] { +body[host-space-theme='dark'] { --color-bg-header: #232323; --color-bg-sidebar: #2C2E31; --color-bg-content: #1A1B1C; @@ -45,7 +45,7 @@ body[terminal-theme='dark'] { } // 布局常量 -.host-layout { +.host-space-layout { --header-height: 44px; --sidebar-width: 44px; --sidebar-icon-wrapper-size: var(--header-height); @@ -62,7 +62,7 @@ body[terminal-theme='dark'] { } // arco 亮色配色 -body .host-layout, .arco-modal-container { +body .host-space-layout, .arco-modal-container { --color-white: #ffffff; --color-black: #000000; --color-border: rgb(var(--gray-3)); @@ -133,9 +133,9 @@ body .host-layout, .arco-modal-container { } // arco 暗色配色 -body[terminal-theme='dark'], -body[terminal-theme='dark'] .host-layout, -body[terminal-theme='dark'] .arco-modal-container { +body[host-space-theme='dark'], +body[host-space-theme='dark'] .host-space-layout, +body[host-space-theme='dark'] .arco-modal-container { --color-white: rgba(255, 255, 255, 0.9); --color-black: #000000; --color-border: #333335; diff --git a/orion-ops-ui/src/router/routes/modules/host-audit.ts b/orion-ops-ui/src/router/routes/modules/host-audit.ts new file mode 100644 index 00000000..0bb9793d --- /dev/null +++ b/orion-ops-ui/src/router/routes/modules/host-audit.ts @@ -0,0 +1,18 @@ +import type { AppRouteRecordRaw } from '../types'; +import { DEFAULT_LAYOUT } from '../base'; + +const HOST_AUDIT: AppRouteRecordRaw = + { + name: 'hostAudit', + path: '/host-audit', + component: DEFAULT_LAYOUT, + children: [ + { + name: 'hostAuditConnectLog', + path: '/host-audit/connect-log', + component: () => import('@/views/host-audit/connect-log/index.vue'), + }, + ], + }; + +export default HOST_AUDIT; diff --git a/orion-ops-ui/src/router/routes/modules/host-review.ts b/orion-ops-ui/src/router/routes/modules/host-review.ts deleted file mode 100644 index 49f21cd1..00000000 --- a/orion-ops-ui/src/router/routes/modules/host-review.ts +++ /dev/null @@ -1,18 +0,0 @@ -import type { AppRouteRecordRaw } from '../types'; -import { DEFAULT_LAYOUT } from '../base'; - -const HOST_REVIEW: AppRouteRecordRaw = - { - name: 'hostReview', - path: '/host-review', - component: DEFAULT_LAYOUT, - children: [ - { - name: 'hostReviewConnectLog', - path: '/host-review/connect-log', - component: () => import('@/views/host-review/connect-log/index.vue'), - }, - ], - }; - -export default HOST_REVIEW; diff --git a/orion-ops-ui/src/router/routes/modules/host.ts b/orion-ops-ui/src/router/routes/modules/host.ts index db8eb615..665ffa04 100644 --- a/orion-ops-ui/src/router/routes/modules/host.ts +++ b/orion-ops-ui/src/router/routes/modules/host.ts @@ -7,9 +7,9 @@ const HOST: AppRouteRecordRaw = { component: FULL_LAYOUT, children: [ { - name: 'hostTerminal', - path: '/host/terminal', - component: () => import('@/views/host/terminal/index.vue'), + name: 'hostSpace', + path: '/host/space', + component: () => import('@/views/host/space/index.vue'), meta: { noAffix: true } diff --git a/orion-ops-ui/src/views/host-review/connect-log/components/connect-log-table.vue b/orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-table.vue similarity index 99% rename from orion-ops-ui/src/views/host-review/connect-log/components/connect-log-table.vue rename to orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-table.vue index 55bed335..58e99f0f 100644 --- a/orion-ops-ui/src/views/host-review/connect-log/components/connect-log-table.vue +++ b/orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-table.vue @@ -97,7 +97,7 @@ diff --git a/orion-ops-ui/src/views/host-review/connect-log/index.vue b/orion-ops-ui/src/views/host-audit/connect-log/index.vue similarity index 96% rename from orion-ops-ui/src/views/host-review/connect-log/index.vue rename to orion-ops-ui/src/views/host-audit/connect-log/index.vue index 06536bf3..1e34f897 100644 --- a/orion-ops-ui/src/views/host-review/connect-log/index.vue +++ b/orion-ops-ui/src/views/host-audit/connect-log/index.vue @@ -7,7 +7,7 @@ diff --git a/orion-ops-ui/src/views/host-review/connect-log/types/const.ts b/orion-ops-ui/src/views/host-audit/connect-log/types/const.ts similarity index 100% rename from orion-ops-ui/src/views/host-review/connect-log/types/const.ts rename to orion-ops-ui/src/views/host-audit/connect-log/types/const.ts diff --git a/orion-ops-ui/src/views/host-review/connect-log/types/table.columns.ts b/orion-ops-ui/src/views/host-audit/connect-log/types/table.columns.ts similarity index 100% rename from orion-ops-ui/src/views/host-review/connect-log/types/table.columns.ts rename to orion-ops-ui/src/views/host-audit/connect-log/types/table.columns.ts diff --git a/orion-ops-ui/src/views/host/space/components/icon-actions.vue b/orion-ops-ui/src/views/host/space/components/icon-actions.vue new file mode 100644 index 00000000..2cc4a503 --- /dev/null +++ b/orion-ops-ui/src/views/host/space/components/icon-actions.vue @@ -0,0 +1,46 @@ + + + + + + + diff --git a/orion-ops-ui/src/views/host/space/components/layout-header.vue b/orion-ops-ui/src/views/host/space/components/layout-header.vue new file mode 100644 index 00000000..0aa90470 --- /dev/null +++ b/orion-ops-ui/src/views/host/space/components/layout-header.vue @@ -0,0 +1,231 @@ + + + + + + + diff --git a/orion-ops-ui/src/views/host/space/index.vue b/orion-ops-ui/src/views/host/space/index.vue new file mode 100644 index 00000000..9d754f5f --- /dev/null +++ b/orion-ops-ui/src/views/host/space/index.vue @@ -0,0 +1,153 @@ + + + + + + + diff --git a/orion-ops-ui/src/views/host/space/types/const.ts b/orion-ops-ui/src/views/host/space/types/const.ts new file mode 100644 index 00000000..e69de29b 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 index 97089107..20bda176 100644 --- 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 @@ -9,7 +9,7 @@
- 点击保存按钮后需要刷新页面生效 (恢复默认配置后也需要点击保存按钮) (设置时需要避免使用浏览器内置快捷键) + 点击保存按钮后需要刷新页面生效 (恢复默认配置后也需要点击保存按钮) (设置时需要避免与浏览器内置快捷键冲突)