react-hook-core 0.1.3 → 0.1.6

package/README.md

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

package/lib/components.js

@@ -25,15 +25,15 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
-var reflectx_1 = require("reflectx");
-var search_core_1 = require("search-core");
 var core_1 = require("./core");
 var core_2 = require("./core");
 var diff_1 = require("./diff");
 var edit_1 = require("./edit");
 var formutil_1 = require("./formutil");
 var input_1 = require("./input");
+var reflect_1 = require("./reflect");
 var route_1 = require("./route");
+var search_1 = require("./search");
 var state_1 = require("./state");
 var ViewComponent = (function (_super) {
   __extends(ViewComponent, _super);
@@ -62,7 +62,6 @@ var ViewComponent = (function (_super) {
         }
       }
     }
-    _this.back = _this.back.bind(_this);
     _this.getModelName = _this.getModelName.bind(_this);
     _this.load = _this.load.bind(_this);
     _this.getModel = _this.getModel.bind(_this);
@@ -70,12 +69,6 @@ var ViewComponent = (function (_super) {
     _this.ref = React.createRef();
     return _this;
   }
-  ViewComponent.prototype.back = function (event) {
-    if (event) {
-      event.preventDefault();
-    }
-    this.props.history.goBack();
-  };
   ViewComponent.prototype.getModelName = function () {
     if (this.name && this.name.length > 0) {
       return this.name;
@@ -88,13 +81,6 @@ var ViewComponent = (function (_super) {
       return n;
     }
   };
-  ViewComponent.prototype.componentDidMount = function () {
-    this.form = this.ref.current;
-    var id = core_2.buildId(this.props, this.keys);
-    if (id) {
-      this.load(id);
-    }
-  };
   ViewComponent.prototype.load = function (_id, callback) {
     var id = _id;
     if (id != null && id !== '' && this.loadData) {
@@ -322,11 +308,12 @@ var BaseSearchComponent = (function (_super) {
     };
     _this.pageSizeChanged = function (event) {
       var size = parseInt(event.currentTarget.value, 10);
-      search_core_1.changePageSize(_this, size);
+      search_1.changePageSize(_this, size);
       _this.tmpPageIndex = 1;
       _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);
@@ -357,10 +344,12 @@ var BaseSearchComponent = (function (_super) {
     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);
+    var obj2 = search_1.initFilter(s, this);
     this.setFilter(obj2);
     var com = this;
     if (autoSearch) {
@@ -401,11 +390,11 @@ var BaseSearchComponent = (function (_super) {
     var l = this.getList();
     var f = this.getSearchForm();
     var dc = (this.ui ? this.ui.decodeFromForm : undefined);
-    var obj3 = search_core_1.getModel(this.state, name, this, fields, this.excluding, this.keys, l, f, dc, lc, cc);
+    var obj3 = search_1.getModel(this.state, name, this, fields, this.excluding, this.keys, l, f, dc, lc, cc);
     return obj3;
   };
   BaseSearchComponent.prototype.getFields = function () {
-    var fs = search_core_1.getFieldsFromForm(this.fields, this.initFields, this.form);
+    var fs = search_1.getFieldsFromForm(this.fields, this.initFields, this.form);
     this.initFields = true;
     return fs;
   };
@@ -439,7 +428,7 @@ var BaseSearchComponent = (function (_super) {
       this.triggerSearch = true;
       return;
     }
-    search_core_1.reset(this);
+    search_1.reset(this);
     this.tmpPageIndex = 1;
     this.doSearch();
   };
@@ -458,7 +447,7 @@ var BaseSearchComponent = (function (_super) {
       com.running = true;
       core_1.showLoading(_this.loading);
       if (!_this.ignoreUrlParam) {
-        search_core_1.addParametersIntoUrl(s, isFirstLoad);
+        search_1.addParametersIntoUrl(s, isFirstLoad);
       }
       com.call(s);
     });
@@ -468,14 +457,14 @@ var BaseSearchComponent = (function (_super) {
   BaseSearchComponent.prototype.validateSearch = function (se, callback) {
     var u = this.ui;
     var vl = (u ? u.validateForm : undefined);
-    search_core_1.validate(se, callback, this.getSearchForm(), state_1.localeOf(undefined, this.getLocale), vl);
+    search_1.validate(se, callback, this.getSearchForm(), state_1.localeOf(undefined, this.getLocale), vl);
   };
   BaseSearchComponent.prototype.showResults = function (s, sr) {
     var com = this;
     var results = sr.list;
     if (results && results.length > 0) {
       var lc = state_1.localeOf(undefined, this.getLocale);
-      search_core_1.formatResults(results, com.pageIndex, com.pageSize, com.pageSize, com.sequenceNo, com.format, lc);
+      search_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);
@@ -488,7 +477,7 @@ var BaseSearchComponent = (function (_super) {
         limit = s.firstLimit;
       }
       com.nextPageToken = sr.nextPageToken;
-      search_core_1.handleAppend(com, sr.list, limit, sr.nextPageToken);
+      search_1.handleAppend(com, sr.list, limit, sr.nextPageToken);
       if (com.append && (s.page && s.page > 1)) {
         com.appendList(results);
       }
@@ -497,11 +486,11 @@ var BaseSearchComponent = (function (_super) {
       }
     }
     else {
-      search_core_1.showPaging(com, sr.list, s.limit, sr.total);
+      search_1.showPaging(com, sr.list, s.limit, sr.total);
       com.setList(results);
       com.tmpPageIndex = s.page;
       if (s.limit) {
-        this.showMessage(search_core_1.buildMessage(this.resourceService, s.page, s.limit, sr.list, sr.total));
+        this.showMessage(search_1.buildMessage(this.resourceService, s.page, s.limit, sr.list, sr.total));
       }
     }
     com.running = undefined;
@@ -514,7 +503,7 @@ var BaseSearchComponent = (function (_super) {
   BaseSearchComponent.prototype.appendList = function (results) {
     var _a;
     var list = this.state.list;
-    var arr = search_core_1.append(list, results);
+    var arr = search_1.append(list, results);
     var listForm = this.getSearchForm();
     var props = this.props;
     var setGlobalState = props.props.setGlobalState;
@@ -543,7 +532,7 @@ var BaseSearchComponent = (function (_super) {
   };
   BaseSearchComponent.prototype.sort = function (event) {
     event.preventDefault();
-    search_core_1.handleSortEvent(event, this);
+    search_1.handleSortEvent(event, this);
     if (!this.appendMode) {
       this.doSearch();
     }
@@ -554,12 +543,12 @@ var BaseSearchComponent = (function (_super) {
   BaseSearchComponent.prototype.showMore = function (event) {
     event.preventDefault();
     this.tmpPageIndex = this.pageIndex;
-    search_core_1.more(this);
+    search_1.more(this);
     this.doSearch();
   };
   BaseSearchComponent.prototype.pageChanged = function (data) {
     var page = data.page, size = data.size;
-    search_core_1.changePage(this, page, size);
+    search_1.changePage(this, page, size);
     this.doSearch();
   };
   return BaseSearchComponent;
@@ -569,11 +558,6 @@ 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') {
@@ -587,7 +571,6 @@ var SearchComponent = (function (_super) {
         }
       }
     }
-    _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);
@@ -603,7 +586,7 @@ var SearchComponent = (function (_super) {
     this.load(s, this.autoSearch);
   };
   SearchComponent.prototype.mergeFilter = function (obj, b, arrs) {
-    return search_core_1.mergeFilter(obj, b, this.pageSizes, arrs);
+    return search_1.mergeFilter(obj, b, this.pageSizes, arrs);
   };
   SearchComponent.prototype.createFilter = function () {
     var s = {};
@@ -611,7 +594,7 @@ var SearchComponent = (function (_super) {
   };
   SearchComponent.prototype.call = function (se) {
     this.running = true;
-    var s = reflectx_1.clone(se);
+    var s = reflect_1.clone(se);
     var page = this.pageIndex;
     if (!page || page < 1) {
       page = 1;
@@ -723,7 +706,6 @@ var BaseEditComponent = (function (_super) {
     if (event) {
       event.preventDefault();
     }
-    this.props.history.goBack();
   };
   BaseEditComponent.prototype.resetState = function (newMod, model, originalModel) {
     this.newMode = newMod;
@@ -797,7 +779,7 @@ var BaseEditComponent = (function (_super) {
         });
       }
       else {
-        var diffObj_1 = reflectx_1.makeDiff(edit_1.initPropertyNullInModel(this.orginalModel, this.metadata), obj_1, this.keys, this.version);
+        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'));
@@ -831,7 +813,7 @@ var BaseEditComponent = (function (_super) {
       var model = result.value;
       this.newMode = false;
       if (model && this.setBack) {
-        this.resetState(false, model, reflectx_1.clone(model));
+        this.resetState(false, model, reflect_1.clone(model));
       }
       else {
         edit_1.handleVersion(this.getModel(), this.version);
@@ -948,18 +930,9 @@ var EditComponent = (function (_super) {
     }
     _this.load = _this.load.bind(_this);
     _this.doSave = _this.doSave.bind(_this);
-    _this.componentDidMount = _this.componentDidMount.bind(_this);
     _this.ref = React.createRef();
     return _this;
   }
-  EditComponent.prototype.componentDidMount = function () {
-    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);
-    }
-  };
   EditComponent.prototype.load = function (_id, callback) {
     var _this = this;
     var id = _id;
@@ -973,7 +946,7 @@ var EditComponent = (function (_super) {
         }
         else {
           com_3.newMode = false;
-          com_3.orginalModel = reflectx_1.clone(obj);
+          com_3.orginalModel = reflect_1.clone(obj);
           if (!callback) {
             com_3.showModel(obj);
           }
@@ -1055,7 +1028,6 @@ var BaseDiffApprComponent = (function (_super) {
     _this.resource = resourceService.resource();
     _this.showMessage = _this.showMessage.bind(_this);
     _this.showError = _this.showError.bind(_this);
-    _this.back = _this.back.bind(_this);
     _this.initModel = _this.initModel.bind(_this);
     _this.postApprove = _this.postApprove.bind(_this);
     _this.postReject = _this.postReject.bind(_this);
@@ -1067,12 +1039,6 @@ var BaseDiffApprComponent = (function (_super) {
     };
     return _this;
   }
-  BaseDiffApprComponent.prototype.back = function (event) {
-    if (event) {
-      event.preventDefault();
-    }
-    this.props.history.goBack();
-  };
   BaseDiffApprComponent.prototype.initModel = function () {
     var x = {};
     return x;
@@ -1117,7 +1083,7 @@ var BaseDiffApprComponent = (function (_super) {
     var p = this.props;
     var diffModel = p['diffModel'];
     if (diffModel) {
-      var differentKeys_1 = reflectx_1.diff(diffModel.origin, diffModel.value);
+      var differentKeys_1 = reflect_1.diff(diffModel.origin, diffModel.value);
       var dataFields = diff_1.getDataFields(this.form);
       dataFields.forEach(function (e) {
         var x = e.getAttribute('data-field');
@@ -1136,7 +1102,7 @@ var BaseDiffApprComponent = (function (_super) {
     }
     else {
       var _a = this.state, origin_1 = _a.origin, value = _a.value;
-      var differentKeys_2 = reflectx_1.diff(origin_1, value);
+      var differentKeys_2 = reflect_1.diff(origin_1, value);
       var dataFields = diff_1.getDataFields(this.form);
       dataFields.forEach(function (e) {
         var x = e.getAttribute('data-field');
@@ -1178,13 +1144,6 @@ var DiffApprComponent = (function (_super) {
     };
     return _this;
   }
-  DiffApprComponent.prototype.componentDidMount = function () {
-    this.form = this.ref.current;
-    var id = core_2.buildId(this.props, this.keys);
-    if (id) {
-      this.load(id);
-    }
-  };
   DiffApprComponent.prototype.formatFields = function (value) {
     return value;
   };

package/lib/core.js

@@ -33,7 +33,7 @@ exports.createDiffStatus = createDiffStatus;
 var resource = (function () {
   function resource() {
   }
-  resource.phone = / |\-|\.|\(|\)/g;
+  resource.phone = / |-|\.|\(|\)/g;
   resource._cache = {};
   resource.cache = true;
   return resource;
@@ -107,26 +107,21 @@ function buildKeys(attributes) {
   return ps;
 }
 exports.buildKeys = buildKeys;
-function buildId(props, keys) {
-  if (!props) {
-    return null;
-  }
-  var sp = (props.match ? props : props['props']);
+function buildId(p, keys) {
   if (!keys || keys.length === 0 || keys.length === 1) {
     if (keys && keys.length === 1) {
-      var x = sp.match.params[keys[0]];
-      if (x && x !== '') {
-        return x;
+      if (p[keys[0]]) {
+        return p[keys[0]];
       }
     }
-    return sp.match.params['id'];
+    return p['id'];
   }
   var id = {};
   for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
     var key = keys_1[_i];
-    var v = sp.match.params[key];
+    var v = p[key];
     if (!v) {
-      v = sp[key];
+      v = p[key];
       if (!v) {
         return null;
       }
@@ -269,3 +264,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/diff.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var reflectx_1 = require("reflectx");
+var reflect_1 = require("./reflect");
 function formatDiffModel(obj, formatFields) {
   if (!obj) {
     return obj;
   }
-  var obj2 = reflectx_1.clone(obj);
+  var obj2 = reflect_1.clone(obj);
   if (!obj2.origin) {
     obj2.origin = {};
   }

package/lib/formutil.js

@@ -80,7 +80,7 @@ function focusFirstError(form, className) {
       var ctrl = form[i];
       var parent_1 = ctrl.parentElement;
       if (ctrl.classList.contains(className)
-        || parent_1 && parent_1.classList.contains(className)) {
+        || (parent_1 && parent_1.classList.contains(className))) {
         ctrl.focus();
         ctrl.scrollIntoView();
         return;
@@ -93,7 +93,7 @@ function focusFirstError(form, className) {
       var parent_2 = ctrl.parentElement;
       if (ctrl.classList.contains('invalid')
         || ctrl.classList.contains('.ng-invalid')
-        || parent_2 && parent_2.classList.contains('invalid')) {
+        || (parent_2 && parent_2.classList.contains('invalid'))) {
         ctrl.focus();
         ctrl.scrollIntoView();
         return;

package/lib/index.js

@@ -10,20 +10,32 @@ __export(require("./core"));
 __export(require("./state"));
 __export(require("./edit"));
 __export(require("./route"));
-__export(require("./components"));
 __export(require("./diff"));
-__export(require("./router"));
 __export(require("./merge"));
 __export(require("./update"));
-__export(require("./useView"));
-__export(require("./useEdit"));
 __export(require("./useSearch"));
 __export(require("./useMessage"));
-exports.withDefaultProps = function (Component) {
-  return function (props) {
-    return React.createElement(Component, { props: props, history: props.history });
-  };
-};
+__export(require("./useEdit"));
+__export(require("./components"));
+__export(require("./search"));
+__export(require("./reflect"));
+var core_1 = require("./core");
+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.Loading = function (props) {
   var loadingStyle = {
     top: '30%',
@@ -39,3 +51,10 @@ exports.Loading = function (props) {
     return (React.createElement('div', { className: 'loader-wrapper' }, React.createElement('div', { className: 'loader-sign', style: loadingStyle }, React.createElement('div', { className: 'loader' }))));
   }
 };
+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, defaultValue: p.size, onChange: p.onChange }, opts);
+}
+exports.PageSizeSelect = PageSizeSelect;