react-hook-core 0.2.2 → 0.2.4

package/lib/edit.js

@@ -90,21 +90,6 @@ function createModel(attributes) {
   return obj;
 }
 exports.createModel = createModel;
-function initPropertyNullInModel(obj, m) {
-  if (!m) {
-    var x = {};
-    return x;
-  }
-  var model = createModel(m);
-  for (var _i = 0, _a = Object.keys(model); _i < _a.length; _i++) {
-    var key = _a[_i];
-    if (obj && !obj.hasOwnProperty(key)) {
-      obj[key] = model[key];
-    }
-  }
-  return obj;
-}
-exports.initPropertyNullInModel = initPropertyNullInModel;
 function handleVersion(obj, version) {
   if (obj && version && version.length > 0) {
     var v = obj[version];

package/lib/route.js

@@ -50,7 +50,6 @@ function parseToModel(dest, src) {
   if (typeof dest !== 'object' || typeof src !== 'object') {
     return dest;
   }
-  dest = convertToObject(dest);
   for (var key in src) {
     if (!Object.hasOwn(dest, key))
       continue;
@@ -77,6 +76,11 @@ function parseToModel(dest, src) {
           dest[key] = parseInt(dest[key], 10);
         }
       }
+      else if (typeof src[key] === 'string') {
+        if (dest[key]) {
+          dest[key] = dest[key].toString();
+        }
+      }
     }
   }
   return dest;

package/lib/useEdit.js

@@ -151,25 +151,22 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     if (event) {
       event.preventDefault();
     }
-    var obj = getModel();
-    var metadata = (p && p.metadata ? p.metadata : (service.metadata ? service.metadata() : undefined));
-    var keys;
-    var version;
-    if (p && metadata && (!p.keys || !p.version)) {
-      var meta = edit_1.build(metadata);
-      keys = (p.keys ? p.keys : (meta ? meta.keys : undefined));
-      version = (p.version ? p.version : (meta ? meta.version : undefined));
-    }
-    var diffObj = reflect_1.makeDiff(edit_1.initPropertyNullInModel(flag.originalModel, metadata), obj, keys, version);
-    var objKeys = Object.keys(diffObj);
-    if (objKeys.length === 0) {
+    if (flag.newMode === true) {
       navigate(-1);
     }
     else {
-      var msg = core_1.message(p1.resource.value, 'msg_confirm_back', 'confirm', 'yes', 'no');
-      p1.confirm(msg.message, msg.title, function () {
+      var obj = getModel();
+      var diffObj = reflect_1.makeDiff(flag.originalModel, obj);
+      var objKeys = Object.keys(diffObj);
+      if (objKeys.length === 0) {
         navigate(-1);
-      }, msg.no, msg.yes);
+      }
+      else {
+        var msg = core_1.message(p1.resource.value, 'msg_confirm_back', 'confirm', 'yes', 'no');
+        p1.confirm(msg.message, msg.title, function () {
+          navigate(-1);
+        }, msg.no, msg.yes);
+      }
     }
   };
   var _createModel = function () {
@@ -196,15 +193,15 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     }
   };
   var _onSave = function (isBack) {
-    if (flag.newMode === true) {
-      var m = core_1.message(p1.resource.value, 'error_permission_add', 'error_permission');
-      p1.showError(m.message, m.title);
-      return;
-    }
-    else if (p && flag.newMode === false && p.readOnly) {
-      var msg = core_1.message(p1.resource.value, 'error_permission_edit', 'error_permission');
-      p1.showError(msg.message, msg.title);
-      return;
+    if (p && p.readOnly) {
+      if (flag.newMode === true) {
+        var m = core_1.message(p1.resource.value, 'error_permission_add', 'error_permission');
+        p1.showError(m.message, m.title);
+      }
+      else {
+        var msg = core_1.message(p1.resource.value, 'error_permission_edit', 'error_permission');
+        p1.showError(msg.message, msg.title);
+      }
     }
     else {
       if (running === true) {
@@ -228,7 +225,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         });
       }
       else {
-        var diffObj_1 = reflect_1.makeDiff(edit_1.initPropertyNullInModel(flag.originalModel, metadata), obj_1, keys, version_1);
+        var diffObj_1 = reflect_1.makeDiff(flag.originalModel, obj_1, keys, version_1);
         var objKeys = Object.keys(diffObj_1);
         if (objKeys.length === 0) {
           p1.showMessage(p1.resource.value('msg_no_change'));
@@ -382,16 +379,16 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     var patchable = (p ? p.patchable : true);
     if (flag.newMode === false) {
       if (service.patch && patchable !== false && body && Object.keys(body).length > 0) {
-        service.patch(body).then(function (result) {
-          postSave(result, obj, version, true, isBackO);
+        service.patch(body).then(function (res) {
+          postSave(res, obj, version, true, isBackO);
         }).catch(handleError);
       }
       else {
-        service.update(obj).then(function (result) { return postSave(result, obj, version, false, isBackO); }).catch(handleError);
+        service.update(obj).then(function (res) { return postSave(res, obj, version, false, isBackO); }).catch(handleError);
       }
     }
     else {
-      service.insert(obj).then(function (result) { return postSave(result, obj, version, false, isBackO); }).catch(handleError);
+      service.insert(obj).then(function (res) { return postSave(res, obj, version, false, isBackO); }).catch(handleError);
     }
   };
   var doSave = (p && p.doSave ? p.doSave : _doSave);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hook-core",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "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/route.ts

@@ -51,7 +51,6 @@ function parseToModel(dest: any, src: any) {
   if (typeof dest !== 'object' || typeof src !== 'object') {
     return dest;
   }
-  dest = convertToObject(dest)
   for (let key in src) {
     if (!Object.hasOwn(dest, key)) continue;
     if (src.hasOwnProperty(key)) {
@@ -69,9 +68,13 @@ function parseToModel(dest: any, src: any) {
       } else if (typeof src[key] === 'number') {
         if ( typeof dest[key] === 'string' && dest[key].indexOf(".") !== -1){
           dest[key] = parseFloat(dest[key]);
-        }else{
+        } else{
           dest[key] = parseInt(dest[key], 10);
         }
+      } else if (typeof src[key] === 'string') {
+        if (dest[key]) {
+          dest[key] = dest[key].toString();
+        }
       }
     }
   }

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';
@@ -231,24 +231,20 @@ export const useCoreEdit = <T, ID, S, P>(
     if (event) {
       event.preventDefault();
     }
-    const obj = getModel();
-    const metadata = (p && p.metadata ? p.metadata : (service.metadata ? service.metadata() : undefined));
-    let keys: string[]|undefined;
-    let version: string|undefined;
-    if (p && metadata && (!p.keys || !p.version)) {
-      const meta = build(metadata);
-      keys = (p.keys ? p.keys : (meta ? meta.keys : undefined));
-      version = (p.version ? p.version : (meta ? meta.version : undefined));
-    }
-    const diffObj = makeDiff(initPropertyNullInModel(flag.originalModel, metadata), obj, keys, version);
-    const objKeys = Object.keys(diffObj);
-    if (objKeys.length === 0) {
+    if (flag.newMode === true) {
       navigate(-1);
     } else {
-      const msg = message(p1.resource.value, 'msg_confirm_back', 'confirm', 'yes', 'no');
-      p1.confirm(msg.message, msg.title, () => {
+      const obj = getModel();
+      const diffObj = makeDiff(flag.originalModel, obj);
+      const objKeys = Object.keys(diffObj);
+      if (objKeys.length === 0) {
         navigate(-1);
-      }, msg.no, msg.yes);
+      } 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 => {
@@ -276,16 +272,16 @@ export const useCoreEdit = <T, ID, S, P>(
   };
 
   const _onSave = (isBack?: boolean) => {
-    if (flag.newMode === true) {
-      const m = message(p1.resource.value, 'error_permission_add', 'error_permission');
-      p1.showError(m.message, m.title);
-      return;
-    } else if (p && flag.newMode === false && p.readOnly) {
-      const msg = message(p1.resource.value, 'error_permission_edit', 'error_permission');
-      p1.showError(msg.message, msg.title);
-      return;
+    if (p && p.readOnly) {
+      if (flag.newMode === true) {
+        const m = message(p1.resource.value, 'error_permission_add', 'error_permission');
+        p1.showError(m.message, m.title);
+      } else {
+        const msg = message(p1.resource.value, 'error_permission_edit', 'error_permission');
+        p1.showError(msg.message, msg.title);
+      }
     } else {
-      if (running === true) {
+if (running === true) {
         return;
       }
       const obj = getModel();
@@ -305,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'));
@@ -453,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);
     }
   };
 
@@ -471,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 {
@@ -484,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');