From 54b3b643c9de6605439b9d117b7c5c25911d6328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Sat, 11 Jul 2020 00:47:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=A1=A8=E6=A0=BC=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6-=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/components/common-table/common-table.component.html  | 3 ++-
 .../admin/components/common-table/common-table.component.ts    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/view/admin/components/common-table/common-table.component.html b/src/app/view/admin/components/common-table/common-table.component.html
index 47c721d..cb370c5 100644
--- a/src/app/view/admin/components/common-table/common-table.component.html
+++ b/src/app/view/admin/components/common-table/common-table.component.html
@@ -16,7 +16,8 @@
               [nzPageSize]="dataList.pageSize"
               (nzPageIndexChange)="getData()"
               nzFrontPagination="false"
-              [nzScroll]="{x:'1300px'}">
+              [nzScroll]="{x:'1300px'}"
+              [nzLoading]="loading">
         <thead>
         <tr>
             <ng-container *ngFor="let data of headData">
diff --git a/src/app/view/admin/components/common-table/common-table.component.ts b/src/app/view/admin/components/common-table/common-table.component.ts
index 21907e8..dbfb784 100644
--- a/src/app/view/admin/components/common-table/common-table.component.ts
+++ b/src/app/view/admin/components/common-table/common-table.component.ts
@@ -57,7 +57,7 @@ export class CommonTableComponent<T> implements OnInit, OnChanges {
         return this.httpService.Service<PageList<T>>(this.request).subscribe({
             next: resp => {
                 this.dataList = resp.result;
-                this.loading = false;
+                setTimeout(() => this.loading = false, 10)
             },
             error: err => this.loading = false
         });