@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
|
@@ -2706,7 +2706,11 @@ class AdvancedTableComponent {
|
|
|
2706
2706
|
return;
|
|
2707
2707
|
}
|
|
2708
2708
|
/** @type {?} */
|
|
2709
|
-
const
|
|
2709
|
+
const queryModel = this._query && this._query.getModel();
|
|
2710
|
+
/** @type {?} */
|
|
2711
|
+
const model = queryModel ? queryModel : this.config.model;
|
|
2712
|
+
/** @type {?} */
|
|
2713
|
+
const q = this._context.model(model).asQueryable();
|
|
2710
2714
|
Object.keys(this.lastQueryParams).forEach((key) => {
|
|
2711
2715
|
q.setParam(key, this.lastQueryParams && this.lastQueryParams[key]);
|
|
2712
2716
|
});
|
|
@@ -5214,7 +5218,10 @@ class AdvancedTableSearchComponent extends AdvancedTableSearchBaseComponent {
|
|
|
5214
5218
|
});
|
|
5215
5219
|
}
|
|
5216
5220
|
if (this.table.query && query && query.getParams()['$filter']) {
|
|
5217
|
-
|
|
5221
|
+
/** @type {?} */
|
|
5222
|
+
const queryParams = Object.assign({}, this.table.query.getParams(), query.getParams());
|
|
5223
|
+
query.setQueryParams(queryParams);
|
|
5224
|
+
this.table.query = query;
|
|
5218
5225
|
}
|
|
5219
5226
|
else {
|
|
5220
5227
|
this.table.query = query;
|