react-hook-core 0.1.25 → 0.2.1

package/src/formutil.ts

@@ -1,4 +1,4 @@
-export function readOnly(form?: HTMLFormElement|null): void {
+export function setReadOnly(form?: HTMLFormElement|null, ...args: string[]): void {
   if (!form) {
     return;
   }
@@ -6,28 +6,39 @@ export function readOnly(form?: HTMLFormElement|null): void {
   for (let i = 0; i < len; i++) {
     const ctrl = form[i] as HTMLInputElement;
     const name = ctrl.getAttribute('name');
+    let skip = false;
     if (name != null && name.length > 0 && name !== 'btnBack') {
-      let nodeName = ctrl.nodeName;
-      const type = ctrl.getAttribute('type');
-      if (nodeName === 'INPUT' && type !== null) {
-        nodeName = type.toUpperCase();
+      if (arguments.length > 1) {
+        for (let j = 1; j < arguments.length; j++) {
+          if (arguments[j] === name) {
+            skip = true;
+            // continue; has bugs => why?
+          }
+        }
       }
-      if (nodeName !== 'BUTTON'
-        && nodeName !== 'RESET'
-        && nodeName !== 'SUBMIT'
-        && nodeName !== 'SELECT') {
-        switch (type) {
-          case 'checkbox':
-            ctrl.disabled = true;
-            break;
-          case 'radio':
-            ctrl.disabled = true;
-            break;
-          default:
-            ctrl.readOnly = true;
+      if (skip === false) {
+        let nodeName = ctrl.nodeName;
+        const type = ctrl.getAttribute('type');
+        if (nodeName === 'INPUT' && type !== null) {
+          nodeName = type.toUpperCase();
+        }
+        if (nodeName !== 'BUTTON'
+          && nodeName !== 'RESET'
+          && nodeName !== 'SUBMIT'
+          && nodeName !== 'SELECT') {
+          switch (type) {
+            case 'checkbox':
+              ctrl.disabled = true;
+              break;
+            case 'radio':
+              ctrl.disabled = true;
+              break;
+            default:
+              ctrl.readOnly = true;
+          }
+        } else {
+          ctrl.disabled = true;
         }
-      } else {
-        ctrl.disabled = true;
       }
     }
   }

package/src/index.ts

@@ -137,6 +137,13 @@ export const CurrencyInput = (props: InputProps) => {
   return React.createElement("input", { className: props.className, onBlur: onBlur, type: props.type, name: props.name, onChange: props.onChange ? props.onChange : onChange , disabled: props.disabled, "data-field": props['data-field'], min: props.min, max: props.max, value: state });
 };
 export type OnClick = React.MouseEvent<HTMLElement, MouseEvent>;
+export function getParam(url: string, i?: number): string {
+  const ps = url.split('/');
+  if (!i || i < 0) {
+    i = 0;
+  }
+  return ps[ps.length - 1 - i];
+}
 export function formatDate(date: Date | null | undefined, format: string): string {
   if (!date) {
     return '';

package/src/input.ts

@@ -1,4 +1,4 @@
-import {DiffStatusConfig, EditStatusConfig, LoadingService, Locale, ResourceService, UIService} from './core';
+import {LoadingService, Locale, ResourceService, UIService} from './core';
 
 interface ResourceInput {
   resource: ResourceService;
@@ -75,6 +75,7 @@ export function getErrorFunc(p: ResourceService|ShowErrorInput, showErr?: (m: st
   }
   return (p as any).showError;
 }
+/*
 export interface EditStatusParameter {
   status?: EditStatusConfig;
 }
@@ -93,3 +94,4 @@ export function getDiffStatusFunc(p: ResourceService|DiffStatusParameter, status
   }
   return (p as any).status;
 }
+*/

package/src/useEdit.ts

@@ -1,15 +1,15 @@
 import {useEffect, useState} from 'react';
 import {useNavigate, useParams} from 'react-router';
-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} from './edit';
-import {focusFirstError, readOnly as setReadOnly} from './formutil';
+import {Attributes, buildId, ErrorMessage, getModelName as getModelName2, hideLoading, initForm, LoadingService, Locale, message, messageByHttpStatus, ResourceService, showLoading, UIService} from './core';
+import {build, createModel as createModel2, EditParameter, GenericService, handleVersion, initPropertyNullInModel} from './edit';
+import {focusFirstError, setReadOnly} from './formutil';
 import {DispatchWithCallback, useMergeState} from './merge';
 import {clone, makeDiff} from './reflect';
 import {localeOf} from './state';
 import {useUpdate} from './update';
 
 export interface BaseEditComponentParam<T, ID> {
-  status?: EditStatusConfig;
+  // status?: EditStatusConfig;
   backOnSuccess?: boolean;
   name?: string;
   metadata?: Attributes;
@@ -18,9 +18,9 @@ export interface BaseEditComponentParam<T, ID> {
   setBack?: boolean;
   patchable?: boolean;
 
-  addable?: boolean;
+  // addable?: boolean;
   readOnly?: boolean;
-  deletable?: boolean;
+  // deletable?: boolean;
 
   insertSuccessMsg?: string;
   updateSuccessMsg?: string;
@@ -171,7 +171,7 @@ export const useCoreEdit = <T, ID, S, P>(
     addable = true
   } = p; */
   const navigate = useNavigate();
-  const addable = (p && p.patchable !== false ? true : undefined);
+  // const addable = (p && p.patchable !== false ? true : undefined);
   const back = (event?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     if (event) {
       event.preventDefault();
@@ -193,7 +193,7 @@ export const useCoreEdit = <T, ID, S, P>(
   const [flag, setFlag] = useMergeState({
     newMode: false,
     setBack: false,
-    addable,
+    // addable,
     readOnly: p ? p.readOnly : undefined,
     originalModel: undefined
   });
@@ -258,7 +258,7 @@ export const useCoreEdit = <T, ID, S, P>(
   };
 
   const _onSave = (isBack?: boolean) => {
-    if (flag.newMode === true && flag.addable === false) {
+    if (flag.newMode === true) {
       const m = message(p1.resource.value, 'error_permission_add', 'error_permission');
       p1.showError(m.message, m.title);
       return;
@@ -388,23 +388,21 @@ export const useCoreEdit = <T, ID, S, P>(
     const x: any = r;
     const successMsg = p1.resource.value('msg_save_success');
     const newMod = flag.newMode;
-    const st = createEditStatus(p ? p.status : undefined);
+    // const st = createEditStatus(p ? p.status : undefined);
     if (Array.isArray(x)) {
       fail(x);
     } else if (!isNaN(x)) {
-      if (x === st.success) {
+      if (x > 0) {
         succeed(successMsg, origin, version, backOnSave);
       } else {
-        if (newMod && x === st.duplicate_key) {
+        if (newMod && x <= 0) {
           handleDuplicateKey();
-        } else if (!newMod && x === st.not_found) {
+        } else if (!newMod && x === 0) {
           handleNotFound();
-        } else if (!newMod && x === st.version_error) {
+        } else {
           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 {

package/src/useSearch.ts

@@ -61,10 +61,10 @@ export interface HookPropsSearchParameter<T, S extends Filter, ST extends Search
   initialize?: (ld: (s: S, auto?: boolean) => void, setState2: DispatchWithCallback<Partial<ST>>, com?: SearchComponentState<T, S>) => void;
 }
 export interface SearchComponentParam<T, M extends Filter> {
-  addable?: boolean;
-  editable?: boolean;
-  approvable?: boolean;
-  deletable?: boolean;
+  // addable?: boolean;
+  // editable?: boolean;
+  // approvable?: boolean;
+  // deletable?: boolean;
 
   keys?: string[];
   sequenceNo?: string;
@@ -134,11 +134,11 @@ export interface SearchComponentState<T, S> extends Pagination, Sortable {
   hideFilter?: boolean;
 
   ignoreUrlParam?: boolean;
-  viewable?: boolean;
-  addable?: boolean;
-  editable?: boolean;
-  approvable?: boolean;
-  deletable?: boolean;
+  // viewable?: boolean;
+  // addable?: boolean;
+  // editable?: boolean;
+  // approvable?: boolean;
+  // deletable?: boolean;
 }
 
 export function mergeParam<T, S extends Filter>(p?: SearchComponentParam<T, S>): SearchComponentParam<T, S> {
@@ -158,6 +158,7 @@ export function mergeParam<T, S extends Filter>(p?: SearchComponentParam<T, S>):
     if (p.hideFilter === undefined) {
       p.hideFilter = true;
     }
+    /*
     if (p.addable === undefined) {
       p.addable = true;
     }
@@ -170,6 +171,7 @@ export function mergeParam<T, S extends Filter>(p?: SearchComponentParam<T, S>):
     if (p.deletable === undefined) {
       p.deletable = true;
     }
+    */
     return p;
   } else {
     return {
@@ -178,10 +180,10 @@ export function mergeParam<T, S extends Filter>(p?: SearchComponentParam<T, S>):
       pageSizes,
       pageMaxSize: 7,
       hideFilter: true,
-      addable: true,
-      editable: true,
-      approvable: true,
-      deletable: true
+      // addable: true,
+      // editable: true,
+      // approvable: true,
+      // deletable: true
     };
   }
 }

package/src/useView.ts

@@ -1,7 +1,7 @@
 import {useEffect, useState} from 'react';
 import {useNavigate, useParams} from 'react-router';
 import {buildId, getModelName as getModelName2, hideLoading, initForm, LoadingService, Locale, message, messageByHttpStatus, ResourceService, showLoading, ViewParameter, ViewService} from './core';
-import {readOnly} from './formutil';
+import {setReadOnly} from './formutil';
 import {DispatchWithCallback, useMergeState} from './merge';
 
 export interface BaseViewComponentParam<T, ID> {
@@ -97,7 +97,7 @@ export const useCoreView = <T, ID, S>(
   const _handleNotFound = (form?: any): void => {
     const msg = message(p1.resource.value, 'error_not_found', 'error');
     if (form) {
-      readOnly(form);
+      setReadOnly(form);
     }
     p1.showError(msg.message, msg.title);
   };
@@ -132,7 +132,7 @@ export const useCoreView = <T, ID, S>(
           if (data && data.status) {
             msg = messageByHttpStatus(data.status, r.value);
           }
-          readOnly(refForm.current);
+          setReadOnly(refForm.current);
           p1.showError(msg, title);
         }
         setRunning(false);