From eb4b9ea4402e6da6156c2dfc4f1d61e9ba245566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Fri, 10 Jul 2020 23:15:05 +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-title=E4=BC=A0null=E9=9A=90=E8=97=8F=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common-table/common-table.component.html    | 17 +++++++++++------
 .../common-table/common-table.component.ts      |  2 +-
 2 files changed, 12 insertions(+), 7 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 35a0ab3..47c721d 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
@@ -1,4 +1,14 @@
-<nz-card nzSize="small" [nzExtra]="refresh" [nzTitle]="cardTitle" [nzLoading]="loading">
+<nz-card *ngIf="cardTitle" nzSize="small" [nzExtra]="refresh" [nzTitle]="cardTitle" [nzLoading]="loading">
+    <ng-container *ngTemplateOutlet="table"></ng-container>
+</nz-card>
+
+<ng-container [ngTemplateOutlet]="table" *ngIf="!cardTitle"></ng-container>
+
+<ng-template #refresh>
+    <i nz-icon nzType="reload" nzTheme="outline" (click)="getData()" title="刷新" style="cursor: pointer"></i>
+</ng-template>
+
+<ng-template #table>
     <nz-table nzTableLayout="fixed"
               [nzData]="dataList.list"
               [nzTotal]="dataList.total"
@@ -57,9 +67,4 @@
         </tr>
         </tbody>
     </nz-table>
-</nz-card>
-
-
-<ng-template #refresh>
-    <i nz-icon nzType="reload" nzTheme="outline" (click)="getData()" title="刷新" style="cursor: pointer"></i>
 </ng-template>
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 0350119..21907e8 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
@@ -19,7 +19,7 @@ export class CommonTableComponent<T> implements OnInit, OnChanges {
      */
     @Input() headData: Data<T>[];
     @Input() request: RequestObj;
-    @Input() cardTitle: string;
+    @Input() cardTitle: string | null;
     @Input() template: {
         [fieldValue: string]: {
             temp: TemplateRef<any>,