@universis/ngx-tables 6.13.7 → 6.13.9
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 +9 -3
- 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-search.component.js +5 -2
- package/esm2015/lib/components/advanced-table/advanced-table.component.js +6 -2
- package/esm5/lib/components/advanced-table/advanced-table-search.component.js +5 -3
- package/esm5/lib/components/advanced-table/advanced-table.component.js +6 -2
- package/fesm2015/universis-ngx-tables.js +9 -2
- package/fesm2015/universis-ngx-tables.js.map +1 -1
- package/fesm5/universis-ngx-tables.js +11 -5
- package/fesm5/universis-ngx-tables.js.map +1 -1
- package/package.json +1 -1
|
@@ -22,8 +22,8 @@ import { BsModalRef, BsModalService, ModalModule } from 'ngx-bootstrap/modal';
|
|
|
22
22
|
import { ProgressbarModule } from 'ngx-bootstrap/progressbar';
|
|
23
23
|
import { GroupByPipe, NgPipesModule } from 'ngx-pipes';
|
|
24
24
|
import { template, at, cloneDeep, isEmpty } from 'lodash';
|
|
25
|
-
import { __extends, __awaiter, __generator,
|
|
26
|
-
import { Injectable, Directive, Optional, Input, Component, ElementRef, ViewChild, ViewEncapsulation, EventEmitter, Output, Pipe, NgModule, CUSTOM_ELEMENTS_SCHEMA,
|
|
25
|
+
import { __extends, __values, __awaiter, __generator, __assign, __spread } from 'tslib';
|
|
26
|
+
import { Injectable, Directive, Optional, Input, Component, ElementRef, ViewChild, ViewEncapsulation, EventEmitter, Output, Pipe, NgModule, CUSTOM_ELEMENTS_SCHEMA, defineInjectable, inject, HostListener, ChangeDetectorRef, InjectionToken, Inject, Injector, ViewContainerRef, ChangeDetectionStrategy } from '@angular/core';
|
|
27
27
|
import { ActivatedRoute, Router, NavigationStart, NavigationEnd, RouterModule } from '@angular/router';
|
|
28
28
|
import { createFeatureSelector, createSelector, select, Store } from '@ngrx/store';
|
|
29
29
|
import { skip, first, filter } from 'rxjs/operators';
|
|
@@ -3231,7 +3231,11 @@ var AdvancedTableComponent = /** @class */ (function () {
|
|
|
3231
3231
|
return;
|
|
3232
3232
|
}
|
|
3233
3233
|
/** @type {?} */
|
|
3234
|
-
var
|
|
3234
|
+
var queryModel = this._query && this._query.getModel();
|
|
3235
|
+
/** @type {?} */
|
|
3236
|
+
var model = queryModel ? queryModel : this.config.model;
|
|
3237
|
+
/** @type {?} */
|
|
3238
|
+
var q = this._context.model(model).asQueryable();
|
|
3235
3239
|
Object.keys(this.lastQueryParams).forEach(function (key) {
|
|
3236
3240
|
q.setParam(key, _this.lastQueryParams && _this.lastQueryParams[key]);
|
|
3237
3241
|
});
|
|
@@ -5941,7 +5945,7 @@ var AdvancedTableSearchComponent = /** @class */ (function (_super) {
|
|
|
5941
5945
|
*/
|
|
5942
5946
|
function (event) {
|
|
5943
5947
|
return __awaiter(this, void 0, void 0, function () {
|
|
5944
|
-
var query, queryParams_3;
|
|
5948
|
+
var query, queryParams_3, queryParams;
|
|
5945
5949
|
return __generator(this, function (_a) {
|
|
5946
5950
|
switch (_a.label) {
|
|
5947
5951
|
case 0:
|
|
@@ -5971,7 +5975,9 @@ var AdvancedTableSearchComponent = /** @class */ (function (_super) {
|
|
|
5971
5975
|
})];
|
|
5972
5976
|
}
|
|
5973
5977
|
if (this.table.query && query && query.getParams()['$filter']) {
|
|
5974
|
-
this.table.query.
|
|
5978
|
+
queryParams = Object.assign({}, this.table.query.getParams(), query.getParams());
|
|
5979
|
+
query.setQueryParams(queryParams);
|
|
5980
|
+
this.table.query = query;
|
|
5975
5981
|
}
|
|
5976
5982
|
else {
|
|
5977
5983
|
this.table.query = query;
|