react-hook-core 0.1.15 → 0.1.17

package/src/search.ts

@@ -36,6 +36,7 @@ export interface Sortable {
 export interface Pagination {
   initPageSize?: number;
   pageSize?: number;
+  limit?: number;
   pageIndex?: number;
   total?: number;
   pages?: number;
@@ -171,13 +172,19 @@ export function changePage(com: Pagination, pageIndex: number, pageSize: number)
   com.append = false;
 }
 export function optimizeFilter<S extends Filter>(obj: S, searchable: Searchable, fields?: string[]): S {
+  const sLimit = searchable.limit;
   obj.fields = fields;
   if (searchable.pageIndex && searchable.pageIndex > 1) {
     obj.page = searchable.pageIndex;
   } else {
     delete obj.page;
   }
-  obj.limit = searchable.pageSize;
+  if (sLimit){
+    obj.limit = searchable.limit;
+  }else{
+    obj.limit = searchable.pageSize;
+  }
+
   if (searchable.appendMode && searchable.initPageSize !== searchable.pageSize) {
     obj.firstLimit = searchable.initPageSize;
   } else {
@@ -194,21 +201,19 @@ export function optimizeFilter<S extends Filter>(obj: S, searchable: Searchable,
   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) &&typeof objB[key] === 'string') {
-          const arrayObjKeyB = objB[key].length > 0 ?  (objB[key])?.split(',') : [];
-          if(arrayObjKeyB && arrayObjKeyB.length > 1) {
-            objA[key] = [...arrayObjKeyB];
+function mapObjects(dest: any, src: any): void {
+  for (let key in dest) {
+    if (src.hasOwnProperty(key) && src[key] !== null && src[key] !== undefined) {
+      if(Array.isArray(dest[key]) && typeof src[key] === 'string' && src[key].length > 0) {
+          const arrayObjKeySrc = src[key].length > 0 ?  (src[key])?.split(',') : [];
+          if(arrayObjKeySrc && arrayObjKeySrc.length > 1) {
+            dest[key] = [...arrayObjKeySrc];
           } else {
-            objA[key].push(objB[key])
+            dest[key] = [];
+            dest[key].push(src[key])
           }
-        }
       } else {
-        objA[key] = objB[key];
+        dest[key] = src[key];
       }
     }
   }
@@ -576,7 +581,9 @@ export function toggleSortStyle(target: HTMLElement): string {
 }
 export function getModel<T, S extends Filter>(state: any, modelName: string, searchable: Searchable, fields?: string[], excluding?: string[]|number[]): S {
   let obj2 = getModelFromState(state, modelName);
+
   const obj: any = obj2 ? obj2 : {};
+  console.log("getModel optimizeFilter", searchable)
   const obj3 = optimizeFilter(obj, searchable, fields);
   obj3.excluding = excluding;
   return obj3;

package/src/state.ts

@@ -75,6 +75,7 @@ export function buildState<S, K extends keyof S>(e: any, state: Readonly<S>, ctr
       const dataField = ctrl.getAttribute('data-field');
       const field = (dataField ? dataField : ctrl.name);
       const model = Object.assign({}, ex);
+      const dType= 'array'
       if (type && type.toLowerCase() === 'checkbox') {
         let value = model[field];
         if (ctrl.id && ctrl.name !== ctrl.id) {
@@ -82,7 +83,14 @@ export function buildState<S, K extends keyof S>(e: any, state: Readonly<S>, ctr
             value = [];
           }
           value.includes(ctrl.value) ? value = value.filter((v: string) => v !== ctrl.value) : value.push(ctrl.value);
+          // if (dType == 'array'){
+          //   if (value === 'string'){
+          //     value = [value]
+          //   }
+          // }
           model[field] = value;
+          // console.log(model,  modelName, model, model[field], field, value )
+          // setValue(model, field, value);
         } else {
           const v = valueOfCheckbox(ctrl);
           model[field] = v;
@@ -103,7 +111,7 @@ export function buildState<S, K extends keyof S>(e: any, state: Readonly<S>, ctr
         const objSet: any = {};
         try {
           const selectedDate = new Date(ctrl.value);
-          setValue(model, field, ctrl.value && ctrl.value!== '' ? selectedDate.toISOString() : '');
+          setValue(model, field, ctrl.value && ctrl.value!== '' ? selectedDate.toISOString() : null);
           objSet[modelName] = model;
           return objSet;
         } catch (error) {

package/src/update.ts

@@ -1,74 +1,86 @@
-import {getModelName as getModelName2, Locale, removePhoneFormat} from './core';
-import {useMergeState} from './merge';
-import {buildFlatState, buildState, handleEvent, localeOf} from './state';
-
-const m = 'model';
-const _getModelName = (f2?: HTMLFormElement|null): string => {
-  return getModelName2(f2, m);
-};
-export const useUpdate = <T>(initialState: T, getName?: ((f?: HTMLFormElement|null) => string) | string, getLocale?: (() => Locale) | Locale, removeErr?: (ctrl: HTMLInputElement) => void) => {
-  const [state, setState] = useMergeState<T>(initialState);
-
-  const updatePhoneState = (event: any) => {
-    const re = /^[0-9\b]+$/;
-    const target = event.currentTarget as HTMLInputElement;
-    const value = removePhoneFormat(target.value);
-    if (re.test(value) || !value) {
-      updateState(event);
-    } else {
-      const splitArr = value.split('');
-      let responseStr = '';
-      splitArr.forEach(element => {
-        if (re.test(element)) {
-          responseStr += element;
-        }
-      });
-      target.value = responseStr;
-      updateState(event);
-    }
-  };
-  const getModelName: (f2?: HTMLFormElement|null) => string = (typeof getName === 'function' ? getName : _getModelName);
-
-  const updateState = (e: any, callback?: () => void, lc?: Locale) => {
-    const ctrl = e.currentTarget as HTMLInputElement;
-    let mn: string = m;
-    if (getName) {
-      if (typeof getName === 'string') {
-        mn = getName;
-      } else {
-        mn = getName(ctrl.form);
-      }
-    } else {
-      mn = _getModelName(ctrl.form);
-    }
-    const l = localeOf(lc, getLocale);
-    handleEvent(e, removeErr);
-    const objSet = buildState<T, any>(e, state, ctrl, mn, l);
-    if (objSet) {
-      if (callback) {
-        setState(objSet, callback);
-      } else {
-        setState(objSet);
-      }
-    }
-  };
-  const updateFlatState = (e: any, callback?: () => void, lc?: Locale) => {
-    const objSet = buildFlatState<T, any>(e, state, lc);
-    if (objSet) {
-      if (callback) {
-        setState(objSet, callback);
-      } else {
-        setState(objSet);
-      }
-    }
-  };
-  return {
-    getModelName,
-    updateState,
-    updatePhoneState,
-    updateFlatState,
-    getLocale,
-    setState,
-    state
-  };
-};
+import { getModelName as getModelName2, Locale, removePhoneFormat } from "./core";
+import { useMergeState } from "./merge";
+import { buildFlatState, buildState, handleEvent, localeOf } from "./state";
+import { useEffect, useState } from "react";
+
+const m = "model";
+const _getModelName = (f2?: HTMLFormElement | null): string => {
+  return getModelName2(f2, m);
+};
+export const useUpdate = <T>(
+  initialState: T,
+  getName?: ((f?: HTMLFormElement | null) => string) | string,
+  getLocale?: (() => Locale) | Locale,
+  removeErr?: (ctrl: HTMLInputElement) => void
+) => {
+  const [state, setState] = useMergeState<T>(initialState);
+  const [rerender, setRerender] = useState(false);
+
+  // trigger re-render page when change state in useSearch
+  useEffect(() => {
+    setRerender(!rerender);
+  }, [state]);
+
+  const updatePhoneState = (event: any) => {
+    const re = /^[0-9\b]+$/;
+    const target = event.currentTarget as HTMLInputElement;
+    const value = removePhoneFormat(target.value);
+    if (re.test(value) || !value) {
+      updateState(event);
+    } else {
+      const splitArr = value.split("");
+      let responseStr = "";
+      splitArr.forEach((element) => {
+        if (re.test(element)) {
+          responseStr += element;
+        }
+      });
+      target.value = responseStr;
+      updateState(event);
+    }
+  };
+  const getModelName: (f2?: HTMLFormElement | null) => string = typeof getName === "function" ? getName : _getModelName;
+
+  const updateState = (e: any, callback?: (prev: any) => void, lc?: Locale) => {
+    const ctrl = e.currentTarget as HTMLInputElement;
+    let mn: string = m;
+    if (getName) {
+      if (typeof getName === "string") {
+        mn = getName;
+      } else {
+        mn = getName(ctrl.form);
+      }
+    } else {
+      mn = _getModelName(ctrl.form);
+    }
+    const l = localeOf(lc, getLocale);
+    handleEvent(e, removeErr);
+    const objSet = buildState<T, any>(e, state, ctrl, mn, l);
+    if (objSet) {
+      if (callback) {
+        setState({ ...objSet }, callback);
+      } else {
+        setState(objSet);
+      }
+    }
+  };
+  const updateFlatState = (e: any, callback?: () => void, lc?: Locale) => {
+    const objSet = buildFlatState<T, any>(e, state, lc);
+    if (objSet) {
+      if (callback) {
+        setState(objSet, callback);
+      } else {
+        setState(objSet);
+      }
+    }
+  };
+  return {
+    getModelName,
+    updateState,
+    updatePhoneState,
+    updateFlatState,
+    getLocale,
+    setState,
+    state,
+  };
+};

package/src/useEdit.ts

@@ -34,7 +34,7 @@ export interface BaseEditComponentParam<T, ID> {
   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>, version?: string, backOnSave?: boolean) => void;
+  postSave?: (obj: T, res: number|ResultInfo<T>|ErrorMessage[], version?: string, backOnSave?: boolean) => void;
   handleError?: (error: any) => void;
   handleDuplicateKey?: (result?: ResultInfo<T>) => void;
   load?: (i: ID|null, callback?: (m: T, showM: (m2: T) => void) => void) => void;
@@ -68,7 +68,8 @@ 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>>,
+  service: GenericService<T, ID, number|ResultInfo<T> | ErrorMessage[]>,
+
   p2: EditParameter,
   p?: EditComponentParam<T, ID, S>
   ) => {
@@ -158,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>>,
+  service: GenericService<T, ID, number|ResultInfo<T>|ErrorMessage[]>,
   p1: EditParameter,
   p?: BaseEditComponentParam<T, ID>,
   props?: P
@@ -214,7 +215,7 @@ export const useCoreEdit = <T, ID, S, P>(
   };
 
   const _handleNotFound = (form?: any): void => {
-    const msg = message(p1.resource.value, 'error_not_found', 'error');
+    const msg = message(p1.resource.value, 'error_404', 'error');
     if (form) {
       setReadOnly(form);
     }
@@ -405,7 +406,7 @@ export const useCoreEdit = <T, ID, S, P>(
   };
   const handleError = (p && p.handleError ? p.handleError : _handleError);
 
-  const _postSave = (obj: T, r: number | ResultInfo<T>, version?: string, backOnSave?: boolean) => {
+  const _postSave = (obj: T, r: number | ResultInfo<T>|ErrorMessage[], version?: string, backOnSave?: boolean) => {
     setRunning(false);
     hideLoading(p1.loading);
     const x: any = r;