react-hook-core 0.1.0 → 0.1.4

package/README.md

@@ -1 +1 @@
-# react-xone
+# react

package/lib/components.js

@@ -305,23 +305,18 @@ var BaseSearchComponent = (function (_super) {
     _this.ui = ui;
     _this.loading = loading;
     _this.listFormId = listFormId;
-    _this.initPageSize = 20;
-    _this.pageSize = 20;
+    _this.initPageSize = 24;
+    _this.pageSize = 24;
     _this.pageIndex = 1;
-    _this.itemTotal = 0;
-    _this.pageTotal = 0;
+    _this.total = 0;
+    _this.pages = 0;
     _this.sequenceNo = 'sequenceNo';
     _this.tmpPageIndex = 1;
     _this.pageMaxSize = 7;
-    _this.pageSizes = [10, 20, 40, 60, 100, 200, 400, 800];
+    _this.pageSizes = core_2.pageSizes;
     _this.viewable = true;
     _this.addable = true;
     _this.editable = true;
-    _this.add = function (event) {
-      event.preventDefault();
-      var url = _this.props['props'].match.url + '/add';
-      _this.props.history.push(url);
-    };
     _this.pageSizeOnClick = function () {
       _this.setState(function (prevState) { return ({ isPageSizeOpenDropDown: !prevState.isPageSizeOpenDropDown }); });
     };
@@ -332,11 +327,11 @@ var BaseSearchComponent = (function (_super) {
       _this.doSearch();
     };
     _this.resource = resourceService.resource();
+    _this.hideFilter = true;
     _this.getModelName = _this.getModelName.bind(_this);
     _this.showMessage = _this.showMessage.bind(_this);
     _this.toggleFilter = _this.toggleFilter.bind(_this);
     _this.load = _this.load.bind(_this);
-    _this.add = _this.add.bind(_this);
     _this.getSearchForm = _this.getSearchForm.bind(_this);
     _this.setSearchForm = _this.setSearchForm.bind(_this);
     _this.setFilter = _this.setFilter.bind(_this);
@@ -344,7 +339,7 @@ var BaseSearchComponent = (function (_super) {
     _this.getFields = _this.getFields.bind(_this);
     _this.pageSizeChanged = _this.pageSizeChanged.bind(_this);
     _this.clearQ = _this.clearQ.bind(_this);
-    _this.searchOnClick = _this.searchOnClick.bind(_this);
+    _this.search = _this.search.bind(_this);
     _this.resetAndSearch = _this.resetAndSearch.bind(_this);
     _this.doSearch = _this.doSearch.bind(_this);
     _this.call = _this.call.bind(_this);
@@ -355,14 +350,17 @@ var BaseSearchComponent = (function (_super) {
     _this.sort = _this.sort.bind(_this);
     _this.showMore = _this.showMore.bind(_this);
     _this.pageChanged = _this.pageChanged.bind(_this);
-    _this.url = (props.match ? props.match.url : props['props'].match.url);
+    var currentUrl = window.location.host + window.location.pathname;
+    _this.url = removeUrlParams(currentUrl);
     return _this;
   }
   BaseSearchComponent.prototype.getModelName = function () {
     return 'filter';
   };
   BaseSearchComponent.prototype.toggleFilter = function (event) {
-    this.hideFilter = !this.hideFilter;
+    var x = !this.hideFilter;
+    core_1.handleToggle(event.target, !x);
+    this.hideFilter = x;
   };
   BaseSearchComponent.prototype.load = function (s, autoSearch) {
     var obj2 = search_core_1.initFilter(s, this);
@@ -384,7 +382,10 @@ var BaseSearchComponent = (function (_super) {
     return this.form;
   };
   BaseSearchComponent.prototype.setFilter = function (filter) {
-    this.setState(filter);
+    var modelName = this.getModelName();
+    var objSet = {};
+    objSet[modelName] = filter;
+    this.setState(objSet);
   };
   BaseSearchComponent.prototype.getCurrencyCode = function () {
     return core_2.getCurrencyCode(this.form);
@@ -423,7 +424,7 @@ var BaseSearchComponent = (function (_super) {
       });
     }
   };
-  BaseSearchComponent.prototype.searchOnClick = function (event) {
+  BaseSearchComponent.prototype.search = function (event) {
     if (event) {
       event.preventDefault();
       if (!this.getSearchForm()) {
@@ -477,12 +478,12 @@ var BaseSearchComponent = (function (_super) {
     var results = sr.list;
     if (results && results.length > 0) {
       var lc = state_1.localeOf(undefined, this.getLocale);
-      search_core_1.formatResultsByComponent(results, com, lc);
+      search_core_1.formatResults(results, com.pageIndex, com.pageSize, com.pageSize, com.sequenceNo, com.format, lc);
     }
     var am = com.appendMode;
     com.pageIndex = (s.page && s.page >= 1 ? s.page : 1);
     if (sr.total) {
-      com.itemTotal = sr.total;
+      com.total = sr.total;
     }
     if (am) {
       var limit = s.limit;
@@ -560,8 +561,8 @@ var BaseSearchComponent = (function (_super) {
     this.doSearch();
   };
   BaseSearchComponent.prototype.pageChanged = function (data) {
-    var currentPage = data.currentPage, itemsPerPage = data.itemsPerPage;
-    search_core_1.changePage(this, currentPage, itemsPerPage);
+    var page = data.page, size = data.size;
+    search_core_1.changePage(this, page, size);
     this.doSearch();
   };
   return BaseSearchComponent;
@@ -571,19 +572,25 @@ var SearchComponent = (function (_super) {
   __extends(SearchComponent, _super);
   function SearchComponent(props, sv, param, showMessage, showError, getLocale, uis, loading, listFormId) {
     var _this = _super.call(this, props, input_1.getResource(param), input_1.getMsgFunc(param, showMessage), input_1.getLocaleFunc(param, getLocale), input_1.getUIService(param, uis), input_1.getLoadingFunc(param, loading), listFormId) || this;
+    _this.add = function (event) {
+      event.preventDefault();
+      var url = _this.url + '/add';
+      _this.props.history.push(url);
+    };
     _this.autoSearch = input_1.getAutoSearch(param);
     if (sv) {
       if (typeof sv === 'function') {
         var x = sv;
-        _this.search = x;
+        _this.service = x;
       }
       else {
-        _this.search = sv.search;
+        _this.service = sv.search;
         if (sv.keys) {
           _this.keys = sv.keys();
         }
       }
     }
+    _this.add = _this.add.bind(_this);
     _this.call = _this.call.bind(_this);
     _this.showError = input_1.getErrorFunc(param, showError);
     _this.componentDidMount = _this.componentDidMount.bind(_this);
@@ -630,8 +637,8 @@ var SearchComponent = (function (_super) {
     delete se['firstLimit'];
     core_1.showLoading(this.loading);
     var com = this;
-    if (this.search) {
-      this.search(s, limit, next, fields).then(function (sr) {
+    if (this.service) {
+      this.service(s, limit, next, fields).then(function (sr) {
         com.showResults(s, sr);
         com.running = undefined;
         core_1.hideLoading(com.loading);
@@ -659,7 +666,7 @@ var BaseEditComponent = (function (_super) {
     _this.backOnSuccess = true;
     _this.patchable = true;
     _this.addable = true;
-    _this.newOnClick = function (event) {
+    _this.create = function (event) {
       if (event) {
         event.preventDefault();
       }
@@ -676,7 +683,7 @@ var BaseEditComponent = (function (_super) {
         }, 100);
       }
     };
-    _this.saveOnClick = function (event) {
+    _this.save = function (event) {
       event.preventDefault();
       event.persist();
       if (!_this.form && event && event.target) {
@@ -704,11 +711,11 @@ var BaseEditComponent = (function (_super) {
     _this.showModel = _this.showModel.bind(_this);
     _this.getModel = _this.getModel.bind(_this);
     _this.createModel = _this.createModel.bind(_this);
-    _this.newOnClick = _this.newOnClick.bind(_this);
-    _this.saveOnClick = _this.saveOnClick.bind(_this);
+    _this.create = _this.create.bind(_this);
+    _this.save = _this.save.bind(_this);
     _this.onSave = _this.onSave.bind(_this);
     _this.validate = _this.validate.bind(_this);
-    _this.save = _this.save.bind(_this);
+    _this.doSave = _this.doSave.bind(_this);
     _this.succeed = _this.succeed.bind(_this);
     _this.fail = _this.fail.bind(_this);
     _this.postSave = _this.postSave.bind(_this);
@@ -788,7 +795,7 @@ var BaseEditComponent = (function (_super) {
         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.save(obj_1, obj_1, isBack);
+            com_2.doSave(obj_1, obj_1, isBack);
           }, msg.no, msg.yes);
         });
       }
@@ -802,7 +809,7 @@ var BaseEditComponent = (function (_super) {
           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.save(obj_1, diffObj_1, isBack);
+              com_2.doSave(obj_1, diffObj_1, isBack);
             }, msg.no, msg.yes);
           });
         }
@@ -820,7 +827,7 @@ var BaseEditComponent = (function (_super) {
       callback(obj);
     }
   };
-  BaseEditComponent.prototype.save = function (obj, dif, isBack) {
+  BaseEditComponent.prototype.doSave = function (obj, dif, isBack) {
   };
   BaseEditComponent.prototype.succeed = function (msg, isBack, result) {
     if (result) {
@@ -943,7 +950,7 @@ var EditComponent = (function (_super) {
       _this.keys = [];
     }
     _this.load = _this.load.bind(_this);
-    _this.save = _this.save.bind(_this);
+    _this.doSave = _this.doSave.bind(_this);
     _this.componentDidMount = _this.componentDidMount.bind(_this);
     _this.ref = React.createRef();
     return _this;
@@ -952,9 +959,7 @@ var EditComponent = (function (_super) {
     var k = (this.ui ? this.ui.registerEvents : undefined);
     this.form = core_2.initForm(this.ref.current, k);
     var id = core_2.buildId(this.props, this.keys);
-    if (id) {
-      this.load(id);
-    }
+    this.load(id);
   };
   EditComponent.prototype.load = function (_id, callback) {
     var _this = this;
@@ -1013,7 +1018,7 @@ var EditComponent = (function (_super) {
       }
     }
   };
-  EditComponent.prototype.save = function (obj, body, isBack) {
+  EditComponent.prototype.doSave = function (obj, body, isBack) {
     this.running = true;
     core_1.showLoading(this.loading);
     var isBackO = (isBack == null || isBack === undefined ? this.backOnSuccess : isBack);
@@ -1254,3 +1259,8 @@ var DiffApprComponent = (function (_super) {
   return DiffApprComponent;
 }(BaseDiffApprComponent));
 exports.DiffApprComponent = DiffApprComponent;
+function removeUrlParams(url) {
+  var startParams = url.indexOf('?');
+  return startParams !== -1 ? url.substring(0, startParams) : url;
+}
+exports.removeUrlParams = removeUrlParams;

package/lib/core.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var formutil_1 = require("./formutil");
+exports.pageSizes = [12, 24, 60, 100, 120, 180, 300, 600];
 function createEditStatus(status) {
   if (status) {
     return status;
@@ -268,3 +269,16 @@ function getDecodeFromForm(u, d) {
   return (u && u.ui ? u.ui.decodeFromForm : undefined);
 }
 exports.getDecodeFromForm = getDecodeFromForm;
+function handleToggle(target, on) {
+  if (target) {
+    if (on) {
+      if (!target.classList.contains('on')) {
+        target.classList.add('on');
+      }
+    }
+    else {
+      target.classList.remove('on');
+    }
+  }
+}
+exports.handleToggle = handleToggle;

package/lib/index.js

@@ -19,8 +19,39 @@ __export(require("./useView"));
 __export(require("./useEdit"));
 __export(require("./useSearch"));
 __export(require("./useMessage"));
+function checked(s, v) {
+  if (s) {
+    if (Array.isArray(s)) {
+      return s.includes(v);
+    }
+    else {
+      return s === v;
+    }
+  }
+  return false;
+}
+exports.checked = checked;
+function value(obj) {
+  return (obj ? obj : {});
+}
+exports.value = value;
 exports.withDefaultProps = function (Component) {
   return function (props) {
     return React.createElement(Component, { props: props, history: props.history });
   };
 };
+exports.Loading = function (props) {
+  var loadingStyle = {
+    top: '30%',
+    backgroundColor: 'white',
+    border: 'none',
+    'WebkitBoxShadow': 'none',
+    'boxShadow': 'none'
+  };
+  if (props.error) {
+    return React.createElement('div', null, 'Error Load Module!');
+  }
+  else {
+    return (React.createElement('div', { className: 'loader-wrapper' }, React.createElement('div', { className: 'loader-sign', style: loadingStyle }, React.createElement('div', { className: 'loader' }))));
+  }
+};

package/lib/useEdit.js

@@ -39,20 +39,20 @@ exports.useEditProps = function (props, refForm, initialState, service, p2, p) {
     var keys;
     if (p && !p.keys && service && service.metadata) {
       var metadata = (p.metadata ? p.metadata : service.metadata());
-      var meta = edit_1.build(metadata);
-      keys = (p.keys ? p.keys : (meta ? meta.keys : undefined));
-      var version = (p.version ? p.version : (meta ? meta.version : undefined));
-      p.keys = keys;
-      p.version = version;
+      if (metadata) {
+        var meta = edit_1.build(metadata);
+        keys = (p.keys ? p.keys : (meta ? meta.keys : undefined));
+        var version = (p.version ? p.version : (meta ? meta.version : undefined));
+        p.keys = keys;
+        p.version = version;
+      }
     }
     var id = core_1.buildId(props, keys);
-    if (id) {
-      if (p && p.initialize) {
-        p.initialize(id, baseProps.load, baseProps.setState, p.callback);
-      }
-      else {
-        baseProps.load(id, p ? p.callback : undefined);
-      }
+    if (p && p.initialize) {
+      p.initialize(id, baseProps.load, baseProps.setState, p.callback);
+    }
+    else {
+      baseProps.load(id, p ? p.callback : undefined);
     }
   }, []);
   return __assign({}, baseProps);
@@ -145,7 +145,7 @@ exports.useCoreEdit = function (props, refForm, initialState, service, p1, p) {
     }
   };
   var createModel = (p && p.createModel ? p.createModel : _createModel);
-  var newOnClick = function (event) {
+  var create = function (event) {
     event.preventDefault();
     var obj = createModel();
     resetState(true, obj, undefined);
@@ -184,7 +184,7 @@ exports.useCoreEdit = function (props, refForm, initialState, service, p1, p) {
         validate(obj_1, function () {
           var msg = core_1.message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
           p1.confirm(msg.message, msg.title, function () {
-            save(obj_1, undefined, version_1, isBack);
+            doSave(obj_1, undefined, version_1, isBack);
           }, msg.no, msg.yes);
         });
       }
@@ -198,7 +198,7 @@ exports.useCoreEdit = function (props, refForm, initialState, service, p1, p) {
           validate(obj_1, function () {
             var msg = core_1.message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
             p1.confirm(msg.message, msg.title, function () {
-              save(obj_1, diffObj_1, version_1, isBack);
+              doSave(obj_1, diffObj_1, version_1, isBack);
             }, msg.no, msg.yes);
           });
         }
@@ -206,7 +206,7 @@ exports.useCoreEdit = function (props, refForm, initialState, service, p1, p) {
     }
   };
   var onSave = (p && p.onSave ? p.onSave : _onSave);
-  var saveOnClick = function (event) {
+  var save = function (event) {
     event.preventDefault();
     event.persist();
     onSave();
@@ -319,7 +319,7 @@ exports.useCoreEdit = function (props, refForm, initialState, service, p1, p) {
     p1.showError(msg.message, msg.title);
   };
   var handleDuplicateKey = (p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey);
-  var _save = function (obj, body, version, isBack) {
+  var _doSave = function (obj, body, version, isBack) {
     setRunning(true);
     core_1.showLoading(p1.loading);
     var isBackO = (isBack == null || isBack === undefined ? true : isBack);
@@ -336,7 +336,7 @@ exports.useCoreEdit = function (props, refForm, initialState, service, p1, p) {
       service.insert(obj).then(function (result) { return postSave(obj, result, version, isBackO); });
     }
   };
-  var save = (p && p.save ? p.save : _save);
+  var doSave = (p && p.doSave ? p.doSave : _doSave);
   var _load = function (_id, callback) {
     var id = _id;
     if (id != null && id !== '') {
@@ -400,8 +400,7 @@ exports.useCoreEdit = function (props, refForm, initialState, service, p1, p) {
     getModelName: getModelName,
     resetState: resetState,
     handleNotFound: handleNotFound,
-    getModel: getModel, createNewModel: createModel, newOnClick: newOnClick,
-    saveOnClick: saveOnClick,
+    getModel: getModel, createNewModel: createModel, newOnClick: create, save: save,
     onSave: onSave,
     confirm: confirm,
     validate: validate, showMessage: p1.showMessage, succeed: succeed,
@@ -409,6 +408,6 @@ exports.useCoreEdit = function (props, refForm, initialState, service, p1, p) {
     postSave: postSave,
     handleDuplicateKey: handleDuplicateKey,
     load: load,
-    save: save
+    doSave: doSave
   });
 };