gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-2047 fix： bug1 bug2 修改

Browse Source
This commit is contained in:
zhangyu
2022-07-19 16:31:08 +08:00
parent ab7750cdfa
commit 517ce4bbe1
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/assets/css/common/rightBoxCommon.scss
View File

@@ -221,7 +221,7 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
height: 70px; height: 70px;
box-shadow: -3px 0 8px -3px rgba(205,205,205,0.77); box-shadow: $--right-box-shadow;
} }
.footer__btn { .footer__btn {
margin: 0 15px; margin: 0 15px;

2
nezha-fronted/src/components/common/mixin/system/systemMixin.js
View File

@@ -252,7 +252,7 @@ export default {
this.$refs.emailForm.clearValidate() this.$refs.emailForm.clearValidate()
} }
if (type == 'monitor') { if (type == 'monitor') {
localStorage.setItem('nz-prometheus-federation-enabled', this.monitor.prometheus_federation_enabled)
} }
this[type + 'Copy'] = Object.assign({}, this[type]) this[type + 'Copy'] = Object.assign({}, this[type])
} }

9
nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue
View File

@@ -33,7 +33,7 @@
<el-form-item :label='$t("config.mib.credential.writeCommunity")' prop="writeCommunity" v-if="editCredential.type ===1 || editCredential.type === 2"> <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-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>
<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-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>
<el-form-item :label='$t("config.mib.credential.contextName")' prop="contextname" v-if="editCredential.type === 3"> <el-form-item :label='$t("config.mib.credential.contextName")' prop="contextname" v-if="editCredential.type === 3">
@@ -50,7 +50,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </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-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> </el-form-item>
@@ -64,7 +64,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </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-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-item>
</el-form> </el-form>
@@ -102,6 +102,9 @@ export default {
name: [ name: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
'config.username': [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
remark: [ remark: [
// { required: true, message: this.$t('validate.required'), trigger: 'blur' } // { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],