@universis/ngx-tables 0.8.2 → 0.8.3
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.
- package/bundles/universis-ngx-tables.umd.js +21 -10
- package/bundles/universis-ngx-tables.umd.js.map +1 -1
- package/bundles/universis-ngx-tables.umd.min.js +1 -1
- package/bundles/universis-ngx-tables.umd.min.js.map +1 -1
- package/esm2015/lib/components/advanced-table/advanced-table.component.js +21 -13
- package/esm2015/lib/directives/advance-table-state.directive.js +5 -2
- package/esm5/lib/components/advanced-table/advanced-table.component.js +18 -10
- package/esm5/lib/directives/advance-table-state.directive.js +5 -2
- package/fesm2015/universis-ngx-tables.js +24 -13
- package/fesm2015/universis-ngx-tables.js.map +1 -1
- package/fesm5/universis-ngx-tables.js +21 -10
- package/fesm5/universis-ngx-tables.js.map +1 -1
- package/package.json +1 -1
- package/universis-ngx-tables.metadata.json +1 -1
|
@@ -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
|
-
|
|
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,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWR2YW5jZS10YWJsZS1zdGF0ZS5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AdW5pdmVyc2lzL25neC10YWJsZXMvIiwic291cmNlcyI6WyJsaWIvZGlyZWN0aXZlcy9hZHZhbmNlLXRhYmxlLXN0YXRlLmRpcmVjdGl2ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0gsU0FBUyxFQUFFLFFBQVEsRUFBRSxLQUFLLEdBQzdCLE1BQU0sZUFBZSxDQUFDO0FBQ3ZCLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTVDLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVEQUF1RCxDQUFDO0FBQy9GLE9BQU8sS0FBSyxVQUFVLE1BQU0sYUFBYSxDQUFDO0FBQzFDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN2QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHdkQ7SUFVSSw0QkFBb0IsS0FBNkIsRUFDekIsS0FBNEI7UUFEaEMsVUFBSyxHQUFMLEtBQUssQ0FBd0I7UUFDekIsVUFBSyxHQUFMLEtBQUssQ0FBdUI7SUFFcEQsQ0FBQztJQUNELHFDQUFRLEdBQVI7UUFBQSxpQkEwQ0M7UUF6Q0csSUFBSSxJQUFJLENBQUMsS0FBSyxJQUFJLElBQUksRUFBRTtZQUNwQixPQUFPO1NBQ1Y7UUFDRCxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUM7UUFDNUIsSUFBSSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsR0FBRyxVQUFDLFFBQVEsRUFBRSxRQUFRO1lBQzlDLEtBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsV0FBVyxFQUFFLEVBQUUsRUFBRSxFQUFFLEtBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsU0FBUyxDQUFDLFVBQUMsS0FBVTtnQkFDbkcsUUFBUSxDQUFDLEtBQUssSUFBSSxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7Z0JBQy9CLElBQUksS0FBSyxJQUFJLEtBQUssQ0FBQyxLQUFLLElBQUksS0FBSyxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUU7b0JBQ2hELEtBQUksQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLENBQUM7aUJBQ3ZFO1lBQ0wsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDLENBQUE7UUFDRCxJQUFJLFNBQVMsR0FBRyxJQUFJLENBQUM7UUFDckIsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDO1lBQ3RCLElBQUksU0FBUyxLQUFLLEtBQUssRUFBRTtnQkFDckIsT0FBTzthQUNWO1lBQ0QsSUFBSSxLQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsSUFBSSxJQUFJLEVBQUU7Z0JBQzlCLE9BQU87YUFDVjtZQUNELFNBQVMsR0FBRyxLQUFLLENBQUM7WUFDbEIsSUFBTSxrQkFBa0IsR0FTcEIsS0FBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDdkMsSUFBTSxnQkFBZ0IsR0FBRyxrQkFBa0IsQ0FBQyxXQUFXO2dCQUNuRCxrQkFBa0IsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDO1lBQzVDLElBQUksZ0JBQWdCLElBQUksZ0JBQWdCLENBQUMsTUFBTSxFQUFFO2dCQUM3QyxJQUFNLFFBQVEsR0FBRyxLQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztnQkFDakQsUUFBUSxDQUFDLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUM7YUFDdkQ7UUFDTCxDQUFDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxLQUFLLENBQUMsaUJBQWlCLEdBQUcsVUFBQyxRQUFRLEVBQUUsSUFBSTtZQUMxQyxLQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJLFdBQVcsQ0FBQyxLQUFJLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDaEUsQ0FBQyxDQUFBO0lBQ0wsQ0FBQzs7Z0JBeERKLFNBQVMsU0FDTjtvQkFDSSwrQ0FBK0M7b0JBQy9DLFFBQVEsRUFBRSxjQUFjO2lCQUMzQjs7OztnQkFWSSxzQkFBc0I7Z0JBRmQsS0FBSyx1QkFtQmIsUUFBUTs7OzZCQUhaLEtBQUs7O0lBaURWLHlCQUFDO0NBQUEsQUF6REQsSUF5REM7U0FuRFksa0JBQWtCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgICBEaXJlY3RpdmUsIE9wdGlvbmFsLCBJbnB1dCwgT25Jbml0LFxufSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IHNlbGVjdCwgU3RvcmUgfSBmcm9tICdAbmdyeC9zdG9yZSc7XG5pbXBvcnQgeyBOZ3hUYWJsZXNTdGF0ZSB9IGZyb20gJy4uL3JlZHVjZXJzJztcbmltcG9ydCB7IEFkdmFuY2VkVGFibGVDb21wb25lbnQgfSBmcm9tICcuLi9jb21wb25lbnRzL2FkdmFuY2VkLXRhYmxlL2FkdmFuY2VkLXRhYmxlLmNvbXBvbmVudCc7XG5pbXBvcnQgKiBhcyBmcm9tVGFibGVzIGZyb20gJy4uL3JlZHVjZXJzJztcbmltcG9ydCB7IGZpcnN0IH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgQXBwZW5kU3RhdGUgfSBmcm9tICcuLi9hY3Rpb25zL3RhYmxlLmFjdGlvbnMnO1xuaW1wb3J0IHsgY2xvbmVEZWVwLCB2YWx1ZXMgfSBmcm9tICdsb2Rhc2gnO1xuXG5ARGlyZWN0aXZlKFxuICAgIHtcbiAgICAgICAgLy8gdHNsaW50OmRpc2FibGUtbmV4dC1saW5lOiBkaXJlY3RpdmUtc2VsZWN0b3JcbiAgICAgICAgc2VsZWN0b3I6ICdbdGFibGVTdGF0ZV0nLFxuICAgIH0sXG4pXG5leHBvcnQgY2xhc3MgQWR2YW5jZWRUYWJsZVN0YXRlIGltcGxlbWVudHMgT25Jbml0IHtcblxuICAgIEBJbnB1dCgpIHRhYmxlU3RhdGU6IHN0cmluZztcblxuICAgIGNvbnN0cnVjdG9yKHByaXZhdGUgdGFibGU6IEFkdmFuY2VkVGFibGVDb21wb25lbnQsXG4gICAgICAgIEBPcHRpb25hbCgpIHByaXZhdGUgc3RvcmU6IFN0b3JlPE5neFRhYmxlc1N0YXRlPikge1xuICAgICAgICBcbiAgICB9XG4gICAgbmdPbkluaXQoKTogdm9pZCB7XG4gICAgICAgIGlmICh0aGlzLnN0b3JlID09IG51bGwpIHtcbiAgICAgICAgICAgIHJldHVybjtcbiAgICAgICAgfVxuICAgICAgICB0aGlzLnRhYmxlLnN0YXRlU2F2ZSA9IHRydWU7XG4gICAgICAgIHRoaXMudGFibGUuc3RhdGVMb2FkQ2FsbGJhY2sgPSAoc2V0dGluZ3MsIGNhbGxiYWNrKSA9PiB7XG4gICAgICAgICAgICB0aGlzLnN0b3JlLnBpcGUoc2VsZWN0KGZyb21UYWJsZXMuc2VsZWN0VGFibGUsIHsgaWQ6IHRoaXMudGFibGVTdGF0ZSB9KSwgZmlyc3QoKSkuc3Vic2NyaWJlKChzdGF0ZTogYW55KSA9PiB7XG4gICAgICAgICAgICAgICAgY2FsbGJhY2soc3RhdGUgJiYgc3RhdGUudGFibGUpO1xuICAgICAgICAgICAgICAgIGlmIChzdGF0ZSAmJiBzdGF0ZS50YWJsZSAmJiBzdGF0ZS50YWJsZS5Db2xSZW9yZGVyKSB7XG4gICAgICAgICAgICAgICAgICAgIHRoaXMudGFibGUuZGF0YVRhYmxlLmNvbFJlb3JkZXIub3JkZXIoc3RhdGUudGFibGUuQ29sUmVvcmRlciwgdHJ1ZSk7XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgfSk7XG4gICAgICAgIH1cbiAgICAgICAgbGV0IGZpcnN0RHJhdyA9IHRydWU7XG4gICAgICAgIHRoaXMudGFibGUuZHJhdy5zdWJzY3JpYmUoKCkgPT4ge1xuICAgICAgICAgICAgaWYgKGZpcnN0RHJhdyA9PT0gZmFsc2UpIHtcbiAgICAgICAgICAgICAgICByZXR1cm47XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICBpZiAodGhpcy50YWJsZS5kYXRhVGFibGUgPT0gbnVsbCkge1xuICAgICAgICAgICAgICAgIHJldHVybjtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICAgIGZpcnN0RHJhdyA9IGZhbHNlO1xuICAgICAgICAgICAgY29uc3QgbG9hZGVTdGF0ZVNldHRpbmdzOiB7XG4gICAgICAgICAgICAgICAgb1NhdmVkU3RhdGU/OiB7XG4gICAgICAgICAgICAgICAgICAgIENvbFJlb3JkZXI/OiBudW1iZXJbXTtcbiAgICAgICAgICAgICAgICAgICAgc2Nyb2xsZXI6IHtcbiAgICAgICAgICAgICAgICAgICAgICAgIHRvcFJvdzogbnVtYmVyLFxuICAgICAgICAgICAgICAgICAgICAgICAgYmFzZVNjcm9sbFRvcDogbnVtYmVyLFxuICAgICAgICAgICAgICAgICAgICAgICAgYmFzZVJvd1RvcDogbnVtYmVyXG4gICAgICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9ID0gdGhpcy50YWJsZS5kYXRhVGFibGUuc2V0dGluZ3MoKVswXTtcbiAgICAgICAgICAgIGNvbnN0IHNjcm9sbGVyU2V0dGluZ3MgPSBsb2FkZVN0YXRlU2V0dGluZ3Mub1NhdmVkU3RhdGUgJiZcbiAgICAgICAgICAgICAgICBsb2FkZVN0YXRlU2V0dGluZ3Mub1NhdmVkU3RhdGUuc2Nyb2xsZXI7XG4gICAgICAgICAgICBpZiAoc2Nyb2xsZXJTZXR0aW5ncyAmJiBzY3JvbGxlclNldHRpbmdzLnRvcFJvdykge1xuICAgICAgICAgICAgICAgIGNvbnN0IHNjcm9sbGVyID0gdGhpcy50YWJsZS5kYXRhVGFibGUuc2Nyb2xsZXIoKTtcbiAgICAgICAgICAgICAgICBzY3JvbGxlci5zY3JvbGxUb1JvdyhzY3JvbGxlclNldHRpbmdzLnRvcFJvdywgdHJ1ZSk7XG4gICAgICAgICAgICB9XG4gICAgICAgIH0pO1xuICAgICAgICB0aGlzLnRhYmxlLnN0YXRlU2F2ZUNhbGxiYWNrID0gKHNldHRpbmdzLCBkYXRhKSA9PiB7XG4gICAgICAgICAgICB0aGlzLnN0b3JlLmRpc3BhdGNoKG5ldyBBcHBlbmRTdGF0ZSh0aGlzLnRhYmxlU3RhdGUsIGRhdGEpKTtcbiAgICAgICAgfVxuICAgIH1cbn0iXX0=
|
|
@@ -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
|
-
|
|
1736
|
+
const skip$$1 = aoData[3].value;
|
|
1736
1737
|
// get page size param
|
|
1737
|
-
|
|
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
|
-
|
|
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
|
|
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
|
-
|
|
2203
|
-
|
|
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++) {
|
|
@@ -2314,12 +2324,10 @@ class AdvancedTableComponent {
|
|
|
2314
2324
|
cleanupIndexes.push(index);
|
|
2315
2325
|
return false;
|
|
2316
2326
|
}
|
|
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
2327
|
// exclude hidden columns
|
|
2322
|
-
|
|
2328
|
+
// note: use the datatable visible() function
|
|
2329
|
+
// instead of the hidden config property, to satisfy the column selector
|
|
2330
|
+
if (!this.dataTable.column(index).visible()) {
|
|
2323
2331
|
cleanupIndexes.push(index);
|
|
2324
2332
|
return false;
|
|
2325
2333
|
}
|
|
@@ -5073,7 +5081,10 @@ class AdvancedTableState {
|
|
|
5073
5081
|
this.table.stateSave = true;
|
|
5074
5082
|
this.table.stateLoadCallback = (settings, callback) => {
|
|
5075
5083
|
this.store.pipe(select(selectTable, { id: this.tableState }), first()).subscribe((state) => {
|
|
5076
|
-
|
|
5084
|
+
callback(state && state.table);
|
|
5085
|
+
if (state && state.table && state.table.ColReorder) {
|
|
5086
|
+
this.table.dataTable.colReorder.order(state.table.ColReorder, true);
|
|
5087
|
+
}
|
|
5077
5088
|
});
|
|
5078
5089
|
};
|
|
5079
5090
|
let firstDraw = true;
|