@annalib/anna-core 4.2.26 → 4.2.28
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/esm2020/lib/anna-generic-table-lib/components/anna-non-editable-generic-table/anna-non-editable-generic-table.component.mjs +9 -3
- package/fesm2015/annalib-anna-core.mjs +8 -2
- package/fesm2015/annalib-anna-core.mjs.map +1 -1
- package/fesm2020/annalib-anna-core.mjs +8 -2
- package/fesm2020/annalib-anna-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -2041,10 +2041,16 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2041
2041
|
}
|
|
2042
2042
|
else {
|
|
2043
2043
|
let values = this.tableData.map((u) => u[item]);
|
|
2044
|
-
if
|
|
2044
|
+
// if last applied filter is this header, push it alos as enabledHeader
|
|
2045
|
+
let activeAndLastlyAppliedHeader = false;
|
|
2046
|
+
if (this.annaFilterService.appliedFiltersArray.length > 0 &&
|
|
2047
|
+
this.annaFilterService.appliedFiltersArray[this.annaFilterService.appliedFiltersArray.length - 1] == item) {
|
|
2048
|
+
activeAndLastlyAppliedHeader = true;
|
|
2049
|
+
}
|
|
2050
|
+
if (header.filter == "CHECKBOX" && (uniq(values).filter(n => n != null).length > 1 || activeAndLastlyAppliedHeader)) {
|
|
2045
2051
|
enabledHeaders.push(item);
|
|
2046
2052
|
}
|
|
2047
|
-
else if (header.filter != "CHECKBOX" && uniq(values).filter(n => n != null && n != "-").length > 1) {
|
|
2053
|
+
else if (header.filter != "CHECKBOX" && (uniq(values).filter(n => n != null && n != "-").length > 1 || activeAndLastlyAppliedHeader)) {
|
|
2048
2054
|
enabledHeaders.push(item);
|
|
2049
2055
|
}
|
|
2050
2056
|
}
|