react-hook-core 0.4.0 → 0.4.1

package/lib/search.js

@@ -83,31 +83,31 @@ function initFilter(m, com) {
     var page = parseInt(m.page, 10);
     m.page = page;
     if (page >= 1) {
-      com.pageIndex = page;
+      com.page = page;
     }
   }
   if (!isNaN(m.limit)) {
     var pageSize = parseInt(m.limit, 10);
     m.limit = pageSize;
     if (pageSize > 0) {
-      com.pageSize = pageSize;
+      com.limit = pageSize;
     }
   }
-  if (!m.limit && com.pageSize) {
-    m.limit = com.pageSize;
+  if (!m.limit && com.limit) {
+    m.limit = com.limit;
   }
   if (!isNaN(m.firstLimit)) {
     var initPageSize = parseInt(m.firstLimit, 10);
     if (initPageSize > 0) {
       m.firstLimit = initPageSize;
-      com.initPageSize = initPageSize;
+      com.initLimit = initPageSize;
     }
     else {
-      com.initPageSize = com.pageSize;
+      com.initLimit = com.limit;
     }
   }
   else {
-    com.initPageSize = com.pageSize;
+    com.initLimit = com.limit;
   }
   var st = m.sort;
   if (st && st.length > 0) {
@@ -126,11 +126,11 @@ function initFilter(m, com) {
 exports.initFilter = initFilter;
 function more(com) {
   com.append = true;
-  if (!com.pageIndex) {
-    com.pageIndex = 1;
+  if (!com.page) {
+    com.page = 1;
   }
   else {
-    com.pageIndex = com.pageIndex + 1;
+    com.page = com.page + 1;
   }
 }
 exports.more = more;
@@ -139,32 +139,32 @@ function reset(com) {
   com.sortTarget = undefined;
   com.sortField = undefined;
   com.append = false;
-  com.pageIndex = 1;
+  com.page = 1;
 }
 exports.reset = reset;
 function changePageSize(com, size) {
-  com.initPageSize = size;
-  com.pageSize = size;
-  com.pageIndex = 1;
+  com.initLimit = size;
+  com.limit = size;
+  com.page = 1;
 }
 exports.changePageSize = changePageSize;
 function changePage(com, pageIndex, pageSize) {
-  com.pageIndex = pageIndex;
-  com.pageSize = pageSize;
+  com.page = pageIndex;
+  com.limit = pageSize;
   com.append = false;
 }
 exports.changePage = changePage;
 function optimizeFilter(obj, searchable, fields) {
   obj.fields = fields;
-  if (searchable.pageIndex && searchable.pageIndex > 1) {
-    obj.page = searchable.pageIndex;
+  if (searchable.page && searchable.page > 1) {
+    obj.page = searchable.page;
   }
   else {
     delete obj.page;
   }
-  obj.limit = searchable.pageSize;
-  if (searchable.appendMode && searchable.initPageSize !== searchable.pageSize) {
-    obj.firstLimit = searchable.initPageSize;
+  obj.limit = searchable.limit;
+  if (searchable.appendMode && searchable.initLimit !== searchable.limit) {
+    obj.firstLimit = searchable.initLimit;
   }
   else {
     delete obj.firstLimit;
@@ -279,10 +279,10 @@ function getFields(form, arr) {
 }
 exports.getFields = getFields;
 function formatResultsByComponent(results, c, lc) {
-  formatResults(results, c.pageIndex, c.pageSize, c.pageSize, c.sequenceNo, c.format, lc);
+  formatResults(results, c.page, c.limit, c.limit, c.sequenceNo, c.format, lc);
 }
 exports.formatResultsByComponent = formatResultsByComponent;
-function formatResults(results, pageIndex, pageSize, initPageSize, sequenceNo, ft, lc) {
+function formatResults(results, page, limit, initPageSize, sequenceNo, ft, lc) {
   if (results && results.length > 0) {
     var hasSequencePro = false;
     if (ft) {
@@ -311,21 +311,21 @@ function formatResults(results, pageIndex, pageSize, initPageSize, sequenceNo, f
       }
     }
     if (sequenceNo && sequenceNo.length > 0 && !hasSequencePro) {
-      if (!pageIndex) {
-        pageIndex = 1;
+      if (!page) {
+        page = 1;
       }
-      if (pageSize) {
+      if (limit) {
         if (!initPageSize) {
-          initPageSize = pageSize;
+          initPageSize = limit;
         }
-        if (pageIndex <= 1) {
+        if (page <= 1) {
           for (var i = 0; i < results.length; i++) {
-            results[i][sequenceNo] = i - pageSize + pageSize * pageIndex + 1;
+            results[i][sequenceNo] = i - limit + limit * page + 1;
           }
         }
         else {
           for (var i = 0; i < results.length; i++) {
-            results[i][sequenceNo] = i - pageSize + pageSize * pageIndex + 1 - (pageSize - initPageSize);
+            results[i][sequenceNo] = i - limit + limit * page + 1 - (limit - initPageSize);
           }
         }
       }
@@ -378,19 +378,19 @@ function formatText() {
   return formatted;
 }
 exports.formatText = formatText;
-function buildMessage(resource, results, pageSize, pageIndex, total) {
+function buildMessage(resource, results, limit, page, total) {
   if (!results || results.length === 0) {
     return resource.msg_no_data_found;
   }
   else {
-    if (!pageIndex) {
-      pageIndex = 1;
+    if (!page) {
+      page = 1;
     }
-    var fromIndex = (pageIndex - 1) * pageSize + 1;
+    var fromIndex = (page - 1) * limit + 1;
     var toIndex = fromIndex + results.length - 1;
-    var pageTotal = getPageTotal(pageSize, total);
+    var pageTotal = getPageTotal(limit, total);
     if (pageTotal > 1) {
-      var msg2 = formatText(resource.msg_search_result_page_sequence, fromIndex, toIndex, total, pageIndex, pageTotal);
+      var msg2 = formatText(resource.msg_search_result_page_sequence, fromIndex, toIndex, total, page, pageTotal);
       return msg2;
     }
     else {

package/lib/useSearch.js

@@ -50,8 +50,8 @@ function mergeParam(p) {
     if (!p.sequenceNo) {
       p.sequenceNo = 'sequenceNo';
     }
-    if (!p.pageSize) {
-      p.pageSize = 24;
+    if (!p.limit) {
+      p.limit = 24;
     }
     if (!p.pageSizes) {
       p.pageSizes = core_1.pageSizes;
@@ -67,7 +67,7 @@ function mergeParam(p) {
   else {
     return {
       sequenceNo: 'sequenceNo',
-      pageSize: 24,
+      limit: 24,
       pageSizes: core_1.pageSizes,
       pageMaxSize: 7,
       hideFilter: true,
@@ -202,12 +202,12 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   var validateSearch = p && p.validateSearch ? p.validateSearch : _validateSearch;
   var pageSizeChanged = function (event) {
     var size = parseInt(event.currentTarget.value, 10);
-    component.pageSize = size;
-    component.pageIndex = 1;
+    component.limit = size;
+    component.page = 1;
     component.tmpPageIndex = 1;
     setComponent({
-      pageSize: size,
-      pageIndex: 1,
+      limit: size,
+      page: 1,
       tmpPageIndex: 1
     });
     doSearch(component);
@@ -269,25 +269,25 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   };
   var resetAndSearch = function () {
     if (running === true) {
-      setComponent({ pageIndex: 1, triggerSearch: true });
+      setComponent({ page: 1, triggerSearch: true });
       return;
     }
-    setComponent({ pageIndex: 1, tmpPageIndex: 1 });
+    setComponent({ page: 1, tmpPageIndex: 1 });
     search_1.removeSortStatus(component.sortTarget);
     setComponent({
       sortTarget: undefined,
       sortField: undefined,
       append: false,
-      pageIndex: 1
+      page: 1
     });
     component.sortTarget = undefined;
     component.sortField = undefined;
     component.append = false;
-    component.pageIndex = 1;
+    component.page = 1;
     doSearch(component);
   };
   var searchError = function (err) {
-    setComponent({ pageIndex: component.tmpPageIndex });
+    setComponent({ page: component.tmpPageIndex });
     core_1.error(err, p1.resource.value, p1.showError);
     core_1.hideLoading(p1.loading);
   };
@@ -299,11 +299,11 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     }
     var results = (sr === null || sr === void 0 ? void 0 : sr.list) || [];
     if (results && results.length > 0) {
-      search_1.formatResults(results, component.pageIndex, component.pageSize, component.pageSize, p ? p.sequenceNo : undefined, p ? p.format : undefined, lc);
+      search_1.formatResults(results, component.page, component.limit, component.limit, p ? p.sequenceNo : undefined, p ? p.format : undefined, lc);
     }
     var am = component.appendMode;
     var pi = (s.page && s.page >= 1 ? s.page : 1);
-    setComponent({ total: sr.total, pageIndex: pi, nextPageToken: sr.next });
+    setComponent({ total: sr.total, page: pi, nextPageToken: sr.next });
     if (am) {
       var limit = s.limit;
       if ((!s.page || s.page <= 1) && s.firstLimit && s.firstLimit > 0) {
@@ -336,19 +336,19 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   var showResults = (p && p.showResults ? p.showResults : _showResults);
   var showMore = function (event) {
     event.preventDefault();
-    var n = component.pageIndex ? component.pageIndex + 1 : 2;
-    var m = component.pageIndex;
-    setComponent({ tmpPageIndex: m, pageIndex: n, append: true });
+    var n = component.page ? component.page + 1 : 2;
+    var m = component.page;
+    setComponent({ tmpPageIndex: m, page: n, append: true });
     component.tmpPageIndex = m;
-    component.pageIndex = n;
+    component.page = n;
     component.append = true;
     doSearch(component);
   };
   var pageChanged = function (data) {
     var page = data.page, size = data.size;
-    setComponent({ pageIndex: page, pageSize: size, append: false });
-    component.pageIndex = page;
-    component.pageSize = size;
+    setComponent({ page: page, limit: size, append: false });
+    component.page = page;
+    component.limit = size;
     component.append = false;
     doSearch(component);
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hook-core",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "react",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/search.ts

@@ -8,10 +8,10 @@ export interface Sortable {
 }
 
 export interface Pagination {
-  initPageSize?: number;
-  pageSize: number;
+  initLimit?: number;
+  limit: number;
   // limit: number;
-  pageIndex?: number;
+  page?: number;
   total?: number;
   pages?: number;
   showPaging?: boolean;
@@ -92,29 +92,29 @@ export function initFilter<S extends Filter>(m: S, com: Searchable): S {
     const page = parseInt(m.page as any, 10);
     m.page = page;
     if (page >= 1) {
-      com.pageIndex = page;
+      com.page = page;
     }
   }
   if (!isNaN(m.limit as any)) {
     const pageSize = parseInt(m.limit as any, 10);
     m.limit = pageSize;
     if (pageSize > 0) {
-      com.pageSize = pageSize;
+      com.limit = pageSize;
     }
   }
-  if (!m.limit && com.pageSize) {
-    m.limit = com.pageSize;
+  if (!m.limit && com.limit) {
+    m.limit = com.limit;
   }
   if (!isNaN(m.firstLimit as any)) {
     const initPageSize = parseInt(m.firstLimit as any, 10);
     if (initPageSize > 0) {
       m.firstLimit = initPageSize;
-      com.initPageSize = initPageSize;
+      com.initLimit = initPageSize;
     } else {
-      com.initPageSize = com.pageSize;
+      com.initLimit = com.limit;
     }
   } else {
-    com.initPageSize = com.pageSize;
+    com.initLimit = com.limit;
   }
   const st = m.sort;
   if (st && st.length > 0) {
@@ -136,10 +136,10 @@ export function initFilter<S extends Filter>(m: S, com: Searchable): S {
 }
 export function more(com: Pagination): void {
   com.append = true;
-  if (!com.pageIndex) {
-    com.pageIndex = 1;
+  if (!com.page) {
+    com.page = 1;
   } else {
-    com.pageIndex = com.pageIndex + 1;
+    com.page = com.page + 1;
   }
 }
 
@@ -148,30 +148,30 @@ export function reset(com: Searchable): void {
   com.sortTarget = undefined;
   com.sortField = undefined;
   com.append = false;
-  com.pageIndex = 1;
+  com.page = 1;
 }
 export function changePageSize(com: Pagination, size: number): void {
-  com.initPageSize = size;
-  com.pageSize = size;
-  com.pageIndex = 1;
+  com.initLimit = size;
+  com.limit = size;
+  com.page = 1;
 }
 export function changePage(com: Pagination, pageIndex: number, pageSize: number): void {
-  com.pageIndex = pageIndex;
-  com.pageSize = pageSize;
+  com.page = pageIndex;
+  com.limit = pageSize;
   com.append = false;
 }
 export function optimizeFilter<S extends Filter>(obj: S, searchable: Searchable, fields?: string[]): S {
   // const sLimit = searchable.limit;
   obj.fields = fields;
-  if (searchable.pageIndex && searchable.pageIndex > 1) {
-    obj.page = searchable.pageIndex;
+  if (searchable.page && searchable.page > 1) {
+    obj.page = searchable.page;
   } else {
     delete obj.page;
   }
-  obj.limit = searchable.pageSize;
+  obj.limit = searchable.limit;
 
-  if (searchable.appendMode && searchable.initPageSize !== searchable.pageSize) {
-    obj.firstLimit = searchable.initPageSize;
+  if (searchable.appendMode && searchable.initLimit !== searchable.limit) {
+    obj.firstLimit = searchable.initLimit;
   } else {
     delete obj.firstLimit;
   }
@@ -292,16 +292,15 @@ export function getFields(form?: HTMLFormElement, arr?: string[]): string[] | un
   return fields.length > 0 ? fields : undefined
 }
 interface Component<T> {
-  pageIndex?: number;
-  pageSize?: number;
-  initPageSize?: number;
+  page?: number;
+  limit?: number;
   sequenceNo?: string;
   format?: (oj: T, lc?: Locale) => T;
 }
 export function formatResultsByComponent<T>(results: T[], c: Component<T>, lc: Locale) {
-  formatResults(results, c.pageIndex, c.pageSize, c.pageSize, c.sequenceNo, c.format, lc);
+  formatResults(results, c.page, c.limit, c.limit, c.sequenceNo, c.format, lc);
 }
-export function formatResults<T>(results: T[], pageIndex?: number, pageSize?: number, initPageSize?: number, sequenceNo?: string, ft?: (oj: T, lc?: Locale) => T, lc?: Locale): void {
+export function formatResults<T>(results: T[], page?: number, limit?: number, initPageSize?: number, sequenceNo?: string, ft?: (oj: T, lc?: Locale) => T, lc?: Locale): void {
   if (results && results.length > 0) {
     let hasSequencePro = false;
     if (ft) {
@@ -325,20 +324,20 @@ export function formatResults<T>(results: T[], pageIndex?: number, pageSize?: nu
       }
     }
     if (sequenceNo && sequenceNo.length > 0 && !hasSequencePro) {
-      if (!pageIndex) {
-        pageIndex = 1;
+      if (!page) {
+        page = 1;
       }
-      if (pageSize) {
+      if (limit) {
         if (!initPageSize) {
-          initPageSize = pageSize;
+          initPageSize = limit;
         }
-        if (pageIndex <= 1) {
+        if (page <= 1) {
           for (let i = 0; i < results.length; i++) {
-            (results[i] as any)[sequenceNo] = i - pageSize + pageSize * pageIndex + 1;
+            (results[i] as any)[sequenceNo] = i - limit + limit * page + 1;
           }
         } else {
           for (let i = 0; i < results.length; i++) {
-            (results[i] as any)[sequenceNo] = i - pageSize + pageSize * pageIndex + 1 - (pageSize - initPageSize);
+            (results[i] as any)[sequenceNo] = i - limit + limit * page + 1 - (limit - initPageSize);
           }
         }
       } else {
@@ -383,18 +382,18 @@ export function formatText(...args: any[]): string {
   }
   return formatted
 }
-export function buildMessage<T>(resource: StringMap, results: T[], pageSize: number, pageIndex: number | undefined, total?: number): string {
+export function buildMessage<T>(resource: StringMap, results: T[], limit: number, page: number | undefined, total?: number): string {
   if (!results || results.length === 0) {
     return resource.msg_no_data_found
   } else {
-    if (!pageIndex) {
-      pageIndex = 1
+    if (!page) {
+      page = 1
     }
-    const fromIndex = (pageIndex - 1) * pageSize + 1
+    const fromIndex = (page - 1) * limit + 1
     const toIndex = fromIndex + results.length - 1
-    const pageTotal = getPageTotal(pageSize, total)
+    const pageTotal = getPageTotal(limit, total)
     if (pageTotal > 1) {
-      const msg2 = formatText(resource.msg_search_result_page_sequence, fromIndex, toIndex, total, pageIndex, pageTotal)
+      const msg2 = formatText(resource.msg_search_result_page_sequence, fromIndex, toIndex, total, page, pageTotal)
       return msg2
     } else {
       const msg3 = formatText(resource.msg_search_result_sequence, fromIndex, toIndex)

package/src/useSearch.ts

@@ -61,8 +61,7 @@ export interface SearchComponentParam<T, M extends Filter> {
   appendMode?: boolean;
   pageSizes?: number[];
   pageIndex?: number;
-  pageSize: number;
-  initPageSize?: number;
+  limit: number;
   pageMaxSize?: number;
   ignoreUrlParam?: boolean;
 
@@ -133,8 +132,8 @@ export function mergeParam<T, S extends Filter>(p?: SearchComponentParam<T, S>):
     if (!p.sequenceNo) {
       p.sequenceNo = 'sequenceNo';
     }
-    if (!p.pageSize) {
-      p.pageSize = 24;
+    if (!p.limit) {
+      p.limit = 24;
     }
     if (!p.pageSizes) {
       p.pageSizes = pageSizes;
@@ -163,7 +162,7 @@ export function mergeParam<T, S extends Filter>(p?: SearchComponentParam<T, S>):
   } else {
     return {
       sequenceNo: 'sequenceNo',
-      pageSize: 24,
+      limit: 24,
       pageSizes,
       pageMaxSize: 7,
       hideFilter: true,
@@ -329,12 +328,12 @@ export const useCoreSearch = <T, S extends Filter, ST>(
 
   const pageSizeChanged = (event: any) => {
     const size = parseInt(event.currentTarget.value, 10);
-    component.pageSize = size;
-    component.pageIndex = 1;
+    component.limit = size;
+    component.page = 1;
     component.tmpPageIndex = 1;
     setComponent({
-      pageSize: size,
-      pageIndex: 1,
+      limit: size,
+      page: 1,
       tmpPageIndex: 1
     });
     doSearch(component);
@@ -398,26 +397,26 @@ export const useCoreSearch = <T, S extends Filter, ST>(
 
   const resetAndSearch = () => {
     if (running === true) {
-      setComponent({ pageIndex: 1, triggerSearch: true });
+      setComponent({ page: 1, triggerSearch: true });
       return;
     }
-    setComponent({ pageIndex: 1, tmpPageIndex: 1 });
+    setComponent({ page: 1, tmpPageIndex: 1 });
     removeSortStatus(component.sortTarget);
     setComponent({
       sortTarget: undefined,
       sortField: undefined,
       append: false,
-      pageIndex: 1
+      page: 1
     });
     component.sortTarget = undefined;
     component.sortField = undefined;
     component.append = false;
-    component.pageIndex = 1;
+    component.page = 1;
     doSearch(component);
   };
 
   const searchError = (err: any): void => {
-    setComponent({ pageIndex: component.tmpPageIndex });
+    setComponent({ page: component.tmpPageIndex });
     error(err, p1.resource.value, p1.showError);
     hideLoading(p1.loading)
   };
@@ -429,11 +428,11 @@ export const useCoreSearch = <T, S extends Filter, ST>(
     }
     const results = sr?.list || [];
     if (results && results.length > 0) {
-      formatResults(results, component.pageIndex, component.pageSize, component.pageSize, p ? p.sequenceNo : undefined, p ? p.format : undefined, lc);
+      formatResults(results, component.page, component.limit, component.limit, p ? p.sequenceNo : undefined, p ? p.format : undefined, lc);
     }
     const am = component.appendMode;
     const pi = (s.page && s.page >= 1 ? s.page : 1);
-    setComponent({ total: sr.total, pageIndex: pi, nextPageToken: sr.next });
+    setComponent({ total: sr.total, page: pi, nextPageToken: sr.next });
     if (am) {
       let limit = s.limit;
       if ((!s.page || s.page <= 1) && s.firstLimit && s.firstLimit > 0) {
@@ -465,20 +464,20 @@ export const useCoreSearch = <T, S extends Filter, ST>(
 
   const showMore = (event: any) => {
     event.preventDefault();
-    const n = component.pageIndex ? component.pageIndex + 1 : 2;
-    const m = component.pageIndex;
-    setComponent({ tmpPageIndex: m, pageIndex: n, append: true });
+    const n = component.page ? component.page + 1 : 2;
+    const m = component.page;
+    setComponent({ tmpPageIndex: m, page: n, append: true });
     component.tmpPageIndex = m;
-    component.pageIndex = n;
+    component.page = n;
     component.append = true;
     doSearch(component);
   };
 
   const pageChanged = (data: PageChange) => {
     const { page, size } = data;
-    setComponent({ pageIndex: page, pageSize: size, append: false });
-    component.pageIndex = page;
-    component.pageSize = size;
+    setComponent({ page: page, limit: size, append: false });
+    component.page = page;
+    component.limit = size;
     component.append = false;
     doSearch(component);
   };