@universis/ngx-tables 0.8.2 → 0.8.3

package/bundles/universis-ngx-tables.umd.js

@@ -2006,8 +2006,9 @@
                     if (_this.dataTable) {
                         var info = _this.dataTable.page.info();
                         _this.page.emit(info);
-                        if (drawIndex_1 > 1)
+                        if (drawIndex_1 > 1) {
                             return;
+                        }
                         try {
                             drawIndex_1++;
                             setTimeout(function () { _this.dataTable.columns.adjust(); }, 1);
@@ -2586,7 +2587,7 @@
                 var index = columnOrder.indexOf(i);
                 var visible = _this.dataTable.column(index).visible();
                 // set title for select column
-                if (i == 0 && _this.selectable) {
+                if (i === 0 && _this.selectable) {
                     title = '<' + _this._translateService.instant('Tables.SelectColumn') + '>';
                 }
                 // get column title
@@ -2620,9 +2621,18 @@
             });
             this._columnSelector.selectColumns(columns).then(function (event) {
                 if (event.result === 'ok') {
+                    var sorted = event.columns
+                        .map(function (col) {
+                        return {
+                            key: col.key,
+                            index: col.index
+                        };
+                    })
+                        .sort(function (a, b) { return a.index - b.index; });
                     // get column order e.g. [3, 1, 2, 0, 4]
-                    var indexes = event.columns.map(function (item) {
-                        return item.index;
+                    var indexes = sorted
+                        .map(function (item) {
+                        return event.columns.findIndex(function (next) { return item.key === next.key; });
                     });
                     // reset column visibilty
                     for (var index = 0; index < event.columns.length; index++) {
@@ -2737,12 +2747,10 @@
                     cleanupIndexes.push(index);
                     return false;
                 }
-                // find item by title
-                var findItem = _this.config.columns.find(function (column) {
-                    return column.title && column.title.length && _this._translateService.instant(column.title) === headerItem;
-                });
                 // exclude hidden columns
-                if (findItem && findItem.hidden === true) {
+                // note: use the datatable visible() function
+                // instead of the hidden config property, to satisfy the column selector
+                if (!_this.dataTable.column(index).visible()) {
                     cleanupIndexes.push(index);
                     return false;
                 }
@@ -5645,7 +5653,10 @@
             this.table.stateSave = true;
             this.table.stateLoadCallback = function (settings, callback) {
                 _this.store.pipe(store.select(selectTable, { id: _this.tableState }), operators.first()).subscribe(function (state) {
-                    return callback(state && state.table);
+                    callback(state && state.table);
+                    if (state && state.table && state.table.ColReorder) {
+                        _this.table.dataTable.colReorder.order(state.table.ColReorder, true);
+                    }
                 });
             };
             var firstDraw = true;