@cdmx/wappler_ag_grid 1.7.4 → 1.7.6

package/README.md

@@ -126,7 +126,6 @@ This grid allows you to define custom color and font settings based on specific
        return (data.status == 'success');
      }
    </script>
-</script>
 2. **Color**: The custom color to apply to row when the condition is met. Enter the color in HEX format (e.g., "#FF0000") or use named colors (e.g., "red"). 
 
 # Tooltip Settings

package/dmx-ag-grid.js

@@ -943,7 +943,7 @@ dmx.Component('ag-grid', {
         }
       };
     }
-    createCombinedFilterValueGetter = (key, dataChanges, dataBindedChanges) => {
+    createCombinedFilterValueGetter = (key, dataChanges, dataBindedChanges, displayDataChanges) => {
       const keyLookup = {};
     
       dataBindedChanges.forEach(change => {
@@ -961,6 +961,20 @@ dmx.Component('ag-grid', {
     
       return function (params) {
         const value = params.data[key];
+        if ((displayDataChanges.length > 0) && displayDataChanges.some(change => change.field === key)) {
+          const placeholderMap = Object.fromEntries(
+            Object.entries(params.data).map(([field, fieldValue]) => [`%${field}%`, fieldValue !== null ? fieldValue : ''])
+          );
+          return displayDataChanges.reduce((filterValue, change) => {
+            if (change.field === key) {
+              const placeholders = Object.keys(placeholderMap).join('|');
+              // Add a default value for unknown placeholders
+              const regex = new RegExp(placeholders + '|%[^%]+%', 'g');
+              filterValue = change.data.replace(regex, match => placeholderMap[match] || '');
+            }
+            return filterValue;
+          }, value);
+        }
         // Check if there's a matching change in dataChanges
         const matchingChange = dataChanges.find(change => change.field === key && change.value === String(value));
         if (matchingChange) {
@@ -1056,7 +1070,7 @@ dmx.Component('ag-grid', {
         }
         else {
           valueGetter = createCombinedValueGetter(key, options.data_changes, options.data_binded_changes, options.display_data_changes);
-          filterValueGetter = createCombinedFilterValueGetter(key, options.data_changes, options.data_binded_changes);
+          filterValueGetter = createCombinedFilterValueGetter(key, options.data_changes, options.data_binded_changes, options.display_data_changes);
           tooltipValueGetter = createCombinedTooltipValueGetter(key, options.data_changes, options.data_binded_changes);
 
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cdmx/wappler_ag_grid",
-    "version": "1.7.4",
+    "version": "1.7.6",
     "type": "module",
     "description": "App Connect module for AG Grid Table Generation.",
     "license": "MIT",