ets-fe-ng-sdk 20.3.17 → 20.3.19

package/fesm2022/ets-fe-ng-sdk.mjs

@@ -6762,19 +6762,34 @@ class FilterFormArrayGroupPipe {
          * @param exactMatch Whether to require exact matches
          * @returns Filter function for FormGroups
          */
-        this.filterFunc = (queryObject, exactMatch) => (group) => {
+        this.filterFunc = (_queryObject, exactMatch) => (group) => {
+            const queryObject = _queryObject.filter((x) => x.value != null);
+            if (!queryObject || queryObject.length === 0)
+                return true;
             const formGroupValue = group.getRawValue();
             // console.log('formGroupValue', formGroupValue);
-            for (const key of queryObject || [])
-                if ((key.type == 'string' &&
-                    (exactMatch
-                        ? formGroupValue[key.key]?.toLowerCase() == key.value
-                        : formGroupValue[key.key]
-                            ?.toLowerCase()
-                            ?.includes(key.value))) ||
-                    formGroupValue[key.key] == key.value)
-                    return true;
-            return false;
+            // All conditions must match (AND logic)
+            for (const key of queryObject) {
+                const formValue = formGroupValue[key.key];
+                if (key.type === 'string') {
+                    const formValueStr = formValue?.toLowerCase() || '';
+                    const keyValueStr = key.value?.toLowerCase() || '';
+                    if (exactMatch) {
+                        if (formValueStr !== keyValueStr)
+                            return false;
+                    }
+                    else {
+                        if (!formValueStr.includes(keyValueStr))
+                            return false;
+                    }
+                }
+                else {
+                    // For non-string types, use strict equality
+                    if (formValue !== key.value)
+                        return false;
+                }
+            }
+            return true;
         };
     }
     /**
@@ -20898,7 +20913,7 @@ class TableInputComponent extends FormGeneratorComponent {
         /** Whether to use partial matching for filters */
         this.filterLikeMatch = input(...(ngDevMode ? [undefined, { debugName: "filterLikeMatch" }] : []));
         /** Whether to use exact matching for filters (inverse of filterLikeMatch) */
-        this.filterExactMatch = computed(() => (this.filterLikeMatch() ? false : true), ...(ngDevMode ? [{ debugName: "filterExactMatch" }] : []));
+        this.filterExactMatch = computed(() => !this.filterLikeMatch(), ...(ngDevMode ? [{ debugName: "filterExactMatch" }] : []));
         /** Whether to show the table */
         this.isShow = input(...(ngDevMode ? [undefined, { debugName: "isShow" }] : []));
         /** The number of items to display per page */