From 1193f95d1eb81b95c27311c51282eb8b72cec106 Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Tue, 19 Dec 2017 10:03:38 +0800 Subject: [PATCH] updates --- src/app/routes/users/installer/installer.component.ts | 87 +++++++++++++++++++++++++++++-------------- 1 files changed, 59 insertions(+), 28 deletions(-) diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts index af60ea2..f7ac49c 100644 --- a/src/app/routes/users/installer/installer.component.ts +++ b/src/app/routes/users/installer/installer.component.ts @@ -1,6 +1,10 @@ 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'; +import { UserInstallerEditComponent } from './edit/edit.component'; @Component({ selector: 'app-installer', @@ -17,29 +21,63 @@ u_mobile: '' }; data: any[] = []; - loading = false; + total: 0; selectedRows: any[] = []; curRows: any[] = []; allChecked = false; indeterminate = false; - sortMap: any = {}; - modalVisible = false; - constructor(public msg: NzMessageService) {} + constructor( + public http: _HttpClient, + public msgSrv: NzMessageService, + 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) => { + let 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(); + }); + } + + if (this.q.u_name) { + data = data.filter(d => d.name.indexOf(this.q.u_name) > -1); + } + if (this.q.u_mobile) { + data = data.filter(d => d.mobile.toString().indexOf(this.q.u_mobile) > -1); + } + + const start = (this.q.pi - 1) * this.q.ps; + this.data = data.slice(start, start + this.q.ps); + this.total = total; + }); + } + + edit(user) { + this.modalHelper.static(UserInstallerEditComponent, { user }).subscribe(() => { + this.load(true); + this.msgSrv.info('���������������������������������'); }); } add() { - this.modalVisible = true; + const user = {}; + this.modalHelper.static(UserInstallerEditComponent, { user }); } save() { @@ -48,7 +86,7 @@ remove() { this.selectedRows.forEach(i => deleteInstaller(i.name)); - this.getData(); + this.load(true); } checkAll(value: boolean) { @@ -70,27 +108,20 @@ 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); + } + + // Popconfirm + popConfirm(i) { + this.msgSrv.success('Next step.'); + } + + popCancel() { + this.msgSrv.error('Click on No'); } } -- Gitblit v1.8.0