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

Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4

Browse Source
This commit is contained in:
zhangyu
2022-07-11 14:58:28 +08:00
parent b69c27ea4a e7bc257339
commit 45944ff3df
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nezha-fronted/src/components/common/rightBox/moduleBox.vue
View File

@@ -304,12 +304,12 @@
</el-form-item>
<!--authtype 1-->
<el-form-item v-if="authType === 1" :label='$t("asset.username")' class="half-form-item" prop="configs.0.config.basic_auth.username" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
<el-form-item v-if="authType === 1" :label='$t("profile.username")' class="half-form-item" prop="configs.0.config.basic_auth.username" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
<el-input id="module-box-input-uername" v-model="editModule.configs[0].config.basic_auth.username" placeholder='' size="small"></el-input>
</el-form-item>
<el-form-item v-if="authType === 1" :label='$t("login.pin")' class="half-form-item" prop="configs.0.config.basic_auth.pin" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
<el-input id="module-box-input-password" v-model="editModule.configs[0].config.basic_auth.pin" type="password" autocomplete="new-password" placeholder='' size="small"></el-input>
<el-form-item v-if="authType === 1" :label='$t("login.pin")' class="half-form-item" prop="configs.0.config.basic_auth.password" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
<el-input id="module-box-input-password" v-model="editModule.configs[0].config.basic_auth.password" type="password" autocomplete="new-password" placeholder='' size="small"></el-input>
</el-form-item>
<!--authtype 2-->
@@ -1123,7 +1123,7 @@ export default {
this.editModule.configs[0].config.bearer_token = ''
this.editModule.configs[0].config.basic_auth = {
username: '',
pin: ''
password: ''
}
},
changeBasicType () {
@@ -1355,7 +1355,7 @@ export default {
if (params[0].config.basic_auth && !params[0].config.basic_auth.username) {
delete params[0].config.basic_auth
}
if (params[0].config.basic_auth && !params[0].config.basic_auth.pin) {
if (params[0].config.basic_auth && !params[0].config.basic_auth.password) {
delete params[0].config.basic_auth
}
if (params[0].config.param && !Object.keys(params[0].config.param).length) {