test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev

This commit is contained in:
chenjianxing 2020-05-21 12:01:55 +08:00
parent 72229c3f15 94dd8372a4
commit f456f9a8e0
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/src/business/components/settings/system/SystemParameterSetting.vue
View File

@ -12,7 +12,7 @@
<el-form-item :label="$t('system_parameter_setting.SMTP_host')" prop="host">
</el-form-item>
<el-input v-model="formInline.host" :placeholder="$t('system_parameter_setting.SMTP_host')"
v-on:input="host"></el-input>
v-on:input="host('host')"></el-input>
</el-col>
</el-row>
<el-row>
@ -20,7 +20,7 @@
<el-form-item :label="$t('system_parameter_setting.SMTP_port')" prop="port">
</el-form-item>
<el-input v-model="formInline.port" :placeholder="$t('system_parameter_setting.SMTP_port')"
v-on:input="port"></el-input>
v-on:input="port('port')"></el-input>
</el-col>
</el-row>
<el-row>
@ -28,7 +28,7 @@
<el-form-item :label="$t('system_parameter_setting.SMTP_account')" prop="account">
</el-form-item>
<el-input v-model="formInline.account" :placeholder="$t('system_parameter_setting.SMTP_account')"
v-on:input="account"></el-input>
v-on:input="account('account')"></el-input>
</el-col>
</el-row>
<el-row>
@ -42,13 +42,13 @@
<!---->
<div style="border: 0px;margin-bottom: 20px;margin-top: 20px">
<el-checkbox v-model="SSL" label="开启SSL(如果SMTP端口是465，通常需要启用SSL)"></el-checkbox>
<el-checkbox v-model="SSL" :label="$t('system_parameter_setting.SSL')"></el-checkbox>
</div>
<div style="border: 0px;margin-bottom: 20px">
<el-checkbox v-model="TLS" label="开启TLS(如果SMTP端口是587，通常需要启用TLS)"></el-checkbox>
<el-checkbox v-model="TLS" :label="$t('system_parameter_setting.TLS')"></el-checkbox>
</div>
<div style="border: 0px;margin-bottom: 20px">
<el-checkbox v-model="SMTP" label="是否匿名 SMTP"></el-checkbox>
<el-checkbox v-model="SMTP" :label="$t('system_parameter_setting.SMTP')"></el-checkbox>
</div>
<template v-slot:footer>
</template>
@ -111,9 +111,10 @@
}
}
},
methods: {
host() {
let host = this.formInline.host;
if (!host) {
this.disabledConnection = true;

4
frontend/src/i18n/en-US.js
View File

@ -501,6 +501,10 @@ export default {
'SMTP_port': 'SMTP port',
'SMTP_account': 'SMTP account',
'SMTP_password': 'SMTP password',
'SSL': 'Turn on SSL (if the SMTP port is 465, you usually need to enable SSL)',
'TLS': 'Turn on TLS (if the SMTP port is 587, you usually need to enable TLS)',
'SMTP': 'Anonymous SMTP or not',
},
i18n: {
'home': 'Home'

3
frontend/src/i18n/zh-CN.js
View File

@ -498,6 +498,9 @@ export default {
'SMTP_port': 'SMTP端口',
'SMTP_account': 'SMTP账户',
'SMTP_password': 'SMTP密码',
'SSL': '开启SSL(如果SMTP端口是465，通常需要启用SSL)',
'TLS': '开启TLS(如果SMTP端口是587，通常需要启用TLS)',
'SMTP': '是否匿名 SMTP',
},
i18n: {
'home': '首页'