react-hook-core 0.2.0 → 0.2.1

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 }); });
     };
@@ -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();
@@ -714,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);
   };
@@ -736,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);
       }
     });
   };
@@ -753,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) {
@@ -937,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 {
@@ -1142,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/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;