From f320f1970e5d80a423f377fb3253628bd1e7f5bf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Mar 2018 15:10:46 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into develop
---
src/app/routes/users/installer/edit/edit.component.ts | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/app/routes/users/installer/edit/edit.component.ts b/src/app/routes/users/installer/edit/edit.component.ts
index b35523c..e19f61d 100644
--- a/src/app/routes/users/installer/edit/edit.component.ts
+++ b/src/app/routes/users/installer/edit/edit.component.ts
@@ -29,7 +29,7 @@
const user = this.user;
this.validateForm = this.formBuilder.group({
name: [user.name],
- mobile: [user.mobile, [Validators.pattern("^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))\\d{8}$")]],
+ mobile: [user.mobile, [Validators.pattern('^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))\\d{8}$')]],
email: [user.email],
weixin: [user.weixin],
organizationId: [user.organizationId],
@@ -38,15 +38,15 @@
});
const mobileControl = this.validateForm.get('mobile');
mobileControl.valueChanges.filter(val => {
- return val != null && val.trim() != '';
+ return val != null && val.trim() !== '';
}).debounceTime(900).distinctUntilChanged().subscribe( value => {
- if(mobileControl.errors==null){
- mobileControl.setErrors({unique:true})
- this.http.get(environment.SERVER_BASH_URL + '/operateUser/unique-mobile?mobile='+value)
+ if (mobileControl.errors == null) {
+ mobileControl.setErrors({unique: true});
+ this.http.get(environment.SERVER_BASH_URL + '/operateUser/unique-mobile?mobile=' + value)
.pipe(
catchError(() => {
const req = <XMLHttpRequest>event.target;
- if(req.status==401){
+ if (req.status === 401) {
this.subject.destroy();
}
// ������������������������������������
@@ -54,8 +54,8 @@
})
)
.subscribe(
- (value:ResultBean<boolean>) => {
- if(value.code == 1 && value.data){
+ (val: ResultBean<boolean>) => {
+ if (val.code === 1 && val.data) {
this.validateForm.get('mobile').setErrors(null);
}
}
--
Gitblit v1.8.0