ngx-kit 8.4.0 → 8.5.0

package/fesm2022/ngx-kit-data-table.mjs

@@ -380,7 +380,7 @@ class ColumnFilterService {
     isFilterActive(filter) {
         if (!filter)
             return false;
-        const { operator, value, valueTo } = filter;
+        const { operator, value, valueTo, values } = filter;
         const noValueOps = [
             DynamicDataFilterOperator.IsNull,
             DynamicDataFilterOperator.IsNotNull,
@@ -398,7 +398,7 @@ class ColumnFilterService {
                 valueTo !== '');
         }
         if (operator === DynamicDataFilterOperator.In) {
-            return Array.isArray(value) && value.length > 0;
+            return Array.isArray(values) && values.length > 0;
         }
         return value !== undefined && value !== null && value !== '';
     }
@@ -407,6 +407,7 @@ class ColumnFilterService {
         const op = filter.operator;
         const target = filter.value;
         const targetTo = filter.valueTo;
+        const targets = filter.values;
         if (op === DynamicDataFilterOperator.IsNull)
             return rawVal === null || rawVal === undefined;
         if (op === DynamicDataFilterOperator.IsNotNull)
@@ -417,7 +418,8 @@ class ColumnFilterService {
             return rawVal !== '' && rawVal !== null && rawVal !== undefined;
         if (rawVal === null || rawVal === undefined)
             return false;
-        if (rawVal instanceof Date || (typeof rawVal === 'string' && !isNaN(Date.parse(rawVal)) && isNaN(Number(rawVal)))) {
+        if (rawVal instanceof Date ||
+            (typeof rawVal === 'string' && !isNaN(Date.parse(rawVal)) && isNaN(Number(rawVal)))) {
             const itemTime = new Date(rawVal).getTime();
             const targetTime = target ? new Date(target).getTime() : NaN;
             const targetToTime = targetTo ? new Date(targetTo).getTime() : NaN;
@@ -460,8 +462,8 @@ class ColumnFilterService {
             case DynamicDataFilterOperator.Between:
                 return Number(rawVal) >= Number(target) && Number(rawVal) <= Number(targetTo);
             case DynamicDataFilterOperator.In:
-                return Array.isArray(target)
-                    ? target.some((t) => String(t).toLowerCase() === String(rawVal).toLowerCase())
+                return Array.isArray(targets)
+                    ? targets.some((t) => String(t).toLowerCase() === String(rawVal).toLowerCase())
                     : false;
             default:
                 return true;
@@ -643,8 +645,8 @@ class NgxColumnFilter {
         const type = this.filterType();
         if (cur) {
             this.selectedOperator.set(cur.operator);
-            if (type === 'enum' && Array.isArray(cur.value)) {
-                this.selectedEnumValues.set(new Set(cur.value));
+            if (type === 'enum' && Array.isArray(cur.values)) {
+                this.selectedEnumValues.set(new Set(cur.values));
             }
             else {
                 this.filterValue.set(cur.value ?? '');
@@ -667,10 +669,11 @@ class NgxColumnFilter {
     onApply() {
         const type = this.filterType();
         let value = this.filterValue();
+        let values = [];
         let operator = this.selectedOperator();
         if (type === 'enum') {
             operator = DynamicDataFilterOperator.In;
-            value = Array.from(this.selectedEnumValues());
+            values = Array.from(this.selectedEnumValues());
         }
         this.applyFilter.emit({
             field: this.field(),
@@ -679,6 +682,7 @@ class NgxColumnFilter {
             valueTo: this.selectedOperator() === DynamicDataFilterOperator.Between
                 ? this.filterValueTo()
                 : undefined,
+            values,
         });
         this.isOpen.set(false);
     }