邮箱校验修改
continuous-integration/drone/push Build is passing Details

main
wangxiaoshuang 2025-07-25 15:55:23 +08:00
parent 2b820a114b
commit 3b14944671
21 changed files with 86 additions and 16 deletions

View File

@ -275,6 +275,13 @@ async function VueInit() {
} }
return companyName; return companyName;
} }
Vue.prototype.$reg = () => {
if (localStorage.getItem('CompanyInfo')) {
let { EmailRegexStr } = JSON.parse(localStorage.getItem('CompanyInfo'))
return { EmailRegexStr }
}
return { EmailRegexStr: '/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$/' };
}
Vue.prototype.$updateDictionary = function () { Vue.prototype.$updateDictionary = function () {
Vue.prototype.$d = function (code) { Vue.prototype.$d = function (code) {
var dictInfo = res.Result var dictInfo = res.Result

View File

@ -179,7 +179,8 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
{ {
type: 'email', // type: 'email',
pattern: new RegExp(this.$reg().EmailRegexStr),
message: 'Please input the correct email address', message: 'Please input the correct email address',
trigger: ['blur'], trigger: ['blur'],
}, },

View File

@ -164,6 +164,14 @@ export default {
}, },
}, },
], ],
Email: [
{
// type: 'email',
pattern: new RegExp(this.$reg().EmailRegexStr),
message: this.$t('rules:email'),
trigger: 'blur,change',
},
]
}, },
userId: null, userId: null,
loading: false, loading: false,

View File

@ -125,6 +125,9 @@ export default {
} else { } else {
var reg = var reg =
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
if (this.$reg().EmailRegexStr) {
reg = new RegExp(this.$reg().EmailRegexStr)
}
if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) { if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
this.sendDisabled = false this.sendDisabled = false
callback() callback()

View File

@ -172,6 +172,13 @@ export default {
], ],
Phone: [ Phone: [
{ required: true, validator: checkPhone, trigger: 'blur' } { required: true, validator: checkPhone, trigger: 'blur' }
],
Email: [
{
pattern: new RegExp(this.$reg().EmailRegexStr),
message: 'Please input the correct email address',
trigger: 'blur,change',
}
] ]
}, },
siteOptions: [], siteOptions: [],

View File

