From 72120bbe920425f80d3beb08c08af24151246006 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 04 Jan 2018 14:00:46 +0800
Subject: [PATCH] 组织模块

---
 src/app/routes/devices/version/version.component.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/routes/devices/version/version.component.html b/src/app/routes/devices/version/version.component.html
index 69d1282..9832a1e 100644
--- a/src/app/routes/devices/version/version.component.html
+++ b/src/app/routes/devices/version/version.component.html
@@ -22,10 +22,9 @@
               [nzTotal]="grid.total"
               [(nzPageIndex)]="grid.pageIndex"
               [(nzPageSize)]="grid.pageSize"
-              [nzLoading]="versionService.loading"
+              [nzLoading]="grid.loading"
               [nzShowTotal]="true"
-              (nzPageIndexChange)="load()"
-              (nzDataChange)="dataChange($event)">
+              (nzPageIndexChange)="load()">
               <thead nz-thead>
                   <tr>
                     <th nz-th [nzCheckbox]="true">
@@ -34,6 +33,7 @@
                     <th nz-th *ngFor="let col of grid.columns"
                      [ngStyle]="{'width':col.width,'text-align':col['align'] === undefined?'left':col.align}" >
                            <span>{{ col.text }}</span>
+                           <nz-table-sort *ngIf="col.isSort"   [(nzValue)]="col.sort" (nzValueChange)="sort(col.name,$event)"></nz-table-sort>
                     </th>
                     <th nz-th><span>������</span></th>
                   </tr>
@@ -47,7 +47,7 @@
                     [ngStyle]="{'width':col.width,'text-align':col['align'] === undefined?'left':col.align}">
                         <span [ngSwitch]="col.type">
                              <!-- ������������������������������������ -->
-                            <span *ngSwitchDefault> {{ row[col.name]|tyepHandle:col }} </span>
+                            <span *ngSwitchDefault> {{ row[col.name]|tyepHandle:col:row}} </span>
                              <!-- ������������������������������������ -->        
                         </span>
                     </td>

--
Gitblit v1.8.0