ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 表单单行文本去前后空格

Browse Source
This commit is contained in:
赵霄
2023-10-25 17:42:10 +08:00
parent 8d5c6b9380
commit 8bd2beb10e
9 changed files with 79 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/system/modules/DictItemModal.vue
+16 -7
View File
@@ -10,14 +10,17 @@
:cancelText="$t('close')"
>
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="itemText"
:label="$t('name')">
<a-input :placeholder="$t('pleaseEnter') + $t('name')" :maxLength="50" v-model="model.itemText"/>
<a-input :placeholder="$t('pleaseEnter') + $t('name')"
:maxLength="50"
@change="event => event.target.value = event.target.value.trim()"
v-model="model.itemText" />
</a-form-model-item>
<a-form-model-item
@@ -25,7 +28,10 @@
:wrapperCol="wrapperCol"
prop="enName"
:label="$t('englishName')">
<a-input :placeholder="$t('pleaseEnter') + $t('englishName')" :maxLength="50" v-model="model.enName"/>
<a-input :placeholder="$t('pleaseEnter') + $t('englishName')"
:maxLength="50"
@change="event => event.target.value = event.target.value.trim()"
v-model="model.enName" />
</a-form-model-item>
<a-form-model-item
@@ -40,7 +46,7 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
:label="$t('description')">
<a-input :maxLength="50" v-model="model.description" />
<a-input :maxLength="50" v-model="model.description" @change="event => event.target.value = event.target.value.trim()" />
</a-form-model-item>
<a-form-model-item
@@ -56,7 +62,7 @@
:wrapperCol="wrapperCol"
:label="$t('whether') + $t('enable')"
:hasFeedback="true">
<a-switch :checkedChildren="$t('enable')" :unCheckedChildren="$t('disable')" @change="onChose" v-model="visibleCheck"/>
<a-switch :checkedChildren="$t('enable')" :unCheckedChildren="$t('disable')" @change="onChose" v-model="visibleCheck" />
</a-form-model-item>
</a-form-model>
@@ -90,7 +96,10 @@ export default {
confirmLoading: false,
validatorRules: {
itemText: [{ required: true, message: this.$t('pleaseEnter') + this.$t('name') + '!' }],
itemValue: [{ required: true, message: this.$t('pleaseEnter') + this.$t('dict.dataValue') + '!' }, { validator: this.validateItemValue }]
itemValue: [{
required: true,
message: this.$t('pleaseEnter') + this.$t('dict.dataValue') + '!'
}, { validator: this.validateItemValue }]
}
}
},
@@ -179,7 +188,7 @@ export default {
param.id = this.model.id
}
if (value) {
const reg = new RegExp("[`_~!@#$^&*()=|{}'.<>《》/?！￥（）—【】‘；：”“。，、？]")
const reg = new RegExp('[`_~!@#$^&*()=|{}\'.<>《》/?！￥（）—【】‘；：”“。，、？]')
if (reg.test(value)) {
callback(new Error(this.$t('dict.valueCannotContainSpecChar')))
} else {
src/views/system/modules/UserModal.vue
+35 -16
View File
@@ -27,12 +27,16 @@
:maxLength="50"
v-model="model.username"
:readOnly="!!model.id"
:disabled="disableSubmit" />
:disabled="disableSubmit"
@change="event => event.target.value = event.target.value.trim()" />
</a-form-model-item>
<template v-if="!model.id">
<a-form-model-item :label="$t('user.loginPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="password">
<a-input-password type="password" :placeholder="$t('pleaseEnter') + $t('user.loginPassword')" :maxLength="20" v-model="model.password" />
<a-input-password type="password"
:placeholder="$t('pleaseEnter') + $t('user.loginPassword')"
:maxLength="20"
v-model="model.password" />
</a-form-model-item>
<a-form-model-item :label="$t('user.confirmPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmpassword">
@@ -45,11 +49,19 @@
</template>
<a-form-model-item :label="$t('user.userName')" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="realname">
<a-input :placeholder="$t('pleaseEnter') + $t('user.userName')" v-model="model.realname" :maxLength="50" :disabled="disableSubmit" />
<a-input :placeholder="$t('pleaseEnter') + $t('user.userName')"
v-model="model.realname"
:maxLength="50"
:disabled="disableSubmit"
@change="event => event.target.value = event.target.value.trim()" />
</a-form-model-item>
<a-form-model-item :label="$t('user.post')" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="post">
<a-input :placeholder="$t('pleaseEnter') + $t('user.post')" v-model="model.post" :maxLength="50" :disabled="disableSubmit" />
<a-input :placeholder="$t('pleaseEnter') + $t('user.post')"
v-model="model.post"
:maxLength="50"
:disabled="disableSubmit"
@change="event => event.target.value = event.target.value.trim()" />
</a-form-model-item>
<a-form-model-item :label="$t('user.roleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled">
@@ -90,7 +102,10 @@
<a-radio :value="2">{{ $t('user.superior') }}</a-radio>
</a-radio-group>
</a-form-model-item>
<a-form-model-item :label="$t('user.responsibleDepartment')" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="departIdShow===true">
<a-form-model-item :label="$t('user.responsibleDepartment')"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
v-if="departIdShow===true">
<j-multi-select-tag
:disabled="disableSubmit"
v-model="model.departIds"
@@ -99,14 +114,14 @@
</j-multi-select-tag>
</a-form-model-item>
<!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
<!-- <a-form-model-item :label="$t('user.heads')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <j-image-upload class="avatar-uploader"-->
<!-- :text="$t('upload')"-->
<!-- v-model="model.avatar"-->
<!-- :disabled="disableSubmit"-->
<!-- :number=1-->
<!-- accept='.png,.PNG,.jpg,.JPG'></j-image-upload>-->
<!-- </a-form-model-item>-->
<!-- <a-form-model-item :label="$t('user.heads')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <j-image-upload class="avatar-uploader"-->
<!-- :text="$t('upload')"-->
<!-- v-model="model.avatar"-->
<!-- :disabled="disableSubmit"-->
<!-- :number=1-->
<!-- accept='.png,.PNG,.jpg,.JPG'></j-image-upload>-->
<!-- </a-form-model-item>-->
<a-form-model-item :label="$t('user.gender')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select v-model="model.sex"
@@ -119,7 +134,11 @@
</a-form-model-item>
<a-form-model-item :label="$t('user.mailbox')" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
<a-input :placeholder="$t('pleaseEnter') + $t('user.mailbox')" v-model="model.email" :maxLength="50" :disabled="disableSubmit" />
<a-input :placeholder="$t('pleaseEnter') + $t('user.mailbox')"
v-model="model.email"
:maxLength="50"
:disabled="disableSubmit"
@change="event => event.target.value = event.target.value.trim()" />
</a-form-model-item>
<a-form-model-item :label="$t('phoneNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
@@ -181,13 +200,13 @@ export default {
pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
message: this.$t('user.passwordConsists')
},
{ validator: this.validateToNextPassword, trigger: 'change' }],
{ validator: this.validateToNextPassword, trigger: 'change' }],
confirmpassword: [{ required: true, message: this.$t('user.reenterLoginPassword') },
{ validator: this.compareToFirstPassword }],
realname: [{ required: true, message: this.$t('pleaseEnter') + this.$t('user.userName') }],
phone: [{ validator: this.validatePhone }],
email: [{ validator: this.validateEmail }],
roles: {},
roles: {}
},
departIdShow: false,
title: this.$t('operation'),