react-hook-core 0.0.1 → 0.1.3

package/lib/useMessage.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+exports.useMessage = function (initialState) {
+  var _a = React.useState(initialState), msg = _a[0], setMessage = _a[1];
+  var hideMessage = function () {
+    setMessage({ alertClass: '', message: '' });
+  };
+  var showMessage = function (ms) {
+    setMessage({ alertClass: 'alert alert-info', message: ms });
+  };
+  var showError = function (ms) {
+    if (typeof ms === 'string') {
+      setMessage({ alertClass: 'alert alert-error', message: ms });
+    }
+    else if (Array.isArray(ms) && ms.length > 0) {
+      setMessage({ alertClass: 'alert alert-error', message: ms[0].message });
+    }
+    else {
+      var x = JSON.stringify(ms);
+      setMessage({ alertClass: 'alert alert-error', message: x });
+    }
+  };
+  return { msg: msg, showError: showError, showMessage: showMessage, hideMessage: hideMessage };
+};

package/lib/useSearch.js

@@ -10,239 +10,122 @@ var __assign = (this && this.__assign) || function () {
   };
   return __assign.apply(this, arguments);
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-    function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-    function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-  var _ = { label: 0, sent: function () { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function () { return this; }), g;
-  function verb(n) { return function (v) { return step([n, v]); }; }
-  function step(op) {
-    if (f) throw new TypeError("Generator is already executing.");
-    while (_) try {
-      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-      if (y = 0, t) op = [op[0] & 2, t.value];
-      switch (op[0]) {
-        case 0: case 1: t = op; break;
-        case 4: _.label++; return { value: op[1], done: false };
-        case 5: _.label++; y = op[1]; op = [0]; continue;
-        case 7: op = _.ops.pop(); _.trys.pop(); continue;
-        default:
-          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-          if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-          if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-          if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-          if (t[2]) _.ops.pop();
-          _.trys.pop(); continue;
-      }
-      op = body.call(thisArg, _);
-    } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-    if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-  }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 var react_router_dom_1 = require("react-router-dom");
 var reflectx_1 = require("reflectx");
-var search_utilities_1 = require("search-utilities");
+var search_core_1 = require("search-core");
 var core_1 = require("./core");
 var merge_1 = require("./merge");
 var route_1 = require("./route");
+var state_1 = require("./state");
 var update_1 = require("./update");
 function prepareData(data) {
 }
 exports.callSearch = function (se, search3, showResults3, searchError3, lc, nextPageToken) {
-  return __awaiter(void 0, void 0, void 0, function () {
-    var s, page, offset, limit, next, fields, sr, err_1;
-    return __generator(this, function (_a) {
-      switch (_a.label) {
-        case 0:
-          _a.trys.push([0, 2, , 3]);
-          s = reflectx_1.clone(se);
-          page = se.page;
-          if (!page || page < 1) {
-            page = 1;
-          }
-          offset = void 0;
-          if (se.firstLimit && se.firstLimit > 0) {
-            offset = se.limit * (page - 2) + se.firstLimit;
-          }
-          else {
-            offset = se.limit * (page - 1);
-          }
-          limit = (page <= 1 && se.firstLimit && se.firstLimit > 0 ? se.firstLimit : se.limit);
-          next = (nextPageToken && nextPageToken.length > 0 ? nextPageToken : offset);
-          fields = se.fields;
-          delete se['page'];
-          delete se['fields'];
-          delete se['limit'];
-          delete se['firstLimit'];
-          return [4, search3(s, limit, next, fields)];
-        case 1:
-          sr = _a.sent();
-          showResults3(s, sr, lc);
-          return [3, 3];
-        case 2:
-          err_1 = _a.sent();
-          searchError3(err_1);
-          return [3, 3];
-        case 3: return [2];
-      }
-    });
-  });
+  var s = reflectx_1.clone(se);
+  var page = se.page;
+  if (!page || page < 1) {
+    page = 1;
+  }
+  var offset;
+  if (!se.limit || se.limit <= 0) {
+    se.limit = 24;
+  }
+  if (se.firstLimit && se.firstLimit > 0) {
+    offset = se.limit * (page - 2) + se.firstLimit;
+  }
+  else {
+    offset = se.limit * (page - 1);
+  }
+  var limit = (page <= 1 && se.firstLimit && se.firstLimit > 0 ? se.firstLimit : se.limit);
+  var next = (nextPageToken && nextPageToken.length > 0 ? nextPageToken : offset);
+  var fields = se.fields;
+  delete se['page'];
+  delete se['fields'];
+  delete se['limit'];
+  delete se['firstLimit'];
+  search3(s, limit, next, fields).then(function (sr) {
+    showResults3(s, sr, lc);
+  }).catch(function (err) { return searchError3(err); });
 };
 var appendListOfState = function (results, list, setState2) {
-  var arr = search_utilities_1.append(list, results);
+  var arr = search_core_1.append(list, results);
   setState2({ list: arr });
 };
 var setListOfState = function (list, setState2) {
   setState2({ list: list });
 };
-exports.pageSizes = [10, 20, 40, 60, 100, 200, 400, 800];
-function createSearchComponentState(p, p2) {
-  var p3 = {
-    model: {},
-    pageIndex: p.pageIndex,
-    pageSize: p.pageSize,
-    initPageSize: p.initPageSize,
-    pageSizes: p.pageSizes,
-    appendMode: p.appendMode,
-    displayFields: p.displayFields,
-    pageMaxSize: (p.pageMaxSize && p.pageMaxSize > 0 ? p.pageMaxSize : 7)
-  };
-  if (p2) {
-    p3.viewable = p2.viewable;
-    p3.addable = p2.addable;
-    p3.editable = p2.editable;
-    p3.deletable = p2.deletable;
-    p3.approvable = p2.approvable;
-  }
-  else {
-    p3.viewable = true;
-    p3.addable = true;
-    p3.editable = true;
-  }
-  return p3;
-}
-function mergeParam(p, ui, loading) {
-  if (!p.sequenceNo) {
-    p.sequenceNo = 'sequenceNo';
-  }
-  if (!p.pageIndex || p.pageIndex < 1) {
-    p.pageIndex = 1;
-  }
-  if (!p.pageSize) {
-    p.pageSize = 20;
-  }
-  if (!p.initPageSize) {
-    p.initPageSize = p.pageSize;
-  }
-  if (!p.pageSizes) {
-    p.pageSizes = exports.pageSizes;
-  }
-  if (!p.pageMaxSize) {
-    p.pageMaxSize = 7;
-  }
-  if (ui) {
-    if (!p.decodeFromForm) {
-      p.decodeFromForm = ui.decodeFromForm;
-    }
-    if (!p.registerEvents) {
-      p.registerEvents = ui.registerEvents;
+function mergeParam(p) {
+  if (p) {
+    if (!p.sequenceNo) {
+      p.sequenceNo = 'sequenceNo';
     }
-    if (!p.validateForm) {
-      p.validateForm = ui.validateForm;
+    if (!p.pageSize) {
+      p.pageSize = 24;
     }
-    if (!p.removeFormError) {
-      p.removeFormError = ui.removeFormError;
+    if (!p.pageSizes) {
+      p.pageSizes = core_1.pageSizes;
     }
-    if (!p.removeError) {
-      p.removeError = ui.removeError;
+    if (!p.pageMaxSize || p.pageMaxSize <= 0) {
+      p.pageMaxSize = 7;
     }
+    return p;
   }
-  if (loading) {
-    if (!p.showLoading) {
-      p.showLoading = loading.showLoading;
-    }
-    if (!p.hideLoading) {
-      p.hideLoading = loading.hideLoading;
-    }
+  else {
+    return {
+      sequenceNo: 'sequenceNo',
+      pageSize: 24,
+      pageSizes: core_1.pageSizes,
+      pageMaxSize: 7
+    };
   }
 }
-exports.useSearch = function (refForm, initialState, search, p1, p2, p3) {
-  var baseProps = exports.useBaseSearchWithProps(null, refForm, initialState, search, p1, p2, p3);
+exports.useSearch = function (refForm, initialState, service, p2, p) {
+  var baseProps = exports.useCoreSearch(undefined, refForm, initialState, service, p2, p);
   react_1.useEffect(function () {
     var load = baseProps.load, setState = baseProps.setState, component = baseProps.component;
     if (refForm) {
-      var registerEvents = (p2.ui ? p2.ui.registerEvents : null);
+      var registerEvents = (p2.ui ? p2.ui.registerEvents : undefined);
       core_1.initForm(refForm.current, registerEvents);
     }
-    if (p1.initialize) {
-      p1.initialize(load, setState, component);
-    }
-    else {
-      var se = (p1.createSearchModel ? p1.createSearchModel() : null);
-      var s = search_utilities_1.mergeSearchModel(route_1.buildFromUrl(), se, component.pageSizes);
-      load(s, p2.auto);
-    }
-  }, []);
-  return __assign({}, baseProps);
-};
-exports.useSearchOneWithProps = function (p) {
-  var baseProps = exports.useBaseSearchOne(p);
-  react_1.useEffect(function () {
-    var load = baseProps.load, setState = baseProps.setState, component = baseProps.component;
-    if (p.refForm) {
-      core_1.initForm(p.refForm.current, p.registerEvents);
-    }
-    if (p.initialize) {
+    if (p && p.initialize) {
       p.initialize(load, setState, component);
     }
     else {
-      var se = (p.createSearchModel ? p.createSearchModel() : null);
-      var s = search_utilities_1.mergeSearchModel(route_1.buildFromUrl(), se, component.pageSizes);
-      load(s, p.autoSearch);
+      var se = (p && p.createFilter ? p.createFilter() : undefined);
+      var s = search_core_1.mergeFilter(route_1.buildFromUrl(), se, component.pageSizes);
+      load(s, p2.auto);
     }
   }, []);
   return __assign({}, baseProps);
 };
-exports.useBaseSearchOne = function (p, p2) {
-  return exports.useBaseSearchWithProps(p.props, p.refForm, p.initialState, p.search, p, p, p2);
+exports.useSearchOneProps = function (p) {
+  return exports.useSearch(p.refForm, p.initialState, p.service, p, p);
 };
-exports.useBaseSearch = function (refForm, initialState, search, p1, p2, p3) {
-  return exports.useBaseSearchWithProps(null, refForm, initialState, search, p1, p2, p3);
+exports.useSearchOne = function (p) {
+  return exports.useCoreSearch(undefined, p.refForm, p.initialState, p.service, p, p);
 };
-exports.useBaseSearchWithProps = function (props, refForm, initialState, search, p1, p2, p3) {
-  mergeParam(p1, p2.ui, p2.loading);
-  var _a = react_1.useState(undefined), running = _a[0], setRunning = _a[1];
+exports.useCoreSearch = function (props, refForm, initialState, service, p1, p2) {
+  var p = mergeParam(p2);
+  var _a = react_1.useState(), running = _a[0], setRunning = _a[1];
   var _getModelName = function () {
-    if (p1.name && p1.name.length > 0) {
-      return p1.name;
-    }
-    else {
-      return 'model';
-    }
+    return core_1.getName('filter', p && p.name ? p.name : undefined);
   };
-  var getModelName = (p1.getModelName ? p1.getModelName : _getModelName);
-  var baseProps = (props ? update_1.useUpdateWithProps(props, initialState, p2.getLocale, p1.removeError, getModelName, p1.prepareCustomData) : update_1.useUpdate(initialState, p2.getLocale, p1.removeError, getModelName));
+  var getModelName = (p && p.getModelName ? p.getModelName : _getModelName);
+  var baseProps = (props ? update_1.useUpdateWithProps(props, initialState, getModelName, p1.getLocale, core_1.getRemoveError(p1), p ? p.prepareCustomData : undefined) : update_1.useUpdate(initialState, getModelName, p1.getLocale, core_1.getRemoveError(p1)));
   var state = baseProps.state, setState = baseProps.setState;
   var _b = [react_router_dom_1.useHistory(), react_router_dom_1.useRouteMatch()], history = _b[0], match = _b[1];
   var _getCurrencyCode = function () {
     return refForm && refForm.current ? refForm.current.getAttribute('currency-code') : null;
   };
-  var getCurrencyCode = p1.getCurrencyCode ? p1.getCurrencyCode : _getCurrencyCode;
-  var prepareCustomData = (p1.prepareCustomData ? p1.prepareCustomData : prepareData);
+  var getCurrencyCode = p && p.getCurrencyCode ? p.getCurrencyCode : _getCurrencyCode;
+  var prepareCustomData = (p && p.prepareCustomData ? p.prepareCustomData : prepareData);
   var updateDateState = function (name, value) {
     var _a, _b, _c, _d, _e, _f, _g;
     var modelName = getModelName();
     var currentState = state[modelName];
-    if (props.setGlobalState) {
+    if (props && props.setGlobalState) {
       var data = props.shouldBeCustomized ? prepareCustomData((_a = {}, _a[name] = value, _a)) : (_b = {}, _b[name] = value, _b);
       props.setGlobalState((_c = {}, _c[modelName] = __assign(__assign({}, currentState), data), _c));
     }
@@ -251,7 +134,6 @@ exports.useBaseSearchWithProps = function (props, refForm, initialState, search,
     }
     setState((_f = {}, _f[modelName] = __assign(__assign({}, currentState), (_g = {}, _g[name] = value, _g)), _f));
   };
-  var p = createSearchComponentState(p1, p3);
   var _c = merge_1.useMergeState(p), component = _c[0], setComponent = _c[1];
   var toggleFilter = function (event) {
     setComponent({ hideFilter: !component.hideFilter });
@@ -261,42 +143,42 @@ exports.useBaseSearchWithProps = function (props, refForm, initialState, search,
     history.push(match.url + '/add');
   };
   var _getFields = function () {
-    var displayFields = component.displayFields, initFields = component.initFields;
-    var fs = search_utilities_1.getDisplayFieldsFromForm(displayFields, initFields, refForm.current);
-    setComponent({ displayFields: fs, initFields: true });
+    var fields = component.fields, initFields = component.initFields;
+    var fs = search_core_1.getFieldsFromForm(fields, initFields, refForm.current);
+    setComponent({ fields: fs, initFields: true });
     return fs;
   };
-  var getFields = p1.getFields ? p1.getFields : _getFields;
-  var getSearchModel = function (se) {
+  var getFields = p && p.getFields ? p.getFields : _getFields;
+  var getFilter = function (se) {
     if (!se) {
       se = component;
     }
-    var keys = p1.keys;
-    if (!keys && typeof search !== 'function') {
-      keys = search.keys();
+    var keys = p && p.keys ? p.keys : undefined;
+    if (!keys && typeof service !== 'function' && service.keys) {
+      keys = service.keys();
     }
     var n = getModelName();
-    var fs = p1.displayFields;
+    var fs = p && p.fields;
     if (!fs || fs.length <= 0) {
       fs = getFields();
     }
-    var lc = p2.getLocale();
+    var lc = (p1.getLocale ? p1.getLocale() : state_1.enLocale);
     var cc = getCurrencyCode();
-    var obj3 = search_utilities_1.getModel(state, n, se, fs, se.excluding, keys, se.list, refForm.current, p1.decodeFromForm, lc, cc);
+    var obj3 = search_core_1.getModel(state, n, se, fs, se.excluding, keys, se.list, refForm.current, core_1.getDecodeFromForm(p1), lc, cc);
     return obj3;
   };
-  var _setSearchModel = function (s) {
+  var _setFilter = function (s) {
     var objSet = {};
     var n = getModelName();
     objSet[n] = s;
     setState(objSet);
   };
-  var setSearchModel = p1.setSearchModel ? p1.setSearchModel : _setSearchModel;
+  var setFilter = p && p.setFilter ? p.setFilter : _setFilter;
   var _load = function (s, auto) {
     var com = Object.assign({}, component);
-    var obj2 = search_utilities_1.initSearchable(s, com);
+    var obj2 = search_core_1.initFilter(s, com);
     setComponent(com);
-    setSearchModel(obj2);
+    setFilter(obj2);
     var runSearch = doSearch;
     if (auto) {
       setTimeout(function () {
@@ -304,38 +186,33 @@ exports.useBaseSearchWithProps = function (props, refForm, initialState, search,
       }, 0);
     }
   };
-  var load = p1.load ? p1.load : _load;
+  var load = p && p.load ? p.load : _load;
   var doSearch = function (se, isFirstLoad) {
-    var f = refForm.current;
-    if (f && p1.removeFormError) {
-      p1.removeFormError(f);
-    }
-    var s = getSearchModel(se);
+    core_1.removeFormError(p1, refForm.current);
+    var s = getFilter(se);
     var isStillRunning = running;
     validateSearch(s, function () {
       if (isStillRunning === true) {
         return;
       }
       setRunning(true);
-      if (p1.showLoading) {
-        p1.showLoading();
+      core_1.showLoading(p1.loading);
+      if (p && !p.ignoreUrlParam) {
+        search_core_1.addParametersIntoUrl(s, isFirstLoad);
       }
-      if (!p1.ignoreUrlParam) {
-        search_utilities_1.addParametersIntoUrl(s, isFirstLoad);
-      }
-      var lc = p2.getLocale();
-      if (typeof search === 'function') {
-        exports.callSearch(s, search, showResults, searchError, lc, se.nextPageToken);
+      var lc = p1.getLocale ? p1.getLocale() : state_1.enLocale;
+      if (typeof service === 'function') {
+        exports.callSearch(s, service, showResults, searchError, lc, se.nextPageToken);
       }
       else {
-        exports.callSearch(s, search.search, showResults, searchError, lc, se.nextPageToken);
+        exports.callSearch(s, service.search, showResults, searchError, lc, se.nextPageToken);
       }
     });
   };
   var _validateSearch = function (se, callback) {
-    search_utilities_1.validate(se, callback, refForm.current, p2.getLocale(), p1.validateForm);
+    search_core_1.validate(se, callback, refForm.current, (p1.getLocale ? p1.getLocale() : undefined), core_1.getValidateForm(p1));
   };
-  var validateSearch = p1.validateSearch ? p1.validateSearch : _validateSearch;
+  var validateSearch = p && p.validateSearch ? p.validateSearch : _validateSearch;
   var pageSizeChanged = function (event) {
     var size = parseInt(event.currentTarget.value, 10);
     component.pageSize = size;
@@ -348,7 +225,7 @@ exports.useBaseSearchWithProps = function (props, refForm, initialState, search,
     });
     doSearch(component);
   };
-  var clearKeyworkOnClick = function (event) {
+  var clearQ = function (event) {
     var n = getModelName();
     if (n && n.length > 0) {
       var m = state[n];
@@ -361,7 +238,7 @@ exports.useBaseSearchWithProps = function (props, refForm, initialState, search,
       }
     }
   };
-  var searchOnClick = function (event) {
+  var search = function (event) {
     if (event) {
       event.preventDefault();
     }
@@ -371,7 +248,7 @@ exports.useBaseSearchWithProps = function (props, refForm, initialState, search,
     event.preventDefault();
     if (event && event.target) {
       var target = event.target;
-      var s = search_utilities_1.handleSort(target, component.sortTarget, component.sortField, component.sortType);
+      var s = search_core_1.handleSort(target, component.sortTarget, component.sortField, component.sortType);
       setComponent({
         sortField: s.field,
         sortType: s.type,
@@ -388,46 +265,59 @@ exports.useBaseSearchWithProps = function (props, refForm, initialState, search,
       resetAndSearch();
     }
   };
+  var changeView = function (event, view) {
+    if (view && view.length > 0) {
+      setComponent({ view: view });
+    }
+    else if (event && event.target) {
+      var target = event.target;
+      var v = target.getAttribute('data-view');
+      if (v && v.length > 0) {
+        setComponent({ view: v });
+      }
+    }
+  };
   var resetAndSearch = function () {
     if (running === true) {
       setComponent({ pageIndex: 1, triggerSearch: true });
       return;
     }
     setComponent({ pageIndex: 1, tmpPageIndex: 1 });
-    search_utilities_1.removeSortStatus(component.sortTarget);
+    search_core_1.removeSortStatus(component.sortTarget);
     setComponent({
-      sortTarget: null,
-      sortField: null,
+      sortTarget: undefined,
+      sortField: undefined,
       append: false,
       pageIndex: 1
     });
-    component.sortTarget = null;
-    component.sortField = null;
+    component.sortTarget = undefined;
+    component.sortField = undefined;
     component.append = false;
     component.pageIndex = 1;
     doSearch(component);
   };
   var searchError = function (err) {
     setComponent({ pageIndex: component.tmpPageIndex });
-    core_1.error(err, p2.resource.value, p2.showError);
+    core_1.error(err, p1.resource.value, p1.showError);
   };
-  var appendList = (p1.appendList ? p1.appendList : appendListOfState);
-  var setList = (p1.setList ? p1.setList : setListOfState);
+  var appendList = (p && p.appendList ? p.appendList : appendListOfState);
+  var setList = (p && p.setList ? p.setList : setListOfState);
   var _showResults = function (s, sr, lc) {
     var results = sr.list;
     if (results && results.length > 0) {
-      search_utilities_1.formatResults(results, component.pageIndex, component.pageSize, component.initPageSize, p1.sequenceNo, p1.format, lc);
+      debugger;
+      search_core_1.formatResults(results, component.pageIndex, component.pageSize, component.pageSize, p ? p.sequenceNo : undefined, p ? p.format : undefined, lc);
     }
     var am = component.appendMode;
     var pi = (s.page && s.page >= 1 ? s.page : 1);
-    setComponent({ itemTotal: sr.total, pageIndex: pi, nextPageToken: sr.nextPageToken });
+    setComponent({ total: sr.total, pageIndex: pi, nextPageToken: sr.nextPageToken });
     if (am) {
       var limit = s.limit;
-      if (s.page <= 1 && s.firstLimit && s.firstLimit > 0) {
+      if ((!s.page || s.page <= 1) && s.firstLimit && s.firstLimit > 0) {
         limit = s.firstLimit;
       }
-      search_utilities_1.handleAppend(component, limit, sr.list, sr.nextPageToken);
-      if (component.append && s.page > 1) {
+      search_core_1.handleAppend(component, sr.list, limit, sr.nextPageToken);
+      if (component.append && (s.page && s.page > 1)) {
         appendList(results, component.list, setState);
       }
       else {
@@ -435,25 +325,25 @@ exports.useBaseSearchWithProps = function (props, refForm, initialState, search,
       }
     }
     else {
-      search_utilities_1.showPaging(component, s.limit, sr.list, sr.total);
+      search_core_1.showPaging(component, sr.list, s.limit, sr.total);
       setList(results, setState);
       setComponent({ tmpPageIndex: s.page });
-      var m1 = search_utilities_1.buildSearchMessage(p2.resource, s.page, s.limit, sr.list, sr.total);
-      p2.showMessage(m1);
+      if (s.limit) {
+        var m1 = search_core_1.buildMessage(p1.resource, s.page, s.limit, sr.list, sr.total);
+        p1.showMessage(m1);
+      }
     }
     setRunning(false);
-    if (p1.hideLoading) {
-      p1.hideLoading();
-    }
+    core_1.hideLoading(p1.loading);
     if (component.triggerSearch) {
       setComponent({ triggerSearch: false });
       resetAndSearch();
     }
   };
-  var showResults = (p1.showResults ? p1.showResults : _showResults);
+  var showResults = (p && p.showResults ? p.showResults : _showResults);
   var showMore = function (event) {
     event.preventDefault();
-    var n = component.pageIndex + 1;
+    var n = component.pageIndex ? component.pageIndex + 1 : 2;
     var m = component.pageIndex;
     setComponent({ tmpPageIndex: m, pageIndex: n, append: true });
     component.tmpPageIndex = m;
@@ -462,10 +352,10 @@ exports.useBaseSearchWithProps = function (props, refForm, initialState, search,
     doSearch(component);
   };
   var pageChanged = function (data) {
-    var currentPage = data.currentPage, itemsPerPage = data.itemsPerPage;
-    setComponent({ pageIndex: currentPage, pageSize: itemsPerPage, append: false });
-    component.pageIndex = currentPage;
-    component.pageSize = itemsPerPage;
+    var page = data.page, size = data.size;
+    setComponent({ pageIndex: page, pageSize: size, append: false });
+    component.pageIndex = page;
+    component.pageSize = size;
     component.append = false;
     doSearch(component);
   };
@@ -473,19 +363,16 @@ exports.useBaseSearchWithProps = function (props, refForm, initialState, search,
     running: running,
     setRunning: setRunning,
     getCurrencyCode: getCurrencyCode,
-    updateDateState: updateDateState, resource: p2.resource.resource(), setComponent: setComponent,
-    component: component, showMessage: p2.showMessage, load: load,
-    add: add,
-    searchOnClick: searchOnClick,
-    sort: sort,
+    updateDateState: updateDateState, resource: p1.resource.resource(), setComponent: setComponent,
+    component: component, showMessage: p1.showMessage, load: load,
+    add: add, searchOnClick: search, sort: sort,
+    changeView: changeView,
     showMore: showMore,
     toggleFilter: toggleFilter,
     doSearch: doSearch,
     pageChanged: pageChanged,
-    pageSizeChanged: pageSizeChanged,
-    clearKeyworkOnClick: clearKeyworkOnClick,
-    showResults: showResults,
+    pageSizeChanged: pageSizeChanged, clearKeyworkOnClick: clearQ, showResults: showResults,
     getFields: getFields,
-    getModelName: getModelName, format: p1.format
+    getModelName: getModelName, format: p ? p.format : undefined
   });
 };