Unverified Commit 8eefa0e9 authored by easyscheduler's avatar easyscheduler Committed by GitHub
Browse files

Merge pull request #435 from lfyee/dev 

邮箱格式的验证
parents 5496e3fd f1665bb3

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/util.js

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ let warningTypeList = [ 
]



const isEmial = (val) => {

  let regEmail = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/ // eslint-disable-line

  let regEmail = /^([a-zA-Z0-9]+[_|\-|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\-|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/ // eslint-disable-line

  return regEmail.test(val)

}

escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
        }

      },

      _verification () {

        let regEmail = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/ // eslint-disable-line

        let regEmail = /^([a-zA-Z0-9]+[_|\-|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\-|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/ // eslint-disable-line

        // Mobile phone number regular

        let regPhone = /^1(3|4|5|6|7|8)\d{9}$/; // eslint-disable-line