Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(module:table & i18n): fix table style & export i18n interface #1163

Merged
merged 2 commits into from
Mar 17, 2018
Merged

fix(module:table & i18n): fix table style & export i18n interface #1163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80de874
fix(module:table & i18n): fix table style & export i18n interface
Mar 17, 2018
3c67034
test(module:table): add test for table
Mar 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion components/core/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
z-index: 1000;
}


.box-shadow-left() {
.ant-table-th-right-sticky, .ant-table-td-right-sticky {
box-shadow: -6px 0 6px 0px rgba(0, 0, 0, .05);
Expand All @@ -54,6 +53,14 @@
}
}

.ant-table-td-right-sticky + .ant-table-td-right-sticky {
box-shadow: none;
}

.ant-table-th-right-sticky + .ant-table-th-right-sticky {
box-shadow: none;
}

.ant-table-th-left-sticky, .ant-table-th-right-sticky, .ant-table-td-right-sticky, .ant-table-td-left-sticky {
position: sticky;
z-index: 1;
Expand Down
1 change: 1 addition & 0 deletions components/i18n/public-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export { NzI18nModule } from './nz-i18n.module';
export { NZ_I18N } from './nz-i18n.token';
export { NzI18nService } from './nz-i18n.service';
export { NzI18nInterface } from './nz-i18n.interface';
export { default as ar_EG } from './languages/ar_EG';
export { default as bg_BG } from './languages/bg_BG';
export { default as ca_ES } from './languages/ca_ES';
Expand Down
29 changes: 22 additions & 7 deletions components/table/nz-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { Overlay } from '@angular/cdk/overlay';
import {
AfterViewInit,
ChangeDetectorRef,
Component,
ContentChildren,
ElementRef,
EventEmitter,
HostListener,
Input,
OnInit,
Output,
Expand Down Expand Up @@ -129,7 +131,7 @@ import { NzTheadComponent } from './nz-thead.component';
</div>
`
})
export class NzTableComponent implements OnInit {
export class NzTableComponent implements OnInit, AfterViewInit {
private _bordered = false;
private _showPagination = true;
private _loading = false;
Expand Down Expand Up @@ -278,9 +280,7 @@ export class NzTableComponent implements OnInit {
this._scroll = { x: null, y: null };
}
this.cdr.detectChanges();
if (value && value.x) {
this.scrollPosition = 'left';
}
this.setScrollPositionClassName();
}

get nzScroll(): { x: string; y: string } {
Expand Down Expand Up @@ -383,8 +383,10 @@ export class NzTableComponent implements OnInit {
}

setScrollPositionClassName(): void {
if (this.tableBodyElement) {
if (this.tableBodyElement.nativeElement.scrollLeft === 0) {
if (this.tableBodyElement && this.nzScroll && this.nzScroll.x) {
if ((this.tableBodyElement.nativeElement.scrollWidth === this.tableBodyElement.nativeElement.clientWidth) && (this.tableBodyElement.nativeElement.scrollWidth !== 0)) {
this.scrollPosition = 'default';
} else if (this.tableBodyElement.nativeElement.scrollLeft === 0) {
this.scrollPosition = 'left';
} else if (this.tableBodyElement.nativeElement.scrollWidth === (this.tableBodyElement.nativeElement.scrollLeft + this.tableBodyElement.nativeElement.clientWidth)) {
this.scrollPosition = 'right';
Expand All @@ -394,22 +396,35 @@ export class NzTableComponent implements OnInit {
}
}

ngOnInit(): void {
fitScrollBar(): void {
const scrollbarWidth = measureScrollbar();
if (scrollbarWidth) {
this.headerBottomStyle = {
marginBottom : `-${scrollbarWidth}px`,
paddingBottom: `0px`
};
}
}

@HostListener('window:resize')
onWindowResize(): void {
this.fitScrollBar();
this.setScrollPositionClassName();
}

ngOnInit(): void {
this.fitScrollBar();
if (this.nzScroll && this.nzScroll.x && this.nzScroll.y) {
/** magic code to sync scroll **/
const overlay = this.overlay.create();
overlay.dispose();
}
}

ngAfterViewInit(): void {
setTimeout(() => this.setScrollPositionClassName());
}

constructor(private elementRef: ElementRef, private cdr: ChangeDetectorRef, private overlay: Overlay) {
this.el = this.elementRef.nativeElement;
}
Expand Down
16 changes: 14 additions & 2 deletions components/table/nz-table.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,17 @@ describe('nz-table', () => {
fixture.detectChanges();
expect(table.nativeElement.querySelector('.ant-table').classList).toContain('ant-table-scroll-position-right');
});
it('should change width affect scroll', () => {
fixture.detectChanges();
table.nativeElement.querySelector('.ant-spin-container').removeAttribute('hidden');
fixture.detectChanges();
expect(table.nativeElement.querySelector('.ant-table').classList).toContain('ant-table-scroll-position-left');
testComponent.width = 1000;
window.dispatchEvent(new Event('resize'));
fixture.detectChanges();
const tableBody = table.nativeElement.querySelector('.ant-table-body');
expect(tableBody.scrollWidth).toBe(tableBody.clientWidth);
});
});
});

Expand Down Expand Up @@ -359,8 +370,8 @@ export class NzTestTableBasicComponent implements OnInit {
@Component({
selector : 'nz-test-table-scroll',
template : `
<div style="width: 300px; display: block;">
<nz-table #nzTable [nzData]="dataSet" [nzPageSize]="10" [nzScroll]="{ x:'1300px',y: '240px' }">
<div style="display: block;" [style.width.px]="width">
<nz-table #nzTable [nzData]="dataSet" [nzPageSize]="10" [nzScroll]="{ x:'600px',y: '240px' }">
<thead>
<tr>
<th>Full Name</th>
Expand Down Expand Up @@ -405,6 +416,7 @@ export class NzTestTableBasicComponent implements OnInit {
export class NzTestTableScrollComponent implements OnInit {
@ViewChild(NzTableComponent) nzTableComponent: NzTableComponent;
dataSet = [];
width = 300;

ngOnInit(): void {
for (let i = 0; i < 100; i++) {
Expand Down
4 changes: 3 additions & 1 deletion components/table/nz-th.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export interface NzThItemInterface {
</span>
</div>
<nz-dropdown nzTrigger="click" *ngIf="nzShowFilter" [nzClickHide]="false" [hasFilterButton]="true" (nzVisibleChange)="dropDownVisibleChange($event)">
<i class="anticon anticon-filter" nz-dropdown></i>
<i class="anticon anticon-filter" [class.ant-table-filter-selected]="filterVisible" nz-dropdown></i>
<ul nz-menu>
<ng-container *ngIf="nzFilterMultiple">
<li nz-menu-item *ngFor="let filter of multipleFilterList" (click)="checkMultiple(filter)">
Expand Down Expand Up @@ -106,6 +106,7 @@ export class NzThComponent {
private _showCheckbox = false;
private _showRowSelection = false;
el: HTMLElement;
filterVisible = false;
multipleFilterList: NzThItemInterface[] = [];
singleFilterList: NzThItemInterface[] = [];
/* tslint:disable-next-line:no-any */
Expand Down Expand Up @@ -256,6 +257,7 @@ export class NzThComponent {
}

dropDownVisibleChange(value: boolean): void {
this.filterVisible = value;
if (!value) {
this.search();
}
Expand Down