From 7ce46ab634c25ad4303f22390d5df3bc39a4f3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Wed, 1 Jul 2020 18:08:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E7=BB=84=E4=BB=B6-=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=BB=9A=E5=8A=A8=EF=BC=8C=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common-table/common-table.component.html   | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 6fbb235..7aed052 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
@@ -5,7 +5,8 @@
               [(nzPageIndex)]="dataList.pageNum"
               [nzPageSize]="dataList.pageSize"
               (nzPageIndexChange)="getData()"
-              nzFrontPagination="false">
+              nzFrontPagination="false"
+              [nzScroll]="{x:'1300px'}">
         <thead>
         <tr>
             <ng-container *ngFor="let headData of data">
@@ -21,7 +22,7 @@
                 <td *ngIf="headData.show"
                     nz-typography
                     nzEllipsis
-                    nzEllipsisRows="1"
+                    [nzEllipsisRows]="headData.isActionColumns?3:1"
                     [nzTooltipTitle]="headData.isActionColumns ? null : headData.fieldName+' : '+getValue(index,headData.fieldValue)"
                     nzTooltipPlacement="top"
                     nz-tooltip>
@@ -43,7 +44,8 @@
                            nz-popconfirm
                            [nzPopconfirmTitle]="'是否确认'+action.name+'该数据?'"
                            [nzCondition]="!action.needConfirm"
-                           (nzOnConfirm)="action.click(t)">
+                           (nzOnConfirm)="action.click(t)"
+                           [title]="action.name">
                             {{action.name}}
                             <ng-template [ngIf]="i!=headData.action.length-1">
                                 <nz-divider nzType="vertical"></nz-divider>