Merge remote-tracking branch 'origin/master'

This commit is contained in:
wenyann 2020-10-19 15:45:39 +08:00
commit d2e1b81c6a
2 changed files with 4 additions and 7 deletions

View File

@ -201,6 +201,9 @@ export default {
case RPS_LIMIT:
this.rpsLimit = d.value;
break;
case RPS_LIMIT_ENABLE:
this.rpsLimitEnable = d.value;
break;
default:
break;
}

View File

@ -233,13 +233,7 @@ export default {
rule: {
name: [
{required: true, message: this.$t('organization.input_name'), trigger: 'blur'},
{min: 2, max: 25, message: this.$t('commons.input_limit', [2, 25]), trigger: 'blur'},
{
required: true,
pattern: /^[\u4e00-\u9fa5_a-zA-Z0-9.·-]+$/,
message: this.$t('organization.special_characters_are_not_supported'),
trigger: 'blur'
}
{min: 2, max: 25, message: this.$t('commons.input_limit', [2, 25]), trigger: 'blur'}
],
description: [
{max: 50, message: this.$t('commons.input_limit', [0, 50]), trigger: 'blur'}