react-hook-core 0.2.3 → 0.2.5

package/lib/index.js

@@ -123,7 +123,9 @@ function dateToString(date) {
 exports.dateToString = dateToString;
 ;
 function datetimeToString(date) {
-  if (date === void 0) { date = ""; }
+  if (!date || date === '') {
+    return undefined;
+  }
   var d2 = typeof date !== "string" ? date : new Date(date);
   var year = d2.getFullYear();
   var month = String(d2.getMonth() + 1).padStart(2, "0");

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

@@ -193,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) {

package/package.json

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

package/src/index.ts

@@ -172,7 +172,10 @@ export function dateToString(date: Date | string): string {
   const day = String(d2.getDate()).padStart(2, "0");
   return `${year}-${month}-${day}`;
 };
-export function datetimeToString(date: Date | string = ""): string {
+export function datetimeToString(date?: Date | string): string|undefined {
+  if (!date || date === '') {
+    return undefined;
+  }
   const d2 = typeof date !== "string" ? date : new Date(date);
   const year = d2.getFullYear();
   const month = String(d2.getMonth() + 1).padStart(2, "0");

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

@@ -272,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();