@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
|
@@ -2043,10 +2043,16 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2043
2043
|
}
|
|
2044
2044
|
else {
|
|
2045
2045
|
let values = this.tableData.map((u) => u[item]);
|
|
2046
|
-
if
|
|
2046
|
+
// if last applied filter is this header, push it alos as enabledHeader
|
|
2047
|
+
let activeAndLastlyAppliedHeader = false;
|
|
2048
|
+
if (this.annaFilterService.appliedFiltersArray.length > 0 &&
|
|
2049
|
+
this.annaFilterService.appliedFiltersArray[this.annaFilterService.appliedFiltersArray.length - 1] == item) {
|
|
2050
|
+
activeAndLastlyAppliedHeader = true;
|
|
2051
|
+
}
|
|
2052
|
+
if (header.filter == "CHECKBOX" && (uniq(values).filter(n => n != null).length > 1 || activeAndLastlyAppliedHeader)) {
|
|
2047
2053
|
enabledHeaders.push(item);
|
|
2048
2054
|
}
|
|
2049
|
-
else if (header.filter != "CHECKBOX" && uniq(values).filter(n => n != null && n != "-").length > 1) {
|
|
2055
|
+
else if (header.filter != "CHECKBOX" && (uniq(values).filter(n => n != null && n != "-").length > 1 || activeAndLastlyAppliedHeader)) {
|
|
2050
2056
|
enabledHeaders.push(item);
|
|
2051
2057
|
}
|
|
2052
2058
|
}
|