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/users/installer/installer.component.html | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.html b/src/app/routes/users/installer/installer.component.html
index ceab058..849b08c 100644
--- a/src/app/routes/users/installer/installer.component.html
+++ b/src/app/routes/users/installer/installer.component.html
@@ -40,14 +40,13 @@
</nz-alert>
</div>
<nz-table #nzTable
- [nzDataSource]="data"
+ [nzAjaxData]="data"
[nzLoading]="http.loading"
[nzTotal]="total"
[(nzPageIndex)]="q.pi"
[nzPageSize]="q.ps"
[nzShowTotal]="true"
- (nzPageIndexChange)="load()"
- (nzDataChange)="dataChange($event)">
+ (nzPageIndexChange)="load()">
<thead nz-thead>
<tr>
<th nz-th [nzCheckbox]="true">
@@ -62,7 +61,7 @@
<th nz-th><span>������������</span></th>
<th nz-th>
<span>������������</span>
- <nz-table-sort [(nzValue)]="sortMap.updatedAt" (nzValueChange)="sort('expireTime', $event)"></nz-table-sort>
+ <nz-table-sort [(nzValue)]="sortMap.updatedAt" (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
</th>
<th nz-th><span>������</span></th>
</tr>
@@ -83,10 +82,12 @@
<td nz-td>{{format_date(i.expireTime)}}</td>
<td nz-td>
<a (click)="edit(i)">������</a>
+ <ng-container *ngIf="i.isDelete == '0'">
<span nz-table-divider></span>
<nz-popconfirm [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(i)" >
<a nz-popconfirm>������</a>
</nz-popconfirm>
+ </ng-container>
</td>
</tr>
</tbody>
--
Gitblit v1.8.0