react-hook-core 0.1.11 → 0.1.13

package/lib/components.js

@@ -385,12 +385,8 @@ var BaseSearchComponent = (function (_super) {
     if (!lc) {
       lc = state_1.enLocale;
     }
-    var cc = this.getCurrencyCode();
     var fields = this.getFields();
-    var l = this.getList();
-    var f = this.getSearchForm();
-    var dc = (this.ui ? this.ui.decodeFromForm : undefined);
-    var obj3 = search_1.getModel(this.state, name, this, fields, this.excluding, this.keys, l, f, dc, lc, cc);
+    var obj3 = search_1.getModel(this.state, name, this, fields, this.excluding);
     return obj3;
   };
   BaseSearchComponent.prototype.getFields = function () {
@@ -833,27 +829,54 @@ var BaseEditComponent = (function (_super) {
     }
   };
   BaseEditComponent.prototype.fail = function (result) {
-    var errors = result.errors;
     var f = this.form;
     var u = this.ui;
-    if (u && f) {
-      var unmappedErrors = u.showFormError(f, errors);
-      if (!result.message) {
-        if (errors && errors.length === 1) {
-          result.message = errors[0].message;
+    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 {
+        var t = this.resourceService.value('error');
+        if (result.length > 0) {
+          this.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
         }
         else {
-          result.message = u.buildErrorMessage(unmappedErrors);
+          this.showError(t, t);
         }
       }
-      formutil_1.focusFirstError(f);
     }
-    else if (errors && errors.length === 1) {
-      result.message = errors[0].message;
-    }
-    if (result.message) {
-      var t = this.resourceService.value('error');
-      this.showError(result.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;
+      }
+      if (result.message) {
+        var t = this.resourceService.value('error');
+        this.showError(result.message, t);
+      }
     }
   };
   BaseEditComponent.prototype.postSave = function (res, backOnSave) {
@@ -864,7 +887,10 @@ var BaseEditComponent = (function (_super) {
     var successMsg = (newMod ? this.insertSuccessMsg : this.updateSuccessMsg);
     var x = res;
     var r = this.resourceService;
-    if (!isNaN(x)) {
+    if (Array.isArray(x)) {
+      this.fail(x);
+    }
+    else if (!isNaN(x)) {
       if (x === st.success) {
         this.succeed(successMsg, backOnSave);
       }

package/lib/core.js

@@ -132,17 +132,22 @@ function buildId(p, keys) {
   return id;
 }
 exports.buildId = buildId;
-function dateToDefaultString(date) {
-  return '' + date.getFullYear() + '-' + addZero(date.getMonth() + 1, 2) + '-' + addZero(date.getDate(), 2);
-}
-exports.dateToDefaultString = dateToDefaultString;
-function addZero(val, num) {
-  var v = val.toString();
-  while (v.length < num) {
-    v = '0' + v;
-  }
-  return v.toString();
-}
+exports.datetimeToString = function (inputDate) {
+  var date = new Date(inputDate);
+  var year = date.getFullYear();
+  var month = String(date.getMonth() + 1).padStart(2, '0');
+  var day = String(date.getDate()).padStart(2, '0');
+  var hours = String(date.getHours()).padStart(2, '0');
+  var minutes = String(date.getMinutes()).padStart(2, '0');
+  var seconds = String(date.getSeconds()).padStart(2, '0');
+  return year + "-" + month + "-" + day + "T" + hours + ":" + minutes + ":" + seconds;
+};
+exports.dateToString = function (inputDate) {
+  var year = inputDate.getFullYear();
+  var month = String(inputDate.getMonth() + 1).padStart(2, '0');
+  var day = String(inputDate.getDate()).padStart(2, '0');
+  return year + "-" + month + "-" + day;
+};
 function initForm(form, initMat) {
   if (form) {
     setTimeout(function () {

package/lib/route.js

@@ -11,7 +11,35 @@ function buildParameters(url) {
   if (i >= 0) {
     urlSearch = url.substring(i + 1);
   }
-  var parsed = qs.parse(urlSearch);
-  return parsed;
+  try {
+    var parsed = convertToObject(qs.parse(urlSearch));
+    return parsed;
+  }
+  catch (error) {
+    console.log(error);
+    throw error;
+  }
 }
 exports.buildParameters = buildParameters;
+function convertToObject(input) {
+  var output = {};
+  for (var key in input) {
+    var value = input[key];
+    var keys = key.split('.');
+    var currentObj = output;
+    for (var i = 0; i < keys.length; i++) {
+      var currentKey = keys[i];
+      if (!currentObj[currentKey]) {
+        if (i === keys.length - 1) {
+          currentObj[currentKey] = value;
+        }
+        else {
+          currentObj[currentKey] = {};
+        }
+      }
+      currentObj = currentObj[currentKey];
+    }
+  }
+  return output;
+}
+exports.convertToObject = convertToObject;

package/lib/search.js

@@ -1,4 +1,11 @@
 "use strict";
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+  for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+  for (var r = Array(s), k = 0, i = 0; i < il; i++)
+    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+      r[k] = a[j];
+  return r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var resources = (function () {
   function resources() {
@@ -156,9 +163,36 @@ function optimizeFilter(obj, searchable, fields) {
   else {
     delete obj.sort;
   }
+  if (searchable) {
+    mapObjects(obj, searchable);
+  }
   return obj;
 }
 exports.optimizeFilter = optimizeFilter;
+function mapObjects(objA, objB) {
+  var _a;
+  for (var key in objA) {
+    if (objB.hasOwnProperty(key) && objB[key] !== null && objB[key] !== undefined) {
+      if (Array.isArray(objA[key])) {
+        objA[key] = [];
+        if (Array.isArray(objB[key]) && objB[key].length === 0) {
+        }
+        else {
+          var arrayObjKeyB = objB[key].length > 0 ? (_a = (objB[key])) === null || _a === void 0 ? void 0 : _a.split(',') : [];
+          if (arrayObjKeyB && arrayObjKeyB.length > 1) {
+            objA[key] = __spreadArrays(arrayObjKeyB);
+          }
+          else {
+            objA[key].push(objB[key]);
+          }
+        }
+      }
+      else {
+        objA[key] = objB[key];
+      }
+    }
+  }
+}
 function append(list, results) {
   if (list && results) {
     for (var _i = 0, results_1 = results; _i < results_1.length; _i++) {
@@ -527,22 +561,11 @@ function toggleSortStyle(target) {
   return field;
 }
 exports.toggleSortStyle = toggleSortStyle;
-function getModel(state, modelName, searchable, fields, excluding, keys, l, f, dc, lc, currencyCode) {
+function getModel(state, modelName, searchable, fields, excluding) {
   var obj2 = getModelFromState(state, modelName);
-  if (f && dc) {
-    obj2 = dc(f, lc, currencyCode);
-  }
   var obj = obj2 ? obj2 : {};
   var obj3 = optimizeFilter(obj, searchable, fields);
   obj3.excluding = excluding;
-  if (keys && keys.length === 1) {
-    if (l && l.length > 0) {
-      var refId = l[l.length - 1][keys[0]];
-      if (refId) {
-        obj3.refId = '' + refId;
-      }
-    }
-  }
   return obj3;
 }
 exports.getModel = getModel;

package/lib/state.js

@@ -119,6 +119,32 @@ function buildState(e, state, ctrl, modelName, tloc) {
         objSet[modelName] = model;
         return objSet;
       }
+      else if (type && (type.toLowerCase() === 'date' || type.toLowerCase() === 'datetime-local')) {
+        var objSet = {};
+        try {
+          var selectedDate = new Date(ctrl.value);
+          reflect_1.setValue(model, field, selectedDate.toISOString());
+          objSet[modelName] = model;
+          return objSet;
+        }
+        catch (error) {
+          console.error('Error occurred while formatting date:', error);
+        }
+        return objSet;
+      }
+      else if (type && (type.toLowerCase() === 'time')) {
+        var objSet = {};
+        try {
+          var selectedDate = new Date(ctrl.value);
+          reflect_1.setValue(model, field, selectedDate.getTime());
+          objSet[modelName] = model;
+          return objSet;
+        }
+        catch (error) {
+          console.error('Error occurred while formatting time:', error);
+        }
+        return objSet;
+      }
       else {
         if (ctrl.tagName === 'SELECT') {
           if (ctrl.value === '' || !ctrl.value) {

package/lib/useEdit.js

@@ -260,28 +260,55 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   };
   var succeed = (p && p.succeed ? p.succeed : _succeed);
   var _fail = function (result) {
-    var errors = result.errors;
     var f = refForm.current;
     var u = p1.ui;
-    if (errors && u) {
-      var unmappedErrors = u.showFormError(f, errors);
-      formutil_1.focusFirstError(f);
-      if (!result.message) {
-        if (errors && errors.length === 1) {
-          result.message = errors[0].message;
-        }
-        else {
+    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) {
-            result.message = p1.ui.buildErrorMessage(unmappedErrors);
+            var msg = p1.ui.buildErrorMessage(unmappedErrors);
+            p1.showError(msg, t);
           }
           else {
-            result.message = errors[0].message;
+            p1.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, t);
           }
         }
       }
-      if (result.message) {
+      else {
         var t = p1.resource.value('error');
-        p1.showError(result.message, t);
+        if (result.length > 0) {
+          p1.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
+        }
+        else {
+          p1.showError(t, 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 === 1) {
+            result.message = errors[0].message;
+          }
+          else {
+            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);
+        }
       }
     }
   };
@@ -293,7 +320,10 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     var successMsg = p1.resource.value('msg_save_success');
     var newMod = flag.newMode;
     var st = core_1.createEditStatus(p ? p.status : undefined);
-    if (!isNaN(x)) {
+    if (Array.isArray(x)) {
+      fail(x);
+    }
+    else if (!isNaN(x)) {
       if (x === st.success) {
         succeed(obj, successMsg, version, backOnSave);
       }

package/lib/useSearch.js

@@ -102,7 +102,7 @@ exports.mergeParam = mergeParam;
 exports.useSearch = function (refForm, initialState, service, p2, p) {
   var baseProps = exports.useCoreSearch(refForm, initialState, service, p2, p);
   react_1.useEffect(function () {
-    var load = baseProps.load, setState = baseProps.setState, component = baseProps.component;
+    var load = baseProps.load, setState = baseProps.setState, component = baseProps.component, searchError = baseProps.searchError;
     if (refForm) {
       var registerEvents = (p2.ui ? p2.ui.registerEvents : undefined);
       core_1.initForm(refForm.current, registerEvents);
@@ -112,8 +112,13 @@ exports.useSearch = function (refForm, initialState, service, p2, p) {
     }
     else {
       var se = (p && p.createFilter ? p.createFilter() : undefined);
-      var s = search_1.mergeFilter(route_1.buildFromUrl(), se, component.pageSizes);
-      load(s, p2.auto);
+      try {
+        var s = search_1.mergeFilter(route_1.buildFromUrl(), se, component.pageSizes);
+        load(s, p2.auto);
+      }
+      catch (error) {
+        searchError(error);
+      }
     }
   }, []);
   return __assign({}, baseProps);
@@ -163,9 +168,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     if (!fs || fs.length <= 0) {
       fs = getFields();
     }
-    var lc = (p1.getLocale ? p1.getLocale() : state_1.enLocale);
-    var cc = getCurrencyCode();
-    var obj3 = search_1.getModel(state, n, se, fs, se.excluding, keys, se.list, refForm.current, core_1.getDecodeFromForm(p1), lc, cc);
+    var obj3 = search_1.getModel(state, n, se, fs, se.excluding);
     return obj3;
   };
   var getFilter = p && p.getFilter ? p.getFilter : _getFilter;
@@ -184,7 +187,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     var runSearch = doSearch;
     if (auto) {
       setTimeout(function () {
-        runSearch(com, true);
+        runSearch(obj2, true);
       }, 0);
     }
   };
@@ -304,6 +307,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   var searchError = function (err) {
     setComponent({ pageIndex: component.tmpPageIndex });
     core_1.error(err, p1.resource.value, p1.showError);
+    core_1.hideLoading(p1.loading);
   };
   var appendList = (p && p.appendList ? p.appendList : appendListOfState);
   var setList = (p && p.setList ? p.setList : setListOfState);
@@ -379,6 +383,6 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     clearQ: clearQ,
     showResults: showResults,
     getFields: getFields,
-    getModelName: getModelName, format: p ? p.format : undefined
+    getModelName: getModelName, format: p ? p.format : undefined, searchError: searchError
   });
 };

package/package.json

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

package/src/components.ts

@@ -420,12 +420,8 @@ export class BaseSearchComponent<T, F extends Filter, P, I extends SearchState<T
     if (!lc) {
       lc = enLocale;
     }
-    const cc = this.getCurrencyCode();
     const fields = this.getFields();
-    const l = this.getList();
-    const f = this.getSearchForm();
-    const dc = (this.ui ? this.ui.decodeFromForm : undefined);
-    const obj3 = getModel<T, F>(this.state, name, this, fields, this.excluding, this.keys, l, f, dc, lc, cc);
+    const obj3 = getModel<T, F>(this.state, name, this, fields, this.excluding);
     return obj3;
   }
   getFields(): string[]|undefined {
@@ -907,26 +903,49 @@ export abstract class BaseEditComponent<T, P, S> extends BaseComponent<P, S> {
       this.back(null);
     }
   }
-  fail(result: ResultInfo<T>) {
-    const errors = result.errors;
+  fail(result: ResultInfo<T> | ErrorMessage[]) {
     const f = this.form;
     const u = this.ui;
-    if (u && f) {
-      const unmappedErrors = u.showFormError(f, errors);
-      if (!result.message) {
-        if (errors && errors.length === 1) {
-          result.message = errors[0].message;
+    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 {
+        const t = this.resourceService.value('error');
+        if (result.length > 0) {
+          this.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
         } else {
-          result.message = u.buildErrorMessage(unmappedErrors);
+          this.showError(t, t);
         }
       }
-      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);
+    } 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);
+      }
     }
   }
 
@@ -938,7 +957,9 @@ export abstract class BaseEditComponent<T, P, S> extends BaseComponent<P, S> {
     const successMsg = (newMod ? this.insertSuccessMsg : this.updateSuccessMsg);
     const x: any = res;
     const r = this.resourceService;
-    if (!isNaN(x)) {
+    if (Array.isArray(x)) {
+      this.fail(x);
+    } else if (!isNaN(x)) {
       if (x === st.success) {
         this.succeed(successMsg, backOnSave);
       } else {

package/src/core.ts

@@ -310,16 +310,23 @@ export function buildId<ID>(p: Readonly<Params<string>>, keys?: string[]): ID |
   }
   return id;
 }
-export function dateToDefaultString(date: Date): string {
-  return '' + date.getFullYear() + '-' + addZero(date.getMonth() + 1, 2) + '-' + addZero(date.getDate(), 2); // DateUtil.formatDate(date, 'YYYY-MM-DD');
-}
-function addZero(val: number, num: number): string {
-  let v = val.toString();
-  while (v.length < num) {
-    v = '0' + v;
-  }
-  return v.toString();
-}
+export const datetimeToString = (inputDate: Date) => {
+  const date = new Date(inputDate);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  const seconds = String(date.getSeconds()).padStart(2, '0');
+  return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
+};
+
+export const dateToString = (inputDate: Date) => {
+  const year = inputDate.getFullYear();
+  const month = String(inputDate.getMonth() + 1).padStart(2, '0');
+  const day = String(inputDate.getDate()).padStart(2, '0');
+  return `${year}-${month}-${day}`;
+};
 /*
 export function formatFax(value: string) {
   return formatter.formatFax(value);

package/src/route.ts

@@ -4,11 +4,44 @@ export function buildFromUrl<S>(): S {
   return buildParameters(window.location.search);
 }
 export function buildParameters<T>(url: string): T {
+
   let urlSearch = url;
   const i = urlSearch.indexOf('?');
   if (i >= 0) {
     urlSearch = url.substring(i + 1);
   }
-  const parsed: any = qs.parse(urlSearch);
-  return parsed;
+  try {
+    const parsed: any = convertToObject(qs.parse(urlSearch));
+    return parsed;
+    
+  } catch (error) {
+    console.log(error);
+    throw error;
+  }
+}
+
+export function convertToObject(input: any) {
+  const output = {};
+
+  for (let key in input) {
+    const value = input[key];
+    const keys = key.split('.');
+
+    let currentObj = output as any;
+    for (let i = 0; i < keys.length; i++) {
+      const currentKey = keys[i];
+
+      if (!currentObj[currentKey]) {
+        if (i === keys.length - 1) {
+          currentObj[currentKey] = value;
+        } else {
+          currentObj[currentKey] = {};
+        }
+      }
+
+      currentObj = currentObj[currentKey];
+    }
+  }
+
+  return output;
 }

package/src/search.ts

@@ -188,9 +188,33 @@ export function optimizeFilter<S extends Filter>(obj: S, searchable: Searchable,
   } else {
     delete obj.sort;
   }
+  if(searchable) {
+    mapObjects(obj, searchable as S);
+  }
   return obj;
 }
 
+function mapObjects(objA: any, objB: any): void {
+  for (let key in objA) {
+    if (objB.hasOwnProperty(key) && objB[key] !== null && objB[key] !== undefined) {
+      if(Array.isArray(objA[key])) {
+        objA[key] = [];
+        if(Array.isArray(objB[key]) && objB[key].length === 0) {
+        } else {
+          const arrayObjKeyB = objB[key].length > 0 ?  (objB[key])?.split(',') : [];
+          if(arrayObjKeyB && arrayObjKeyB.length > 1) {
+            objA[key] = [...arrayObjKeyB];
+          } else {
+            objA[key].push(objB[key])
+          }
+        }
+      } else {
+        objA[key] = objB[key];
+      }
+    }
+  }
+}
+
 export function append<T>(list?: T[], results?: T[]): T[] {
   if (list && results) {
     for (const obj of results) {
@@ -551,22 +575,11 @@ export function toggleSortStyle(target: HTMLElement): string {
   }
   return field;
 }
-export function getModel<T, S extends Filter>(state: any, modelName: string, searchable: Searchable, fields?: string[], excluding?: string[]|number[], keys?: string[], l?: T[], f?: HTMLFormElement|null, dc?: (f2: HTMLFormElement, lc2?: Locale, cc?: string) => any, lc?: Locale, currencyCode?: string): S {
+export function getModel<T, S extends Filter>(state: any, modelName: string, searchable: Searchable, fields?: string[], excluding?: string[]|number[]): S {
   let obj2 = getModelFromState(state, modelName);
-  if (f && dc) {
-    obj2 = dc(f, lc, currencyCode);
-  }
   const obj: any = obj2 ? obj2 : {};
   const obj3 = optimizeFilter(obj, searchable, fields);
   obj3.excluding = excluding;
-  if (keys && keys.length === 1) {
-    if (l && l.length > 0) {
-      const refId = (l[l.length - 1] as any)[keys[0]];
-      if (refId) {
-        obj3.refId = '' + refId;
-      }
-    }
-  }
   return obj3;
 }
 function getModelFromState(state: any, modelName: string): any {

package/src/state.ts

@@ -99,7 +99,29 @@ export function buildState<S, K extends keyof S>(e: any, state: Readonly<S>, ctr
         const objSet: any = {};
         objSet[modelName] = model;
         return objSet;
-      } else {
+      } else if (type && (type.toLowerCase() === 'date' || type.toLowerCase() === 'datetime-local')) {
+        const objSet: any = {};
+        try {
+          const selectedDate = new Date(ctrl.value);
+          setValue(model, field, selectedDate.toISOString());
+          objSet[modelName] = model;
+          return objSet;
+        } catch (error) {
+          console.error('Error occurred while formatting date:', error);
+        }
+        return objSet;
+    } else if (type && (type.toLowerCase() === 'time')) {
+      const objSet: any = {};
+      try {
+        const selectedDate = new Date(ctrl.value);
+        setValue(model, field, selectedDate.getTime());
+        objSet[modelName] = model;
+        return objSet;
+      } catch (error) {
+        console.error('Error occurred while formatting time:', error);
+      }
+      return objSet;
+    } else {
         if (ctrl.tagName === 'SELECT') {
           if (ctrl.value === '' || !ctrl.value) {
             ctrl.removeAttribute('data-value');

package/src/useEdit.ts

@@ -1,6 +1,6 @@
 import {useEffect, useState} from 'react';
 import {useNavigate, useParams} from 'react-router';
-import {Attributes, buildId, createEditStatus, EditStatusConfig, getModelName as getModelName2, hideLoading, initForm, LoadingService, Locale, message, messageByHttpStatus, ResourceService, showLoading, UIService} from './core';
+import {Attributes, buildId, createEditStatus, EditStatusConfig, ErrorMessage, getModelName as getModelName2, hideLoading, initForm, LoadingService, Locale, message, messageByHttpStatus, ResourceService, showLoading, UIService} from './core';
 import {build, createModel as createModel2, EditParameter, GenericService, handleStatus, handleVersion, initPropertyNullInModel, ResultInfo} from './edit';
 import {focusFirstError, readOnly as setReadOnly} from './formutil';
 import {DispatchWithCallback, useMergeState} from './merge';
@@ -33,7 +33,7 @@ export interface BaseEditComponentParam<T, ID> {
   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>) => void;
+  fail?: (result: ResultInfo<T>|ErrorMessage[]) => void;
   postSave?: (obj: T, res: number|ResultInfo<T>, version?: string, backOnSave?: boolean) => void;
   handleDuplicateKey?: (result?: ResultInfo<T>) => void;
   load?: (i: ID|null, callback?: (m: T, showM: (m2: T) => void) => void) => void;
@@ -334,27 +334,50 @@ export const useCoreEdit = <T, ID, S, P>(
   };
   const succeed = (p && p.succeed ? p.succeed : _succeed);
 
-  const _fail = (result: ResultInfo<T>) => {
-    const errors = result.errors;
+  const _fail = (result: ResultInfo<T> | ErrorMessage[]) => {
     const f = refForm.current;
     const u = p1.ui;
-    if (errors && u) {
-      const unmappedErrors = u.showFormError(f, errors);
-      focusFirstError(f);
-      if (!result.message) {
-        if (errors && errors.length === 1) {
-          result.message = errors[0].message;
-        } else {
+    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) {
-            result.message = p1.ui.buildErrorMessage(unmappedErrors);
+            const msg = p1.ui.buildErrorMessage(unmappedErrors);
+            p1.showError(msg, t);
           } else {
-            result.message = errors[0].message;
+            p1.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, t);
           }
         }
-      }
-      if (result.message) {
+      } else {
         const t = p1.resource.value('error');
-        p1.showError(result.message, t);
+        if (result.length > 0) {
+          p1.showError(result[0].field + ' ' + result[0].code + ' ' + result[0].message, t);
+        } else {
+          p1.showError(t, t);
+        }
+      }
+    } else {
+      const errors = result.errors;
+      if (errors && u) {
+        const unmappedErrors = u.showFormError(f, errors);
+        focusFirstError(f);
+        if (!result.message) {
+          if (errors && errors.length === 1) {
+            result.message = errors[0].message;
+          } else {
+            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);
+        }
       }
     }
   };
@@ -367,7 +390,9 @@ export const useCoreEdit = <T, ID, S, P>(
     const successMsg = p1.resource.value('msg_save_success');
     const newMod = flag.newMode;
     const st = createEditStatus(p ? p.status : undefined);
-    if (!isNaN(x)) {
+    if (Array.isArray(x)) {
+      fail(x);
+    } else if (!isNaN(x)) {
       if (x === st.success) {
         succeed(obj, successMsg, version, backOnSave);
       } else {

package/src/useSearch.ts

@@ -1,5 +1,5 @@
 import {useEffect, useState} from 'react';
-import {error, getDecodeFromForm, getName, getRemoveError, getValidateForm, handleToggle, hideLoading, initForm, Locale, PageChange, pageSizes, removeFormError, ResourceService, SearchParameter, SearchResult, SearchService, showLoading} from './core';
+import {error, getName, getRemoveError, getValidateForm, handleToggle, hideLoading, initForm, Locale, PageChange, pageSizes, removeFormError, ResourceService, SearchParameter, SearchResult, SearchService, showLoading} from './core';
 import {DispatchWithCallback, useMergeState} from './merge';
 import {clone} from './reflect';
 import {buildFromUrl} from './route';
@@ -196,7 +196,7 @@ export const useSearch = <T, S extends Filter, ST extends SearchComponentState<T
   const baseProps = useCoreSearch(refForm, initialState, service, p2, p);
 
   useEffect(() => {
-    const { load, setState, component } = baseProps;
+    const { load, setState, component, searchError } = baseProps;
     if (refForm) {
       const registerEvents = (p2.ui ? p2.ui.registerEvents : undefined);
       initForm(refForm.current, registerEvents);
@@ -205,8 +205,12 @@ export const useSearch = <T, S extends Filter, ST extends SearchComponentState<T
       p.initialize(load, setState, component);
     } else {
       const se: S|undefined = (p && p.createFilter ? p.createFilter() : undefined);
-      const s: any = mergeFilter2(buildFromUrl<S>(), se, component.pageSizes);
-      load(s, p2.auto);
+      try {
+        const s: any = mergeFilter2(buildFromUrl<S>(), se, component.pageSizes);
+        load(s, p2.auto);
+      } catch (error) {
+        searchError(error);
+      }
     }
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -272,9 +276,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
     if (!fs || fs.length <= 0) {
       fs = getFields();
     }
-    const lc = (p1.getLocale ? p1.getLocale() : enLocale);
-    const cc = getCurrencyCode();
-    const obj3 = getModel<T, S>(state, n, se, fs, se.excluding, keys, se.list, refForm.current, getDecodeFromForm(p1), lc, cc);
+    const obj3 = getModel<T, S>(state, n, se, fs, se.excluding);
     return obj3;
   };
   const getFilter = p && p.getFilter ? p.getFilter : _getFilter;
@@ -295,7 +297,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
     const runSearch = doSearch;
     if (auto) {
       setTimeout(() => {
-        runSearch(com, true);
+        runSearch((obj2 as Searchable<T>), true);
       }, 0);
     }
   };
@@ -420,6 +422,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
   const searchError = (err: any): void => {
     setComponent({ pageIndex: component.tmpPageIndex });
     error(err, p1.resource.value, p1.showError);
+    hideLoading(p1.loading)
   };
   const appendList = (p && p.appendList ? p.appendList : appendListOfState);
   const setList = (p && p.setList ? p.setList : setListOfState);
@@ -502,6 +505,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
     showResults,
     getFields,
     getModelName,
-    format: p ? p.format : undefined
+    format: p ? p.format : undefined,
+    searchError
   };
 };

package/tsconfig.json

@@ -16,7 +16,8 @@
     "lib": [
       "dom",
       "es6",
-      "es7"
+      "es7",
+      "es2017"
     ]
   },
   "include": [