@universis/ngx-tables 0.8.2 → 0.8.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -231,8 +231,8 @@ var ColumnSelectorComponent = /** @class */ (function (_super) {
231
231
  ColumnSelectorComponent.decorators = [
232
232
  { type: Component, args: [{
233
233
  selector: 'app-column-selector',
234
- template: "<div>\n <div class=\"modal-header\">\n <h5 class=\"modal-title\">{{'Tables.SelectColumns' | translate}}</h5>\n <button (click)=\"cancel()\"\n type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Cancel\">\n <span aria-hidden=\"true\">&times;</span>\n </button>\n </div>\n <div class=\"modal-body pt-0\">\n <div class=\"row\">\n <div class=\"col-12\">\n <p [translate]=\"'Tables.SelectColumnHelp'\"></p>\n <p [translate]=\"'Tables.MoveColumnHelp'\"></p>\n </div>\n </div>\n <div class=\"row\">\n <div class=\"col-4\">\n <select [formControl]=\"availableColumnsControl\" size=\"10\" class=\"form-select form-control\" multiple aria-label=\"multiple select example\">\n <ng-container *ngIf=\"columns\">\n <ng-container *ngFor=\"let column of columns | orderBy: ['title']\">\n <option [value]=\"column.key\">{{column.title}}</option>\n </ng-container>\n </ng-container>\n </select>\n </div>\n <div class=\"col-4 d-flex justify-content-center align-items-center\">\n <div class=\"col-9\">\n <div>\n <button [disabled]=\"!(availableColumnsControl.value && availableColumnsControl.value.length)\" (click)=\"addColumns()\" type=\"button\" class=\"btn btn-primary btn-block\">\n <i class=\"fas fa-plus mr-2\"></i><span [translate]=\"'Tables.AddColumn'\"></span>\n </button>\n </div>\n <div class=\"mt-3\">\n <button [disabled]=\"!(selectedColumnsControl.value && selectedColumnsControl.value.length)\" (click)=\"removeColumns()\" type=\"button\" class=\"btn btn-secondary btn-block\">\n <i class=\"fas fa-minus mr-2\"></i><span [translate]=\"'Tables.RemoveColumn'\"></span>\n </button>\n </div>\n </div>\n </div>\n <div class=\"col-4\">\n <select [formControl]=\"selectedColumnsControl\" size=\"10\" class=\"form-select form-control\" multiple aria-label=\"multiple select example\">\n <ng-container *ngIf=\"selectedColumns\">\n <ng-container *ngFor=\"let column of selectedColumns\">\n <option [value]=\"column.key\">{{column.title}}</option>\n </ng-container>\n </ng-container>\n </select>\n <div class=\"d-flex justify-content-center align-items-center\">\n <div class=\"btn-group mt-4\">\n <button #moveUpButton (click)=\"moveUp()\" type=\"button\" class=\"btn btn-primary\">\n <i class=\"fas fa-chevron-up mr-2\"></i><span [translate]=\"'Tables.MoveUp'\"></span>\n </button>\n <button #moveDownButton (click)=\"moveDown()\" type=\"button\" class=\"btn btn-primary ml-2\">\n <i class=\"fas fa-chevron-down mr-2\"></i><span [translate]=\"'Tables.MoveDown'\"></span>\n </button>\n </div>\n </div>\n </div>\n </div>\n \n </div>\n <div class=\"modal-footer justify-content-end\">\n <button [disabled]=\"okButtonDisabled\" (click)=\"ok()\"\n type=\"button\" class=\"btn btn-primary\">\n {{'OK' | translate}}\n </button>\n <button [disabled]=\"cancelButtonDisabled\"\n (click)=\"cancel()\" type=\"button\" [ngClass]=\"cancelButtonClass\" data-dismiss=\"modal\">\n {{'Cancel' | translate}}\n </button>\n </div>\n </div>\n ",
235
- encapsulation: ViewEncapsulation.None,
234
+ template: "<div>\n <div class=\"modal-header\">\n <h5 class=\"modal-title\">{{'Tables.SelectColumns' | translate}}</h5>\n <button (click)=\"cancel()\"\n type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Cancel\">\n <span aria-hidden=\"true\">&times;</span>\n </button>\n </div>\n <div class=\"modal-body pt-0\">\n <div class=\"row\">\n <div class=\"col-12\">\n <p [translate]=\"'Tables.SelectColumnHelp'\"></p>\n <p [translate]=\"'Tables.MoveColumnHelp'\"></p>\n </div>\n </div>\n <div class=\"row\">\n <div class=\"col-4\">\n <select [formControl]=\"availableColumnsControl\" size=\"10\" class=\"form-select form-control\" multiple aria-label=\"multiple select example\">\n <ng-container *ngIf=\"columns\">\n <ng-container *ngFor=\"let column of columns | orderBy: ['title']\">\n <option class=\"text-wrap\" [value]=\"column.key\">{{column.title}}</option>\n </ng-container>\n </ng-container>\n </select>\n </div>\n <div class=\"col-4 d-flex justify-content-center align-items-center\">\n <div class=\"col-9\">\n <div>\n <button [disabled]=\"!(availableColumnsControl.value && availableColumnsControl.value.length)\" (click)=\"addColumns()\" type=\"button\" class=\"btn btn-primary btn-block\">\n <i class=\"fas fa-plus mr-2\"></i><span [translate]=\"'Tables.AddColumn'\"></span>\n </button>\n </div>\n <div class=\"mt-3\">\n <button [disabled]=\"!(selectedColumnsControl.value && selectedColumnsControl.value.length)\" (click)=\"removeColumns()\" type=\"button\" class=\"btn btn-secondary btn-block\">\n <i class=\"fas fa-minus mr-2\"></i><span [translate]=\"'Tables.RemoveColumn'\"></span>\n </button>\n </div>\n </div>\n </div>\n <div class=\"col-4\">\n <select [formControl]=\"selectedColumnsControl\" size=\"10\" class=\"form-select form-control\" multiple aria-label=\"multiple select example\">\n <ng-container *ngIf=\"selectedColumns\">\n <ng-container *ngFor=\"let column of selectedColumns\">\n <option class=\"text-wrap\" [value]=\"column.key\">{{column.title}}</option>\n </ng-container>\n </ng-container>\n </select>\n <div class=\"d-flex justify-content-center align-items-center\">\n <div class=\"btn-group mt-4\">\n <button #moveUpButton (click)=\"moveUp()\" type=\"button\" class=\"btn btn-primary\">\n <i class=\"fas fa-chevron-up mr-2\"></i><span [translate]=\"'Tables.MoveUp'\"></span>\n </button>\n <button #moveDownButton (click)=\"moveDown()\" type=\"button\" class=\"btn btn-primary ml-2\">\n <i class=\"fas fa-chevron-down mr-2\"></i><span [translate]=\"'Tables.MoveDown'\"></span>\n </button>\n </div>\n </div>\n </div>\n </div>\n \n </div>\n <div class=\"modal-footer justify-content-end\">\n <button [disabled]=\"okButtonDisabled\" (click)=\"ok()\"\n type=\"button\" class=\"btn btn-primary\">\n {{'OK' | translate}}\n </button>\n <button [disabled]=\"cancelButtonDisabled\"\n (click)=\"cancel()\" type=\"button\" [ngClass]=\"cancelButtonClass\" data-dismiss=\"modal\">\n {{'Cancel' | translate}}\n </button>\n </div>\n </div>\n ",
235
+ encapsulation: ViewEncapsulation.Emulated,
236
236
  styles: ["\n .form-select {\n -webkit-appearance: none;\n -moz-appearance: none;\n appearance: none;\n padding: 5px;\n }\n .form-select * {\n padding: 5px 5px;\n }\n .btn.disabled, .btn:disabled {\n border-color: transparent !important;\n }\n "]
237
237
  }] }
238
238
  ];
@@ -254,4 +254,4 @@ var ColumnSelectorComponent = /** @class */ (function (_super) {
254
254
  }(RouterModalOkCancel));
255
255
  export { ColumnSelectorComponent };
256
256
 
257
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"column-selector.component.js","sourceRoot":"ng://@universis/ngx-tables/","sources":["lib/components/column-selector/column-selector.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, OnInit, OnDestroy, Input, EventEmitter, ViewEncapsulation, OnChanges, SimpleChanges, ChangeDetectorRef, ViewChild, ElementRef } from '@angular/core';\nimport { FormControl } from '@angular/forms';\nimport { ActivatedRoute, Router } from '@angular/router';\nimport { TranslateService } from '@ngx-translate/core';\nimport { RouterModalOkCancel } from '@universis/common/routing';\nimport { BsModalRef } from 'ngx-bootstrap/modal';\n@Component({\n  selector: 'app-column-selector',\n  templateUrl: './column-selector.component.html',\n  encapsulation: ViewEncapsulation.None,\n  styles: [\n    `\n    .form-select {\n        -webkit-appearance: none;\n        -moz-appearance: none;\n        appearance: none;\n        padding: 5px;\n    }\n    .form-select * {\n        padding: 5px 5px;\n    }\n    .btn.disabled, .btn:disabled {\n        border-color: transparent !important;\n    }\n    `\n  ]\n})\nexport class ColumnSelectorComponent extends RouterModalOkCancel implements OnInit, OnDestroy, OnChanges {\n    \n    @Input() columns: { key: string, title: string, visible: boolean, index: number }[];\n    public dismiss: EventEmitter<any> = new EventEmitter();\n\n    @Input() selectedColumns: { key: string, title: string }[];\n\n    @ViewChild('moveUpButton') moveUpButton: ElementRef;\n    @ViewChild('moveDownButton') moveDownButton: ElementRef;\n\n    availableColumnsControl = new FormControl();\n    selectedColumnsControl = new FormControl();\n\n    ok(): Promise<any> {\n        this._modalRef.hide();\n        this.applyChanges();\n        this.dismiss.emit('ok');\n        return Promise.resolve('ok');\n    }\n    cancel(): Promise<any> {\n        this._modalRef.hide();\n        this.dismiss.emit('cancel');\n        return Promise.resolve('cancel');\n    }\n\n  constructor(router: Router,\n    activatedRoute: ActivatedRoute,\n    private _modalRef: BsModalRef,\n    private ref: ChangeDetectorRef,\n    private _translateService: TranslateService) { \n        super(router, activatedRoute);\n    }\n    ngOnChanges(changes: SimpleChanges): void {\n        //\n    }\n    ngOnDestroy(): void {\n        //\n    }\n    ngOnInit(): void {\n        if (Array.isArray(this.columns)) {\n            this.selectedColumns = this.columns.filter((item) => {\n                return item.visible;\n            }).sort((a, b) => {\n                if (a.index < b.index) {\n                    return -1\n                }\n                if (a.index > b.index) {\n                    return 1;\n                }\n                return 0;\n            }).map((item) => {\n                return {\n                    key: item.key,\n                    title: item.title\n                }\n            });\n        }\n    }\n\n    private applyChanges() {\n        let moveIndex = this.selectedColumns.length - 1;\n        for (const column of this.columns) {\n            const findIndex = this.selectedColumns.findIndex((item) => {\n                return item.key === column.key;\n            });\n            if (findIndex < 0) {\n                column.visible = false;\n                moveIndex += 1;\n                column.index = moveIndex;\n            } else {\n                column.visible = true;\n                column.index = findIndex;\n            }\n        }\n    }\n\n    removeColumns() {\n        const selected = this.selectedColumnsControl.value as string[];\n        if (selected.length > 0) {\n            for (const value of selected) {\n                let findIndex = this.selectedColumns.findIndex((item) => {\n                    return item.key === value;\n                });\n                if (findIndex >= 0) {\n                    this.selectedColumns.splice(findIndex, 1);\n                }\n            }\n            // reset column\n            this.selectedColumnsControl.reset();\n        }\n    }\n\n    addColumns() {\n        const selected = this.availableColumnsControl.value as string[];\n        if (selected.length > 0) {\n            for (const value of selected) {\n                let findColumn = this.columns.find((item) => {\n                    return item.key === value;\n                });\n                if (findColumn) {\n                    const findIndex = this.selectedColumns.findIndex((item) => {\n                        return item.key === value;\n                    });\n                    if (findIndex < 0) {\n                        this.selectedColumns.push({\n                            key: findColumn.key,\n                            title: findColumn.title\n                        });\n                    }\n                }\n            }\n            // find the last index of the selected items\n            const lastSelectedIndex = this.columns.findIndex((item) => {\n                return item.key === selected[selected.length - 1];\n            });\n            // reset control\n            this.availableColumnsControl.reset();\n            if (lastSelectedIndex > -1 && lastSelectedIndex < this.columns.length - 1) {\n                this.availableColumnsControl.patchValue([\n                    this.columns[lastSelectedIndex + 1].key\n                ])\n            }\n        }\n    }\n\n    moveUp() {\n        this.moveUpButton.nativeElement.disabled = true;\n        const selected = this.selectedColumnsControl.value as string[];\n        if (selected.length > 0) {\n            for (const value of selected) {\n                const findIndex = this.selectedColumns.findIndex((item) => {\n                    return item.key === value;\n                });\n                if (findIndex > 0) {\n                    const column = this.selectedColumns[findIndex];\n                    this.selectedColumns.splice(findIndex, 1);\n                    this.selectedColumns.splice(findIndex - 1 , 0, column);\n                }\n            }\n        }\n        this.moveUpButton.nativeElement.disabled = false;\n    }\n\n    moveDown() {\n        this.moveDownButton.nativeElement.disabled = true;\n        const selected = this.selectedColumnsControl.value as string[];\n        if (selected.length > 0) {\n            for (const value of selected) {\n                let findIndex = this.selectedColumns.findIndex((item) => {\n                    return item.key === value;\n                });\n                const length = this.columns.length;\n                if (findIndex >= 0 && findIndex < length) {\n                    const column = this.selectedColumns[findIndex];\n                    this.selectedColumns.splice(findIndex, 1);\n                    this.selectedColumns.splice(findIndex + 1 , 0, column);\n                }\n            }\n        }\n        this.moveDownButton.nativeElement.disabled = false;\n    }\n  \n\n}\n"]}
257
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"column-selector.component.js","sourceRoot":"ng://@universis/ngx-tables/","sources":["lib/components/column-selector/column-selector.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, OnInit, OnDestroy, Input, EventEmitter, ViewEncapsulation, OnChanges, SimpleChanges, ChangeDetectorRef, ViewChild, ElementRef } from '@angular/core';\nimport { FormControl } from '@angular/forms';\nimport { ActivatedRoute, Router } from '@angular/router';\nimport { TranslateService } from '@ngx-translate/core';\nimport { RouterModalOkCancel } from '@universis/common/routing';\nimport { BsModalRef } from 'ngx-bootstrap/modal';\n@Component({\n  selector: 'app-column-selector',\n  templateUrl: './column-selector.component.html',\n  encapsulation: ViewEncapsulation.Emulated,\n  styles: [\n    `\n    .form-select {\n        -webkit-appearance: none;\n        -moz-appearance: none;\n        appearance: none;\n        padding: 5px;\n    }\n    .form-select * {\n        padding: 5px 5px;\n    }\n    .btn.disabled, .btn:disabled {\n        border-color: transparent !important;\n    }\n    `\n  ]\n})\nexport class ColumnSelectorComponent extends RouterModalOkCancel implements OnInit, OnDestroy, OnChanges {\n    \n    @Input() columns: { key: string, title: string, visible: boolean, index: number }[];\n    public dismiss: EventEmitter<any> = new EventEmitter();\n\n    @Input() selectedColumns: { key: string, title: string }[];\n\n    @ViewChild('moveUpButton') moveUpButton: ElementRef;\n    @ViewChild('moveDownButton') moveDownButton: ElementRef;\n\n    availableColumnsControl = new FormControl();\n    selectedColumnsControl = new FormControl();\n\n    ok(): Promise<any> {\n        this._modalRef.hide();\n        this.applyChanges();\n        this.dismiss.emit('ok');\n        return Promise.resolve('ok');\n    }\n    cancel(): Promise<any> {\n        this._modalRef.hide();\n        this.dismiss.emit('cancel');\n        return Promise.resolve('cancel');\n    }\n\n  constructor(router: Router,\n    activatedRoute: ActivatedRoute,\n    private _modalRef: BsModalRef,\n    private ref: ChangeDetectorRef,\n    private _translateService: TranslateService) { \n        super(router, activatedRoute);\n    }\n    ngOnChanges(changes: SimpleChanges): void {\n        //\n    }\n    ngOnDestroy(): void {\n        //\n    }\n    ngOnInit(): void {\n        if (Array.isArray(this.columns)) {\n            this.selectedColumns = this.columns.filter((item) => {\n                return item.visible;\n            }).sort((a, b) => {\n                if (a.index < b.index) {\n                    return -1\n                }\n                if (a.index > b.index) {\n                    return 1;\n                }\n                return 0;\n            }).map((item) => {\n                return {\n                    key: item.key,\n                    title: item.title\n                }\n            });\n        }\n    }\n\n    private applyChanges() {\n        let moveIndex = this.selectedColumns.length - 1;\n        for (const column of this.columns) {\n            const findIndex = this.selectedColumns.findIndex((item) => {\n                return item.key === column.key;\n            });\n            if (findIndex < 0) {\n                column.visible = false;\n                moveIndex += 1;\n                column.index = moveIndex;\n            } else {\n                column.visible = true;\n                column.index = findIndex;\n            }\n        }\n    }\n\n    removeColumns() {\n        const selected = this.selectedColumnsControl.value as string[];\n        if (selected.length > 0) {\n            for (const value of selected) {\n                let findIndex = this.selectedColumns.findIndex((item) => {\n                    return item.key === value;\n                });\n                if (findIndex >= 0) {\n                    this.selectedColumns.splice(findIndex, 1);\n                }\n            }\n            // reset column\n            this.selectedColumnsControl.reset();\n        }\n    }\n\n    addColumns() {\n        const selected = this.availableColumnsControl.value as string[];\n        if (selected.length > 0) {\n            for (const value of selected) {\n                let findColumn = this.columns.find((item) => {\n                    return item.key === value;\n                });\n                if (findColumn) {\n                    const findIndex = this.selectedColumns.findIndex((item) => {\n                        return item.key === value;\n                    });\n                    if (findIndex < 0) {\n                        this.selectedColumns.push({\n                            key: findColumn.key,\n                            title: findColumn.title\n                        });\n                    }\n                }\n            }\n            // find the last index of the selected items\n            const lastSelectedIndex = this.columns.findIndex((item) => {\n                return item.key === selected[selected.length - 1];\n            });\n            // reset control\n            this.availableColumnsControl.reset();\n            if (lastSelectedIndex > -1 && lastSelectedIndex < this.columns.length - 1) {\n                this.availableColumnsControl.patchValue([\n                    this.columns[lastSelectedIndex + 1].key\n                ])\n            }\n        }\n    }\n\n    moveUp() {\n        this.moveUpButton.nativeElement.disabled = true;\n        const selected = this.selectedColumnsControl.value as string[];\n        if (selected.length > 0) {\n            for (const value of selected) {\n                const findIndex = this.selectedColumns.findIndex((item) => {\n                    return item.key === value;\n                });\n                if (findIndex > 0) {\n                    const column = this.selectedColumns[findIndex];\n                    this.selectedColumns.splice(findIndex, 1);\n                    this.selectedColumns.splice(findIndex - 1 , 0, column);\n                }\n            }\n        }\n        this.moveUpButton.nativeElement.disabled = false;\n    }\n\n    moveDown() {\n        this.moveDownButton.nativeElement.disabled = true;\n        const selected = this.selectedColumnsControl.value as string[];\n        if (selected.length > 0) {\n            for (const value of selected) {\n                let findIndex = this.selectedColumns.findIndex((item) => {\n                    return item.key === value;\n                });\n                const length = this.columns.length;\n                if (findIndex >= 0 && findIndex < length) {\n                    const column = this.selectedColumns[findIndex];\n                    this.selectedColumns.splice(findIndex, 1);\n                    this.selectedColumns.splice(findIndex + 1 , 0, column);\n                }\n            }\n        }\n        this.moveDownButton.nativeElement.disabled = false;\n    }\n  \n\n}\n"]}
@@ -17,7 +17,10 @@ var AdvancedTableState = /** @class */ (function () {
17
17
  this.table.stateSave = true;
18
18
  this.table.stateLoadCallback = function (settings, callback) {
19
19
  _this.store.pipe(select(fromTables.selectTable, { id: _this.tableState }), first()).subscribe(function (state) {
20
- return callback(state && state.table);
20
+ callback(state && state.table);
21
+ if (state && state.table && state.table.ColReorder) {
22
+ _this.table.dataTable.colReorder.order(state.table.ColReorder, true);
23
+ }
21
24
  });
22
25
  };
23
26
  var firstDraw = true;
@@ -59,4 +62,4 @@ var AdvancedTableState = /** @class */ (function () {
59
62
  }());
60
63
  export { AdvancedTableState };
61
64
 
62
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWR2YW5jZS10YWJsZS1zdGF0ZS5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AdW5pdmVyc2lzL25neC10YWJsZXMvIiwic291cmNlcyI6WyJsaWIvZGlyZWN0aXZlcy9hZHZhbmNlLXRhYmxlLXN0YXRlLmRpcmVjdGl2ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0gsU0FBUyxFQUFFLFFBQVEsRUFBRSxLQUFLLEdBQzdCLE1BQU0sZUFBZSxDQUFDO0FBQ3ZCLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTVDLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVEQUF1RCxDQUFDO0FBQy9GLE9BQU8sS0FBSyxVQUFVLE1BQU0sYUFBYSxDQUFDO0FBQzFDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN2QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHdkQ7SUFVSSw0QkFBb0IsS0FBNkIsRUFDekIsS0FBNEI7UUFEaEMsVUFBSyxHQUFMLEtBQUssQ0FBd0I7UUFDekIsVUFBSyxHQUFMLEtBQUssQ0FBdUI7SUFFcEQsQ0FBQztJQUNELHFDQUFRLEdBQVI7UUFBQSxpQkF1Q0M7UUF0Q0csSUFBSSxJQUFJLENBQUMsS0FBSyxJQUFJLElBQUksRUFBRTtZQUNwQixPQUFPO1NBQ1Y7UUFDRCxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUM7UUFDNUIsSUFBSSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsR0FBRyxVQUFDLFFBQVEsRUFBRSxRQUFRO1lBQzlDLEtBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsV0FBVyxFQUFFLEVBQUUsRUFBRSxFQUFFLEtBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsU0FBUyxDQUFDLFVBQUMsS0FBVTtnQkFDbkcsT0FBTyxRQUFRLENBQUMsS0FBSyxJQUFJLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUMxQyxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQTtRQUNELElBQUksU0FBUyxHQUFHLElBQUksQ0FBQztRQUNyQixJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7WUFDdEIsSUFBSSxTQUFTLEtBQUssS0FBSyxFQUFFO2dCQUNyQixPQUFPO2FBQ1Y7WUFDRCxJQUFJLEtBQUksQ0FBQyxLQUFLLENBQUMsU0FBUyxJQUFJLElBQUksRUFBRTtnQkFDOUIsT0FBTzthQUNWO1lBQ0QsU0FBUyxHQUFHLEtBQUssQ0FBQztZQUNsQixJQUFNLGtCQUFrQixHQVNwQixLQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN2QyxJQUFNLGdCQUFnQixHQUFHLGtCQUFrQixDQUFDLFdBQVc7Z0JBQ25ELGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUM7WUFDNUMsSUFBSSxnQkFBZ0IsSUFBSSxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUU7Z0JBQzdDLElBQU0sUUFBUSxHQUFHLEtBQUksQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxDQUFDO2dCQUNqRCxRQUFRLENBQUMsV0FBVyxDQUFDLGdCQUFnQixDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQzthQUN2RDtRQUNMLENBQUMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsR0FBRyxVQUFDLFFBQVEsRUFBRSxJQUFJO1lBQzFDLEtBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLElBQUksV0FBVyxDQUFDLEtBQUksQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUNoRSxDQUFDLENBQUE7SUFDTCxDQUFDOztnQkFyREosU0FBUyxTQUNOO29CQUNJLCtDQUErQztvQkFDL0MsUUFBUSxFQUFFLGNBQWM7aUJBQzNCOzs7O2dCQVZJLHNCQUFzQjtnQkFGZCxLQUFLLHVCQW1CYixRQUFROzs7NkJBSFosS0FBSzs7SUE4Q1YseUJBQUM7Q0FBQSxBQXRERCxJQXNEQztTQWhEWSxrQkFBa0IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICAgIERpcmVjdGl2ZSwgT3B0aW9uYWwsIElucHV0LCBPbkluaXQsXG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgc2VsZWN0LCBTdG9yZSB9IGZyb20gJ0BuZ3J4L3N0b3JlJztcbmltcG9ydCB7IE5neFRhYmxlc1N0YXRlIH0gZnJvbSAnLi4vcmVkdWNlcnMnO1xuaW1wb3J0IHsgQWR2YW5jZWRUYWJsZUNvbXBvbmVudCB9IGZyb20gJy4uL2NvbXBvbmVudHMvYWR2YW5jZWQtdGFibGUvYWR2YW5jZWQtdGFibGUuY29tcG9uZW50JztcbmltcG9ydCAqIGFzIGZyb21UYWJsZXMgZnJvbSAnLi4vcmVkdWNlcnMnO1xuaW1wb3J0IHsgZmlyc3QgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBBcHBlbmRTdGF0ZSB9IGZyb20gJy4uL2FjdGlvbnMvdGFibGUuYWN0aW9ucyc7XG5pbXBvcnQgeyBjbG9uZURlZXAsIHZhbHVlcyB9IGZyb20gJ2xvZGFzaCc7XG5cbkBEaXJlY3RpdmUoXG4gICAge1xuICAgICAgICAvLyB0c2xpbnQ6ZGlzYWJsZS1uZXh0LWxpbmU6IGRpcmVjdGl2ZS1zZWxlY3RvclxuICAgICAgICBzZWxlY3RvcjogJ1t0YWJsZVN0YXRlXScsXG4gICAgfSxcbilcbmV4cG9ydCBjbGFzcyBBZHZhbmNlZFRhYmxlU3RhdGUgaW1wbGVtZW50cyBPbkluaXQge1xuXG4gICAgQElucHV0KCkgdGFibGVTdGF0ZTogc3RyaW5nO1xuXG4gICAgY29uc3RydWN0b3IocHJpdmF0ZSB0YWJsZTogQWR2YW5jZWRUYWJsZUNvbXBvbmVudCxcbiAgICAgICAgQE9wdGlvbmFsKCkgcHJpdmF0ZSBzdG9yZTogU3RvcmU8Tmd4VGFibGVzU3RhdGU+KSB7XG4gICAgICAgIFxuICAgIH1cbiAgICBuZ09uSW5pdCgpOiB2b2lkIHtcbiAgICAgICAgaWYgKHRoaXMuc3RvcmUgPT0gbnVsbCkge1xuICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICB9XG4gICAgICAgIHRoaXMudGFibGUuc3RhdGVTYXZlID0gdHJ1ZTtcbiAgICAgICAgdGhpcy50YWJsZS5zdGF0ZUxvYWRDYWxsYmFjayA9IChzZXR0aW5ncywgY2FsbGJhY2spID0+IHtcbiAgICAgICAgICAgIHRoaXMuc3RvcmUucGlwZShzZWxlY3QoZnJvbVRhYmxlcy5zZWxlY3RUYWJsZSwgeyBpZDogdGhpcy50YWJsZVN0YXRlIH0pLCBmaXJzdCgpKS5zdWJzY3JpYmUoKHN0YXRlOiBhbnkpID0+IHtcbiAgICAgICAgICAgICAgICByZXR1cm4gY2FsbGJhY2soc3RhdGUgJiYgc3RhdGUudGFibGUpO1xuICAgICAgICAgICAgfSk7XG4gICAgICAgIH1cbiAgICAgICAgbGV0IGZpcnN0RHJhdyA9IHRydWU7XG4gICAgICAgIHRoaXMudGFibGUuZHJhdy5zdWJzY3JpYmUoKCkgPT4ge1xuICAgICAgICAgICAgaWYgKGZpcnN0RHJhdyA9PT0gZmFsc2UpIHtcbiAgICAgICAgICAgICAgICByZXR1cm47XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICBpZiAodGhpcy50YWJsZS5kYXRhVGFibGUgPT0gbnVsbCkge1xuICAgICAgICAgICAgICAgIHJldHVybjtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICAgIGZpcnN0RHJhdyA9IGZhbHNlO1xuICAgICAgICAgICAgY29uc3QgbG9hZGVTdGF0ZVNldHRpbmdzOiB7XG4gICAgICAgICAgICAgICAgb1NhdmVkU3RhdGU/OiB7XG4gICAgICAgICAgICAgICAgICAgIENvbFJlb3JkZXI/OiBudW1iZXJbXTtcbiAgICAgICAgICAgICAgICAgICAgc2Nyb2xsZXI6IHtcbiAgICAgICAgICAgICAgICAgICAgICAgIHRvcFJvdzogbnVtYmVyLFxuICAgICAgICAgICAgICAgICAgICAgICAgYmFzZVNjcm9sbFRvcDogbnVtYmVyLFxuICAgICAgICAgICAgICAgICAgICAgICAgYmFzZVJvd1RvcDogbnVtYmVyXG4gICAgICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9ID0gdGhpcy50YWJsZS5kYXRhVGFibGUuc2V0dGluZ3MoKVswXTtcbiAgICAgICAgICAgIGNvbnN0IHNjcm9sbGVyU2V0dGluZ3MgPSBsb2FkZVN0YXRlU2V0dGluZ3Mub1NhdmVkU3RhdGUgJiZcbiAgICAgICAgICAgICAgICBsb2FkZVN0YXRlU2V0dGluZ3Mub1NhdmVkU3RhdGUuc2Nyb2xsZXI7XG4gICAgICAgICAgICBpZiAoc2Nyb2xsZXJTZXR0aW5ncyAmJiBzY3JvbGxlclNldHRpbmdzLnRvcFJvdykge1xuICAgICAgICAgICAgICAgIGNvbnN0IHNjcm9sbGVyID0gdGhpcy50YWJsZS5kYXRhVGFibGUuc2Nyb2xsZXIoKTtcbiAgICAgICAgICAgICAgICBzY3JvbGxlci5zY3JvbGxUb1JvdyhzY3JvbGxlclNldHRpbmdzLnRvcFJvdywgdHJ1ZSk7XG4gICAgICAgICAgICB9XG4gICAgICAgIH0pO1xuICAgICAgICB0aGlzLnRhYmxlLnN0YXRlU2F2ZUNhbGxiYWNrID0gKHNldHRpbmdzLCBkYXRhKSA9PiB7XG4gICAgICAgICAgICB0aGlzLnN0b3JlLmRpc3BhdGNoKG5ldyBBcHBlbmRTdGF0ZSh0aGlzLnRhYmxlU3RhdGUsIGRhdGEpKTtcbiAgICAgICAgfVxuICAgIH1cbn0iXX0=
65
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWR2YW5jZS10YWJsZS1zdGF0ZS5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AdW5pdmVyc2lzL25neC10YWJsZXMvIiwic291cmNlcyI6WyJsaWIvZGlyZWN0aXZlcy9hZHZhbmNlLXRhYmxlLXN0YXRlLmRpcmVjdGl2ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0gsU0FBUyxFQUFFLFFBQVEsRUFBRSxLQUFLLEdBQzdCLE1BQU0sZUFBZSxDQUFDO0FBQ3ZCLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTVDLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVEQUF1RCxDQUFDO0FBQy9GLE9BQU8sS0FBSyxVQUFVLE1BQU0sYUFBYSxDQUFDO0FBQzFDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN2QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHdkQ7SUFVSSw0QkFBb0IsS0FBNkIsRUFDekIsS0FBNEI7UUFEaEMsVUFBSyxHQUFMLEtBQUssQ0FBd0I7UUFDekIsVUFBSyxHQUFMLEtBQUssQ0FBdUI7SUFFcEQsQ0FBQztJQUNELHFDQUFRLEdBQVI7UUFBQSxpQkEwQ0M7UUF6Q0csSUFBSSxJQUFJLENBQUMsS0FBSyxJQUFJLElBQUksRUFBRTtZQUNwQixPQUFPO1NBQ1Y7UUFDRCxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUM7UUFDNUIsSUFBSSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsR0FBRyxVQUFDLFFBQVEsRUFBRSxRQUFRO1lBQzlDLEtBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsV0FBVyxFQUFFLEVBQUUsRUFBRSxFQUFFLEtBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsU0FBUyxDQUFDLFVBQUMsS0FBVTtnQkFDbkcsUUFBUSxDQUFDLEtBQUssSUFBSSxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7Z0JBQy9CLElBQUksS0FBSyxJQUFJLEtBQUssQ0FBQyxLQUFLLElBQUksS0FBSyxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUU7b0JBQ2hELEtBQUksQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLENBQUM7aUJBQ3ZFO1lBQ0wsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDLENBQUE7UUFDRCxJQUFJLFNBQVMsR0FBRyxJQUFJLENBQUM7UUFDckIsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDO1lBQ3RCLElBQUksU0FBUyxLQUFLLEtBQUssRUFBRTtnQkFDckIsT0FBTzthQUNWO1lBQ0QsSUFBSSxLQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsSUFBSSxJQUFJLEVBQUU7Z0JBQzlCLE9BQU87YUFDVjtZQUNELFNBQVMsR0FBRyxLQUFLLENBQUM7WUFDbEIsSUFBTSxrQkFBa0IsR0FTcEIsS0FBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDdkMsSUFBTSxnQkFBZ0IsR0FBRyxrQkFBa0IsQ0FBQyxXQUFXO2dCQUNuRCxrQkFBa0IsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDO1lBQzVDLElBQUksZ0JBQWdCLElBQUksZ0JBQWdCLENBQUMsTUFBTSxFQUFFO2dCQUM3QyxJQUFNLFFBQVEsR0FBRyxLQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztnQkFDakQsUUFBUSxDQUFDLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUM7YUFDdkQ7UUFDTCxDQUFDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxLQUFLLENBQUMsaUJBQWlCLEdBQUcsVUFBQyxRQUFRLEVBQUUsSUFBSTtZQUMxQyxLQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJLFdBQVcsQ0FBQyxLQUFJLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDaEUsQ0FBQyxDQUFBO0lBQ0wsQ0FBQzs7Z0JBeERKLFNBQVMsU0FDTjtvQkFDSSwrQ0FBK0M7b0JBQy9DLFFBQVEsRUFBRSxjQUFjO2lCQUMzQjs7OztnQkFWSSxzQkFBc0I7Z0JBRmQsS0FBSyx1QkFtQmIsUUFBUTs7OzZCQUhaLEtBQUs7O0lBaURWLHlCQUFDO0NBQUEsQUF6REQsSUF5REM7U0FuRFksa0JBQWtCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgICBEaXJlY3RpdmUsIE9wdGlvbmFsLCBJbnB1dCwgT25Jbml0LFxufSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IHNlbGVjdCwgU3RvcmUgfSBmcm9tICdAbmdyeC9zdG9yZSc7XG5pbXBvcnQgeyBOZ3hUYWJsZXNTdGF0ZSB9IGZyb20gJy4uL3JlZHVjZXJzJztcbmltcG9ydCB7IEFkdmFuY2VkVGFibGVDb21wb25lbnQgfSBmcm9tICcuLi9jb21wb25lbnRzL2FkdmFuY2VkLXRhYmxlL2FkdmFuY2VkLXRhYmxlLmNvbXBvbmVudCc7XG5pbXBvcnQgKiBhcyBmcm9tVGFibGVzIGZyb20gJy4uL3JlZHVjZXJzJztcbmltcG9ydCB7IGZpcnN0IH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgQXBwZW5kU3RhdGUgfSBmcm9tICcuLi9hY3Rpb25zL3RhYmxlLmFjdGlvbnMnO1xuaW1wb3J0IHsgY2xvbmVEZWVwLCB2YWx1ZXMgfSBmcm9tICdsb2Rhc2gnO1xuXG5ARGlyZWN0aXZlKFxuICAgIHtcbiAgICAgICAgLy8gdHNsaW50OmRpc2FibGUtbmV4dC1saW5lOiBkaXJlY3RpdmUtc2VsZWN0b3JcbiAgICAgICAgc2VsZWN0b3I6ICdbdGFibGVTdGF0ZV0nLFxuICAgIH0sXG4pXG5leHBvcnQgY2xhc3MgQWR2YW5jZWRUYWJsZVN0YXRlIGltcGxlbWVudHMgT25Jbml0IHtcblxuICAgIEBJbnB1dCgpIHRhYmxlU3RhdGU6IHN0cmluZztcblxuICAgIGNvbnN0cnVjdG9yKHByaXZhdGUgdGFibGU6IEFkdmFuY2VkVGFibGVDb21wb25lbnQsXG4gICAgICAgIEBPcHRpb25hbCgpIHByaXZhdGUgc3RvcmU6IFN0b3JlPE5neFRhYmxlc1N0YXRlPikge1xuICAgICAgICBcbiAgICB9XG4gICAgbmdPbkluaXQoKTogdm9pZCB7XG4gICAgICAgIGlmICh0aGlzLnN0b3JlID09IG51bGwpIHtcbiAgICAgICAgICAgIHJldHVybjtcbiAgICAgICAgfVxuICAgICAgICB0aGlzLnRhYmxlLnN0YXRlU2F2ZSA9IHRydWU7XG4gICAgICAgIHRoaXMudGFibGUuc3RhdGVMb2FkQ2FsbGJhY2sgPSAoc2V0dGluZ3MsIGNhbGxiYWNrKSA9PiB7XG4gICAgICAgICAgICB0aGlzLnN0b3JlLnBpcGUoc2VsZWN0KGZyb21UYWJsZXMuc2VsZWN0VGFibGUsIHsgaWQ6IHRoaXMudGFibGVTdGF0ZSB9KSwgZmlyc3QoKSkuc3Vic2NyaWJlKChzdGF0ZTogYW55KSA9PiB7XG4gICAgICAgICAgICAgICAgY2FsbGJhY2soc3RhdGUgJiYgc3RhdGUudGFibGUpO1xuICAgICAgICAgICAgICAgIGlmIChzdGF0ZSAmJiBzdGF0ZS50YWJsZSAmJiBzdGF0ZS50YWJsZS5Db2xSZW9yZGVyKSB7XG4gICAgICAgICAgICAgICAgICAgIHRoaXMudGFibGUuZGF0YVRhYmxlLmNvbFJlb3JkZXIub3JkZXIoc3RhdGUudGFibGUuQ29sUmVvcmRlciwgdHJ1ZSk7XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgfSk7XG4gICAgICAgIH1cbiAgICAgICAgbGV0IGZpcnN0RHJhdyA9IHRydWU7XG4gICAgICAgIHRoaXMudGFibGUuZHJhdy5zdWJzY3JpYmUoKCkgPT4ge1xuICAgICAgICAgICAgaWYgKGZpcnN0RHJhdyA9PT0gZmFsc2UpIHtcbiAgICAgICAgICAgICAgICByZXR1cm47XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICBpZiAodGhpcy50YWJsZS5kYXRhVGFibGUgPT0gbnVsbCkge1xuICAgICAgICAgICAgICAgIHJldHVybjtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICAgIGZpcnN0RHJhdyA9IGZhbHNlO1xuICAgICAgICAgICAgY29uc3QgbG9hZGVTdGF0ZVNldHRpbmdzOiB7XG4gICAgICAgICAgICAgICAgb1NhdmVkU3RhdGU/OiB7XG4gICAgICAgICAgICAgICAgICAgIENvbFJlb3JkZXI/OiBudW1iZXJbXTtcbiAgICAgICAgICAgICAgICAgICAgc2Nyb2xsZXI6IHtcbiAgICAgICAgICAgICAgICAgICAgICAgIHRvcFJvdzogbnVtYmVyLFxuICAgICAgICAgICAgICAgICAgICAgICAgYmFzZVNjcm9sbFRvcDogbnVtYmVyLFxuICAgICAgICAgICAgICAgICAgICAgICAgYmFzZVJvd1RvcDogbnVtYmVyXG4gICAgICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9ID0gdGhpcy50YWJsZS5kYXRhVGFibGUuc2V0dGluZ3MoKVswXTtcbiAgICAgICAgICAgIGNvbnN0IHNjcm9sbGVyU2V0dGluZ3MgPSBsb2FkZVN0YXRlU2V0dGluZ3Mub1NhdmVkU3RhdGUgJiZcbiAgICAgICAgICAgICAgICBsb2FkZVN0YXRlU2V0dGluZ3Mub1NhdmVkU3RhdGUuc2Nyb2xsZXI7XG4gICAgICAgICAgICBpZiAoc2Nyb2xsZXJTZXR0aW5ncyAmJiBzY3JvbGxlclNldHRpbmdzLnRvcFJvdykge1xuICAgICAgICAgICAgICAgIGNvbnN0IHNjcm9sbGVyID0gdGhpcy50YWJsZS5kYXRhVGFibGUuc2Nyb2xsZXIoKTtcbiAgICAgICAgICAgICAgICBzY3JvbGxlci5zY3JvbGxUb1JvdyhzY3JvbGxlclNldHRpbmdzLnRvcFJvdywgdHJ1ZSk7XG4gICAgICAgICAgICB9XG4gICAgICAgIH0pO1xuICAgICAgICB0aGlzLnRhYmxlLnN0YXRlU2F2ZUNhbGxiYWNrID0gKHNldHRpbmdzLCBkYXRhKSA9PiB7XG4gICAgICAgICAgICB0aGlzLnN0b3JlLmRpc3BhdGNoKG5ldyBBcHBlbmRTdGF0ZSh0aGlzLnRhYmxlU3RhdGUsIGRhdGEpKTtcbiAgICAgICAgfVxuICAgIH1cbn0iXX0=
@@ -629,8 +629,8 @@ class ColumnSelectorComponent extends RouterModalOkCancel {
629
629
  ColumnSelectorComponent.decorators = [
630
630
  { type: Component, args: [{
631
631
  selector: 'app-column-selector',
632
- template: "<div>\n <div class=\"modal-header\">\n <h5 class=\"modal-title\">{{'Tables.SelectColumns' | translate}}</h5>\n <button (click)=\"cancel()\"\n type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Cancel\">\n <span aria-hidden=\"true\">&times;</span>\n </button>\n </div>\n <div class=\"modal-body pt-0\">\n <div class=\"row\">\n <div class=\"col-12\">\n <p [translate]=\"'Tables.SelectColumnHelp'\"></p>\n <p [translate]=\"'Tables.MoveColumnHelp'\"></p>\n </div>\n </div>\n <div class=\"row\">\n <div class=\"col-4\">\n <select [formControl]=\"availableColumnsControl\" size=\"10\" class=\"form-select form-control\" multiple aria-label=\"multiple select example\">\n <ng-container *ngIf=\"columns\">\n <ng-container *ngFor=\"let column of columns | orderBy: ['title']\">\n <option [value]=\"column.key\">{{column.title}}</option>\n </ng-container>\n </ng-container>\n </select>\n </div>\n <div class=\"col-4 d-flex justify-content-center align-items-center\">\n <div class=\"col-9\">\n <div>\n <button [disabled]=\"!(availableColumnsControl.value && availableColumnsControl.value.length)\" (click)=\"addColumns()\" type=\"button\" class=\"btn btn-primary btn-block\">\n <i class=\"fas fa-plus mr-2\"></i><span [translate]=\"'Tables.AddColumn'\"></span>\n </button>\n </div>\n <div class=\"mt-3\">\n <button [disabled]=\"!(selectedColumnsControl.value && selectedColumnsControl.value.length)\" (click)=\"removeColumns()\" type=\"button\" class=\"btn btn-secondary btn-block\">\n <i class=\"fas fa-minus mr-2\"></i><span [translate]=\"'Tables.RemoveColumn'\"></span>\n </button>\n </div>\n </div>\n </div>\n <div class=\"col-4\">\n <select [formControl]=\"selectedColumnsControl\" size=\"10\" class=\"form-select form-control\" multiple aria-label=\"multiple select example\">\n <ng-container *ngIf=\"selectedColumns\">\n <ng-container *ngFor=\"let column of selectedColumns\">\n <option [value]=\"column.key\">{{column.title}}</option>\n </ng-container>\n </ng-container>\n </select>\n <div class=\"d-flex justify-content-center align-items-center\">\n <div class=\"btn-group mt-4\">\n <button #moveUpButton (click)=\"moveUp()\" type=\"button\" class=\"btn btn-primary\">\n <i class=\"fas fa-chevron-up mr-2\"></i><span [translate]=\"'Tables.MoveUp'\"></span>\n </button>\n <button #moveDownButton (click)=\"moveDown()\" type=\"button\" class=\"btn btn-primary ml-2\">\n <i class=\"fas fa-chevron-down mr-2\"></i><span [translate]=\"'Tables.MoveDown'\"></span>\n </button>\n </div>\n </div>\n </div>\n </div>\n \n </div>\n <div class=\"modal-footer justify-content-end\">\n <button [disabled]=\"okButtonDisabled\" (click)=\"ok()\"\n type=\"button\" class=\"btn btn-primary\">\n {{'OK' | translate}}\n </button>\n <button [disabled]=\"cancelButtonDisabled\"\n (click)=\"cancel()\" type=\"button\" [ngClass]=\"cancelButtonClass\" data-dismiss=\"modal\">\n {{'Cancel' | translate}}\n </button>\n </div>\n </div>\n ",
633
- encapsulation: ViewEncapsulation.None,
632
+ template: "<div>\n <div class=\"modal-header\">\n <h5 class=\"modal-title\">{{'Tables.SelectColumns' | translate}}</h5>\n <button (click)=\"cancel()\"\n type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Cancel\">\n <span aria-hidden=\"true\">&times;</span>\n </button>\n </div>\n <div class=\"modal-body pt-0\">\n <div class=\"row\">\n <div class=\"col-12\">\n <p [translate]=\"'Tables.SelectColumnHelp'\"></p>\n <p [translate]=\"'Tables.MoveColumnHelp'\"></p>\n </div>\n </div>\n <div class=\"row\">\n <div class=\"col-4\">\n <select [formControl]=\"availableColumnsControl\" size=\"10\" class=\"form-select form-control\" multiple aria-label=\"multiple select example\">\n <ng-container *ngIf=\"columns\">\n <ng-container *ngFor=\"let column of columns | orderBy: ['title']\">\n <option class=\"text-wrap\" [value]=\"column.key\">{{column.title}}</option>\n </ng-container>\n </ng-container>\n </select>\n </div>\n <div class=\"col-4 d-flex justify-content-center align-items-center\">\n <div class=\"col-9\">\n <div>\n <button [disabled]=\"!(availableColumnsControl.value && availableColumnsControl.value.length)\" (click)=\"addColumns()\" type=\"button\" class=\"btn btn-primary btn-block\">\n <i class=\"fas fa-plus mr-2\"></i><span [translate]=\"'Tables.AddColumn'\"></span>\n </button>\n </div>\n <div class=\"mt-3\">\n <button [disabled]=\"!(selectedColumnsControl.value && selectedColumnsControl.value.length)\" (click)=\"removeColumns()\" type=\"button\" class=\"btn btn-secondary btn-block\">\n <i class=\"fas fa-minus mr-2\"></i><span [translate]=\"'Tables.RemoveColumn'\"></span>\n </button>\n </div>\n </div>\n </div>\n <div class=\"col-4\">\n <select [formControl]=\"selectedColumnsControl\" size=\"10\" class=\"form-select form-control\" multiple aria-label=\"multiple select example\">\n <ng-container *ngIf=\"selectedColumns\">\n <ng-container *ngFor=\"let column of selectedColumns\">\n <option class=\"text-wrap\" [value]=\"column.key\">{{column.title}}</option>\n </ng-container>\n </ng-container>\n </select>\n <div class=\"d-flex justify-content-center align-items-center\">\n <div class=\"btn-group mt-4\">\n <button #moveUpButton (click)=\"moveUp()\" type=\"button\" class=\"btn btn-primary\">\n <i class=\"fas fa-chevron-up mr-2\"></i><span [translate]=\"'Tables.MoveUp'\"></span>\n </button>\n <button #moveDownButton (click)=\"moveDown()\" type=\"button\" class=\"btn btn-primary ml-2\">\n <i class=\"fas fa-chevron-down mr-2\"></i><span [translate]=\"'Tables.MoveDown'\"></span>\n </button>\n </div>\n </div>\n </div>\n </div>\n \n </div>\n <div class=\"modal-footer justify-content-end\">\n <button [disabled]=\"okButtonDisabled\" (click)=\"ok()\"\n type=\"button\" class=\"btn btn-primary\">\n {{'OK' | translate}}\n </button>\n <button [disabled]=\"cancelButtonDisabled\"\n (click)=\"cancel()\" type=\"button\" [ngClass]=\"cancelButtonClass\" data-dismiss=\"modal\">\n {{'Cancel' | translate}}\n </button>\n </div>\n </div>\n ",
633
+ encapsulation: ViewEncapsulation.Emulated,
634
634
  styles: [`
635
635
  .form-select {
636
636
  -webkit-appearance: none;
@@ -1592,8 +1592,9 @@ class AdvancedTableComponent {
1592
1592
  if (this.dataTable) {
1593
1593
  const info = this.dataTable.page.info();
1594
1594
  this.page.emit(info);
1595
- if (drawIndex > 1)
1595
+ if (drawIndex > 1) {
1596
1596
  return;
1597
+ }
1597
1598
  try {
1598
1599
  drawIndex++;
1599
1600
  setTimeout(() => { this.dataTable.columns.adjust(); }, 1);
@@ -1732,9 +1733,9 @@ class AdvancedTableComponent {
1732
1733
  // get order expression
1733
1734
  const order = aoData[2].value;
1734
1735
  // get skip records param
1735
- let skip$$1 = aoData[3].value;
1736
+ const skip$$1 = aoData[3].value;
1736
1737
  // get page size param
1737
- let top = aoData[4].value;
1738
+ const top = aoData[4].value;
1738
1739
  // get search value
1739
1740
  const search = aoData[5].value;
1740
1741
  // get data queryable
@@ -2158,13 +2159,13 @@ class AdvancedTableComponent {
2158
2159
  // get column definitions
2159
2160
  const columnDefs = this.dataTable.settings().init().columns;
2160
2161
  const columns = columnDefs.map((columnDef, i) => {
2161
- let key = `column-${i}`;
2162
+ const key = `column-${i}`;
2162
2163
  let title = columnDef.title;
2163
2164
  // get column index
2164
2165
  const index = columnOrder.indexOf(i);
2165
2166
  const visible = this.dataTable.column(index).visible();
2166
2167
  // set title for select column
2167
- if (i == 0 && this.selectable) {
2168
+ if (i === 0 && this.selectable) {
2168
2169
  title = '<' + this._translateService.instant('Tables.SelectColumn') + '>';
2169
2170
  }
2170
2171
  // get column title
@@ -2198,9 +2199,18 @@ class AdvancedTableComponent {
2198
2199
  });
2199
2200
  this._columnSelector.selectColumns(columns).then((event) => {
2200
2201
  if (event.result === 'ok') {
2202
+ const sorted = event.columns
2203
+ .map((col) => {
2204
+ return {
2205
+ key: col.key,
2206
+ index: col.index
2207
+ };
2208
+ })
2209
+ .sort((a, b) => a.index - b.index);
2201
2210
  // get column order e.g. [3, 1, 2, 0, 4]
2202
- let indexes = event.columns.map((item) => {
2203
- return item.index;
2211
+ const indexes = sorted
2212
+ .map((item) => {
2213
+ return event.columns.findIndex((next) => item.key === next.key);
2204
2214
  });
2205
2215
  // reset column visibilty
2206
2216
  for (let index = 0; index < event.columns.length; index++) {
@@ -2211,6 +2221,12 @@ class AdvancedTableComponent {
2211
2221
  }
2212
2222
  // finally apply column order
2213
2223
  this.dataTable.colReorder.order(indexes, true);
2224
+ if (this.selectable) {
2225
+ // rebind onSelectionChange function
2226
+ const tableElement = jQuery(this.table.nativeElement);
2227
+ const elements = tableElement.find('input.s-row');
2228
+ elements.off('click').on('click', this.onSelectionChange.bind(this));
2229
+ }
2214
2230
  }
2215
2231
  });
2216
2232
  }
@@ -2314,12 +2330,10 @@ class AdvancedTableComponent {
2314
2330
  cleanupIndexes.push(index);
2315
2331
  return false;
2316
2332
  }
2317
- // find item by title
2318
- const findItem = this.config.columns.find((column) => {
2319
- return column.title && column.title.length && this._translateService.instant(column.title) === headerItem;
2320
- });
2321
2333
  // exclude hidden columns
2322
- if (findItem && findItem.hidden === true) {
2334
+ // note: use the datatable visible() function
2335
+ // instead of the hidden config property, to satisfy the column selector
2336
+ if (!this.dataTable.column(index).visible()) {
2323
2337
  cleanupIndexes.push(index);
2324
2338
  return false;
2325
2339
  }
@@ -5073,7 +5087,10 @@ class AdvancedTableState {
5073
5087
  this.table.stateSave = true;
5074
5088
  this.table.stateLoadCallback = (settings, callback) => {
5075
5089
  this.store.pipe(select(selectTable, { id: this.tableState }), first()).subscribe((state) => {
5076
- return callback(state && state.table);
5090
+ callback(state && state.table);
5091
+ if (state && state.table && state.table.ColReorder) {
5092
+ this.table.dataTable.colReorder.order(state.table.ColReorder, true);
5093
+ }
5077
5094
  });
5078
5095
  };
5079
5096
  let firstDraw = true;