diff --git a/src/common/pattern.ts b/src/common/pattern.ts index 820cc88c..ecc53f7e 100755 --- a/src/common/pattern.ts +++ b/src/common/pattern.ts @@ -14,7 +14,11 @@ export class Patterns { * * public static Password: RegExp = /^((?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%!\-]).{6,20})/i * - * 8 to 20 characters string with at least one digit, one upper case letter, one lower case letter and one special symbol + + * 6 to 30 characters string with at least one digit, one upper case letter, one lower case letter and one special symbol */ + public static Username = /^[a-zA-Z0-9]+([_@.-]?[a-zA-Z0-9])*$/i + + // * 8 to 20 characters string with at least one digit, one upper case letter, one lower case letter public static Password = /^((?=.*[A-Z])(?=.*\d)(?!.* ).{8,30})/i } diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue index 49897b4b..dec9b155 100755 --- a/src/components/CMyPopupEdit/CMyPopupEdit.vue +++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue @@ -384,7 +384,7 @@ :useinput="isInModif"> -
+
@@ -701,7 +701,7 @@ :optlab="fieldsTable.getLabelByTable(col.jointable)">
-
+