Skip to content
This repository was archived by the owner on Jun 22, 2020. It is now read-only.

Commit 3866b27

Browse files
committed
fix: support vertical-border attr without boolean
1 parent 7ea65ce commit 3866b27

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

projects/table-builder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular-ru/ng-table-builder",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"license": "MIT",
55
"bugs": {
66
"url": "https://github.com/Angular-RU/ng-table-builder/issues"

projects/table-builder/src/lib/table/table-builder.component.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,11 @@
9090
[class.table-grid__column--is-dragging]="isDragging[schema.key]"
9191
[class.table-grid__column--with-footer-content]="footerTemplate"
9292
[class.table-grid__column--selected-all]="selection.selectionModel.isAll"
93-
[class.table-grid__column--vertical-line]="verticalBorder || schema?.verticalLine"
94-
[class.table-grid__column--auto-width-reset-default-with]="isEnableAutoWidthColumn"
9593
[class.table-grid__column--is-draggable]="schema?.isModel && schema?.draggable"
94+
[class.table-grid__column--auto-width-reset-default-with]="isEnableAutoWidthColumn"
95+
[class.table-grid__column--vertical-line]="
96+
verticalBorder !== false || schema?.verticalLine !== false
97+
"
9698
(observeVisible)="markVisibleColumn(column, $event)"
9799
>
98100
<div *ngIf="column['visible']" [@fadeAnimation]>

projects/table-builder/src/lib/table/table-builder.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ export class TableBuilderComponent extends TableBuilderApiImpl
290290
}
291291

292292
public resetSchema(): void {
293+
this.columnListWidth = 0;
293294
this.schemaColumns = null;
294295
detectChanges(this.cd);
295296

@@ -299,6 +300,7 @@ export class TableBuilderComponent extends TableBuilderApiImpl
299300
this.ngZone.runOutsideAngular((): void => {
300301
window.setTimeout((): void => {
301302
this.tableViewportChecked = true;
303+
this.calculateColumnWidthSummary();
302304
detectChanges(this.cd);
303305
}, TABLE_GLOBAL_OPTIONS.TIME_IDLE);
304306
});

src/app/samples/sample-sixteen/sample-sixteen.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
<ngx-table-builder
77
#table
8-
[name]="testName"
98
[source]="data"
9+
[name]="testName"
1010
[schema-columns]="schema"
1111
[vertical-border]="false"
1212
[exclude-keys]="['reverseId']"

0 commit comments

Comments
 (0)