diff --git a/src/utils/test/index.spec.js b/src/utils/test/index.spec.js index 86b54980a..650ebc062 100644 --- a/src/utils/test/index.spec.js +++ b/src/utils/test/index.spec.js @@ -77,6 +77,7 @@ test('raf', async () => { test('isEmail', () => { expect(isEmail('abc@gmail.com')).toBeTruthy(); + expect(isEmail(' abc@gmail.com ')).toBeTruthy(); expect(isEmail('abc@@gmail.com')).toBeFalsy(); expect(isEmail('@gmail.com')).toBeFalsy(); expect(isEmail('abc@')).toBeFalsy(); diff --git a/src/utils/validate/email.ts b/src/utils/validate/email.ts index d5e3c21b8..c463fb169 100644 --- a/src/utils/validate/email.ts +++ b/src/utils/validate/email.ts @@ -1,5 +1,5 @@ /* eslint-disable */ export function isEmail(value: string): boolean { - const reg = /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i; - return reg.test(value); + const reg = /^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$/; + return reg.test(value.trim()); }