@mcurros2/microm 1.1.97-0 → 1.1.98-0

package/dist/index.js

@@ -154,8 +154,8 @@ $parcel$export(module.exports, "useEntityForm", function () { return $8b0c683387
 
 
 parcelRequire("2eyXi");
-var $lTNXP = parcelRequire("lTNXP");
 var $iKzSR = parcelRequire("iKzSR");
+var $lTNXP = parcelRequire("lTNXP");
 parcelRequire("6Rdyz");
 var $98ddT = parcelRequire("98ddT");
 
@@ -244,6 +244,7 @@ function $8b0c683387a5432f$export$f1f43a62560a15ec(props) {
     }, [
         form
     ]);
+    const lastGetValues = (0, $b4te3$react.useRef)();
     // Form Handlers
     const performGetData = (0, $b4te3$react.useCallback)(()=>$8b0c683387a5432f$var$__awaiter(this, void 0, void 0, function*() {
             setStatus({
@@ -256,11 +257,14 @@ function $8b0c683387a5432f$export$f1f43a62560a15ec(props) {
                 if (ret) {
                     const new_values = (0, $vXZlt.getMantineValuesObject)(form.values, entity.def.columns, true);
                     form.setValues(new_values);
+                    lastGetValues.current = new_values;
                     const new_status = {
                         loading: false,
                         operationType: "get"
                     };
                     setStatus(new_status);
+                    form.resetDirty();
+                    form.resetTouched();
                 }
                 return ret;
             } catch (e) {
@@ -425,16 +429,13 @@ function $8b0c683387a5432f$export$f1f43a62560a15ec(props) {
     const removeValidation = (0, $b4te3$react.useCallback)((column)=>{
         delete validationObject.current[column.name];
     }, []);
+    // getDataOnInit
     (0, $b4te3$react.useEffect)(()=>{
         const cancellation = getAbortController.current;
         if (getDataOnInit) {
             function getData() {
                 return $8b0c683387a5432f$var$__awaiter(this, void 0, void 0, function*() {
-                    const result = yield performGetData();
-                    if (result) {
-                        form.resetDirty();
-                        form.resetTouched();
-                    }
+                    yield performGetData();
                 });
             }
             getData();
@@ -465,9 +466,9 @@ function $8b0c683387a5432f$export$f1f43a62560a15ec(props) {
     (0, $b4te3$react.useEffect)(()=>{
         const handleBeforeUnload = ()=>$8b0c683387a5432f$var$__awaiter(this, void 0, void 0, function*() {
                 try {
-                    if (saveBeforeRemoteNavigation && form.isDirty()) {
+                    if (saveBeforeRemoteNavigation) {
                         form.validate();
-                        yield saveAndGet();
+                        if (!(0, $iKzSR.areValuesObjectsEqual)(form.values, lastGetValues.current)) yield saveAndGet();
                     }
                 } catch (ex) {
                     console.error("SaveBeforeRemoteNavigation", ex);
@@ -488,7 +489,7 @@ function $8b0c683387a5432f$export$f1f43a62560a15ec(props) {
                 try {
                     if (saveBeforeLocalNavigation && form.isDirty() && prevLocationRef.current !== window.location.hash) {
                         form.validate();
-                        yield saveAndGet();
+                        if (!(0, $iKzSR.areValuesObjectsEqual)(form.values, lastGetValues.current)) yield saveAndGet();
                     }
                 } catch (ex) {
                     console.error("SaveBeforeLocalNavigation", ex);