react-hook-core 0.2.1 → 0.2.3

package/package.json

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

package/src/edit.ts

@@ -116,7 +116,7 @@ export function createModel<T>(attributes?: Attributes): T {
   }
   return obj;
 }
-
+/*
 export function initPropertyNullInModel<T>(obj: T, m?: Attributes): T {
   if (!m) {
     const x: any = {};
@@ -130,7 +130,6 @@ export function initPropertyNullInModel<T>(obj: T, m?: Attributes): T {
   }
   return obj;
 }
-/*
 export function handleStatus(x: number|string, st: EditStatusConfig, gv: (k: string, p?: any) => string, se: (m: string, title?: string, detail?: string, callback?: () => void) => void): void {
   const title = gv('error');
   if (x === st.version_error) {

package/src/index.ts

@@ -12,7 +12,6 @@ export * from './update';
 export * from './useSearch';
 export * from './useMessage';
 export * from './useEdit';
-export * from './components';
 export * from './search';
 export * from './reflect';
 export * from './com';

package/src/useEdit.ts

@@ -1,7 +1,7 @@
 import {useEffect, useState} from 'react';
 import {useNavigate, useParams} from 'react-router';
 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 {build, createModel as createModel2, EditParameter, GenericService, handleVersion} from './edit';
 import {focusFirstError, setReadOnly} from './formutil';
 import {DispatchWithCallback, useMergeState} from './merge';
 import {clone, makeDiff} from './reflect';
@@ -172,12 +172,6 @@ export const useCoreEdit = <T, ID, S, P>(
   } = p; */
   const navigate = useNavigate();
   // const addable = (p && p.patchable !== false ? true : undefined);
-  const back = (event?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
-    if (event) {
-      event.preventDefault();
-    }
-    navigate(-1);
-  };
 
   const [running, setRunning] = useState<boolean>();
 
@@ -233,6 +227,26 @@ export const useCoreEdit = <T, ID, S, P>(
   };
   const getModel = (p && p.getModel ? p.getModel : _getModel);
 
+  const back = (event?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
+    if (event) {
+      event.preventDefault();
+    }
+    if (flag.newMode === true) {
+      navigate(-1);
+    } else {
+      const obj = getModel();
+      const diffObj = makeDiff(flag.originalModel, obj);
+      const objKeys = Object.keys(diffObj);
+      if (objKeys.length === 0) {
+        navigate(-1);
+      } else {
+        const msg = message(p1.resource.value, 'msg_confirm_back', 'confirm', 'yes', 'no');
+        p1.confirm(msg.message, msg.title, () => {
+          navigate(-1);
+        }, msg.no, msg.yes);
+      }
+    }
+  };
   const _createModel = (): T => {
     const metadata = (p && p.metadata ? p.metadata : (service.metadata ? service.metadata() : undefined));
     if (metadata) {
@@ -287,7 +301,7 @@ export const useCoreEdit = <T, ID, S, P>(
           }, msg.no, msg.yes);
         });
       } else {
-        const diffObj = makeDiff(initPropertyNullInModel(flag.originalModel, metadata), obj, keys, version);
+        const diffObj = makeDiff(flag.originalModel, obj, keys, version);
         const objKeys = Object.keys(diffObj);
         if (objKeys.length === 0) {
           p1.showMessage(p1.resource.value('msg_no_change'));
@@ -435,14 +449,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(result, obj, version, true, isBackO);
+        service.patch(body).then((res: number|T|ErrorMessage[]) => {
+          postSave(res, obj, version, true, isBackO);
         }).catch(handleError);
       } else {
-        service.update(obj).then(result => postSave(result, obj, version, false, isBackO)).catch(handleError);
+        service.update(obj).then((res: number|T|ErrorMessage[]) => postSave(res, obj, version, false, isBackO)).catch(handleError);
       }
     } else {
-      service.insert(obj).then(result => postSave(result, obj, version, false, isBackO)).catch(handleError);
+      service.insert(obj).then((res: number|T|ErrorMessage[]) => postSave(res, obj, version, false, isBackO)).catch(handleError);
     }
   };
 
@@ -453,7 +467,7 @@ export const useCoreEdit = <T, ID, S, P>(
     if (id != null && id !== '') {
       setRunning(true);
       showLoading(p1.loading);
-      service.load(id).then(obj => {
+      service.load(id).then((obj: T|null) => {
         if (!obj) {
           handleNotFound(refForm.current);
         } else {
@@ -466,7 +480,7 @@ export const useCoreEdit = <T, ID, S, P>(
         }
         setRunning(false);
         hideLoading(p1.loading);
-      }).catch(err => {
+      }).catch((err: any) => {
         const data = (err &&  err.response) ? err.response : err;
         const r = p1.resource;
         const title = r.value('error');