mmhglobal-dynamicform 2.7.0 → 2.7.1

package/fesm2020/mmhglobal-dynamicform.mjs

@@ -1611,7 +1611,7 @@ class ZformComponent {
             console.error('Field Name Duplication: ' + field.Name + ';  ', field);
         }
     }
-    getFormControls(fieldArray, formControls) {
+    getFormControls(fieldArray, formControls, containerIsVisible = true) {
         fieldArray.forEach(field => {
             if (!field.SubType) {
                 this.addToFieldIndex(field);
@@ -1623,13 +1623,17 @@ class ZformComponent {
                 }
                 else {
                     if (Array.isArray(field.Value)) {
-                        this.getFormControls(field.Value, formControls);
+                        const containerIsVisible = ZComponentHelper.isVisibleFormControl(this, field);
+                        this.getFormControls(field.Value, formControls, containerIsVisible);
                     }
                     else {
-                        this.fieldService.incrementComponentCounter(field.FieldElementName);
                         const isFormControl = ZComponentHelper.isFormControl(field);
                         const isVisible = ZComponentHelper.isVisibleFormControl(this, field);
                         const isRequired = ZComponentHelper.isRequiredFormControl(this, field);
+                        // if container || control visible == false, dont increase the counter.
+                        if (isVisible && containerIsVisible) {
+                            this.fieldService.incrementComponentCounter(field.FieldElementName);
+                        }
                         if (isFormControl === true) {
                             const validators = ZComponentHelper.getValidators(field, isVisible, isRequired);
                             formControls[field.Value] = new FormControl(this.group.zModel[field.Value], validators);
@@ -2646,7 +2650,7 @@ class MainService {
             }
             return of(false);
         }
-        updateAPIObservable = updateAPIObservable || this.webApiService.httpPut$(group.resourceURL + "/" + group.zModel.Id, group.zModel, false, event).pipe(tap$1((res) => {
+        updateAPIObservable = updateAPIObservable || this.webApiService.httpPut$(group.resourceURL + "/" + group.zModel.Id, group.zModel, false).pipe(tap$1((res) => {
             this.handleSuccess(res, resMessage);
         }
         //this.handleSuccess(res, "Record is updated successfully.")
@@ -11747,6 +11751,11 @@ class ZudfComponent extends ContainerFieldBase {
             this.isLoading = false;
         })).subscribe();
     }
+    ngOnDestroy() {
+        if (this.subscription) {
+            this.subscription.unsubscribe();
+        }
+    }
     /**
      * Renders the field element and sets up the form.
      */