react-hook-core 0.1.19 → 0.1.20

package/lib/components.js

@@ -808,19 +808,18 @@ var BaseEditComponent = (function (_super) {
   };
   BaseEditComponent.prototype.doSave = function (obj, dif, isBack) {
   };
-  BaseEditComponent.prototype.succeed = function (msg, isBack, result) {
-    if (result) {
-      var model = result.value;
+  BaseEditComponent.prototype.succeed = function (msg, origin, isBack, model) {
+    if (model) {
       this.newMode = false;
       if (model && this.setBack) {
         this.resetState(false, model, reflect_1.clone(model));
       }
       else {
-        edit_1.handleVersion(this.getModel(), this.version);
+        edit_1.handleVersion(origin, this.version);
       }
     }
     else {
-      edit_1.handleVersion(this.getModel(), this.version);
+      edit_1.handleVersion(origin, this.version);
     }
     var isBackO = (isBack == null || isBack === undefined ? this.backOnSuccess : isBack);
     this.showMessage(msg);
@@ -831,55 +830,31 @@ var BaseEditComponent = (function (_super) {
   BaseEditComponent.prototype.fail = function (result) {
     var f = this.form;
     var u = this.ui;
-    if (Array.isArray(result)) {
-      if (u && f) {
-        var unmappedErrors = u.showFormError(f, result);
-        formutil_1.focusFirstError(f);
-        if (unmappedErrors && unmappedErrors.length > 0) {
-          var t = this.resourceService.value('error');
-          if (u && u.buildErrorMessage) {
-            var msg = u.buildErrorMessage(unmappedErrors);
-            this.showError(msg, t);
-          }
-          else {
-            this.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, t);
-          }
-        }
-      }
-      else {
+    if (u && f) {
+      var unmappedErrors = u.showFormError(f, result);
+      formutil_1.focusFirstError(f);
+      if (unmappedErrors && unmappedErrors.length > 0) {
         var t = this.resourceService.value('error');
-        if (result.length > 0) {
-          this.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
+        if (u && u.buildErrorMessage) {
+          var msg = u.buildErrorMessage(unmappedErrors);
+          this.showError(msg, t);
         }
         else {
-          this.showError(t, t);
+          this.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, t);
         }
       }
     }
     else {
-      var errors = result.errors;
-      if (u && f) {
-        var unmappedErrors = u.showFormError(f, errors);
-        if (!result.message) {
-          if (errors && errors.length === 1) {
-            result.message = errors[0].message;
-          }
-          else {
-            result.message = u.buildErrorMessage(unmappedErrors);
-          }
-        }
-        formutil_1.focusFirstError(f);
-      }
-      else if (errors && errors.length === 1) {
-        result.message = errors[0].message;
+      var t = this.resourceService.value('error');
+      if (result.length > 0) {
+        this.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
       }
-      if (result.message) {
-        var t = this.resourceService.value('error');
-        this.showError(result.message, t);
+      else {
+        this.showError(t, t);
       }
     }
   };
-  BaseEditComponent.prototype.postSave = function (res, backOnSave) {
+  BaseEditComponent.prototype.postSave = function (res, origin, isPatch, backOnSave) {
     this.running = false;
     core_1.hideLoading(this.loading);
     var st = this.status;
@@ -892,7 +867,7 @@ var BaseEditComponent = (function (_super) {
     }
     else if (!isNaN(x)) {
       if (x === st.success) {
-        this.succeed(successMsg, backOnSave);
+        this.succeed(successMsg, origin, backOnSave);
       }
       else {
         if (newMod && x === st.duplicate_key) {
@@ -908,22 +883,19 @@ var BaseEditComponent = (function (_super) {
     }
     else {
       var result = x;
-      if (result.status === st.success) {
-        this.succeed(successMsg, backOnSave, result);
-        this.showMessage(successMsg);
-      }
-      else if (result.errors && result.errors.length > 0) {
-        this.fail(result);
-      }
-      else if (newMod && result.status === st.duplicate_key) {
-        this.handleDuplicateKey(result);
-      }
-      else if (!newMod && x === st.not_found) {
-        this.handleNotFound();
+      if (isPatch) {
+        var keys = Object.keys(result);
+        var a = origin;
+        for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+          var k = keys_1[_i];
+          a[k] = result[k];
+        }
+        this.succeed(successMsg, a, backOnSave);
       }
       else {
-        edit_1.handleStatus(result.status, st, r.value, this.showError);
+        this.succeed(successMsg, origin, backOnSave, result);
       }
+      this.showMessage(successMsg);
     }
   };
   BaseEditComponent.prototype.handleDuplicateKey = function (result) {
@@ -1027,14 +999,16 @@ var EditComponent = (function (_super) {
     var com = this;
     var m = obj;
     var fn = this.newMode ? this.service.insert : this.service.update;
+    var isPatch = false;
     if (!this.newMode) {
       if (this.patchable === true && this.service.patch && body && Object.keys(body).length > 0) {
         m = body;
+        isPatch = true;
         fn = this.service.patch;
       }
     }
     fn(m).then(function (result) {
-      com.postSave(result, isBackO);
+      com.postSave(result, obj, isBackO);
       com.running = false;
       core_1.hideLoading(com.loading);
     }).then(function (err) {

package/lib/core.js

@@ -11,9 +11,9 @@ function createEditStatus(status) {
     duplicate_key: 0,
     not_found: 0,
     success: 1,
-    version_error: 2,
-    error: 4,
-    data_corrupt: 8
+    version_error: -1,
+    error: 2,
+    data_corrupt: 4
   };
   return s;
 }

package/lib/index.js

@@ -67,3 +67,49 @@ exports.Loading = function (props) {
     return (React.createElement('div', { className: 'loader-wrapper' }, React.createElement('div', { className: 'loader-sign', style: loadingStyle }, React.createElement('div', { className: 'loader' }))));
   }
 };
+function formatDate(date, format) {
+  if (!date) {
+    return '';
+  }
+  var opts = {
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "numeric",
+    minute: "numeric",
+    second: "numeric",
+    hour12: false,
+  };
+  var d2 = new Date(date).toLocaleString("en-US", opts);
+  var od = format.replace("YYYY", d2.slice(6, 10));
+  od = od.replace("MM", d2.slice(0, 2));
+  od = od.replace("DD", d2.slice(3, 5));
+  od = od.replace("HH", d2.slice(12, 14));
+  od = od.replace("mm", d2.slice(15, 17));
+  od = od.replace("ss", d2.slice(18, 20));
+  return od;
+}
+exports.formatDate = formatDate;
+;
+function dateToString(date) {
+  var d2 = typeof date !== "string" ? date : new Date(date);
+  var year = d2.getFullYear();
+  var month = String(d2.getMonth() + 1).padStart(2, "0");
+  var day = String(d2.getDate()).padStart(2, "0");
+  return year + "-" + month + "-" + day;
+}
+exports.dateToString = dateToString;
+;
+function datetimeToString(date) {
+  if (date === void 0) { date = ""; }
+  var d2 = typeof date !== "string" ? date : new Date(date);
+  var year = d2.getFullYear();
+  var month = String(d2.getMonth() + 1).padStart(2, "0");
+  var day = String(d2.getDate()).padStart(2, "0");
+  var hours = String(d2.getHours()).padStart(2, "0");
+  var minutes = String(d2.getMinutes()).padStart(2, "0");
+  var seconds = String(d2.getSeconds()).padStart(2, "0");
+  return year + "-" + month + "-" + day + "T" + hours + ":" + minutes + ":" + seconds;
+}
+exports.datetimeToString = datetimeToString;
+;

package/lib/reflect.js

@@ -81,6 +81,16 @@ var setKey = function (_object, _isArrayKey, _key, _nextValue) {
   }
   return _object;
 };
+function isEmptyObject(obj) {
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      return false;
+    }
+  }
+  return true;
+}
+exports.isEmptyObject = isEmptyObject;
+;
 function diff(obj1, obj2) {
   var fields = [];
   var key1s = Object.keys(obj1);

package/lib/useEdit.js

@@ -245,19 +245,18 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     }
   };
   var validate = (p && p.validate ? p.validate : _validate);
-  var _succeed = function (obj, msg, version, isBack, result) {
-    if (result) {
-      var model = result.value;
+  var _succeed = function (origin, msg, version, isBack, model) {
+    if (model) {
       setFlag({ newMode: false });
       if (model && flag.setBack === true) {
         resetState(false, model, reflect_1.clone(model));
       }
       else {
-        edit_1.handleVersion(obj, version);
+        edit_1.handleVersion(origin, version);
       }
     }
     else {
-      edit_1.handleVersion(obj, version);
+      edit_1.handleVersion(origin, version);
     }
     p1.showMessage(msg);
     if (isBack) {
@@ -268,50 +267,27 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var _fail = function (result) {
     var f = refForm.current;
     var u = p1.ui;
-    if (Array.isArray(result)) {
-      if (u && f) {
-        var unmappedErrors = u.showFormError(f, result);
-        formutil_1.focusFirstError(f);
-        if (unmappedErrors && unmappedErrors.length > 0) {
-          var t = p1.resource.value('error');
-          if (p1.ui && p1.ui.buildErrorMessage) {
-            var msg = p1.ui.buildErrorMessage(unmappedErrors);
-            p1.showError(msg, t);
-          }
-          else {
-            p1.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, t);
-          }
-        }
-      }
-      else {
+    if (u && f) {
+      var unmappedErrors = u.showFormError(f, result);
+      formutil_1.focusFirstError(f);
+      if (unmappedErrors && unmappedErrors.length > 0) {
         var t = p1.resource.value('error');
-        if (result.length > 0) {
-          p1.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
+        if (p1.ui && p1.ui.buildErrorMessage) {
+          var msg = p1.ui.buildErrorMessage(unmappedErrors);
+          p1.showError(msg, t);
         }
         else {
-          p1.showError(t, t);
+          p1.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, t);
         }
       }
     }
     else {
-      var errors = result.errors;
-      if (errors && u) {
-        var unmappedErrors = u.showFormError(f, errors);
-        formutil_1.focusFirstError(f);
-        if (!result.message) {
-          if (errors && errors.length > 0) {
-            if (p1.ui && p1.ui.buildErrorMessage) {
-              result.message = p1.ui.buildErrorMessage(unmappedErrors);
-            }
-            else {
-              result.message = errors[0].message;
-            }
-          }
-        }
-        if (result.message) {
-          var t = p1.resource.value('error');
-          p1.showError(result.message, t);
-        }
+      var t = p1.resource.value('error');
+      if (result.length > 0) {
+        p1.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
+      }
+      else {
+        p1.showError(t, t);
       }
     }
   };
@@ -332,7 +308,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     }
   };
   var handleError = (p && p.handleError ? p.handleError : _handleError);
-  var _postSave = function (obj, r, version, backOnSave) {
+  var _postSave = function (r, origin, version, isPatch, backOnSave) {
     setRunning(false);
     core_1.hideLoading(p1.loading);
     var x = r;
@@ -344,7 +320,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     }
     else if (!isNaN(x)) {
       if (x === st.success) {
-        succeed(obj, successMsg, version, backOnSave);
+        succeed(origin, successMsg, version, backOnSave);
       }
       else {
         if (newMod && x === st.duplicate_key) {
@@ -353,29 +329,31 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         else if (!newMod && x === st.not_found) {
           handleNotFound();
         }
+        else if (!newMod && x === st.version_error) {
+          var title = p1.resource.value('error');
+          var err = p1.resource.value('error_version');
+          p1.showError(err, title);
+        }
         else {
           edit_1.handleStatus(x, st, p1.resource.value, p1.showError);
         }
       }
     }
     else {
-      var result = x;
-      if (result.status === st.success) {
-        succeed(obj, successMsg, version, backOnSave, result);
-        p1.showMessage(successMsg);
-      }
-      else if (result.errors && result.errors.length > 0) {
-        fail(result);
-      }
-      else if (newMod && result.status === st.duplicate_key) {
-        handleDuplicateKey(result);
-      }
-      else if (!newMod && x === st.not_found) {
-        handleNotFound();
+      var result = r;
+      if (isPatch) {
+        var keys = Object.keys(result);
+        var a = origin;
+        for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+          var k = keys_1[_i];
+          a[k] = result[k];
+        }
+        succeed(a, successMsg, undefined, backOnSave);
       }
       else {
-        edit_1.handleStatus(result.status, st, p1.resource.value, p1.showError);
+        succeed(origin, successMsg, version, backOnSave, r);
       }
+      p1.showMessage(successMsg);
     }
   };
   var postSave = (p && p.postSave ? p.postSave : _postSave);
@@ -391,14 +369,16 @@ 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); }).catch(handleError);
+        service.patch(body).then(function (result) {
+          postSave(result, obj, version, true, isBackO);
+        }).catch(handleError);
       }
       else {
-        service.update(obj).then(function (result) { return postSave(obj, result, version, isBackO); }).catch(handleError);
+        service.update(obj).then(function (result) { return postSave(result, obj, version, false, isBackO); }).catch(handleError);
       }
     }
     else {
-      service.insert(obj).then(function (result) { return postSave(obj, result, version, isBackO); }).catch(handleError);
+      service.insert(obj).then(function (result) { return postSave(result, obj, version, false, isBackO); }).catch(handleError);
     }
   };
   var doSave = (p && p.doSave ? p.doSave : _doSave);

package/package.json

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

package/src/components.ts

@@ -885,17 +885,16 @@ export abstract class BaseEditComponent<T, P, S> extends BaseComponent<P, S> {
   doSave(obj: T, dif?: Partial<T>, isBack?: boolean) {
   }
 
-  succeed(msg: string, isBack?: boolean, result?: ResultInfo<T>) {
-    if (result) {
-      const model = result.value;
+  succeed(msg: string, origin: T, isBack?: boolean, model?: T) {
+    if (model) {
       this.newMode = false;
       if (model && this.setBack) {
         this.resetState(false, model, clone(model));
       } else {
-        handleVersion(this.getModel(), this.version);
+        handleVersion(origin, this.version);
       }
     } else {
-      handleVersion(this.getModel(), this.version);
+      handleVersion(origin, this.version);
     }
     const isBackO = (isBack == null || isBack === undefined ? this.backOnSuccess : isBack);
     this.showMessage(msg);
@@ -903,53 +902,32 @@ export abstract class BaseEditComponent<T, P, S> extends BaseComponent<P, S> {
       this.back(null);
     }
   }
-  fail(result: ResultInfo<T> | ErrorMessage[]) {
+  fail(result: ErrorMessage[]) {
     const f = this.form;
     const u = this.ui;
-    if (Array.isArray(result)) {
-      if (u && f) {
-        const unmappedErrors = u.showFormError(f, result);
-        focusFirstError(f);
-        if (unmappedErrors && unmappedErrors.length > 0) {
-          const t = this.resourceService.value('error');
-          if (u && u.buildErrorMessage) {
-            const msg = u.buildErrorMessage(unmappedErrors);
-            this.showError(msg, t);
-          } else {
-            this.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, t);
-          }
-        }
-      } else {
+    if (u && f) {
+      const unmappedErrors = u.showFormError(f, result);
+      focusFirstError(f);
+      if (unmappedErrors && unmappedErrors.length > 0) {
         const t = this.resourceService.value('error');
-        if (result.length > 0) {
-          this.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
+        if (u && u.buildErrorMessage) {
+          const msg = u.buildErrorMessage(unmappedErrors);
+          this.showError(msg, t);
         } else {
-          this.showError(t, t);
+          this.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, t);
         }
       }
     } else {
-      const errors = result.errors;
-      if (u && f) {
-        const unmappedErrors = u.showFormError(f, errors);
-        if (!result.message) {
-          if (errors && errors.length === 1) {
-            result.message = errors[0].message;
-          } else {
-            result.message = u.buildErrorMessage(unmappedErrors);
-          }
-        }
-        focusFirstError(f);
-      } else if (errors && errors.length === 1) {
-        result.message = errors[0].message;
-      }
-      if (result.message) {
-        const t = this.resourceService.value('error');
-        this.showError(result.message, t);
+      const t = this.resourceService.value('error');
+      if (result.length > 0) {
+        this.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
+      } else {
+        this.showError(t, t);
       }
     }
   }
 
-  postSave(res: number|string|ResultInfo<T>|ErrorMessage[], backOnSave?: boolean) {
+  postSave(res: number|string|T|ErrorMessage[], origin: T, isPatch: boolean, backOnSave?: boolean) {
     this.running = false;
     hideLoading(this.loading);
     const st = this.status;
@@ -961,7 +939,7 @@ export abstract class BaseEditComponent<T, P, S> extends BaseComponent<P, S> {
       this.fail(x);
     } else if (!isNaN(x)) {
       if (x === st.success) {
-        this.succeed(successMsg, backOnSave);
+        this.succeed(successMsg, origin, backOnSave);
       } else {
         if (newMod && x === st.duplicate_key) {
           this.handleDuplicateKey();
@@ -972,28 +950,27 @@ export abstract class BaseEditComponent<T, P, S> extends BaseComponent<P, S> {
         }
       }
     } else {
-      const result: ResultInfo<T> = x;
-      if (result.status === st.success) {
-        this.succeed(successMsg, backOnSave, result);
-        this.showMessage(successMsg);
-      } else if (result.errors && result.errors.length > 0) {
-        this.fail(result);
-      } else if (newMod && result.status === st.duplicate_key) {
-        this.handleDuplicateKey(result);
-      } else if (!newMod && x === st.not_found) {
-        this.handleNotFound();
+      const result: T = x;
+      if (isPatch) {
+        const keys = Object.keys(result);
+        const a: any = origin;
+        for (const k of keys) {
+          a[k] = (result as any)[k];
+        }
+        this.succeed(successMsg, a, backOnSave);
       } else {
-        handleStatus(result.status, st, r.value, this.showError);
+        this.succeed(successMsg, origin, backOnSave, result);
       }
+      this.showMessage(successMsg);
     }
   }
-  handleDuplicateKey(result?: ResultInfo<T>) {
+  handleDuplicateKey(result?: T) {
     const msg = message(this.resourceService.value, 'error_duplicate_key', 'error');
     this.showError(msg.message, msg.title);
   }
 }
 export class EditComponent<T, ID, P, S> extends BaseEditComponent<T, P, S>  {
-  constructor(props: P, protected service: GenericService<T, ID, number|ResultInfo<T>|ErrorMessage[]>,
+  constructor(props: P, protected service: GenericService<T, ID, number|T|ErrorMessage[]>,
       param: ResourceService|EditParameter,
       showMessage?: (msg: string, option?: string) => void,
       showError?: (m: string, title?: string, detail?: string, callback?: () => void) => void,
@@ -1086,14 +1063,16 @@ export class EditComponent<T, ID, P, S> extends BaseEditComponent<T, P, S>  {
     const com = this;
     let m: T|Partial<T> = obj;
     let fn = this.newMode ? this.service.insert : this.service.update;
+    let isPatch = false;
     if (!this.newMode) {
       if (this.patchable === true && this.service.patch && body && Object.keys(body).length > 0) {
         m = body;
+        isPatch = true;
         fn = this.service.patch;
       }
     }
     fn(m as any).then(result => {
-      com.postSave(result, isBackO);
+      com.postSave(result, obj, isBackO);
       com.running = false;
       hideLoading(com.loading);
     }).then(err => {

package/src/core.ts

@@ -51,9 +51,9 @@ export function createEditStatus(status?: EditStatusConfig): EditStatusConfig {
     duplicate_key: 0,
     not_found: 0,
     success: 1,
-    version_error: 2,
-    error: 4,
-    data_corrupt: 8
+    version_error: -1,
+    error: 2,
+    data_corrupt: 4
   };
   return s;
 }

package/src/index.ts

@@ -78,3 +78,42 @@ export const Loading = (props: LoadingProps) => {
   }
 };
 export type OnClick = React.MouseEvent<HTMLElement, MouseEvent>;
+export function formatDate(date: Date | null | undefined, format: string): string {
+  if (!date) {
+    return '';
+  }
+  const opts: any = {
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "numeric",
+      minute: "numeric",
+      second: "numeric",
+      hour12: false,
+  };
+  const d2 = new Date(date).toLocaleString("en-US", opts);
+  let od = format.replace("YYYY", d2.slice(6, 10));
+  od = od.replace("MM", d2.slice(0, 2));
+  od = od.replace("DD", d2.slice(3, 5));
+  od = od.replace("HH", d2.slice(12, 14));
+  od = od.replace("mm", d2.slice(15, 17));
+  od = od.replace("ss", d2.slice(18, 20));
+  return od;
+};
+export function dateToString(date: Date | string): string {
+  const d2 = typeof date !== "string" ? date : new Date(date);
+  const year = d2.getFullYear();
+  const month = String(d2.getMonth() + 1).padStart(2, "0");
+  const day = String(d2.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+};
+export function datetimeToString(date: Date | string = ""): string {
+  const d2 = typeof date !== "string" ? date : new Date(date);
+  const year = d2.getFullYear();
+  const month = String(d2.getMonth() + 1).padStart(2, "0");
+  const day = String(d2.getDate()).padStart(2, "0");
+  const hours = String(d2.getHours()).padStart(2, "0");
+  const minutes = String(d2.getMinutes()).padStart(2, "0");
+  const seconds = String(d2.getSeconds()).padStart(2, "0");
+  return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
+};

package/src/reflect.ts

@@ -73,7 +73,14 @@ const setKey = (_object: any, _isArrayKey: boolean, _key: string, _nextValue: an
   }
   return _object;
 };
-
+export function isEmptyObject(obj: any): boolean {
+  for (let key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      return false;
+    }
+  }
+  return true;
+};
 export function diff(obj1: any, obj2: any): string[] {
   const fields = [];
   const key1s = Object.keys(obj1);
@@ -159,7 +166,7 @@ export function equal(obj1: any, obj2: any): boolean {
     return (obj1.getTime() === obj2.getTime());
   }
   if ((Array.isArray(obj1) && !Array.isArray(obj2))
-      || (!Array.isArray(obj1) && Array.isArray(obj2))) {
+    || (!Array.isArray(obj1) && Array.isArray(obj2))) {
     return false;
   }
   if (!Array.isArray(obj1) && !Array.isArray(obj2)) {
@@ -205,7 +212,7 @@ export function equalArrays<T>(ar1: T[], ar2: T[]): boolean {
   return true;
 }
 
-export function getArray<T>(list: T[]|undefined|null, name: string, v: boolean|string|number): T[] {
+export function getArray<T>(list: T[] | undefined | null, name: string, v: boolean | string | number): T[] {
   const arrs = [];
   if (list) {
     for (const obj of list) {
@@ -216,7 +223,7 @@ export function getArray<T>(list: T[]|undefined|null, name: string, v: boolean|s
   }
   return arrs;
 }
-export function getDiffArray<T>(list: T[]|undefined|null, name: string, v: boolean|string|number): T[] {
+export function getDiffArray<T>(list: T[] | undefined | null, name: string, v: boolean | string | number): T[] {
   const arrs = [];
   if (list) {
     for (const obj of list) {
@@ -227,14 +234,14 @@ export function getDiffArray<T>(list: T[]|undefined|null, name: string, v: boole
   }
   return arrs;
 }
-export function setAll<T>(list: T[]|undefined|null, name: string, v: boolean|string|number): void {
+export function setAll<T>(list: T[] | undefined | null, name: string, v: boolean | string | number): void {
   if (list) {
     for (const obj of list) {
       (obj as any)[name] = v;
     }
   }
 }
-export function equalAll<T>(list: T[]|undefined|null, name: string, v: boolean|string|number): boolean {
+export function equalAll<T>(list: T[] | undefined | null, name: string, v: boolean | string | number): boolean {
   if (list) {
     for (const obj of list) {
       if ((obj as any)[name] !== v) {

package/src/useEdit.ts

@@ -32,11 +32,11 @@ export interface BaseEditComponentParam<T, ID> {
   createModel?: () => T;
   onSave?: (isBack?: boolean) => void;
   validate?: (obj: T, callback: (obj2?: T) => void) => void;
-  succeed?: (obj: T, msg: string, version?: string, isBack?: boolean, result?: ResultInfo<T>) => void;
-  fail?: (result: ResultInfo<T>|ErrorMessage[]) => void;
-  postSave?: (obj: T, res: number|ResultInfo<T>|ErrorMessage[], version?: string, backOnSave?: boolean) => void;
+  succeed?: (origin: T, msg: string, version?: string, isBack?: boolean, model?: T) => void;
+  fail?: (result: ErrorMessage[]) => void;
+  postSave?: (res: number|T|ErrorMessage[], origin: T, version?: string, isPatch?: boolean, backOnSave?: boolean) => void;
   handleError?: (error: any) => void;
-  handleDuplicateKey?: (result?: ResultInfo<T>) => void;
+  handleDuplicateKey?: (result?: T) => void;
   load?: (i: ID|null, callback?: (m: T, showM: (m2: T) => void) => void) => void;
   doSave?: (obj: T, diff?: T, version?: string, isBack?: boolean) => void;
   // prepareCustomData?: (data: any) => void; // need to review
@@ -44,7 +44,7 @@ export interface BaseEditComponentParam<T, ID> {
 export interface HookBaseEditParameter<T, ID, S> extends BaseEditComponentParam<T, ID> {
   refForm: any;
   initialState: S;
-  service: GenericService<T, ID, number|ResultInfo<T>>;
+  service: GenericService<T, ID, number|T|ErrorMessage[]>;
   resource: ResourceService;
   showMessage: (msg: string) => void;
   showError: (m: string, header?: string, detail?: string, callback?: () => void) => void;
@@ -68,7 +68,7 @@ export interface HookPropsBaseEditParameter<T, ID, S, P> extends HookBaseEditPar
 export const useEdit = <T, ID, S>(
   refForm: any,
   initialState: S,
-  service: GenericService<T, ID, number|ResultInfo<T> | ErrorMessage[]>,
+  service: GenericService<T, ID, number|T|ErrorMessage[]>,
 
   p2: EditParameter,
   p?: EditComponentParam<T, ID, S>
@@ -114,7 +114,7 @@ export const useEditProps = <T, ID, S, P>(
   props: P,
   refForm: any,
   initialState: S,
-  service: GenericService<T, ID, number|ResultInfo<T>>,
+  service: GenericService<T, ID, number|T|ErrorMessage[]>,
   p2: EditParameter,
   p?: EditComponentParam<T, ID, S>
   ) => {
@@ -159,7 +159,7 @@ export const useEditOne = <T, ID, S>(p: HookBaseEditParameter<T, ID, S>) => {
 export const useCoreEdit = <T, ID, S, P>(
   refForm: any,
   initialState: S,
-  service: GenericService<T, ID, number|ResultInfo<T>|ErrorMessage[]>,
+  service: GenericService<T, ID, number|T|ErrorMessage[]>,
   p1: EditParameter,
   p?: BaseEditComponentParam<T, ID>,
   props?: P
@@ -322,17 +322,16 @@ export const useCoreEdit = <T, ID, S, P>(
   };
   const validate = (p && p.validate ? p.validate : _validate);
 
-  const _succeed = (obj: T, msg: string, version?: string, isBack?: boolean, result?: ResultInfo<T>) => {
-    if (result) {
-      const model = result.value;
+  const _succeed = (origin: T, msg: string, version?: string, isBack?: boolean, model?: T) => {
+    if (model) {
       setFlag({ newMode: false });
       if (model && flag.setBack === true) {
         resetState(false, model, clone(model));
       } else {
-        handleVersion(obj, version);
+        handleVersion(origin, version);
       }
     } else {
-      handleVersion(obj, version);
+      handleVersion(origin, version);
     }
     p1.showMessage(msg);
     if (isBack) {
@@ -341,48 +340,27 @@ export const useCoreEdit = <T, ID, S, P>(
   };
   const succeed = (p && p.succeed ? p.succeed : _succeed);
 
-  const _fail = (result: ResultInfo<T> | ErrorMessage[]) => {
+  const _fail = (result: ErrorMessage[]) => {
     const f = refForm.current;
     const u = p1.ui;
-    if (Array.isArray(result)) {
-      if (u && f) {
-        const unmappedErrors = u.showFormError(f, result);
-        focusFirstError(f);
-        if (unmappedErrors && unmappedErrors.length > 0) {
-          const t = p1.resource.value('error');
-          if (p1.ui && p1.ui.buildErrorMessage) {
-            const msg = p1.ui.buildErrorMessage(unmappedErrors);
-            p1.showError(msg, t);
-          } else {
-            p1.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, t);
-          }
-        }
-      } else {
+    if (u && f) {
+      const unmappedErrors = u.showFormError(f, result);
+      focusFirstError(f);
+      if (unmappedErrors && unmappedErrors.length > 0) {
         const t = p1.resource.value('error');
-        if (result.length > 0) {
-          p1.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
+        if (p1.ui && p1.ui.buildErrorMessage) {
+          const msg = p1.ui.buildErrorMessage(unmappedErrors);
+          p1.showError(msg, t);
         } else {
-          p1.showError(t, t);
+          p1.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, t);
         }
       }
     } else {
-      const errors = result.errors;
-      if (errors && u) {
-        const unmappedErrors = u.showFormError(f, errors);
-        focusFirstError(f);
-        if (!result.message) {
-          if (errors && errors.length > 0) {
-            if (p1.ui && p1.ui.buildErrorMessage) {
-              result.message = p1.ui.buildErrorMessage(unmappedErrors);
-            } else {
-              result.message = errors[0].message;
-            }
-          }
-        }
-        if (result.message) {
-          const t = p1.resource.value('error');
-          p1.showError(result.message, t);
-        }
+      const t = p1.resource.value('error');
+      if (result.length > 0) {
+        p1.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
+      } else {
+        p1.showError(t, t);
       }
     }
   };
@@ -404,7 +382,7 @@ export const useCoreEdit = <T, ID, S, P>(
   };
   const handleError = (p && p.handleError ? p.handleError : _handleError);
 
-  const _postSave = (obj: T, r: number | ResultInfo<T>|ErrorMessage[], version?: string, backOnSave?: boolean) => {
+  const _postSave = (r: number | T|ErrorMessage[], origin: T, version?: string, isPatch?: boolean, backOnSave?: boolean) => {
     setRunning(false);
     hideLoading(p1.loading);
     const x: any = r;
@@ -415,35 +393,38 @@ export const useCoreEdit = <T, ID, S, P>(
       fail(x);
     } else if (!isNaN(x)) {
       if (x === st.success) {
-        succeed(obj, successMsg, version, backOnSave);
+        succeed(origin, successMsg, version, backOnSave);
       } else {
         if (newMod && x === st.duplicate_key) {
           handleDuplicateKey();
         } else if (!newMod && x === st.not_found) {
           handleNotFound();
+        } else if (!newMod && x === st.version_error) {
+          const title = p1.resource.value('error');
+          const err = p1.resource.value('error_version');
+          p1.showError(err, title);
         } else {
           handleStatus(x as number, st, p1.resource.value, p1.showError);
         }
       }
     } else {
-      const result: ResultInfo<any> = x;
-      if (result.status === st.success) {
-        succeed(obj, successMsg, version, backOnSave, result);
-        p1.showMessage(successMsg);
-      } else if (result.errors && result.errors.length > 0) {
-        fail(result);
-      } else if (newMod && result.status === st.duplicate_key) {
-        handleDuplicateKey(result);
-      } else if (!newMod && x === st.not_found) {
-        handleNotFound();
+      const result = r as T;
+      if (isPatch) {
+        const keys = Object.keys(result);
+        const a: any = origin;
+        for (const k of keys) {
+          a[k] = (result as any)[k];
+        }
+        succeed(a, successMsg, undefined, backOnSave);
       } else {
-        handleStatus(result.status, st, p1.resource.value, p1.showError);
+        succeed(origin, successMsg, version, backOnSave, r as T);
       }
+      p1.showMessage(successMsg);
     }
   };
   const postSave = (p && p.postSave ? p.postSave : _postSave);
 
-  const _handleDuplicateKey = (result?: ResultInfo<any>) => {
+  const _handleDuplicateKey = (result?: T) => {
     const msg = message(p1.resource.value, 'error_duplicate_key', 'error');
     p1.showError(msg.message, msg.title);
   };
@@ -456,12 +437,14 @@ 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)).catch(handleError);
+        service.patch(body).then(result => {
+          postSave(result, obj, version, true, isBackO);
+        }).catch(handleError);
       } else {
-        service.update(obj).then(result => postSave(obj, result, version, isBackO)).catch(handleError);
+        service.update(obj).then(result => postSave(result, obj, version, false, isBackO)).catch(handleError);
       }
     } else {
-      service.insert(obj).then(result => postSave(obj, result, version, isBackO)).catch(handleError);
+      service.insert(obj).then(result => postSave(result, obj, version, false, isBackO)).catch(handleError);
     }
   };