From 2d4cbcc4f92edbc4f926d9710bdda64520039c2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 05 Jan 2018 11:21:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/systems/account/account.component.ts | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/app/routes/systems/account/account.component.ts b/src/app/routes/systems/account/account.component.ts
index 0f532d3..1168412 100644
--- a/src/app/routes/systems/account/account.component.ts
+++ b/src/app/routes/systems/account/account.component.ts
@@ -32,6 +32,7 @@
allChecked = false;
indeterminate = false;
sortMap: string[] = [];
+ loading: boolean = true;
constructor(
public http: HttpClient,
@@ -52,6 +53,7 @@
this.total = res.data.total;
this.refreshStatus();
+ this.loading = false;
});
}
@@ -59,8 +61,8 @@
this.load();
}
- edit(account) {
- if (account == null) {
+ edit(account?: any) {
+ if (!account) {
account = {};
}
this.modalHelper.static(AccountEditComponent, {account}).subscribe((res: any) => {
@@ -73,14 +75,14 @@
});
}
- remove(accountId) {
- const ids = [];
- if (accountId == null) {
+ remove(accountId?: number) {
+ const ids: number[] = [];
+ if (accountId) {
+ ids.push(accountId);
+ } else {
this.selectedRows.forEach(i => {
ids.push(i.id);
});
- } else {
- ids.push(accountId);
}
this.http.post(environment.SERVER_BASH_URL + '/account/ids', ids).subscribe((res: any) => {
if (res.data > 0) {
@@ -119,7 +121,7 @@
this.sortMap.push(i);
}
});
- if (value != null) {
+ if (value) {
this.sortMap.push(`${field} ${value}`);
}
this.query.sorter = this.sortMap.length > 0 ? this.sortMap.join(",") : '';
@@ -127,7 +129,9 @@
}
format_date(date) {
- return this.dateSrv.date_format(date, 'YYYY-MM-DD');
+ if (date) {
+ return this.dateSrv.date_format(date, 'YYYY-MM-DD');
+ }
}
}
--
Gitblit v1.8.0