react-hook-core 0.1.13 → 0.1.14

package/lib/useEdit.js

@@ -48,7 +48,13 @@ exports.useEdit = function (refForm, initialState, service, p2, p) {
       p.initialize(id, baseProps.load, baseProps.setState, p.callback);
     }
     else {
-      baseProps.load(id, p ? p.callback : undefined);
+      try {
+        baseProps.load(id, p ? p.callback : undefined);
+      }
+      catch (error) {
+        p2.showError(error);
+        core_1.hideLoading(p2.loading);
+      }
     }
   }, []);
   return __assign({}, baseProps);
@@ -372,14 +378,29 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     var patchable = (p ? p.patchable : true);
     if (flag.newMode === false) {
       if (service.patch && patchable !== false && body && Object.keys(body).length > 0) {
-        service.patch(body).then(function (result) { return postSave(obj, result, version, isBackO); });
+        service.patch(body).then(function (result) { return postSave(obj, result, version, isBackO); }).catch(handleError);
       }
       else {
-        service.update(obj).then(function (result) { return postSave(obj, result, version, isBackO); });
+        service.update(obj).then(function (result) { return postSave(obj, result, version, isBackO); }).catch(handleError);
       }
     }
     else {
-      service.insert(obj).then(function (result) { return postSave(obj, result, version, isBackO); });
+      service.insert(obj).then(function (result) { return postSave(obj, result, version, isBackO); }).catch(handleError);
+    }
+  };
+  var handleError = function (err) {
+    if (err) {
+      setRunning(false);
+      core_1.hideLoading(p1.loading);
+      var errMsg = p1.resource.value('error_internal');
+      var data = (err && err.response) ? err.response : err;
+      if (data.status === 400) {
+        var errMsg_1 = p1.resource.value('error_400');
+        p1.showError(errMsg_1, "Error");
+      }
+      else {
+        p1.showError(errMsg, "Error");
+      }
     }
   };
   var doSave = (p && p.doSave ? p.doSave : _doSave);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hook-core",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "react",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/useEdit.ts

@@ -97,7 +97,12 @@ export const useEdit = <T, ID, S>(
     if (p && p.initialize) {
       p.initialize(id, baseProps.load, baseProps.setState, p.callback);
     } else {
-      baseProps.load(id, p ? p.callback : undefined);
+      try {
+        baseProps.load(id, p ? p.callback : undefined);
+      } catch (error) {
+        p2.showError(error as string);
+        hideLoading(p2.loading);
+      }
     }
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -435,12 +440,27 @@ export const useCoreEdit = <T, ID, S, P>(
     const patchable = (p ? p.patchable : true);
     if (flag.newMode === false) {
       if (service.patch && patchable !== false && body && Object.keys(body).length > 0) {
-        service.patch(body).then(result => postSave(obj, result, version, isBackO));
+        service.patch(body).then(result => postSave(obj, result, version, isBackO)).catch(handleError);
       } else {
-        service.update(obj).then(result => postSave(obj, result, version, isBackO));
+        service.update(obj).then(result => postSave(obj, result, version, isBackO)).catch(handleError);
       }
     } else {
-      service.insert(obj).then(result => postSave(obj, result, version, isBackO));
+      service.insert(obj).then(result => postSave(obj, result, version, isBackO)).catch(handleError);
+    }
+  };
+
+  const handleError = function (err: any) {
+    if (err) {
+      setRunning(false);
+      hideLoading(p1.loading);
+      const errMsg = p1.resource.value('error_internal');
+      const data = (err && err.response) ? err.response : err;
+      if (data.status === 400) {
+          const errMsg = p1.resource.value('error_400');
+          p1.showError(errMsg, "Error");
+      } else{
+        p1.showError(errMsg, "Error");
+      }
     }
   };
   const doSave = (p && p.doSave ? p.doSave : _doSave);