From 6fa2d65e1883c324675ed8861748d7ed363c8992 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Thu, 3 Jul 2025 00:01:41 +0800
Subject: [PATCH] =?UTF-8?q?:hammer:=20=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/store/modules/user/index.ts           |  2 +-
 .../src/views/asset/grant/index.vue           |  4 +-
 .../src/views/asset/host-identity/index.vue   |  4 +-
 .../host-list/components/host-card-list.vue   | 37 +++++++++++++------
 .../asset/host-list/components/host-table.vue |  1 -
 .../src/views/asset/host-list/index.vue       |  4 +-
 .../src/views/exec/batch-upload/index.vue     |  4 +-
 .../src/views/exec/exec-command/index.vue     |  4 +-
 8 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/orion-visor-ui/src/store/modules/user/index.ts b/orion-visor-ui/src/store/modules/user/index.ts
index 8db1ebaf..0a39d838 100644
--- a/orion-visor-ui/src/store/modules/user/index.ts
+++ b/orion-visor-ui/src/store/modules/user/index.ts
@@ -30,7 +30,7 @@ const checkForVersionUpdate = (serverVersion: string) => {
       return;
     }
     // 提示用户更新
-    if (window.confirm('检测到新版本, 是否刷新页面以获取最新内容?')) {
+    if (window.confirm('检测到新版本, 请强制刷新页面以获取最新内容!')) {
       window.location.reload();
     }
     // 更新 localStorage 记录
diff --git a/orion-visor-ui/src/views/asset/grant/index.vue b/orion-visor-ui/src/views/asset/grant/index.vue
index bfef9767..bf203965 100644
--- a/orion-visor-ui/src/views/asset/grant/index.vue
+++ b/orion-visor-ui/src/views/asset/grant/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout-container view-container">
+  <div class="layout-container view-container" v-if="render">
     <a-tabs v-model:active-key="activeKey"
             class="tabs-container simple-card"
             size="large"
@@ -32,12 +32,14 @@
 
   const route = useRoute();
 
+  const render = ref();
   const activeKey = ref();
 
   // 加载字典项
   onBeforeMount(async () => {
     const dictStore = useDictStore();
     await dictStore.loadKeys(dictKeys);
+    render.value = true;
   });
 
   // 跳转到指定页
diff --git a/orion-visor-ui/src/views/asset/host-identity/index.vue b/orion-visor-ui/src/views/asset/host-identity/index.vue
index 5b541f4c..418952c3 100644
--- a/orion-visor-ui/src/views/asset/host-identity/index.vue
+++ b/orion-visor-ui/src/views/asset/host-identity/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout-container">
+  <div class="layout-container" v-if="render">
     <!-- 列表-表格 -->
     <host-identity-table v-if="renderTable"
                          ref="table"
@@ -36,6 +36,7 @@
   import HostIdentityFormModal from './components/host-identity-form-modal.vue';
   import HostKeyFormDrawer from '../host-key/components/host-key-form-drawer.vue';
 
+  const render = ref();
   const table = ref();
   const card = ref();
   const modal = ref();
@@ -57,6 +58,7 @@
   onBeforeMount(async () => {
     const dictStore = useDictStore();
     await dictStore.loadKeys(dictKeys);
+    render.value = true;
   });
 
 </script>
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue b/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
index a2ad5317..d0740b5d 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
@@ -208,6 +208,31 @@
     <!-- 拓展操作 -->
     <template #extra="{ record }">
       <a-space>
+        <!-- 单协议连接 -->
+        <a-button v-if="record.types?.length === 1"
+                  size="mini"
+                  v-permission="['terminal:terminal:access']"
+                  @click="openNewRoute({ name: 'terminal', query: { connect: record.id, type: record.types[0] } })">
+          连接
+        </a-button>
+        <!-- 多协议连接 -->
+        <a-popover v-if="(record.types?.length || 0) > 1"
+                   :title="undefined"
+                   :content-style="{ padding: '8px' }">
+          <a-button v-permission="['terminal:terminal:access']" size="mini">
+            连接
+          </a-button>
+          <template #content>
+            <a-space>
+              <a-button v-for="type in record.types"
+                        :key="type"
+                        size="mini"
+                        @click="openNewRoute({ name: 'terminal', query: { connect: record.id, type} })">
+                {{ type }}
+              </a-button>
+            </a-space>
+          </template>
+        </a-popover>
         <!-- 更多操作 -->
         <a-dropdown trigger="hover" :popup-max-height="false">
           <icon-more class="card-extra-icon" />
@@ -236,18 +261,6 @@
                        @click="deleteRow(record.id)">
               <span class="more-doption error">删除</span>
             </a-doption>
-            <!-- SSH -->
-            <a-doption v-if="record.types.includes(HostType.SSH.value)"
-                       v-permission="['terminal:terminal:access']"
-                       @click="openNewRoute({ name: 'terminal', query: { connect: record.id, type: 'SSH' } })">
-              <span class="more-doption normal">SSH</span>
-            </a-doption>
-            <!-- RDP -->
-            <a-doption v-if="record.types.includes(HostType.RDP.value)"
-                       v-permission="['terminal:terminal:access']"
-                       @click="openNewRoute({ name: 'terminal', query: { connect: record.id, type: 'RDP' } })">
-              <span class="more-doption normal">RDP</span>
-            </a-doption>
           </template>
         </a-dropdown>
       </a-space>
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-table.vue b/orion-visor-ui/src/views/asset/host-list/components/host-table.vue
index 477331c9..2952a165 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-table.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-table.vue
@@ -274,7 +274,6 @@
               <a-space>
                 <a-button v-for="type in record.types"
                           :key="type"
-                          type="text"
                           size="mini"
                           @click="openNewRoute({ name: 'terminal', query: { connect: record.id, type} })">
                   {{ type }}
diff --git a/orion-visor-ui/src/views/asset/host-list/index.vue b/orion-visor-ui/src/views/asset/host-list/index.vue
index 643059b2..fe024f11 100644
--- a/orion-visor-ui/src/views/asset/host-list/index.vue
+++ b/orion-visor-ui/src/views/asset/host-list/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout-container">
+  <div class="layout-container" v-if="render">
     <!-- 列表-表格 -->
     <host-table v-if="renderTable"
                 ref="table"
@@ -36,6 +36,7 @@
   import HostFormDrawer from './components/host-form-drawer.vue';
   import HostGroupDrawer from '../host-group/drawer/index.vue';
 
+  const render = ref();
   const table = ref();
   const card = ref();
   const drawer = ref();
@@ -57,6 +58,7 @@
   // 加载字典配置
   onBeforeMount(() => {
     useDictStore().loadKeys(dictKeys);
+    render.value = true;
   });
 
 </script>
diff --git a/orion-visor-ui/src/views/exec/batch-upload/index.vue b/orion-visor-ui/src/views/exec/batch-upload/index.vue
index c31dfd75..f34e3c21 100644
--- a/orion-visor-ui/src/views/exec/batch-upload/index.vue
+++ b/orion-visor-ui/src/views/exec/batch-upload/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout-container upload-container">
+  <div class="layout-container upload-container" v-if="render">
     <!-- 上传面板 -->
     <upload-panel ref="panel" />
   </div>
@@ -20,12 +20,14 @@
 
   const route = useRoute();
 
+  const render = ref();
   const panel = ref();
 
   // 加载字典值
   onMounted(async () => {
     const dictStore = useDictStore();
     await dictStore.loadKeys(dictKeys);
+    render.value = true;
   });
 
   // 跳转日志
diff --git a/orion-visor-ui/src/views/exec/exec-command/index.vue b/orion-visor-ui/src/views/exec/exec-command/index.vue
index 644c650e..9f2d175c 100644
--- a/orion-visor-ui/src/views/exec/exec-command/index.vue
+++ b/orion-visor-ui/src/views/exec/exec-command/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout-container full">
+  <div class="layout-container full" v-if="render">
     <!-- 执行面板 -->
     <div v-show="!logVisible" class="panel-wrapper">
       <exec-command-panel @submit="openLog" />
@@ -34,6 +34,7 @@
   const { visible: logVisible, setVisible: setLogVisible } = useVisible();
   const route = useRoute();
 
+  const render = ref();
   const log = ref();
 
   // 打开日志
@@ -56,6 +57,7 @@
   onMounted(async () => {
     const dictStore = useDictStore();
     await dictStore.loadKeys(dictKeys);
+    render.value = true;
   });
 
   // 跳转日志