@ -117,6 +117,9 @@ export default {
} else { } else {
var reg = var reg =
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
if (this.$reg().EmailRegexStr) {
reg = new RegExp(this.$reg().EmailRegexStr)
}
if (this.form.Email && reg.test(this.form.Email)) { if (this.form.Email && reg.test(this.form.Email)) {
this.sendDisabled = false this.sendDisabled = false
callback() callback()

View File

@ -136,6 +136,9 @@ export default {
} else { } else {
var reg = var reg =
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
if (this.$reg().EmailRegexStr) {
reg = new RegExp(this.$reg().EmailRegexStr)
}
if (this.form.Email && reg.test(this.form.Email)) { if (this.form.Email && reg.test(this.form.Email)) {
this.sendDisabled = false this.sendDisabled = false
callback() callback()

View File

@ -158,6 +158,9 @@ export default {
callback(new Error(this.$t('trials:researchForm:formRule:specify'))) callback(new Error(this.$t('trials:researchForm:formRule:specify')))
} else { } else {
var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
if (this.$reg().EmailRegexStr) {
reg = new RegExp(this.$reg().EmailRegexStr)
}
if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) { if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
callback() callback()
} else { } else {
@ -170,6 +173,9 @@ export default {
callback(new Error(this.$t('trials:researchForm:formRule:specify'))) callback(new Error(this.$t('trials:researchForm:formRule:specify')))
} else { } else {
var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
if (this.$reg().EmailRegexStr) {
reg = new RegExp(this.$reg().EmailRegexStr)
}
if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) { if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) {
callback() callback()
} else { } else {

View File

@ -49,7 +49,7 @@
<el-input v-model="form.Phone" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" /> <el-input v-model="form.Phone" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
</el-form-item> </el-form-item>
<!-- 联系邮箱 --> <!-- 联系邮箱 -->
<el-form-item :label="$t('trials:researchForm:form:contactorEmail')"> <el-form-item :label="$t('trials:researchForm:form:contactorEmail')" prop="Email">
<el-input v-model="form.Email" disabled /> <el-input v-model="form.Email" disabled />
</el-form-item> </el-form-item>
@ -183,6 +183,13 @@ export default {
], ],
Phone: [ Phone: [
{ required: true, validator: checkPhone, trigger: 'blur' } { required: true, validator: checkPhone, trigger: 'blur' }
],
Email: [
{
pattern: new RegExp(this.$reg().EmailRegexStr),
message: 'Please input the correct email address',
trigger: 'blur,change',
}
] ]
}, },
siteOptions: [], siteOptions: [],

View File

@ -108,6 +108,9 @@ export default {
} else { } else {
var reg = var reg =
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
if (this.$reg().EmailRegexStr) {
reg = new RegExp(this.$reg().EmailRegexStr)
}
if (this.form.Email && reg.test(this.form.Email)) { if (this.form.Email && reg.test(this.form.Email)) {
this.sendDisabled = false this.sendDisabled = false
callback() callback()

View File

@ -139,6 +139,9 @@ export default {
} else { } else {
var reg = var reg =
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
if (this.$reg().EmailRegexStr) {
reg = new RegExp(this.$reg().EmailRegexStr)
}
if (this.form.Email && reg.test(this.form.Email)) { if (this.form.Email && reg.test(this.form.Email)) {
this.sendDisabled = false this.sendDisabled = false
callback() callback()

View File

@ -131,6 +131,9 @@ export default {
callback(new Error(this.$t('trials:researchForm:formRule:specify'))) callback(new Error(this.$t('trials:researchForm:formRule:specify')))
} else { } else {
var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
if (this.$reg().EmailRegexStr) {
reg = new RegExp(this.$reg().EmailRegexStr)
}
if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) { if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
// this.sendDisabled = false // this.sendDisabled = false
callback() callback()
@ -145,6 +148,9 @@ export default {
callback(new Error(this.$t('trials:researchForm:formRule:specify'))) callback(new Error(this.$t('trials:researchForm:formRule:specify')))
} else { } else {
var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
if (this.$reg().EmailRegexStr) {
reg = new RegExp(this.$reg().EmailRegexStr)
}
if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) { if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) {
callback() callback()
} else { } else {

View File

@ -110,6 +110,9 @@ export default {
} else { } else {
var reg = var reg =
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
if (this.$reg().EmailRegexStr) {
reg = new RegExp(this.$reg().EmailRegexStr)
}
if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) { if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
this.sendDisabled = false this.sendDisabled = false
callback() callback()
@ -125,6 +128,9 @@ export default {
} else { } else {
var reg = var reg =
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
if (this.$reg().EmailRegexStr) {
reg = new RegExp(this.$reg().EmailRegexStr)
}
if ( if (
this.form.ReplaceUserEmailOrPhone && this.form.ReplaceUserEmailOrPhone &&
reg.test(this.form.ReplaceUserEmailOrPhone) reg.test(this.form.ReplaceUserEmailOrPhone)

View File

@ -285,7 +285,8 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
{ {
type: 'email', // type: 'email',
pattern: new RegExp(this.$reg().EmailRegexStr),
message: 'Please input the correct email address', message: 'Please input the correct email address',
trigger: 'blur,change', trigger: 'blur,change',
}, },

View File

@ -548,7 +548,8 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
{ {
type: 'email', // type: 'email',
pattern: new RegExp(this.$reg().EmailRegexStr),
message: this.$t('rules:email'), message: this.$t('rules:email'),
trigger: 'blur,change', trigger: 'blur,change',
}, },

View File

@ -530,6 +530,9 @@ export default {
emailList.forEach((item) => { emailList.forEach((item) => {
var pattern = var pattern =
/^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/ /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
if (this.$reg().EmailRegexStr) {
pattern = new RegExp(this.$reg().EmailRegexStr)
}
if (!pattern.test(item)) { if (!pattern.test(item)) {
isError = true isError = true
} }

View File

@ -439,7 +439,8 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
{ {
type: 'email', // type: 'email',
pattern: new RegExp(this.$reg().EmailRegexStr),
message: 'Please input the correct email address', message: 'Please input the correct email address',
trigger: ['blur'], trigger: ['blur'],
}, },

View File

@ -290,11 +290,8 @@ export default {
handleEmailChange() { handleEmailChange() {
var reg = var reg =
/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$/ /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$/
if (localStorage.getItem('CompanyInfo')) { if (this.$reg().EmailRegexStr) {
let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo')); reg = new RegExp(this.$reg().EmailRegexStr)
if (CompanyInfo.EmailRegexStr) {
reg = new RegExp(CompanyInfo.EmailRegexStr)
}
} }
if (this.userForm.EMail && reg.test(this.userForm.EMail)) { if (this.userForm.EMail && reg.test(this.userForm.EMail)) {
this.sendDisabled = false this.sendDisabled = false

View File

@ -535,7 +535,8 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
{ {
type: 'email', // type: 'email',
pattern: new RegExp(this.$reg().EmailRegexStr),
message: this.$t('rules:email'), message: this.$t('rules:email'),
trigger: 'blur,change', trigger: 'blur,change',
}, },
@ -610,6 +611,9 @@ export default {
emailList.forEach((item) => { emailList.forEach((item) => {
var pattern = var pattern =
/^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/ /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
if (this.$reg().EmailRegexStr) {
pattern = new RegExp(this.$reg().EmailRegexStr)
}
if (!pattern.test(item)) { if (!pattern.test(item)) {
isError = true isError = true
} }

View File

@ -114,6 +114,9 @@ export default {
callback(new Error(this.$t('common:ruleMessage:specify'))) callback(new Error(this.$t('common:ruleMessage:specify')))
} else { } else {
var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
if (this.$reg().EmailRegexStr) {
reg = new RegExp(this.$reg().EmailRegexStr)
}
if (this.form.Email && reg.test(this.form.Email)) { if (this.form.Email && reg.test(this.form.Email)) {
this.sendDisabled = false this.sendDisabled = false
callback() callback()

View File

@ -438,11 +438,8 @@ export default {
handleEmailChange() { handleEmailChange() {
var reg = var reg =
/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$/ /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$/
if (localStorage.getItem('CompanyInfo')) { if (this.$reg().EmailRegexStr) {
let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo')); reg = new RegExp(this.$reg().EmailRegexStr)
if (CompanyInfo.EmailRegexStr) {
reg = new RegExp(CompanyInfo.EmailRegexStr)
}
} }
if (this.userForm.EMail && reg.test(this.userForm.EMail)) { if (this.userForm.EMail && reg.test(this.userForm.EMail)) {
this.sendDisabled = false this.sendDisabled = false