From 07b1fad5e34d5c5af259cb36654a6855e5634747 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 3 Nov 2022 13:53:00 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2356=20fix=EF=BC=9AAsset=20list=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E8=B5=84=E4=BA=A7=E6=97=B6=E5=88=87=E6=8D=A2Type?=
 =?UTF-8?q?=E5=90=8E=E9=83=A8=E5=88=86=E8=BE=93=E5=85=A5=E6=A1=86=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/asset/assetBox.vue        | 75 ++++++++++++++-----
 1 file changed, 56 insertions(+), 19 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index edae135ec..d6f65a7b4 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -218,27 +218,37 @@
           </template>
           <!-- TELNET -->
           <template v-if="editAsset.type && editAsset.type.authProtocol === assetConstants.authProtocolData.telnet">
-            <div class="form__sub-title">TELNET</div>
-            <el-form-item :label="$t('profile.username')" prop="authUsername">
-              <el-input maxlength="64" show-word-limit v-model="editAsset.authUsername" size="small"/>
-            </el-form-item>
-            <el-form-item :label="$t('login.pin')" prop="authPin">
-              <el-input maxlength="256" show-word-limit v-model="editAsset.authPin" size="small"  type="password"/>
-            </el-form-item>
-            <el-form-item :label="$t('asset.usernamePrompt')" prop="authUserTip">
-              <el-input maxlength="64" show-word-limit v-model="editAsset.authUserTip" size="small"/>
-            </el-form-item>
-            <el-form-item :label="$t('asset.pinPrompt')" prop="authPinTip">
-              <el-input maxlength="64" show-word-limit v-model="editAsset.authPinTip" size="small"  type="password"/>
-            </el-form-item>
-            <el-form-item :label="$t('asset.port')" prop="authProtocolPort">
-              <el-input v-model="editAsset.authProtocolPort" size="small"/>
-            </el-form-item>
+            <div class="form__sub-title">TELNET
+              <div>
+                <el-switch v-model="editAsset.showTelnet" :active-value="true" :inactive-value="false" size="small"></el-switch>
+              </div>
+            </div>
+            <div v-if="editAsset.showTelnet">
+              <el-form-item :label="$t('profile.username')" prop="authUsername">
+                <el-input maxlength="64" show-word-limit v-model="editAsset.authUsername" size="small"/>
+              </el-form-item>
+              <el-form-item :label="$t('login.pin')" prop="authPin">
+                <el-input maxlength="256" show-word-limit v-model="editAsset.authPin" size="small"  type="password"/>
+              </el-form-item>
+              <el-form-item :label="$t('asset.usernamePrompt')" prop="authUserTip">
+                <el-input maxlength="64" show-word-limit v-model="editAsset.authUserTip" size="small"/>
+              </el-form-item>
+              <el-form-item :label="$t('asset.pinPrompt')" prop="authPinTip">
+                <el-input maxlength="64" show-word-limit v-model="editAsset.authPinTip" size="small"  type="password"/>
+              </el-form-item>
+              <el-form-item :label="$t('asset.port')" prop="authProtocolPort">
+                <el-input v-model="editAsset.authProtocolPort" size="small"/>
+              </el-form-item>
+            </div>
           </template>
           <!-- SNMP -->
           <template v-if="editAsset.type && editAsset.type.snmpEnable === 1">
-            <div class="form__sub-title">SNMP</div>
-            <el-form-item :label="$t('asset.snmpCredential')" prop="snmpCredentialId">
+            <div class="form__sub-title">SNMP
+              <div>
+                <el-switch v-model="editAsset.showSnmp" :active-value="true" :inactive-value="false" size="small"></el-switch>
+              </div>
+            </div>
+            <el-form-item :label="$t('asset.snmpCredential')" prop="snmpCredentialId" v-if="editAsset.showSnmp">
               <el-select v-model="editAsset.snmpCredentialId" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id">
                 <el-option v-for="snmp in options.snmpCredentialOptions" :key="snmp.id" :label="snmp.name" :value="snmp.id"></el-option>
               </el-select>
@@ -450,6 +460,16 @@ export default {
         } else {
           editAsset.showSSH = false
         }
+        if (!editAsset.authType && this.editAsset.authUsername) {
+          editAsset.showTelnet = true
+        } else if (!editAsset.authType && !this.editAsset.authUsername) {
+          editAsset.showTelnet = false
+        }
+        if (editAsset.type.snmpEnable === 1 && editAsset.snmpCredentialId) {
+          editAsset.showSnmp = true
+        } else {
+          editAsset.showSnmp = false
+        }
         this.editAsset = editAsset
         this.editAsset.brandAndModel = [this.editAsset.brand.id, this.editAsset.model.id]
         this.editAsset.stateId = n.state ? n.state.id : 2
@@ -677,6 +697,7 @@ export default {
       this.editAsset.snmpCredentialId = ''
       this.editAsset.authProtocolPort = ''
       this.editAsset.pid = ''
+      this.$refs.form.clearValidate()
       this.getModelData()
     },
     addLabel ([groupId, metaId]) {
@@ -733,12 +754,28 @@ export default {
           if (params.purchaseDate) {
             params.purchaseDate = bus.timeFormate(new Date(params.purchaseDate), 'YYYY-MM-DD')
           }
-          if (!params.showSSH) {
+          // 判断是 ssh 还是 telnet
+          if (params.type.authProtocol === assetConstants.authProtocolData.telnet && !params.showTelnet) { // telnet
             params.authType = ''
             params.authUsername = ''
             params.authPriKey = ''
             params.authPin = ''
           }
+          if (params.type.authProtocol === assetConstants.authProtocolData.ssh && !params.showSSH) { // ssh
+            params.authType = ''
+            params.authUsername = ''
+            params.authPriKey = ''
+            params.authPin = ''
+          }
+          if (!params.showSSH && !params.showTelnet) {
+            params.authType = ''
+            params.authUsername = ''
+            params.authPriKey = ''
+            params.authPin = ''
+          }
+          if (!params.showSnmp) {
+            params.snmpCredentialId = ''
+          }
           if (params.type.vm !== 1) {
             params.parent = {}
             params.pid = '-1'