diff --git a/orion-ops-ui/src/assets/style/arco-extends.less b/orion-ops-ui/src/assets/style/arco-extends.less index 2c2734b8..adf66ba3 100644 --- a/orion-ops-ui/src/assets/style/arco-extends.less +++ b/orion-ops-ui/src/assets/style/arco-extends.less @@ -42,7 +42,7 @@ // 垂直滚动 .arco-scrollbar-track-direction-vertical { - width: 6px; + width: 10px; .arco-scrollbar-thumb-bar { margin: 0; @@ -51,7 +51,7 @@ // 水平滚动 .arco-scrollbar-track-direction-horizontal { - height: 6px; + width: 10px; .arco-scrollbar-thumb-bar { margin: 0; diff --git a/orion-ops-ui/src/assets/style/host-terminal-layout.less b/orion-ops-ui/src/assets/style/host-terminal-layout.less index 959ad1ec..9ab7d583 100644 --- a/orion-ops-ui/src/assets/style/host-terminal-layout.less +++ b/orion-ops-ui/src/assets/style/host-terminal-layout.less @@ -45,7 +45,7 @@ body[terminal-theme='dark'] { --color-content-text-2: rgba(255, 255, 255, .85); --color-content-text-3: rgba(255, 255, 255, .95); --color-bg-panel-tabs: var(--color-bg-panel); - --color-bg-panel-tabs-active: #434343; + --color-bg-panel-tabs-active: #383838; --color-bg-panel-icon-1: var(--color-bg-panel-tabs-active); --color-bg-panel-bar: #323538; --color-panel-text-1: var(--color-content-text-1); 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 714dd3a4..411d139b 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,10 +130,10 @@ .tab-title-wrapper { display: flex; - align-items: stretch; + align-items: center; .tab-title-icon { - font-size: 16px; + font-size: 18px; margin-right: 6px; } } @@ -196,7 +196,7 @@ } .arco-tabs-tab-title { - padding: 11px 18px; + padding: 11px 18px 11px 14px; background: var(--color-bg-header-tabs); font-size: 14px; height: var(--header-height); 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 70146ec9..ffe1f8fb 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 @@ -1,10 +1,18 @@ + panel.clickTab(k as string)" @delete="k => panel.deleteTab(k as string)"> + + + Action + + @@ -20,6 +28,9 @@ + + openTerminal(item, index)" /> @@ -31,13 +42,27 @@ @@ -49,10 +74,10 @@ .tab-title-wrapper { display: flex; - align-items: stretch; + align-items: center; .tab-title-icon { - font-size: 16px; + font-size: 18px; margin-right: 6px; } } @@ -89,6 +114,14 @@ display: none; } + &-add-btn { + padding: 0 14px; + + .arco-icon-hover { + font-size: 14px; + } + } + &-button .arco-icon-hover:hover { color: var(--color-panel-text-2); @@ -96,6 +129,7 @@ background: var(--color-bg-panel-icon-1); } } + } :deep(.arco-tabs-nav-type-line .arco-tabs-tab:hover .arco-tabs-tab-title::before) { @@ -132,7 +166,7 @@ } .arco-tabs-tab-title { - padding: 11px 18px; + padding: 11px 18px 11px 14px; background: var(--color-bg-panel-tabs); font-size: 14px; height: var(--panel-nav-height); diff --git a/orion-ops-ui/src/views/host/terminal/components/layout/terminal-panels-view.vue b/orion-ops-ui/src/views/host/terminal/components/layout/terminal-panels-view.vue index 5119f50e..fb3644a3 100644 --- a/orion-ops-ui/src/views/host/terminal/components/layout/terminal-panels-view.vue +++ b/orion-ops-ui/src/views/host/terminal/components/layout/terminal-panels-view.vue @@ -3,6 +3,7 @@ diff --git a/orion-ops-ui/src/views/host/terminal/components/new-connection/host-list-modal.vue b/orion-ops-ui/src/views/host/terminal/components/new-connection/host-list-modal.vue new file mode 100644 index 00000000..da25545d --- /dev/null +++ b/orion-ops-ui/src/views/host/terminal/components/new-connection/host-list-modal.vue @@ -0,0 +1,153 @@ + + + + + + 主机列表 + + + + + + + + + + + + + + {{ `${item.alias || item.name} (${item.address})` }} + + + + + + + + + + + + + + diff --git a/orion-ops-ui/src/views/host/terminal/components/new-connection/host-list-view.vue b/orion-ops-ui/src/views/host/terminal/components/new-connection/host-list-view.vue index 410d0036..3b3d8447 100644 --- a/orion-ops-ui/src/views/host/terminal/components/new-connection/host-list-view.vue +++ b/orion-ops-ui/src/views/host/terminal/components/new-connection/host-list-view.vue @@ -1,30 +1,30 @@ - - - - - - - - - {{ emptyValue }} - - - - - - - - - - + + + + + + + + {{ emptyValue }} + + + + + + + + + + - - + + @@ -53,7 +53,7 @@ @click="clickEditAlias(item)" /> - + + + + + + + + {{ item.address }} + + + + + + + + + + {{ tag.name }} + + - - - + + + - - {{ item.address }} - + content="连接主机"> + + + + + + + + + + + + + + + + + + + + + + - - - - - - - {{ tag.name }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +