Merge pull request #3177 from dataease/pr@dev@fix_login_limit_form_limit

fix(系统管理-系统参数): 登录限制表单验证允许1-100正整数
This commit is contained in:
xuwei-fit2cloud 2022-09-26 17:03:10 +08:00 committed by GitHub
commit eec95afd0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 6 deletions

View File

@ -813,8 +813,10 @@ export default {
login_type: 'Default login type',
empty_front: 'If empty then default value is 10s',
empty_msg: 'If empty then default value is 30 days',
front_error: 'Valid ranger [0 - 300]', // 修改了提示信息
msg_error: 'Valid ranger [1 - 365]',
front_error: 'Valid range [0 - 300]', // 修改了提示信息
msg_error: 'Valid range [1 - 365]',
limit_times_error: 'Valid range [1 - 100]',
relieve_times_error: 'Valid range [1 - 100]',
SMTP_port: 'SMTP Port',
SMTP_account: 'SMTP Account',
SMTP_password: 'SMTP Password',
@ -2349,7 +2351,7 @@ export default {
label: 'Search Button',
text: 'Text',
auto_trigger: 'Auto Trigger',
range: 'Ranger',
range: 'Range',
relative: 'Relation',
auto_trigger_tip: 'Automatically trigger once when entering the preview page',
range_tip: 'Default association all filter components'

View File

@ -815,6 +815,8 @@ export default {
empty_msg: '為空則默認取值30天',
front_error: '請填寫0-300正整數', // 修改了提示信息
msg_error: '請填寫1-365正整數',
limit_times_error: '請填寫1-100正整數',
relieve_times_error: '請填寫1-100正整數',
SMTP_port: 'SMTP端口',
SMTP_account: 'SMTP賬戶',
SMTP_password: 'SMTP密碼',

View File

@ -814,6 +814,8 @@ export default {
empty_msg: '为空则默认取30天',
front_error: '请填写0-300正整数', // 修改了提示信息
msg_error: '请填写1-365正整数',
limit_times_error: '请填写1-100正整数',
relieve_times_error: '请填写1-100正整数',
SMTP_port: 'SMTP端口',
SMTP_account: 'SMTP账户',
SMTP_password: 'SMTP密码',

View File

@ -49,8 +49,8 @@
<el-form-item :label="$t('system_parameter_setting.ds_check_time')">
<el-form :inline="true" :disabled="show">
<el-form-item >
<el-input size="mini" v-model="formInline.dsCheckInterval" type="number" min="1" @change="onSimpleCronChange()" />
<el-form-item>
<el-input v-model="formInline.dsCheckInterval" size="mini" type="number" min="1" @change="onSimpleCronChange()" />
</el-form-item>
<el-form-item class="form-item">
@ -139,7 +139,7 @@ export default {
rules: {
frontTimeOut: [
{
pattern: '^([0-9]|\\b[1-9]\\d\\b|\\b[1-2]\\d\\d\\b|\\b300\\b)$', // 0-300
pattern: '^([0-9]|\\b[1-9]\\d\\b|\\b[1-2]\\d\\d\\b|\\b300\\b)$',
message: this.$t('system_parameter_setting.front_error'),
trigger: 'blur'
}
@ -150,6 +150,20 @@ export default {
message: this.$t('system_parameter_setting.msg_error'),
trigger: 'blur'
}
],
limitTimes: [
{
pattern: '^([1-9]|[1-9]\\d|100)$',
message: this.$t('system_parameter_setting.limit_times_error'),
trigger: 'blur'
}
],
relieveTimes: [
{
pattern: '^([1-9]|[1-9]\\d|100)$',
message: this.$t('system_parameter_setting.relieve_times_error'),
trigger: 'blur'
}
]
},
originLoginType: null