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/v1.0' into v1.0

This commit is contained in:
Captain.B 2020-06-16 16:34:18 +08:00
parent 4bb76b6f50 685a36f169
commit c934dbe181
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/business/components/api/test/components/ApiRequestForm.vue
View File

@ -5,7 +5,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('api_test.request.url')" prop="url"> <el-form-item :label="$t('api_test.request.url')" prop="url">
<el-input :disabled="isReadOnly" v-model="request.url" maxlength="100" :placeholder="$t('api_test.request.url_description')" <el-input :disabled="isReadOnly" v-model="request.url" maxlength="500" :placeholder="$t('api_test.request.url_description')"
@change="urlChange" clearable> @change="urlChange" clearable>
<el-select :disabled="isReadOnly" v-model="request.method" slot="prepend" class="request-method-select" @change="methodChange"> <el-select :disabled="isReadOnly" v-model="request.method" slot="prepend" class="request-method-select" @change="methodChange">
<el-option label="GET" value="GET"/> <el-option label="GET" value="GET"/>
@ -74,7 +74,7 @@
{max: 100, message: this.$t('commons.input_limit', [0, 100]), trigger: 'blur'} {max: 100, message: this.$t('commons.input_limit', [0, 100]), trigger: 'blur'}
], ],
url: [ url: [
{max: 100, required: true, message: this.$t('commons.input_limit', [0, 100]), trigger: 'blur'}, {max: 500, required: true, message: this.$t('commons.input_limit', [0, 500]), trigger: 'blur'},
{validator: validateURL, trigger: 'blur'} {validator: validateURL, trigger: 'blur'}
] ]
} }

6
frontend/src/business/components/settings/personal/PersonSetting.vue
View File

@ -128,12 +128,6 @@
rules:{ rules:{
password: [ password: [
{required: true, message: this.$t('user.input_password'), trigger: 'blur'}, {required: true, message: this.$t('user.input_password'), trigger: 'blur'},
{
required: true,
pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,16}$/,
message: this.$t('member.password_format_is_incorrect'),
trigger: 'blur'
}
], ],
newpassword: [ newpassword: [
{required: true, message: this.$t('user.input_password'), trigger: 'blur'}, {required: true, message: this.$t('user.input_password'), trigger: 'blur'},