From 517ce4bbe1bca896bfc7b4953b035449cf3f3078 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 19 Jul 2022 16:31:08 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2047=20fix=EF=BC=9A=20bug1=20bug2=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common/rightBoxCommon.scss  | 2 +-
 .../src/components/common/mixin/system/systemMixin.js    | 2 +-
 .../src/components/common/rightBox/snmpCredentialBox.vue | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
index ff493c21a..e6182c1bb 100644
--- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
+++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
@@ -221,7 +221,7 @@
   align-items: center;
   justify-content: center;
   height: 70px;
-  box-shadow: -3px 0 8px -3px rgba(205,205,205,0.77);
+  box-shadow: $--right-box-shadow;
 }
 .footer__btn {
   margin: 0 15px;
diff --git a/nezha-fronted/src/components/common/mixin/system/systemMixin.js b/nezha-fronted/src/components/common/mixin/system/systemMixin.js
index e556267e8..4bd5b88d8 100644
--- a/nezha-fronted/src/components/common/mixin/system/systemMixin.js
+++ b/nezha-fronted/src/components/common/mixin/system/systemMixin.js
@@ -252,7 +252,7 @@ export default {
             this.$refs.emailForm.clearValidate()
           }
           if (type == 'monitor') {
-
+            localStorage.setItem('nz-prometheus-federation-enabled', this.monitor.prometheus_federation_enabled)
           }
           this[type + 'Copy'] = Object.assign({}, this[type])
         }
diff --git a/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue b/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue
index de3cfa92f..8de01efaf 100644
--- a/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue
@@ -33,7 +33,7 @@
             <el-form-item :label='$t("config.mib.credential.writeCommunity")' prop="writeCommunity" v-if="editCredential.type ===1 || editCredential.type === 2">
               <el-input placeholder="" autocomplete="new-password" maxlength="64" show-word-limit v-model="editCredential.config.writeCommunity" size="small" id="credential-box-input-writeCommunity" type="password" show-password></el-input>
             </el-form-item>
-            <el-form-item :label='$t("profile.username")' prop="username" v-if="editCredential.type === 3">
+            <el-form-item :label='$t("profile.username")' prop="config.username" v-if="editCredential.type === 3">
               <el-input placeholder="" maxlength="64" show-word-limit v-model="editCredential.config.username" size="small" id="credential-box-input-username"></el-input>
             </el-form-item>
             <el-form-item :label='$t("config.mib.credential.contextName")' prop="contextname"  v-if="editCredential.type === 3">
@@ -50,7 +50,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :label='$t("login.pin")' prop="authPin" v-if="editCredential.type === 3">
+            <el-form-item :label='$t("login.pin")' prop="authPin" v-if="editCredential.type === 3" :rules="[ { required: editCredential.config.authProtocol, message: this.$t('validate.required'), trigger: 'blur' }]">
               <el-input placeholder=""  autocomplete="new-password"  v-model="editCredential.config.authPin" size="small" id="credential-box-input-authPin" type="password" show-password></el-input>
             </el-form-item>
 
@@ -64,7 +64,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :label='$t("login.pin")' prop="privPin"  v-if="editCredential.type === 3">
+            <el-form-item :label='$t("login.pin")' prop="privPin"  v-if="editCredential.type === 3" :rules="[ { required: editCredential.config.privProtocol, message: this.$t('validate.required'), trigger: 'blur' }]">
               <el-input placeholder=""  autocomplete="new-password"  v-model="editCredential.config.privPin" size="small" id="credential-box-input-privPin" :disabled="!editCredential.config.authProtocol || editCredential.config.authProtocol === ''" type="password" show-password></el-input>
             </el-form-item>
           </el-form>
@@ -102,6 +102,9 @@ export default {
         name: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        'config.username': [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         remark: [
           // { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],