@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
package/fesm5/datorama-core.js
CHANGED
|
@@ -12625,19 +12625,18 @@ var DatoGridFilterComponent = /** @class */ (function () {
|
|
|
12625
12625
|
var _a;
|
|
12626
12626
|
var _this = this;
|
|
12627
12627
|
var _b = this.popover.data, gridService = _b.gridService, gridQuery = _b.gridQuery;
|
|
12628
|
-
var _c = this.colDef, filter = _c.filter, pivotValueColumn = _c.pivotValueColumn, pivotKeys = _c.pivotKeys;
|
|
12628
|
+
var _c = this.colDef, filter = _c.filter, _d = _c.filtersConfig, filtersConfig = _d === void 0 ? {} : _d, pivotValueColumn = _c.pivotValueColumn, pivotKeys = _c.pivotKeys;
|
|
12629
12629
|
var colDefs = gridQuery.api.columns.getAllColumns().map(function (column) { return column.getColDef(); });
|
|
12630
12630
|
this.colField = getColField(this.colDef);
|
|
12631
12631
|
var colDef = colDefs.find(function (colDef) { return colDef.field === _this.colField; });
|
|
12632
|
-
var
|
|
12632
|
+
var colFilter = filter || colDef.filter;
|
|
12633
|
+
var filterOptions = DatoGridFilterOptionsMap[colFilter];
|
|
12633
12634
|
this.pivotColumn = gridQuery.api.columns.getSecondaryPivotColumn(pivotKeys, pivotValueColumn);
|
|
12634
12635
|
if (filtersConfig.sections) {
|
|
12635
12636
|
this.filterSections = (_a = {}, _a[filtersConfig.sections] = true, _a);
|
|
12636
12637
|
}
|
|
12637
12638
|
this.keepPredefinedListOriginalOrder =
|
|
12638
12639
|
filtersConfig.keepPredefinedListOriginalOrder && !isEmpty(filtersConfig.predefinedListValues);
|
|
12639
|
-
var colFilter = filter || colDef.filter;
|
|
12640
|
-
var filterOptions = DatoGridFilterOptionsMap[colFilter];
|
|
12641
12640
|
this.filterType = filterOptions ? colFilter : DatoGridFilterTypes.String;
|
|
12642
12641
|
this.listLabelType = this.filterType.toLowerCase();
|
|
12643
12642
|
this.listSortByKey = this.filterType === DatoGridFilterTypes.Number && this.colDef.valueFormatter ? 'id' : 'label';
|
|
@@ -14179,27 +14178,29 @@ var GridService = /** @class */ (function () {
|
|
|
14179
14178
|
};
|
|
14180
14179
|
GridService.prototype.setGridFilters = function (filters) {
|
|
14181
14180
|
var e_2, _a;
|
|
14182
|
-
|
|
14183
|
-
|
|
14184
|
-
var
|
|
14185
|
-
|
|
14186
|
-
|
|
14187
|
-
|
|
14188
|
-
|
|
14189
|
-
|
|
14190
|
-
|
|
14191
|
-
|
|
14181
|
+
if (this.api) {
|
|
14182
|
+
try {
|
|
14183
|
+
for (var filters_1 = __values(filters), filters_1_1 = filters_1.next(); !filters_1_1.done; filters_1_1 = filters_1.next()) {
|
|
14184
|
+
var filter = filters_1_1.value.filter;
|
|
14185
|
+
var column = this.api.columns.getColumn(filter.colId);
|
|
14186
|
+
if (column) {
|
|
14187
|
+
this.setColumnFilter(column, filter);
|
|
14188
|
+
}
|
|
14189
|
+
else {
|
|
14190
|
+
var pivotColumn = this.gridQuery.getSecondaryColumn(filter.colId);
|
|
14191
|
+
this.setColumnFilter(pivotColumn, filter);
|
|
14192
|
+
}
|
|
14192
14193
|
}
|
|
14193
14194
|
}
|
|
14194
|
-
|
|
14195
|
-
|
|
14196
|
-
|
|
14197
|
-
|
|
14198
|
-
|
|
14195
|
+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
14196
|
+
finally {
|
|
14197
|
+
try {
|
|
14198
|
+
if (filters_1_1 && !filters_1_1.done && (_a = filters_1.return)) _a.call(filters_1);
|
|
14199
|
+
}
|
|
14200
|
+
finally { if (e_2) throw e_2.error; }
|
|
14199
14201
|
}
|
|
14200
|
-
|
|
14202
|
+
this.notifyFilterUpdate();
|
|
14201
14203
|
}
|
|
14202
|
-
this.notifyFilterUpdate();
|
|
14203
14204
|
};
|
|
14204
14205
|
GridService.prototype.updateFilter = function (column, filter) {
|
|
14205
14206
|
var colField = getColField(column.getColDef());
|
|
@@ -14723,7 +14724,7 @@ var GridService = /** @class */ (function () {
|
|
|
14723
14724
|
var _this = this;
|
|
14724
14725
|
var gridOptions = _a.gridOptions;
|
|
14725
14726
|
gridOptions.processSecondaryColDef = function (colDef) {
|
|
14726
|
-
var userProvidedColDef = colDef.pivotValueColumn.getUserProvidedColDef();
|
|
14727
|
+
var userProvidedColDef = colDef.pivotValueColumn && colDef.pivotValueColumn.getUserProvidedColDef();
|
|
14727
14728
|
if (userProvidedColDef) {
|
|
14728
14729
|
colDef.filter = userProvidedColDef.filter;
|
|
14729
14730
|
}
|