@datorama/core 21.4.0-rc.16 → 21.4.0-rc.19
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/datorama-core.umd.js +23 -22
- package/bundles/datorama-core.umd.js.map +1 -1
- package/bundles/datorama-core.umd.min.js +1 -1
- package/bundles/datorama-core.umd.min.js.map +1 -1
- package/esm2015/lib/grid-v2/grid-filter/grid-filter.component.js +4 -5
- package/esm2015/lib/grid-v2/grid-store/grid.service.js +13 -11
- package/esm5/lib/grid-v2/grid-filter/grid-filter.component.js +4 -5
- package/esm5/lib/grid-v2/grid-store/grid.service.js +21 -19
- package/fesm2015/datorama-core.js +15 -14
- package/fesm2015/datorama-core.js.map +1 -1
- package/fesm5/datorama-core.js +23 -22
- package/fesm5/datorama-core.js.map +1 -1
- package/package.json +1 -1
|
@@ -12824,19 +12824,18 @@
|
|
|
12824
12824
|
var _a;
|
|
12825
12825
|
var _this = this;
|
|
12826
12826
|
var _b = this.popover.data, gridService = _b.gridService, gridQuery = _b.gridQuery;
|
|
12827
|
-
var _c = this.colDef, filter = _c.filter, pivotValueColumn = _c.pivotValueColumn, pivotKeys = _c.pivotKeys;
|
|
12827
|
+
var _c = this.colDef, filter = _c.filter, _d = _c.filtersConfig, filtersConfig = _d === void 0 ? {} : _d, pivotValueColumn = _c.pivotValueColumn, pivotKeys = _c.pivotKeys;
|
|
12828
12828
|
var colDefs = gridQuery.api.columns.getAllColumns().map(function (column) { return column.getColDef(); });
|
|
12829
12829
|
this.colField = getColField(this.colDef);
|
|
12830
12830
|
var colDef = colDefs.find(function (colDef) { return colDef.field === _this.colField; });
|
|
12831
|
-
var
|
|
12831
|
+
var colFilter = filter || colDef.filter;
|
|
12832
|
+
var filterOptions = DatoGridFilterOptionsMap[colFilter];
|
|
12832
12833
|
this.pivotColumn = gridQuery.api.columns.getSecondaryPivotColumn(pivotKeys, pivotValueColumn);
|
|
12833
12834
|
if (filtersConfig.sections) {
|
|
12834
12835
|
this.filterSections = (_a = {}, _a[filtersConfig.sections] = true, _a);
|
|
12835
12836
|
}
|
|
12836
12837
|
this.keepPredefinedListOriginalOrder =
|
|
12837
12838
|
filtersConfig.keepPredefinedListOriginalOrder && !isEmpty(filtersConfig.predefinedListValues);
|
|
12838
|
-
var colFilter = filter || colDef.filter;
|
|
12839
|
-
var filterOptions = DatoGridFilterOptionsMap[colFilter];
|
|
12840
12839
|
this.filterType = filterOptions ? colFilter : exports.DatoGridFilterTypes.String;
|
|
12841
12840
|
this.listLabelType = this.filterType.toLowerCase();
|
|
12842
12841
|
this.listSortByKey = this.filterType === exports.DatoGridFilterTypes.Number && this.colDef.valueFormatter ? 'id' : 'label';
|
|
@@ -14378,27 +14377,29 @@
|
|
|
14378
14377
|
};
|
|
14379
14378
|
GridService.prototype.setGridFilters = function (filters) {
|
|
14380
14379
|
var e_2, _a;
|
|
14381
|
-
|
|
14382
|
-
|
|
14383
|
-
var
|
|
14384
|
-
|
|
14385
|
-
|
|
14386
|
-
|
|
14387
|
-
|
|
14388
|
-
|
|
14389
|
-
|
|
14390
|
-
|
|
14380
|
+
if (this.api) {
|
|
14381
|
+
try {
|
|
14382
|
+
for (var filters_1 = __values(filters), filters_1_1 = filters_1.next(); !filters_1_1.done; filters_1_1 = filters_1.next()) {
|
|
14383
|
+
var filter = filters_1_1.value.filter;
|
|
14384
|
+
var column = this.api.columns.getColumn(filter.colId);
|
|
14385
|
+
if (column) {
|
|
14386
|
+
this.setColumnFilter(column, filter);
|
|
14387
|
+
}
|
|
14388
|
+
else {
|
|
14389
|
+
var pivotColumn = this.gridQuery.getSecondaryColumn(filter.colId);
|
|
14390
|
+
this.setColumnFilter(pivotColumn, filter);
|
|
14391
|
+
}
|
|
14391
14392
|
}
|
|
14392
14393
|
}
|
|
14393
|
-
|
|
14394
|
-
|
|
14395
|
-
|
|
14396
|
-
|
|
14397
|
-
|
|
14394
|
+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
14395
|
+
finally {
|
|
14396
|
+
try {
|
|
14397
|
+
if (filters_1_1 && !filters_1_1.done && (_a = filters_1.return)) _a.call(filters_1);
|
|
14398
|
+
}
|
|
14399
|
+
finally { if (e_2) throw e_2.error; }
|
|
14398
14400
|
}
|
|
14399
|
-
|
|
14401
|
+
this.notifyFilterUpdate();
|
|
14400
14402
|
}
|
|
14401
|
-
this.notifyFilterUpdate();
|
|
14402
14403
|
};
|
|
14403
14404
|
GridService.prototype.updateFilter = function (column, filter) {
|
|
14404
14405
|
var colField = getColField(column.getColDef());
|
|
@@ -14922,7 +14923,7 @@
|
|
|
14922
14923
|
var _this = this;
|
|
14923
14924
|
var gridOptions = _a.gridOptions;
|
|
14924
14925
|
gridOptions.processSecondaryColDef = function (colDef) {
|
|
14925
|
-
var userProvidedColDef = colDef.pivotValueColumn.getUserProvidedColDef();
|
|
14926
|
+
var userProvidedColDef = colDef.pivotValueColumn && colDef.pivotValueColumn.getUserProvidedColDef();
|
|
14926
14927
|
if (userProvidedColDef) {
|
|
14927
14928
|
colDef.filter = userProvidedColDef.filter;
|
|
14928
14929
|
}
|