From 581c14d8d703b3edbfc88d8955cc7c6925792eab Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Tue, 19 Dec 2023 12:06:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=87=E6=BB=A4=E5=88=AB=E5=90=8D.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asset/host-group/host-group-tree.vue       |  1 -
 .../components/group/host-group-drawer.vue     |  2 +-
 .../components/group/host-transfer.vue         | 18 ++++++++++++++++--
 .../components/new-connection/hosts-view.vue   |  1 +
 .../new-connection/new-connection-view.vue     |  6 +++---
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/orion-ops-ui/src/components/asset/host-group/host-group-tree.vue b/orion-ops-ui/src/components/asset/host-group/host-group-tree.vue
index 9c0efdc8..a6449e66 100644
--- a/orion-ops-ui/src/components/asset/host-group/host-group-tree.vue
+++ b/orion-ops-ui/src/components/asset/host-group/host-group-tree.vue
@@ -212,7 +212,6 @@
     });
   };
 
-  // FIXME 测试
   // 保存节点
   const saveNode = async (node: TreeNodeData) => {
     const key = node.key
diff --git a/orion-ops-ui/src/views/asset/host-list/components/group/host-group-drawer.vue b/orion-ops-ui/src/views/asset/host-list/components/group/host-group-drawer.vue
index 551c69f7..ab2e3a90 100644
--- a/orion-ops-ui/src/views/asset/host-list/components/group/host-group-drawer.vue
+++ b/orion-ops-ui/src/views/asset/host-list/components/group/host-group-drawer.vue
@@ -1,7 +1,7 @@
 <template>
   <a-drawer v-model:visible="visible"
             class="host-group-drawer"
-            width="70%"
+            :width="1120"
             title="主机分组配置"
             :esc-to-close="false"
             :mask-closable="false"
diff --git a/orion-ops-ui/src/views/asset/host-list/components/group/host-transfer.vue b/orion-ops-ui/src/views/asset/host-list/components/group/host-transfer.vue
index 00202cc5..3f8583ef 100644
--- a/orion-ops-ui/src/views/asset/host-list/components/group/host-transfer.vue
+++ b/orion-ops-ui/src/views/asset/host-list/components/group/host-transfer.vue
@@ -34,7 +34,11 @@
       </template>
       <!-- 内容 -->
       <template #item="{ label }">
-        <span v-html="renderLabel(label)" />
+        <a-tooltip position="top"
+                   :mini="true"
+                   :content="label">
+          <span v-html="renderLabel(label)" />
+        </a-tooltip>
       </template>
     </a-transfer>
   </div>
@@ -86,7 +90,6 @@
     }
   });
 
-  // FIXME 省略和tooltip
   // 渲染 label
   const renderLabel = (label: string) => {
     const last = label.lastIndexOf('-');
@@ -142,10 +145,21 @@
       user-select: none;
     }
 
+    .arco-transfer-view-source {
+
+      .arco-transfer-list-item .arco-checkbox {
+        width: calc(100% - 24px);
+        position: absolute;
+      }
+    }
+
     .arco-transfer-view-target {
 
       .arco-transfer-list-item-content {
         margin-left: 4px;
+        position: absolute;
+        width: calc(100% - 52px);
+        display: inline-block;
       }
 
       .arco-transfer-list-item-remove-btn {
diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/new-connection/hosts-view.vue b/orion-ops-ui/src/views/host-ops/terminal/components/new-connection/hosts-view.vue
index 9de9f947..96ac2c3e 100644
--- a/orion-ops-ui/src/views/host-ops/terminal/components/new-connection/hosts-view.vue
+++ b/orion-ops-ui/src/views/host-ops/terminal/components/new-connection/hosts-view.vue
@@ -65,6 +65,7 @@
         : list.filter(item => {
           return (item.name as string)?.toLowerCase().indexOf(filterVal) > -1
             || (item.code as string)?.toLowerCase().indexOf(filterVal) > -1
+            || (item.alias as string)?.toLowerCase().indexOf(filterVal) > -1
             || (item.address as string)?.toLowerCase().indexOf(filterVal) > -1;
         });
     }
diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/new-connection/new-connection-view.vue b/orion-ops-ui/src/views/host-ops/terminal/components/new-connection/new-connection-view.vue
index 29ff7d8f..df899498 100644
--- a/orion-ops-ui/src/views/host-ops/terminal/components/new-connection/new-connection-view.vue
+++ b/orion-ops-ui/src/views/host-ops/terminal/components/new-connection/new-connection-view.vue
@@ -14,7 +14,7 @@
         <!-- 过滤 -->
         <a-auto-complete v-model="filterValue"
                          class="host-filter"
-                         placeholder="输入名称/编码/IP @标签"
+                         placeholder="别名/名称/编码/IP @标签"
                          :allow-clear="true"
                          :data="filterOptions"
                          :filter-option="searchFilter">
@@ -118,8 +118,8 @@
     }).forEach(s => filterOptions.value.push(s));
     // 添加主机信息
     const hostMeta = hosts.value.hostList?.map(s => {
-      return [s.name, s.code, s.address];
-    }).flat(1);
+      return [s.name, s.code, s.address, s.alias];
+    }).filter(Boolean).flat(1);
     [...new Set(hostMeta)].map(value => {
       return { label: value, value };
     }).forEach(s => filterOptions.value.push(s));