From 5933685ea11e748cca2f5c13b79abc2b1ffa32a2 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 18 Dec 2017 20:20:01 +0800
Subject: [PATCH] updates
---
src/app/routes/users/installer/installer.component.ts | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index af60ea2..51d9a85 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -1,6 +1,9 @@
import { Component, OnInit } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd';
+import { ModalHelper } from '@delon/theme';
+import { _HttpClient } from '@delon/theme';
import { getInstaller, deleteInstaller } from '../../../../../_mock/installer.service';
+import * as moment from 'moment';
@Component({
selector: 'app-installer',
@@ -17,7 +20,7 @@
u_mobile: ''
};
data: any[] = [];
- loading = false;
+ total: 0;
selectedRows: any[] = [];
curRows: any[] = [];
allChecked = false;
@@ -26,15 +29,36 @@
sortMap: any = {};
modalVisible = false;
- constructor(public msg: NzMessageService) {}
+ constructor(
+ public msg: NzMessageService,
+ public http: _HttpClient,
+ private modalHelper: ModalHelper) {}
ngOnInit() {
- this.getData();
+ this.load();
}
- getData() {
- this.pageChange(1).then(() => {
- this.data = getInstaller(this.q);
+ load(reload: boolean = false) {
+ if (reload) {
+ this.q.pi = 1;
+ }
+ this.http.get('./assets/users-installer-data.json', this.q).subscribe((res: any) => {
+ const data = res.data;
+ const total = res.total;
+
+ if (this.q.sorter !== '') {
+ const s = this.q.sorter.split('_');
+ data.sort((prev, next) => {
+ if (s[1] === 'descend') {
+ return moment(next[s[0]]).unix() - moment(prev[s[0]]).unix();
+ }
+ return moment(prev[s[0]]).unix() - moment(next[s[0]]).unix();
+ });
+ }
+
+ const start = (this.q.pi - 1) * this.q.ps;
+ this.data = data.slice(start, start + this.q.ps);
+ this.total = total;
});
}
@@ -48,7 +72,7 @@
remove() {
this.selectedRows.forEach(i => deleteInstaller(i.name));
- this.getData();
+ this.load(true);
}
checkAll(value: boolean) {
@@ -70,27 +94,11 @@
this.sortMap = {};
this.sortMap[field] = value;
this.q.sorter = value ? `${field}_${value}` : '';
- this.getData();
- }
-
- dataChange(res: any) {
- this.curRows = res;
- this.refreshStatus();
- }
-
- pageChange(pi: number): Promise<any> {
- this.q.pi = pi;
- this.loading = true;
- return new Promise((resolve) => {
- setTimeout(() => {
- this.loading = false;
- resolve();
- }, 500);
- });
+ this.load(true);
}
reset(ls: any[]) {
for (const item of ls) item.value = false;
- this.getData();
+ this.load(true);
}
}
--
Gitblit v1.8.0