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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wenyann 2020-10-19 15:45:39 +08:00
parent dd86a0f53a 452fc29771
commit d2e1b81c6a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
View File

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

8
frontend/src/business/components/settings/system/Organization.vue
View File

@ -233,13 +233,7 @@ export default {
rule: { rule: {
name: [ name: [
{required: true, message: this.$t('organization.input_name'), trigger: 'blur'}, {required: true, message: this.$t('organization.input_name'), trigger: 'blur'},
{min: 2, max: 25, message: this.$t('commons.input_limit', [2, 25]), 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'
}
], ],
description: [ description: [
{max: 50, message: this.$t('commons.input_limit', [0, 50]), trigger: 'blur'} {max: 50, message: this.$t('commons.input_limit', [0, 50]), trigger: 'blur'}