Merge remote-tracking branch 'origin/v1.0' into v1.0

This commit is contained in:
Captain.B 2020-06-16 15:57:30 +08:00
commit f7e60ceef3
7 changed files with 17 additions and 7 deletions

View File

@ -10,7 +10,7 @@
:placeholder="$t('api_test.key')" show-word-limit/>
</el-col>
<el-col>
<el-input :disabled="isReadOnly" v-model="item.value" size="small" maxlength="100" @change="change"
<el-input :disabled="isReadOnly" v-model="item.value" size="small" maxlength="500" @change="change"
:placeholder="$t('api_test.value')" show-word-limit/>
</el-col>
<el-col class="kv-delete">

View File

@ -304,6 +304,12 @@
return false;
}
if (!this.threadNumber || !this.duration || !this.rampUpTime || !this.step || !this.rpsLimit) {
this.$warning(this.$t('load_test.pressure_config_params_is_empty'));
this.$emit('changeActive', '1');
return false;
}
return true;
},
convertProperty() {

View File

@ -57,7 +57,7 @@
</el-dialog>
<!--Change personal password-->
<el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="30%" left>
<el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="35%" left>
<el-form :model="ruleForm" :rules="rules" ref="editPasswordForm" label-width="120px" class="demo-ruleForm">
<el-form-item :label="$t('member.old_password')" prop="password" style="margin-bottom: 29px">
<el-input v-model="ruleForm.password" autocomplete="off" show-password/>

View File

@ -64,8 +64,9 @@
<el-form-item :label="$t('commons.phone')" prop="phone">
<el-input v-model="form.phone" autocomplete="off" :placeholder="$t('user.input_phone')"/>
</el-form-item>
<el-form-item :label="$t('commons.password')" prop="password">
<el-input v-model="form.password" autocomplete="new-password" show-password :placeholder="$t('user.input_password')"/>
<el-form-item :label="$t('commons.password')" prop="password" style="margin-bottom: 29px">
<el-input v-model="form.password" autocomplete="new-password" show-password
:placeholder="$t('user.input_password')"/>
</el-form-item>
<div v-for="(role, index) in form.roles" :key="index">
<el-form-item :label="$t('commons.role')+index"

View File

@ -155,7 +155,7 @@ export default {
'special_characters_are_not_supported': 'Special characters are not supported',
'mobile_number_format_is_incorrect': 'Mobile number format is incorrect',
'email_format_is_incorrect': 'Email format is incorrect',
'password_format_is_incorrect': 'Password format is incorrect (At least 8-16 characters, at least 1 uppercase letter, 1 lowercase letter and 1 number)',
'password_format_is_incorrect': 'Valid password: 8-16 digits, English upper and lower case letters + numbers ',
'old_password': 'Old Password',
'new_password': 'New Password',
'remove_member': 'Are you sure you want to remove this member',
@ -268,6 +268,7 @@ export default {
'download_log_file': 'Download',
'user_name': 'Creator',
'special_characters_are_not_supported': 'Test name does not support special characters',
'pressure_config_params_is_empty': 'Pressure configuration parameters cannot be empty!'
},
api_test: {
creator: "Creator",

View File

@ -154,7 +154,7 @@ export default {
'special_characters_are_not_supported': '不支持特殊字符',
'mobile_number_format_is_incorrect': '手机号码格式不正确',
'email_format_is_incorrect': '邮箱格式不正确',
'password_format_is_incorrect': '密码格式不正确(至少8-16个字符至少1个大写字母1个小写字母和1个数字)',
'password_format_is_incorrect': '有效密码8-16位英文大小写字母+数字',
'old_password': '旧密码',
'new_password': '新密码',
'remove_member': '确定要移除该成员吗',
@ -268,6 +268,7 @@ export default {
'pressure_prediction_chart': '压力预估图',
'user_name': '创建人',
'special_characters_are_not_supported': '测试名称不支持特殊字符',
'pressure_config_params_is_empty': '压力配置参数不能为空!'
},
api_test: {
creator: "创建人",

View File

@ -152,7 +152,7 @@ export default {
'special_characters_are_not_supported': '不支持特殊字符',
'mobile_number_format_is_incorrect': '手機號碼格式不正確',
'email_format_is_incorrect': '郵箱格式不正確',
'password_format_is_incorrect': '密碼格式不正確(至少8-16個字符,至少1個大寫字母,1個小寫字母和1個數字)',
'password_format_is_incorrect': '有效密碼8-16比特英文大小寫字母+數位',
'old_password': '舊密碼',
'new_password': '新密碼',
'remove_member': '確定要移除該成員嗎',
@ -266,6 +266,7 @@ export default {
'pressure_prediction_chart': '壓力預估圖',
'user_name': '創建人',
'special_characters_are_not_supported': '測試名稱不支持特殊字符',
'pressure_config_params_is_empty': '壓力配置參數不能為空!'
},
api_test: {
title: "測試",