react-hook-core 0.1.25 → 0.2.1

package/lib/com.js

@@ -6,7 +6,7 @@ function PageSizeSelect(p) {
   var g = p.sizes;
   var s = (!g || g.length === 0 ? core_1.pageSizes : g);
   var opts = s.map(function (pgSize) { return React.createElement('option', { key: pgSize, value: pgSize }, pgSize); });
-  return React.createElement('select', { id: p.id, name: p.name, value: p.size, defaultValue: p.size, onChange: p.onChange }, opts);
+  return React.createElement('select', { id: p.id, name: p.name, defaultValue: p.size, onChange: p.onChange }, opts);
 }
 exports.PageSizeSelect = PageSizeSelect;
 function Search(p) {

package/lib/components.js

@@ -117,7 +117,7 @@ var ViewComponent = (function (_super) {
   ViewComponent.prototype.handleNotFound = function (form) {
     var msg = core_2.message(this.resourceService.value, 'error_not_found', 'error');
     if (form) {
-      formutil_1.readOnly(form);
+      formutil_1.setReadOnly(form);
     }
     this.showError(msg.message, msg.title);
   };
@@ -300,9 +300,6 @@ var BaseSearchComponent = (function (_super) {
     _this.tmpPageIndex = 1;
     _this.pageMaxSize = 7;
     _this.pageSizes = core_2.pageSizes;
-    _this.viewable = true;
-    _this.addable = true;
-    _this.editable = true;
     _this.pageSizeOnClick = function () {
       _this.setState(function (prevState) { return ({ isPageSizeOpenDropDown: !prevState.isPageSizeOpenDropDown }); });
     };
@@ -635,7 +632,7 @@ var SearchComponent = (function (_super) {
 exports.SearchComponent = SearchComponent;
 var BaseEditComponent = (function (_super) {
   __extends(BaseEditComponent, _super);
-  function BaseEditComponent(props, resourceService, showMessage, showError, confirm, getLocale, ui, loading, status, patchable, backOnSaveSuccess) {
+  function BaseEditComponent(props, resourceService, showMessage, showError, confirm, getLocale, ui, loading, patchable, backOnSaveSuccess) {
     var _this = _super.call(this, props, getLocale, (ui ? ui.removeError : undefined)) || this;
     _this.resourceService = resourceService;
     _this.showMessage = showMessage;
@@ -645,7 +642,6 @@ var BaseEditComponent = (function (_super) {
     _this.loading = loading;
     _this.backOnSuccess = true;
     _this.patchable = true;
-    _this.addable = true;
     _this.create = function (event) {
       if (event) {
         event.preventDefault();
@@ -672,7 +668,6 @@ var BaseEditComponent = (function (_super) {
       _this.onSave(_this.backOnSuccess);
     };
     _this.resource = resourceService.resource();
-    _this.status = core_1.createEditStatus(status);
     if (patchable === false) {
       _this.patchable = patchable;
     }
@@ -715,7 +710,7 @@ var BaseEditComponent = (function (_super) {
   BaseEditComponent.prototype.handleNotFound = function (form) {
     var msg = core_2.message(this.resourceService.value, 'error_not_found', 'error');
     if (form) {
-      formutil_1.readOnly(form);
+      formutil_1.setReadOnly(form);
     }
     this.showError(msg.message, msg.title);
   };
@@ -737,7 +732,7 @@ var BaseEditComponent = (function (_super) {
     objSet[modelName] = model;
     this.setState(objSet, function () {
       if (_this.readOnly) {
-        formutil_1.readOnly(f);
+        formutil_1.setReadOnly(f);
       }
     });
   };
@@ -754,45 +749,33 @@ var BaseEditComponent = (function (_super) {
   BaseEditComponent.prototype.onSave = function (isBack) {
     var _this = this;
     var r = this.resourceService;
-    if (this.newMode && !this.addable) {
-      var m = core_2.message(r.value, 'error_permission_add', 'error_permission');
-      this.showError(m.message, m.title);
+    if (this.running) {
       return;
     }
-    else if (!this.newMode && this.readOnly) {
-      var msg = core_2.message(r.value, 'error_permission_edit', 'error_permission');
-      this.showError(msg.message, msg.title);
-      return;
+    var com = this;
+    var obj = com.getModel();
+    if (this.newMode) {
+      com.validate(obj, function () {
+        var msg = core_2.message(r.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
+        _this.confirm(msg.message, msg.title, function () {
+          com.doSave(obj, obj, isBack);
+        }, msg.no, msg.yes);
+      });
     }
     else {
-      if (this.running) {
-        return;
+      var diffObj_1 = reflect_1.makeDiff(edit_1.initPropertyNullInModel(this.orginalModel, this.metadata), obj, this.keys, this.version);
+      var keys = Object.keys(diffObj_1);
+      if (keys.length === 0) {
+        this.showMessage(r.value('msg_no_change'));
       }
-      var com_2 = this;
-      var obj_1 = com_2.getModel();
-      if (this.newMode) {
-        com_2.validate(obj_1, function () {
+      else {
+        com.validate(obj, function () {
           var msg = core_2.message(r.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
           _this.confirm(msg.message, msg.title, function () {
-            com_2.doSave(obj_1, obj_1, isBack);
+            com.doSave(obj, diffObj_1, isBack);
           }, msg.no, msg.yes);
         });
       }
-      else {
-        var diffObj_1 = reflect_1.makeDiff(edit_1.initPropertyNullInModel(this.orginalModel, this.metadata), obj_1, this.keys, this.version);
-        var keys = Object.keys(diffObj_1);
-        if (keys.length === 0) {
-          this.showMessage(r.value('msg_no_change'));
-        }
-        else {
-          com_2.validate(obj_1, function () {
-            var msg = core_2.message(r.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
-            _this.confirm(msg.message, msg.title, function () {
-              com_2.doSave(obj_1, diffObj_1, isBack);
-            }, msg.no, msg.yes);
-          });
-        }
-      }
     }
   };
   BaseEditComponent.prototype.validate = function (obj, callback) {
@@ -857,7 +840,6 @@ var BaseEditComponent = (function (_super) {
   BaseEditComponent.prototype.postSave = function (res, origin, isPatch, backOnSave) {
     this.running = false;
     core_1.hideLoading(this.loading);
-    var st = this.status;
     var newMod = this.newMode;
     var successMsg = (newMod ? this.insertSuccessMsg : this.updateSuccessMsg);
     var x = res;
@@ -866,18 +848,18 @@ var BaseEditComponent = (function (_super) {
       this.fail(x);
     }
     else if (!isNaN(x)) {
-      if (x === st.success) {
+      if (x > 0) {
         this.succeed(successMsg, origin, backOnSave);
       }
       else {
-        if (newMod && x === st.duplicate_key) {
+        if (newMod && x <= 0) {
           this.handleDuplicateKey();
         }
-        else if (!newMod && x === st.not_found) {
+        else if (!newMod && x === 0) {
           this.handleNotFound();
         }
         else {
-          edit_1.handleStatus(x, st, r.value, this.showError);
+          this.showError(r.value('error_version'), r.value('error'));
         }
       }
     }
@@ -907,8 +889,8 @@ var BaseEditComponent = (function (_super) {
 exports.BaseEditComponent = BaseEditComponent;
 var EditComponent = (function (_super) {
   __extends(EditComponent, _super);
-  function EditComponent(props, service, param, showMessage, showError, confirm, getLocale, uis, loading, status, patchable, backOnSaveSuccess) {
-    var _this = _super.call(this, props, input_1.getResource(param), input_1.getMsgFunc(param, showMessage), input_1.getErrorFunc(param, showError), input_1.getConfirmFunc(param, confirm), input_1.getLocaleFunc(param, getLocale), input_1.getUIService(param, uis), input_1.getLoadingFunc(param, loading), input_1.getEditStatusFunc(param, status), patchable, backOnSaveSuccess) || this;
+  function EditComponent(props, service, param, showMessage, showError, confirm, getLocale, uis, loading, patchable, backOnSaveSuccess) {
+    var _this = _super.call(this, props, input_1.getResource(param), input_1.getMsgFunc(param, showMessage), input_1.getErrorFunc(param, showError), input_1.getConfirmFunc(param, confirm), input_1.getLocaleFunc(param, getLocale), input_1.getUIService(param, uis), input_1.getLoadingFunc(param, loading), patchable, backOnSaveSuccess) || this;
     _this.service = service;
     if (service.metadata) {
       var metadata = service.metadata();
@@ -939,45 +921,45 @@ var EditComponent = (function (_super) {
     var _this = this;
     var id = _id;
     if (id != null && id !== '') {
-      var com_3 = this;
+      var com_2 = this;
       this.running = true;
-      core_1.showLoading(com_3.loading);
+      core_1.showLoading(com_2.loading);
       this.service.load(id).then(function (obj) {
         if (!obj) {
-          com_3.handleNotFound(_this.form);
+          com_2.handleNotFound(_this.form);
         }
         else {
-          com_3.newMode = false;
-          com_3.orginalModel = reflect_1.clone(obj);
+          com_2.newMode = false;
+          com_2.orginalModel = reflect_1.clone(obj);
           if (!callback) {
-            com_3.showModel(obj);
+            com_2.showModel(obj);
           }
           else {
-            callback(obj, com_3.showModel);
+            callback(obj, com_2.showModel);
           }
         }
-        com_3.running = false;
-        core_1.hideLoading(com_3.loading);
+        com_2.running = false;
+        core_1.hideLoading(com_2.loading);
       }).catch(function (err) {
         var data = (err && err.response) ? err.response : err;
-        var r = com_3.resourceService;
+        var r = com_2.resourceService;
         var gv = r.value;
         var title = gv('error');
         var msg = gv('error_internal');
         if (data && data.status === 404) {
-          com_3.handleNotFound(com_3.form);
+          com_2.handleNotFound(com_2.form);
         }
         else {
           if (data.status && !isNaN(data.status)) {
             msg = core_2.messageByHttpStatus(data.status, gv);
           }
           if (data && (data.status === 401 || data.status === 403)) {
-            formutil_1.readOnly(com_3.form);
+            formutil_1.setReadOnly(com_2.form);
           }
-          com_3.showError(msg, title);
+          com_2.showError(msg, title);
         }
-        com_3.running = false;
-        core_1.hideLoading(com_3.loading);
+        com_2.running = false;
+        core_1.hideLoading(com_2.loading);
       });
     }
     else {
@@ -1020,7 +1002,7 @@ var EditComponent = (function (_super) {
 exports.EditComponent = EditComponent;
 var BaseDiffApprComponent = (function (_super) {
   __extends(BaseDiffApprComponent, _super);
-  function BaseDiffApprComponent(props, keys, resourceService, showMessage, showError, loading, status) {
+  function BaseDiffApprComponent(props, keys, resourceService, showMessage, showError, loading) {
     var _this = _super.call(this, props) || this;
     _this.keys = keys;
     _this.resourceService = resourceService;
@@ -1035,7 +1017,6 @@ var BaseDiffApprComponent = (function (_super) {
     _this.postReject = _this.postReject.bind(_this);
     _this.format = _this.format.bind(_this);
     _this.handleNotFound = _this.handleNotFound.bind(_this);
-    _this.status = core_1.createDiffStatus(status);
     _this.state = {
       disabled: false
     };
@@ -1048,37 +1029,29 @@ var BaseDiffApprComponent = (function (_super) {
   BaseDiffApprComponent.prototype.postApprove = function (s, err) {
     this.setState({ disabled: true });
     var r = this.resourceService;
-    var st = this.status;
-    if (s === st.success) {
+    if (s > 0) {
       this.showMessage(r.value('msg_approve_success'));
     }
-    else if (s === st.version_error) {
-      var msg = core_2.message(r.value, 'msg_approve_version_error', 'error');
-      this.showError(msg.message, msg.title);
-    }
-    else if (s === st.not_found) {
+    else if (s === 0) {
       this.handleNotFound();
     }
     else {
-      core_2.error(err, r.value, this.showError);
+      var msg = core_2.message(r.value, 'msg_approve_version_error', 'error');
+      this.showError(msg.message, msg.title);
     }
   };
   BaseDiffApprComponent.prototype.postReject = function (status, err) {
     this.setState({ disabled: true });
     var r = this.resourceService;
-    var st = this.status;
-    if (status === st.success) {
+    if (status > 0) {
       this.showMessage(r.value('msg_reject_success'));
     }
-    else if (status === st.version_error) {
-      var msg = core_2.message(r.value, 'msg_approve_version_error', 'error');
-      this.showError(msg.message, msg.title);
-    }
-    else if (status === st.not_found) {
+    else if (status === 0) {
       this.handleNotFound();
     }
     else {
-      core_2.error(err, r.value, this.showError);
+      var msg = core_2.message(r.value, 'msg_approve_version_error', 'error');
+      this.showError(msg.message, msg.title);
     }
   };
   BaseDiffApprComponent.prototype.format = function () {
@@ -1132,8 +1105,8 @@ var BaseDiffApprComponent = (function (_super) {
 exports.BaseDiffApprComponent = BaseDiffApprComponent;
 var DiffApprComponent = (function (_super) {
   __extends(DiffApprComponent, _super);
-  function DiffApprComponent(props, service, param, showMessage, showError, loading, status) {
-    var _this = _super.call(this, props, service.keys(), input_1.getResource(param), input_1.getMsgFunc(param, showMessage), input_1.getErrorFunc(param, showError), input_1.getLoadingFunc(param, loading), input_1.getDiffStatusFunc(param, status)) || this;
+  function DiffApprComponent(props, service, param, showMessage, showError, loading) {
+    var _this = _super.call(this, props, service.keys(), input_1.getResource(param), input_1.getMsgFunc(param, showMessage), input_1.getErrorFunc(param, showError), input_1.getLoadingFunc(param, loading)) || this;
     _this.service = service;
     _this.approve = _this.approve.bind(_this);
     _this.reject = _this.reject.bind(_this);
@@ -1153,32 +1126,32 @@ var DiffApprComponent = (function (_super) {
     var id = _id;
     if (id != null && id !== '') {
       this.id = _id;
-      var com_4 = this;
+      var com_3 = this;
       this.running = true;
       core_1.showLoading(this.loading);
       this.service.diff(id).then(function (dobj) {
         if (!dobj) {
-          com_4.handleNotFound();
+          com_3.handleNotFound();
         }
         else {
-          var formatdDiff = diff_1.formatDiffModel(dobj, com_4.formatFields);
-          com_4.setState({
+          var formatdDiff = diff_1.formatDiffModel(dobj, com_3.formatFields);
+          com_3.setState({
             origin: formatdDiff.origin,
             value: formatdDiff.value
-          }, com_4.format);
+          }, com_3.format);
         }
-        com_4.running = false;
-        core_1.hideLoading(com_4.loading);
+        com_3.running = false;
+        core_1.hideLoading(com_3.loading);
       }).catch(function (err) {
         var data = (err && err.response) ? err.response : err;
         if (data && data.status === 404) {
-          com_4.handleNotFound();
+          com_3.handleNotFound();
         }
         else {
-          core_2.error(err, com_4.resourceService.value, com_4.showError);
+          core_2.error(err, com_3.resourceService.value, com_3.showError);
         }
-        com_4.running = false;
-        core_1.hideLoading(com_4.loading);
+        com_3.running = false;
+        core_1.hideLoading(com_3.loading);
       });
     }
   };

package/lib/core.js

@@ -3,34 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var formutil_1 = require("./formutil");
 exports.pageSizes = [12, 24, 60, 100, 120, 180, 300, 600];
 exports.size = exports.pageSizes;
-function createEditStatus(status) {
-  if (status) {
-    return status;
-  }
-  var s = {
-    duplicate_key: 0,
-    not_found: 0,
-    success: 1,
-    version_error: -1,
-    error: 2,
-    data_corrupt: 4
-  };
-  return s;
-}
-exports.createEditStatus = createEditStatus;
-function createDiffStatus(status) {
-  if (status) {
-    return status;
-  }
-  var s = {
-    not_found: 0,
-    success: 1,
-    version_error: 2,
-    error: 4
-  };
-  return s;
-}
-exports.createDiffStatus = createDiffStatus;
 var resource = (function () {
   function resource() {
   }

package/lib/edit.js

@@ -105,19 +105,6 @@ function initPropertyNullInModel(obj, m) {
   return obj;
 }
 exports.initPropertyNullInModel = initPropertyNullInModel;
-function handleStatus(x, st, gv, se) {
-  var title = gv('error');
-  if (x === st.version_error) {
-    se(gv('error_version'), title);
-  }
-  else if (x === st.data_corrupt) {
-    se(gv('error_data_corrupt'), title);
-  }
-  else {
-    se(gv('error_internal'), title);
-  }
-}
-exports.handleStatus = handleStatus;
 function handleVersion(obj, version) {
   if (obj && version && version.length > 0) {
     var v = obj[version];

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

@@ -82,6 +82,14 @@ exports.CurrencyInput = function (props) {
   };
   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 });
 };
+function getParam(url, i) {
+  var ps = url.split('/');
+  if (!i || i < 0) {
+    i = 0;
+  }
+  return ps[ps.length - 1 - i];
+}
+exports.getParam = getParam;
 function formatDate(date, format) {
   if (!date) {
     return '';

package/lib/input.js

@@ -60,17 +60,3 @@ function getErrorFunc(p, showErr) {
   return p.showError;
 }
 exports.getErrorFunc = getErrorFunc;
-function getEditStatusFunc(p, status) {
-  if (status) {
-    return status;
-  }
-  return p.status;
-}
-exports.getEditStatusFunc = getEditStatusFunc;
-function getDiffStatusFunc(p, status) {
-  if (status) {
-    return status;
-  }
-  return p.status;
-}
-exports.getDiffStatusFunc = getDiffStatusFunc;