@cdmx/wappler_ag_grid 0.4.2 → 0.4.4

package/app_connect/components.hjson

@@ -258,7 +258,7 @@
               "attribute": "date_format",
               "title": "Date Format",
               "type": "text",
-              "defaultValue": "dd/MM/yyyy HH:mm A",
+              "defaultValue": "dd/MM/yyyy hh:mm A",
               "help": "Date Format"
             },
             {
@@ -503,7 +503,7 @@
           "variables": [
             {
               "name": "cstyles",
-              "title": "Configure Colors",
+              "title": "Configure Colors and Fonts",
               "attributeStartsWith": "dmx-bind",
               "attribute": "cstyles",
               "type": "boolean",
@@ -551,14 +551,39 @@
                         "type": "text"
                       },
                       help: "Example: '#FF0000' or 'red'"
+                    },
+                    {
+                      "field": "area",
+                      "caption": "Area",
+                      "size": "20%",
+                      "editable": {
+                        "type": "list", 
+                        "items": [
+                          {id: 'text', text: 'text'},
+                          {id: 'cell', text: 'cell'}
+                        ]
+                      }
+                    },
+                    {
+                      "field": "font",
+                      "caption": "Font",
+                      "size": "20%",
+                      "editable": {
+                        "type": "list", 
+                        "items": [
+                          {id: 'normal', text: 'normal'},
+                          {id: 'italic', text: 'italic'},
+                          {id: 'bold', text: 'bold'}
+                        ]
+                      }
                     }
                   ],
                   "newRecord": {
-                    "name": "",
-                    "value": "",
                     "field": "",
                     "condition": "",
-                    "customColor": ""
+                    "customColor": "",
+                    "area": "text",
+                    "font": "normal"
                   }
                 }
               ]

package/dmx-ag-grid.js

@@ -39,7 +39,7 @@ dmx.Component('ag-grid', {
     enable_rtl: { type: Boolean, default: false },
     locale_text: { type: String, default: null },
     date_locale: { type: String, default: 'en-IN' },
-    date_format: { type: String, default: 'dd/MM/yyyy HH:mm A' },
+    date_format: { type: String, default: 'dd/MM/yyyy hh:mm A' },
     min_width: { type: Number, default: 150 },
     sortable: { type: Boolean, default: true },
     resizable: { type: Boolean, default: true },
@@ -216,8 +216,6 @@ dmx.Component('ag-grid', {
   
       return container;
   }
-    
-
     function humanize(str) {
       if (str == null) return str;
 
@@ -520,12 +518,26 @@ dmx.Component('ag-grid', {
           filterValueGetter = createCombinedFilterValueGetter(key, options.data_changes, options.data_binded_changes);
         }
         function extractConditionParts(condition) {
-          const parts = condition.match(/(.+?)(===|==|!=|>|<|>=|<=)(.+)/);
-          if (parts) {
-            const [, left, operator, right] = parts;
-            return [left.trim(), operator.trim(), right.trim()];
+          const operators = ['===', '==', '!=', '>', '<', '>=', '<='];
+          let operator;
+          let left;
+          let right;
+        
+          for (const op of operators) {
+            if (condition.includes(op)) {
+              operator = op;
+              const parts = condition.split(op).map(part => part.trim());
+              left = parts[0];
+              right = parts.slice(1).join(op).trim();
+              break;
+            }
+          }
+        
+          if (!operator) {
+            throw new Error('Invalid operator in the condition.');
           }
-          return [];
+        
+          return [left, operator, right];
         }
         
         function evaluateCondition(left, operator, right) {
@@ -557,17 +569,24 @@ dmx.Component('ag-grid', {
           for (const style of styles) {
             const condition = style.condition;
             const customColor = style.customColor;
+            const font = style.font || 'normal';
+            const area = style.area || 'text'; 
             const [left, operator, right] = extractConditionParts(condition);
+            
             if (
-              params.data.hasOwnProperty(left) && 
-              evaluateCondition(params.data[left], operator, right) 
+              params.data.hasOwnProperty(left) &&
+              evaluateCondition(params.data[left], operator, right)
             ) {
-              return { color: customColor }; 
+              if (area === 'text') {
+                return { color: customColor, fontStyle: font };
+              } else if (area === 'cell') {
+                return { backgroundColor: customColor, fontStyle: font };
+              }
             }
           }
         
           return null;
-          }
+        }
 
         if (cnames.hasOwnProperty(key)) {
         const cname = cnames[key]
@@ -654,6 +673,7 @@ dmx.Component('ag-grid', {
         field: 'action',
         colId: 'actionsColumn',
         filter: null,
+        sortable: false,
         cellRenderer: actionsRenderer,
         pinned: options.pin_actions,
         cellRendererParams: {

package/package.json

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