From 5f3cde6725f3d06b1e19bca3886bced9104d1100 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 31 May 2021 11:50:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/settings/personal/PersonSetting.vue   | 4 ++--
 frontend/src/business/components/settings/system/EditUser.vue | 4 ++--
 frontend/src/common/js/regex.js                               | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index 21aaf5b98a..4f6a4eaa4d 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -88,7 +88,7 @@ import {TokenKey} from "../../../../common/js/constants";
 import MsDialogFooter from "../../common/components/MsDialogFooter";
 import {getCurrentUser, listenGoBack, removeGoBackListener} from "../../../../common/js/utils";
 import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
-import {PHONE_REGEX} from "@/common/js/regex";
+import {EMAIL_REGEX, PHONE_REGEX} from "@/common/js/regex";
 
 export default {
   name: "MsPersonSetting",
@@ -126,7 +126,7 @@ export default {
           {required: true, message: this.$t('member.input_email'), trigger: 'blur'},
           {
             required: true,
-            pattern: /^([A-Za-z0-9_\-.])+@([A-Za-z0-9]+\.)+[A-Za-z]{2,6}$/,
+            pattern: EMAIL_REGEX,
             message: this.$t('member.email_format_is_incorrect'),
             trigger: 'blur'
           }
diff --git a/frontend/src/business/components/settings/system/EditUser.vue b/frontend/src/business/components/settings/system/EditUser.vue
index bc420e40e9..26bf88142f 100644
--- a/frontend/src/business/components/settings/system/EditUser.vue
+++ b/frontend/src/business/components/settings/system/EditUser.vue
@@ -111,7 +111,7 @@
 </template>
 
 <script>
-import {PHONE_REGEX} from "@/common/js/regex";
+import {EMAIL_REGEX, PHONE_REGEX} from "@/common/js/regex";
 import {GROUP_ORGANIZATION, GROUP_PROJECT, GROUP_SYSTEM, GROUP_WORKSPACE} from "@/common/js/constants";
 
 export default {
@@ -159,7 +159,7 @@ export default {
           {required: true, message: this.$t('user.input_email'), trigger: 'blur'},
           {
             required: true,
-            pattern: /^[a-zA-Z0-9_._-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/,
+            pattern: EMAIL_REGEX,
             message: this.$t('user.email_format_is_incorrect'),
             trigger: 'blur'
           }
diff --git a/frontend/src/common/js/regex.js b/frontend/src/common/js/regex.js
index 4f6f028161..1ce4b2ee85 100644
--- a/frontend/src/common/js/regex.js
+++ b/frontend/src/common/js/regex.js
@@ -1 +1,2 @@
 export const PHONE_REGEX = '^1(3|4|5|6|7|8|9)\\d{9}$';
+export const EMAIL_REGEX = '^[a-zA-Z0-9_._-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$';