@visns-studio/visns-components 5.10.1 → 5.10.2

package/package.json

@@ -87,7 +87,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "5.10.1",
+    "version": "5.10.2",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/crm/Field.jsx

@@ -162,8 +162,18 @@ function Field({
             let filter = {};
 
             if (settings.where?.length > 0) {
+                const processedWhere = settings.where.map((whereItem) => {
+                    if (whereItem.getKey && formData[whereItem.getKey]) {
+                        return {
+                            ...whereItem,
+                            value: formData[whereItem.getKey],
+                        };
+                    }
+                    return whereItem;
+                });
+
                 filter = {
-                    where: settings.where,
+                    where: processedWhere,
                 };
             }
 
@@ -187,6 +197,8 @@ function Field({
                 };
             }
 
+            console.info(JSON.stringify(filter));
+
             CustomFetch(settings.url, 'POST', filter, function (result) {
                 setOptions(result.data);
 
@@ -247,7 +259,7 @@ function Field({
             );
             setCanvasUrl(canvasType.url);
         }
-    }, [settings, counter]);
+    }, [settings, counter, formData]);
 
     const fetchChildDropdownData = (s, v) => {
         let filter = {};
@@ -265,7 +277,9 @@ function Field({
                                     {
                                         id: s.id,
                                         value: _inputValue,
-                                        ...(a.whereHas && { whereHas: a.whereHas }),
+                                        ...(a.whereHas && {
+                                            whereHas: a.whereHas,
+                                        }),
                                     },
                                 ],
                             };