mmhglobal-dynamicform 2.0.0-beta.21 → 2.0.0-beta.23

package/fesm2015/mmhglobal-dynamicform.mjs

@@ -2155,6 +2155,10 @@ class MainService {
             }
             // used in grid to refresh data and will set to false after that.
             this.storageService.set("navigatedReloadGrid", JSON.stringify(true));
+            // clear cloneNewModel cache(if have) 
+            if (this.cacheService.getCache("cloneNewModel")) {
+                this.cacheService.clearCache("cloneNewModel");
+            }
             this.router.navigate([backNavigationURL], { replaceUrl: true });
         }
         else {
@@ -2335,7 +2339,7 @@ class MainService {
                     fg.patchValue(resp);
                 }
                 fg.markAsPristine();
-                if (_group.isCloseAfterSuccess && !_group.isCloneNew) {
+                if ((_group.isCloseAfterSuccess || _group.isCloseAfterCreated) && !_group.isCloneNew) {
                     this.backNavigation(null, _group, this);
                 }
             }
@@ -2387,7 +2391,7 @@ class MainService {
             return this.afterUpdateModel(_group, zmodel);
         }), tap$1((resp) => {
             if (resp) {
-                if (_group.isCloseAfterSuccess) {
+                if (_group.isCloseAfterSuccess || _group.isCloseAfterUpdated) {
                     this.backNavigation(null, _group, this);
                 }
             }
@@ -2408,13 +2412,13 @@ class MainService {
                 _group = group['_' + event.data.SubType];
             }
         }
-        Object.assign(_group.zModel, _group.form.value);
-        Object.assign(_group.zModel, {
+        Object.assign(_group.form.value, {
             Id: 0,
             WFS_StatusCode: null,
             WFS_StatusId: null,
             WFS_StatusName: null
         });
+        Object.assign(_group.zModel, _group.form.value);
         this.cacheService.setCache("cloneNewModel", group.zModel);
         this.newModel(null, group);
         group.isTriggered = false;
@@ -2452,6 +2456,7 @@ class MainService {
                 }), tap$1((resp) => {
                     if (resp) {
                         //this.historyBack();
+                        fg.reset();
                         this.backNavigation(null, _group, this);
                     }
                 }));
@@ -7581,6 +7586,7 @@ class ZgridComponent extends DataListingFieldBase {
                 else {
                     this.zgrid.grid.data = gData;
                 }
+                this.inlineEditedFormGroups = {};
                 this.createFormControls(this.zgrid.gridColumns);
                 const gridData = this.getGridData();
                 this.setupPopoverFeature(this.columns, gridData);
@@ -7627,7 +7633,7 @@ class ZgridComponent extends DataListingFieldBase {
     ngAfterViewChecked() {
         const isBackNavigated = (sessionStorage.getItem("navigatedReloadGrid") === 'true');
         if (isBackNavigated) {
-            if (this.isUseLocalData()) {
+            if (!this.isUseLocalData()) {
                 this.getData();
             }
             this.cdr.detectChanges();
@@ -7964,6 +7970,7 @@ class ZgridComponent extends DataListingFieldBase {
     }
     getData() {
         if (this.zgrid) {
+            this.inlineEditedFormGroups = {};
             this.zgrid.getDataBinding();
         }
     }