From da5188c3bf59a504f01ae1fb913c46e1f4df215a Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Wed, 14 Sep 2022 04:27:21 +0000 Subject: [PATCH] bug fix --- .../partner/compose/regist-compose.component.ts | 11 ++++------- .../auth/sign-in/components/sign-in.component.ts | 5 +---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/app/modules/admin/member/partner/compose/regist-compose.component.ts b/src/app/modules/admin/member/partner/compose/regist-compose.component.ts index bc6b296..114753b 100644 --- a/src/app/modules/admin/member/partner/compose/regist-compose.component.ts +++ b/src/app/modules/admin/member/partner/compose/regist-compose.component.ts @@ -77,29 +77,26 @@ export class RegistComposeComponent implements OnInit { siteId: ['', [Validators.required]], username: [ '', - [ - Validators.required, - Validators.pattern('^[a-zA-Z][a-zA-Z0-9]{6,12}\\w'), - ], + [Validators.required, Validators.pattern('^[a-zA-Z0-9]{6,12}$')], ], password: [ 'beteran', [ Validators.required, Validators.pattern( - '^(?=.*[A-Za-z])(?=.*d)(?=.*[@$!%*#?&])[A-Za-zd@$!%*#?&]{8,20}' + '^(?=.*[A-Za-z])(?=.*d)(?=.*[@$!%*#?&])[A-Za-zd@$!%*#?&]{8,20}$' ), ], ], exchangePassword: [ 'beteran', - [Validators.required, Validators.pattern('^[a-zA-Z0-9]{4,8}')], + [Validators.required, Validators.pattern('^[a-zA-Z0-9]{4,8}$')], ], nickname: [ '', [ Validators.required, - Validators.pattern('^[a-z|0-9|ㄱ-ㅎ|가-힣]{2,8}'), + Validators.pattern('^[a-z|0-9|ㄱ-ㅎ|가-힣]{2,8}$'), ], ], calculateType: ['', [Validators.required]], diff --git a/src/app/modules/auth/sign-in/components/sign-in.component.ts b/src/app/modules/auth/sign-in/components/sign-in.component.ts index a71a548..cd39624 100644 --- a/src/app/modules/auth/sign-in/components/sign-in.component.ts +++ b/src/app/modules/auth/sign-in/components/sign-in.component.ts @@ -49,10 +49,7 @@ export class AuthSignInComponent implements OnInit { this.signInForm = this._formBuilder.group({ email: [ 'administrator', - [ - Validators.required, - Validators.pattern('^[a-zA-Z][a-zA-Z0-9]{6,12}\\w'), - ], + [Validators.required, Validators.pattern('^[a-zA-Z0-9]{6,12}$')], ], password: ['beteran', Validators.required], captchaSecurityCode: ['', Validators.required],