@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
|
@@ -3428,7 +3428,11 @@
|
|
|
3428
3428
|
return;
|
|
3429
3429
|
}
|
|
3430
3430
|
/** @type {?} */
|
|
3431
|
-
var
|
|
3431
|
+
var queryModel = this._query && this._query.getModel();
|
|
3432
|
+
/** @type {?} */
|
|
3433
|
+
var model = queryModel ? queryModel : this.config.model;
|
|
3434
|
+
/** @type {?} */
|
|
3435
|
+
var q = this._context.model(model).asQueryable();
|
|
3432
3436
|
Object.keys(this.lastQueryParams).forEach(function (key) {
|
|
3433
3437
|
q.setParam(key, _this.lastQueryParams && _this.lastQueryParams[key]);
|
|
3434
3438
|
});
|
|
@@ -6160,7 +6164,7 @@
|
|
|
6160
6164
|
*/
|
|
6161
6165
|
function (event) {
|
|
6162
6166
|
return __awaiter(this, void 0, void 0, function () {
|
|
6163
|
-
var query, queryParams_3;
|
|
6167
|
+
var query, queryParams_3, queryParams;
|
|
6164
6168
|
return __generator(this, function (_a) {
|
|
6165
6169
|
switch (_a.label) {
|
|
6166
6170
|
case 0:
|
|
@@ -6191,7 +6195,9 @@
|
|
|
6191
6195
|
})];
|
|
6192
6196
|
}
|
|
6193
6197
|
if (this.table.query && query && query.getParams()['$filter']) {
|
|
6194
|
-
this.table.query.
|
|
6198
|
+
queryParams = Object.assign({}, this.table.query.getParams(), query.getParams());
|
|
6199
|
+
query.setQueryParams(queryParams);
|
|
6200
|
+
this.table.query = query;
|
|
6195
6201
|
}
|
|
6196
6202
|
else {
|
|
6197
6203
|
this.table.query = query;
|