公共组件 #18

Merged
xiaohai2271 merged 45 commits from dev into master 2020-07-11 10:41:50 +08:00
Showing only changes of commit 7ce46ab634 - Show all commits

View File

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