From 8719f563108c3f82edebf7f0c8b1f947f878f842 Mon Sep 17 00:00:00 2001
From: wkl505997900 <2313665567@qq.com>
Date: Fri, 20 Oct 2023 21:15:29 +0800
Subject: [PATCH] fix bug

---
 src/api/assest.js                        |  3 ++-
 src/views/assests/HostEdition.vue        | 16 ++++++++--------
 src/views/leaks/components/HostTable.vue |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/api/assest.js b/src/api/assest.js
index 69b12e2..095a943 100644
--- a/src/api/assest.js
+++ b/src/api/assest.js
@@ -142,7 +142,8 @@ export function editHost(parameter, id) {
           ssh_port: parameter.ssh_port,
           management: parameter.management,
           ssh_user: parameter.ssh_user,
-          password: parameter.password
+          password: parameter.password,
+          ssh_pkey: parameter.ssh_pkey
         }
   });
 }
diff --git a/src/views/assests/HostEdition.vue b/src/views/assests/HostEdition.vue
index de6253e..962c2d1 100644
--- a/src/views/assests/HostEdition.vue
+++ b/src/views/assests/HostEdition.vue
@@ -99,7 +99,7 @@
                 主机登录密码
               </a-radio>
               <a-radio :value="2">
-                主机登录公钥
+                主机登录密钥
               </a-radio>
             </a-radio-group>
           </a-form-item>
@@ -107,9 +107,9 @@
             <template v-slot:label>
               <span v-if="identificaWay === 1">主机登录密码</span>
               <span v-else>
-                <span>主机登录公钥</span>
+                <span>主机登录密钥</span>
                 <description-tips style="margin-left: 3px;margin-right: 1px;">
-                  id_rsa.pub
+                  id_rsa
                 </description-tips>
               </span>
             </template>
@@ -119,13 +119,13 @@
                 {rules: [{required: pageType === 'create' ? true : requiredRules, message: '请输入主机登录密码'}]}
               ]"
               :placeholder="pageType === 'create' ? '请设置主机登录密码' : '请输入主机登录密码, 若未修改主机用户名或端口可以为空'"></a-input-password>
-            <a-input-password v-else
+            <a-textarea :rows="4" v-else
               :maxLength="4096"
               v-decorator="[
                 'ssh_pkey',
-                {rules: [{required: pageType === 'create' ? true : requiredRules, message: '请输入主机登录公钥'}]}
+                {rules: [{required: pageType === 'create' ? true : requiredRules, message: '请输入主机登录密钥'}]}
               ]"
-              :placeholder="pageType === 'create' ? '请设置主机登录公钥' : '请输入主机登录公钥, 若未修改主机用户名或端口可以为空'"></a-input-password>
+              :placeholder="pageType === 'create' ? '请设置主机登录密钥' : '请输入主机登录密钥, 若未修改主机用户名或端口可以为空'"></a-textarea>
           </a-form-item>
           <a-form-item :wrapper-col="{span: 10, offset: 5}">
             <a-button @click="handleCancel">取消</a-button>
@@ -271,9 +271,9 @@ export default {
              if (tableParams[key] === this.basicHostInfo[key]) {
                delete tableParams[key] //  删除未修改数据
              }
-             if (key === 'password') {
+             if (key === 'password' || key === 'ssh_pkey') {
                if (tableParams[key].length === 0) {
-                 delete tableParams[key] //  password为空不传
+                 delete tableParams[key] //  password或密钥为空不传
                }
              }
             }
diff --git a/src/views/leaks/components/HostTable.vue b/src/views/leaks/components/HostTable.vue
index 63dc4f2..950097f 100644
--- a/src/views/leaks/components/HostTable.vue
+++ b/src/views/leaks/components/HostTable.vue
@@ -964,11 +964,11 @@ export default {
   },
   mounted: function () {
     this.getHostGroup();
+    this.getHostList();
     if (this.standalone) {
       // 主机列表页面中要自行获取全量主机和扫描状态
       this.getScanStatusAll([]);
     } else {
-      this.getHostList();
       // 主机详情页面中要自行获取repo列表
       this.getRepoList();
     }
-- 
Gitee