fix(系统设置): 修复创建用户时电话号码不支持199段的问题

Closes 818
babysor · Nov 25, 2020 · e43ce4f · e43ce4f
1 parent 754f067
commit e43ce4f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -86,6 +86,7 @@
   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";
 
   export default {
     name: "MsPersonSetting",
@@ -115,7 +116,7 @@
           phone: [
             {
               required: false,
-              pattern: '^1(3|4|5|7|8)\\d{9}$',
+              pattern: PHONE_REGEX,
               message: this.$t('member.mobile_number_format_is_incorrect'),
               trigger: 'blur'
             }

diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
@@ -338,6 +338,7 @@ import {hasRole, listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import MsRolesTag from "../../common/components/MsRolesTag";
 import {ROLE_ADMIN} from "@/common/js/constants";
 import {getCurrentUser} from "../../../../common/js/utils";
+import {PHONE_REGEX} from "@/common/js/regex";
 
 export default {
   name: "MsUser",
@@ -401,7 +402,7 @@ export default {
           {required: true, message: this.$t('user.input_phone'), trigger: 'blur'},
           {
             required: true,
-            pattern: '^1(3|4|5|7|8)\\d{9}$',
+            pattern: PHONE_REGEX,
             message: this.$t('user.mobile_number_format_is_incorrect'),
             trigger: 'blur'
           }

diff --git a/frontend/src/common/js/regex.js b/frontend/src/common/js/regex.js
@@ -0,0 +1 @@
+export const PHONE_REGEX = '^1(3|4|5|7|8|9)\\d{9}$';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const PHONE_REGEX = '^1(3\|4\|5\|7\|8\|9)\\d{9}$';