react-hook-core 0.2.0 → 0.2.2

package/lib/formutil.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-function readOnly(form) {
+function setReadOnly(form) {
+  var args = [];
+  for (var _i = 1; _i < arguments.length; _i++) {
+    args[_i - 1] = arguments[_i];
+  }
   if (!form) {
     return;
   }
@@ -8,34 +12,44 @@ function readOnly(form) {
   for (var i = 0; i < len; i++) {
     var ctrl = form[i];
     var name_1 = ctrl.getAttribute('name');
+    var skip = false;
     if (name_1 != null && name_1.length > 0 && name_1 !== 'btnBack') {
-      var nodeName = ctrl.nodeName;
-      var 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;
+      if (arguments.length > 1) {
+        for (var j = 1; j < arguments.length; j++) {
+          if (arguments[j] === name_1) {
+            skip = true;
+          }
         }
       }
-      else {
-        ctrl.disabled = true;
+      if (skip === false) {
+        var nodeName = ctrl.nodeName;
+        var 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;
+        }
       }
     }
   }
 }
-exports.readOnly = readOnly;
+exports.setReadOnly = setReadOnly;
 function focusFirstElement(form) {
   var i = 0;
   var len = form.length;

package/lib/index.js

@@ -17,7 +17,6 @@ __export(require("./update"));
 __export(require("./useSearch"));
 __export(require("./useMessage"));
 __export(require("./useEdit"));
-__export(require("./components"));
 __export(require("./search"));
 __export(require("./reflect"));
 __export(require("./com"));

package/lib/useEdit.js

@@ -100,12 +100,6 @@ exports.useEditOne = function (p) {
 };
 exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var navigate = react_router_1.useNavigate();
-  var back = function (event) {
-    if (event) {
-      event.preventDefault();
-    }
-    navigate(-1);
-  };
   var _a = react_1.useState(), running = _a[0], setRunning = _a[1];
   var getModelName = function (f) {
     if (p && p.name && p.name.length > 0) {
@@ -128,7 +122,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     setState(objSet);
     if (p && p.readOnly) {
       var f = refForm.current;
-      formutil_1.readOnly(f);
+      formutil_1.setReadOnly(f);
     }
   };
   var resetState = function (newMode, model, originalModel) {
@@ -138,7 +132,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var _handleNotFound = function (form) {
     var msg = core_1.message(p1.resource.value, 'error_404', 'error');
     if (form) {
-      formutil_1.readOnly(form);
+      formutil_1.setReadOnly(form);
     }
     p1.showError(msg.message, msg.title, undefined, function () { return window.history.back; });
   };
@@ -153,6 +147,31 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     }
   };
   var getModel = (p && p.getModel ? p.getModel : _getModel);
+  var back = function (event) {
+    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) {
+      navigate(-1);
+    }
+    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 () {
     var metadata = (p && p.metadata ? p.metadata : (service.metadata ? service.metadata() : undefined));
     if (metadata) {
@@ -418,7 +437,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
               msg = core_1.messageByHttpStatus(data.status, r.value);
             }
             if (data && (data.status === 401 || data.status === 403)) {
-              formutil_1.readOnly(refForm.current);
+              formutil_1.setReadOnly(refForm.current);
             }
             p1.showError(msg, title);
           }

package/lib/useView.js

@@ -1,14 +1,14 @@
 "use strict";
 var __assign = (this && this.__assign) || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-        t[p] = s[p];
-    }
-    return t;
-  };
-  return __assign.apply(this, arguments);
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
@@ -17,110 +17,110 @@ var core_1 = require("./core");
 var formutil_1 = require("./formutil");
 var merge_1 = require("./merge");
 exports.useViewOne = function (p) {
-  return exports.useCoreView(p.refForm, p.initialState, p.service, p, p);
+    return exports.useCoreView(p.refForm, p.initialState, p.service, p, p);
 };
 exports.useView = function (refForm, initialState, service, p1, p) {
-  var baseProps = exports.useCoreView(refForm, initialState, service, p1, p);
-  var _a = merge_1.useMergeState(initialState), setState = _a[1];
-  var params = react_router_1.useParams();
-  react_1.useEffect(function () {
-    if (baseProps.refForm) {
-      core_1.initForm(baseProps.refForm.current);
-    }
-    var id = core_1.buildId(params, p ? p.keys : undefined);
-    if (id) {
-      if (p && p.initialize) {
-        p.initialize(id, baseProps.load, setState, p.callback);
-      }
-      else {
-        baseProps.load(id, p ? p.callback : undefined);
-      }
-    }
-  }, []);
-  return __assign({}, baseProps);
+    var baseProps = exports.useCoreView(refForm, initialState, service, p1, p);
+    var _a = merge_1.useMergeState(initialState), setState = _a[1];
+    var params = react_router_1.useParams();
+    react_1.useEffect(function () {
+        if (baseProps.refForm) {
+            core_1.initForm(baseProps.refForm.current);
+        }
+        var id = core_1.buildId(params, p ? p.keys : undefined);
+        if (id) {
+            if (p && p.initialize) {
+                p.initialize(id, baseProps.load, setState, p.callback);
+            }
+            else {
+                baseProps.load(id, p ? p.callback : undefined);
+            }
+        }
+    }, []);
+    return __assign({}, baseProps);
 };
 exports.useCoreView = function (refForm, initialState, service, p1, p) {
-  var _a = merge_1.useMergeState(initialState), state = _a[0], setState = _a[1];
-  var _b = react_1.useState(), running = _b[0], setRunning = _b[1];
-  var navigate = react_router_1.useNavigate();
-  var back = function (event) {
-    if (event) {
-      event.preventDefault();
-    }
-    navigate(-1);
-  };
-  var getModelName = function (f) {
-    if (p && p.name) {
-      return p.name;
-    }
-    return core_1.getModelName(f, 'model');
-  };
-  var showModel = function (model) {
-    var n = getModelName(refForm.current);
-    var objSet = {};
-    objSet[n] = model;
-    setState(objSet);
-  };
-  var _handleNotFound = function (form) {
-    var msg = core_1.message(p1.resource.value, 'error_not_found', 'error');
-    if (form) {
-      formutil_1.readOnly(form);
-    }
-    p1.showError(msg.message, msg.title);
-  };
-  var handleNotFound = (p && p.handleNotFound ? p.handleNotFound : _handleNotFound);
-  var _load = function (_id, callback) {
-    var id = _id;
-    if (id != null && id !== '') {
-      setRunning(true);
-      core_1.showLoading(p1.loading);
-      var fn = (typeof service === 'function' ? service : service.load);
-      fn(id).then(function (obj) {
-        if (!obj) {
-          handleNotFound(refForm.current);
+    var _a = merge_1.useMergeState(initialState), state = _a[0], setState = _a[1];
+    var _b = react_1.useState(), running = _b[0], setRunning = _b[1];
+    var navigate = react_router_1.useNavigate();
+    var back = function (event) {
+        if (event) {
+            event.preventDefault();
         }
-        else {
-          if (callback) {
-            callback(obj, showModel);
-          }
-          else {
-            showModel(obj);
-          }
+        navigate(-1);
+    };
+    var getModelName = function (f) {
+        if (p && p.name) {
+            return p.name;
         }
-        setRunning(false);
-        core_1.hideLoading(p1.loading);
-      }).catch(function (err) {
-        var data = (err && err.response) ? err.response : err;
-        var r = p1.resource;
-        var title = r.value('error');
-        var msg = r.value('error_internal');
-        if (data && data.status === 404) {
-          handleNotFound(refForm.current);
+        return core_1.getModelName(f, 'model');
+    };
+    var showModel = function (model) {
+        var n = getModelName(refForm.current);
+        var objSet = {};
+        objSet[n] = model;
+        setState(objSet);
+    };
+    var _handleNotFound = function (form) {
+        var msg = core_1.message(p1.resource.value, 'error_not_found', 'error');
+        if (form) {
+            formutil_1.setReadOnly(form);
         }
-        else {
-          if (data && data.status) {
-            msg = core_1.messageByHttpStatus(data.status, r.value);
-          }
-          formutil_1.readOnly(refForm.current);
-          p1.showError(msg, title);
+        p1.showError(msg.message, msg.title);
+    };
+    var handleNotFound = (p && p.handleNotFound ? p.handleNotFound : _handleNotFound);
+    var _load = function (_id, callback) {
+        var id = _id;
+        if (id != null && id !== '') {
+            setRunning(true);
+            core_1.showLoading(p1.loading);
+            var fn = (typeof service === 'function' ? service : service.load);
+            fn(id).then(function (obj) {
+                if (!obj) {
+                    handleNotFound(refForm.current);
+                }
+                else {
+                    if (callback) {
+                        callback(obj, showModel);
+                    }
+                    else {
+                        showModel(obj);
+                    }
+                }
+                setRunning(false);
+                core_1.hideLoading(p1.loading);
+            }).catch(function (err) {
+                var data = (err && err.response) ? err.response : err;
+                var r = p1.resource;
+                var title = r.value('error');
+                var msg = r.value('error_internal');
+                if (data && data.status === 404) {
+                    handleNotFound(refForm.current);
+                }
+                else {
+                    if (data && data.status) {
+                        msg = core_1.messageByHttpStatus(data.status, r.value);
+                    }
+                    formutil_1.setReadOnly(refForm.current);
+                    p1.showError(msg, title);
+                }
+                setRunning(false);
+                core_1.hideLoading(p1.loading);
+            });
         }
-        setRunning(false);
-        core_1.hideLoading(p1.loading);
-      });
-    }
-  };
-  var load = (p && p.load ? p.load : _load);
-  return {
-    state: state,
-    setState: setState,
-    refForm: refForm,
-    resource: p1.resource.resource(),
-    running: running,
-    setRunning: setRunning,
-    showModel: showModel,
-    getModelName: getModelName,
-    handleNotFound: handleNotFound,
-    load: load,
-    back: back
-  };
+    };
+    var load = (p && p.load ? p.load : _load);
+    return {
+        state: state,
+        setState: setState,
+        refForm: refForm,
+        resource: p1.resource.resource(),
+        running: running,
+        setRunning: setRunning,
+        showModel: showModel,
+        getModelName: getModelName,
+        handleNotFound: handleNotFound,
+        load: load,
+        back: back
+    };
 };

package/package.json

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

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

@@ -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

@@ -2,7 +2,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 {focusFirstError, readOnly as setReadOnly} from './formutil';
+import {focusFirstError, setReadOnly} from './formutil';
 import {DispatchWithCallback, useMergeState} from './merge';
 import {clone, makeDiff} from './reflect';
 import {localeOf} from './state';
@@ -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,30 @@ 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();
+    }
+    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) {
+      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) {

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);