From e3ce0d1c025af56aec95e1837e9acfe1e64da28f Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 9 Nov 2021 17:01:43 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1210=20fix=EF=BC=9A=20=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8A=E6=96=B9=20terminal=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E9=80=89=E6=8B=A9=20asset=20=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=98=BE=E7=A4=BA=20asset=20=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/cli/webSSH.vue | 67 ++++++++++++++++++++-
 1 file changed, 65 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/cli/webSSH.vue b/nezha-fronted/src/components/cli/webSSH.vue
index a39d17d6b..ca024b93b 100644
--- a/nezha-fronted/src/components/cli/webSSH.vue
+++ b/nezha-fronted/src/components/cli/webSSH.vue
@@ -197,14 +197,28 @@
           </div>
         </div>
       </el-dialog>
-      <el-dialog :modal-append-to-body='false'  :show-close="true" :visible.sync="assetShow" @close="closeAssetCustom" class="nz-dialog" width="620px" destroy-on-close>
+      <el-dialog :modal-append-to-body='false'  :show-close="true" :visible.sync="assetShow" @close="closeAssetCustom" class="nz-dialog" width="620px">
         <div slot="title">Connect</div>
         <div >
           <el-form label-width="120px" size="small" :model="assetContent" label-position = "top" :rules="rules" ref="assetConnect" v-loading="assetLoading" >
             <el-form-item :label='$t("overall.asset")' prop="assetId" class="flex">
+              <el-dropdown trigger="click" class="header-el-dropdown">
+              <span class="el-dropdown-link">
+                <span>{{selectValue}}</span>
+                <span><i class="el-icon-arrow-down el-icon--right"></i></span>
+              </span>
+                <el-dropdown-menu style="width: 118px" class="el-dropdown__width right-box-select-top right-public-box-dropdown-top" placement="bottom-end" slot="dropdown">
+                  <el-dropdown-item
+                    @click.native="selectAssetAuth(item.label, item.value)"
+                    v-for="item in searchMetrics"
+                    :key="item.value"><i class="nz-icon" :class="item.icon" style="margin-right: 5px"/>{{item.label}}</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
               <v-selectpage
+                ref="selectPage"
                 style="flex: 1"
                 data="asset/asset"
+                :params="selectPageParams"
                 :tb-columns="columns"
                 key-field="id"
                 show-field="manageIp"
@@ -300,6 +314,20 @@ export default {
   data () {
     const termFontSize = parseInt(localStorage.getItem('termFontSize'))
     return {
+      selectValue: 'SSH',
+      searchMetrics: [
+        {
+          value: 'SSH',
+          label: 'SSH'
+        },
+        {
+          value: 'Telnet',
+          label: 'Telnet'
+        }
+      ],
+      selectPageParams: {
+        authProtocol: 1
+      },
       authProtocol: [
         {
           value: 1,
@@ -466,6 +494,22 @@ export default {
     }
   },
   methods: {
+    selectAssetAuth (val, label) {
+      this.$refs.selectPage.remove()
+      if (val) {
+        this.selectValue = val
+        if (val === 'SSH') {
+          this.selectPageParams = { authProtocol: 1 }
+        } else {
+          this.selectPageParams = { authProtocol: 2 }
+        }
+      } else {
+        label = 'SSH'
+        this.selectPageParams = { authProtocol: 1 }
+      }
+      this.$refs.selectPage.pageNumber = 1
+      this.$refs.selectPage.pageChange()
+    },
     getUuid () {
       let uuid = uuidv1()
       const now = new Date().getTime()
@@ -887,11 +931,18 @@ export default {
     },
     assetShowChange () {
       this.assetShow = true
+      this.selectValue = 'SSH'
+      this.selectPageParams = { authProtocol: 1 }
+      if (this.$refs.selectPage) {
+        this.$refs.selectPage.remove()
+        this.$refs.selectPage.pageNumber = 1
+        this.$refs.selectPage.pageChange()
+      }
       // this.getAssetData()
     },
     getAssetData () {
       this.assetLoading = true
-      this.$get('asset/asset', { pageSize: -1 }).then(res => {
+      this.$get('asset/asset', { pageSize: -1, typeIds: '1,2' }).then(res => {
         this.assetLoading = false
         this.assetData = res.data.list
       })
@@ -1034,6 +1085,18 @@ export default {
   .custom-footer{
     box-shadow: none;
   }
+  .header-el-dropdown {
+    width: 64px;
+    margin-right: 0;
+    background: #f5f7fa;;
+    padding: 0 10px 0 10px;
+    border-radius: 4px 0 0 4px;
+    border: 1px solid #dcdfe6;
+    border-right: none ;
+  }
+  /deep/ div.v-selectpage div.sp-input-container div.sp-base {
+    border-radius: 0 4px 4px 0;
+  }
 </style>
 <style lang="scss">
   .popover-webshell{