react-hook-core 0.1.10 → 0.1.12

package/lib/components.js

@@ -833,27 +833,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 +891,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

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var qs = require("query-string");
-function navigate(history, stateTo) {
-  history.push(stateTo);
-}
-exports.navigate = navigate;
 function buildFromUrl() {
   return buildParameters(window.location.search);
 }
@@ -13,7 +9,7 @@ function buildParameters(url) {
   var urlSearch = url;
   var i = urlSearch.indexOf('?');
   if (i >= 0) {
-    urlSearch = url.substr(i + 1);
+    urlSearch = url.substring(i + 1);
   }
   var parsed = qs.parse(urlSearch);
   return parsed;

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);
+          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/package.json

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

package/src/components.ts

@@ -907,26 +907,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 +961,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

@@ -1,10 +1,5 @@
-import * as H from 'history';
 import * as qs from 'query-string';
 
-export function navigate(history: H.History, stateTo: string) {
-  history.push(stateTo);
-}
-
 export function buildFromUrl<S>(): S {
   return buildParameters(window.location.search);
 }
@@ -12,7 +7,7 @@ export function buildParameters<T>(url: string): T {
   let urlSearch = url;
   const i = urlSearch.indexOf('?');
   if (i >= 0) {
-    urlSearch = url.substr(i + 1);
+    urlSearch = url.substring(i + 1);
   }
   const parsed: any = qs.parse(urlSearch);
   return parsed;

package/src/state.ts

@@ -99,6 +99,28 @@ export function buildState<S, K extends keyof S>(e: any, state: Readonly<S>, ctr
         const objSet: any = {};
         objSet[modelName] = model;
         return objSet;
+      } else if (type && (type.toLowerCase() === 'date' || type.toLowerCase() === 'datetime-local')) {
+        const objSet: any = {};
+        try {
+          const selectedDate = new Date(ctrl.value);
+          setValue(model, field, selectedDate);
+          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) {

package/src/update.ts

@@ -43,7 +43,7 @@ export const useUpdate = <T>(initialState: T, getName?: ((f?: HTMLFormElement|nu
     }
     const l = localeOf(lc, getLocale);
     handleEvent(e, removeErr);
-    const objSet = buildState(e, state, ctrl, mn, l);
+    const objSet = buildState<T, any>(e, state, ctrl, mn, l);
     if (objSet) {
       if (callback) {
         setState(objSet, callback);
@@ -53,7 +53,7 @@ export const useUpdate = <T>(initialState: T, getName?: ((f?: HTMLFormElement|nu
     }
   };
   const updateFlatState = (e: any, callback?: () => void, lc?: Locale) => {
-    const objSet = buildFlatState(e, state, lc);
+    const objSet = buildFlatState<T, any>(e, state, lc);
     if (objSet) {
       if (callback) {
         setState(objSet, callback);

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

@@ -57,7 +57,7 @@ export interface InitSearchComponentParam<T, M extends Filter, S> extends Search
   createFilter?: () => M;
   initialize?: (ld: (s: M, auto?: boolean) => void, setState2: DispatchWithCallback<Partial<S>>, com?: SearchComponentState<T, M>) => void;
 }
-export interface HookPropsSearchParameter<T, S extends Filter, ST, P> extends HookPropsBaseSearchParameter<T, S, ST, P> {
+export interface HookPropsSearchParameter<T, S extends Filter, ST extends SearchComponentState<T, S>, P> extends HookPropsBaseSearchParameter<T, S, ST, P> {
   createFilter?: () => S;
   initialize?: (ld: (s: S, auto?: boolean) => void, setState2: DispatchWithCallback<Partial<ST>>, com?: SearchComponentState<T, S>) => void;
 }
@@ -112,7 +112,7 @@ export interface HookBaseSearchParameter<T, S extends Filter, ST extends SearchC
   getLocale?: () => Locale;
   autoSearch?: boolean;
 }
-export interface HookPropsBaseSearchParameter<T, S extends Filter, ST, P> extends HookBaseSearchParameter<T, S, ST> {
+export interface HookPropsBaseSearchParameter<T, S extends Filter, ST extends SearchComponentState<T, S>, P> extends HookBaseSearchParameter<T, S, ST> {
   props?: P;
   // prepareCustomData?: (data: any) => void;
 }

package/tsconfig.json

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