impaktapps-ui-builder 1.0.116 → 1.0.118

package/dist/impaktapps-ui-builder.es.js

@@ -10140,8 +10140,7 @@ function mergeFormdata(handlerResponse, componentName, eventConfig, store2, form
         ...store2.newData,
         ...handlerResponse == null ? void 0 : handlerResponse.data
       };
-      const keys = Object.keys(handlerResponse.data);
-      keys.map((e) => {
+      Object.keys(handlerResponse.data).forEach((e) => {
         formDataHolder[e] = handlerResponse.data[e];
       });
     }
@@ -10151,7 +10150,7 @@ function mergeFormdata(handlerResponse, componentName, eventConfig, store2, form
       formDataHolder[`${componentName}_RowCount`] = (_c = (_b = handlerResponse.data) == null ? void 0 : _b.meta) == null ? void 0 : _c.totalRowCount;
     }
   } else {
-    if (handlerResponse) {
+    if (handlerResponse == null ? void 0 : handlerResponse.data) {
       formDataHolder[componentName] = handlerResponse.data;
     }
   }
@@ -10431,14 +10430,22 @@ var service = (funcParams) => {
           var _a, _b;
           if (((_a = funcParams.store) == null ? void 0 : _a.formData[componentName]) !== funcParams.store.newData[componentName] && ((_b = funcParams.store) == null ? void 0 : _b.newData[componentName]) !== void 0) {
             for (const eventConfig of eventGroups.onChange[componentName]) {
-              await executeEvents({
-                ...executeEventsParameters,
-                config: eventConfig,
-                componentName,
-                formDataHolder
-              });
               if (eventConfig.Handler === "refresh") {
-                funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+                await executeEvents({
+                  ...executeEventsParameters,
+                  config: eventConfig,
+                  componentName,
+                  formDataHolder
+                });
+                if (!lodash.exports.isEmpty(formDataHolder)) {
+                  funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+                }
+              } else {
+                await executeEvents({
+                  ...executeEventsParameters,
+                  config: eventConfig,
+                  componentName
+                });
               }
             }
           }
@@ -10500,21 +10507,14 @@ var service = (funcParams) => {
       if (((_b = eventGroups == null ? void 0 : eventGroups[eventType]) == null ? void 0 : _b[path]) !== void 0) {
         (_c = eventGroups == null ? void 0 : eventGroups[eventType]) == null ? void 0 : _c[path].map((eventConfig) => {
           executeEventsParameters.store.functionParameters = functionParameters;
-          if (eventConfig.Handler === "refresh") {
-            executeEvents({
-              ...executeEventsParameters,
-              config: eventConfig,
-              componentName: path,
-              formDataHolder
-            }).then((res) => {
-              funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
-            });
-          } else {
-            executeEvents({
-              ...executeEventsParameters,
-              config: eventConfig,
-              componentName: path
-            });
+          executeEvents({
+            ...executeEventsParameters,
+            config: eventConfig,
+            componentName: path,
+            formDataHolder
+          });
+          if (!lodash.exports.isEmpty(formDataHolder)) {
+            funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
           }
         });
       }