react-hook-core 0.3.0 → 0.3.2

package/lib/core.js

@@ -235,16 +235,3 @@ function getValidateForm(u, vf) {
   return (u && u.ui ? u.ui.validateForm : undefined);
 }
 exports.getValidateForm = getValidateForm;
-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/reflect.js

@@ -152,6 +152,20 @@ function makeDiff(o1, o2, keys, version) {
   return obj3;
 }
 exports.makeDiff = makeDiff;
+function hasDiff(o1, o2, keys, version) {
+  var diff = makeDiff(o1, o2, keys, version);
+  return !isEmptyObject(diff);
+}
+exports.hasDiff = hasDiff;
+function goBack(navigate, confirm, resource, o1, o2, keys, version) {
+  if (!hasDiff(o1, o2, keys, version)) {
+    navigate(-1);
+  }
+  else {
+    confirm(resource.msg_confirm_back, function () { return navigate(-1); });
+  }
+}
+exports.goBack = goBack;
 function notIn(s1, s2) {
   var r = [];
   for (var _i = 0, s2_1 = s2; _i < s2_1.length; _i++) {

package/lib/search.js

@@ -7,38 +7,58 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
   return r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var reflect_1 = require("./reflect");
 var resources = (function () {
   function resources() {
   }
   resources.limit = 24;
+  resources.pages = [12, 24, 60, 100, 120, 180, 300, 600];
+  resources.pageMaxSize = 7;
   return resources;
 }());
 exports.resources = resources;
+function getOffset(limit, page, firstLimit) {
+  var p = page && page > 0 ? page : 1;
+  if (firstLimit && firstLimit > 0) {
+    var offset = limit * (p - 2) + firstLimit;
+    return offset < 0 ? 0 : offset;
+  }
+  else {
+    var offset = limit * (p - 1);
+    return offset < 0 ? 0 : offset;
+  }
+}
+exports.getOffset = getOffset;
 function mergeFilter(obj, b, pageSizes, arrs) {
   var a = b;
   if (!b) {
     a = {};
   }
-  var slimit = obj['limit'];
+  var keys = Object.keys(obj);
+  for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+    var key = keys_1[_i];
+    var p = a[key];
+    var v = obj[key];
+    if (v && v !== "") {
+      a[key] = isArray(key, p, arrs) ? v.split(",") : v;
+    }
+  }
+  var spage = obj["page"];
+  if (!isNaN(spage)) {
+    var page = parseInt(spage, 10);
+    a.page = page > 1 ? page : undefined;
+  }
+  var slimit = obj["limit"];
   if (!isNaN(slimit)) {
     var limit = parseInt(slimit, 10);
     if (pageSizes && pageSizes.length > 0) {
       if (pageSizes.indexOf(limit) >= 0) {
         a.limit = limit;
+        return a;
       }
     }
     else {
-      a.limit = limit;
-    }
-  }
-  delete obj['limit'];
-  var keys = Object.keys(obj);
-  for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-    var key = keys_1[_i];
-    var p = a[key];
-    var v = obj[key];
-    if (v && v !== '') {
-      a[key] = (isArray(key, p, arrs) ? v.split(',') : v);
+      a.limit = limit > 0 ? limit : 12;
     }
   }
   return a;
@@ -143,7 +163,6 @@ function changePage(com, pageIndex, pageSize) {
 }
 exports.changePage = changePage;
 function optimizeFilter(obj, searchable, fields) {
-  var sLimit = searchable.limit;
   obj.fields = fields;
   if (searchable.pageIndex && searchable.pageIndex > 1) {
     obj.page = searchable.pageIndex;
@@ -151,12 +170,7 @@ function optimizeFilter(obj, searchable, fields) {
   else {
     delete obj.page;
   }
-  if (sLimit) {
-    obj.limit = searchable.limit;
-  }
-  else {
-    obj.limit = searchable.pageSize;
-  }
+  obj.limit = searchable.pageSize;
   if (searchable.appendMode && searchable.initPageSize !== searchable.pageSize) {
     obj.firstLimit = searchable.initPageSize;
   }
@@ -232,7 +246,10 @@ function showPaging(com, list, pageSize, total) {
   com.showPaging = (!total || com.pages <= 1 || (list && list.length >= total) ? false : true);
 }
 exports.showPaging = showPaging;
-function getFields(form) {
+function getFields(form, arr) {
+  if (arr && arr.length > 0) {
+    return arr;
+  }
   if (!form) {
     return undefined;
   }
@@ -246,19 +263,19 @@ function getFields(form) {
     }
   }
   if (!nodes.querySelector) {
-    return [];
+    return undefined;
   }
-  var table = nodes.querySelector('table');
+  var table = nodes.querySelector("table");
   var fields = [];
   if (table) {
-    var thead = table.querySelector('thead');
+    var thead = table.querySelector("thead");
     if (thead) {
-      var ths = thead.querySelectorAll('th');
+      var ths = thead.querySelectorAll("th");
       if (ths) {
         var l = ths.length;
         for (var i = 0; i < l; i++) {
           var th = ths[i];
-          var field = th.getAttribute('data-field');
+          var field = th.getAttribute("data-field");
           if (field) {
             fields.push(field);
           }
@@ -266,7 +283,7 @@ function getFields(form) {
       }
     }
   }
-  return fields;
+  return fields.length > 0 ? fields : undefined;
 }
 exports.getFields = getFields;
 function formatResultsByComponent(results, c, lc) {
@@ -344,9 +361,34 @@ function getPageTotal(pageSize, total) {
   }
 }
 exports.getPageTotal = getPageTotal;
-function buildMessage(r, pageIndex, pageSize, results, total) {
+function formatText() {
+  var args = [];
+  for (var _i = 0; _i < arguments.length; _i++) {
+    args[_i] = arguments[_i];
+  }
+  var formatted = args[0];
+  if (!formatted || formatted === "") {
+    return "";
+  }
+  if (args.length > 1 && Array.isArray(args[1])) {
+    var params = args[1];
+    for (var i = 0; i < params.length; i++) {
+      var regexp = new RegExp("\\{" + i + "\\}", "gi");
+      formatted = formatted.replace(regexp, params[i]);
+    }
+  }
+  else {
+    for (var i = 1; i < args.length; i++) {
+      var regexp = new RegExp("\\{" + (i - 1) + "\\}", "gi");
+      formatted = formatted.replace(regexp, args[i]);
+    }
+  }
+  return formatted;
+}
+exports.formatText = formatText;
+function buildMessage(resource, results, pageSize, pageIndex, total) {
   if (!results || results.length === 0) {
-    return r.value('msg_no_data_found');
+    return resource.msg_no_data_found;
   }
   else {
     if (!pageIndex) {
@@ -356,11 +398,11 @@ function buildMessage(r, pageIndex, pageSize, results, total) {
     var toIndex = fromIndex + results.length - 1;
     var pageTotal = getPageTotal(pageSize, total);
     if (pageTotal > 1) {
-      var msg2 = r.format(r.value('msg_search_result_page_sequence'), fromIndex, toIndex, total, pageIndex, pageTotal);
+      var msg2 = formatText(resource.msg_search_result_page_sequence, fromIndex, toIndex, total, pageIndex, pageTotal);
       return msg2;
     }
     else {
-      var msg3 = r.format(r.value('msg_search_result_sequence'), fromIndex, toIndex);
+      var msg3 = formatText(resource.msg_search_result_sequence, fromIndex, toIndex);
       return msg3;
     }
   }
@@ -370,7 +412,10 @@ function removeFormatUrl(url) {
   var startParams = url.indexOf('?');
   return startParams !== -1 ? url.substring(0, startParams) : url;
 }
-function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
+function getPrefix(url) {
+  return url.indexOf("?") >= 0 ? "&" : "?";
+}
+function addParametersIntoUrl(ft, isFirstLoad, page, fields, limit) {
   if (!isFirstLoad) {
     if (!fields || fields.length === 0) {
       fields = 'fields';
@@ -378,6 +423,11 @@ function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
     if (!limit || limit.length === 0) {
       limit = 'limit';
     }
+    if (page && page > 1) {
+      if (!ft.page || ft.page <= 1) {
+        ft.page = page;
+      }
+    }
     var pageIndex = ft.page;
     if (pageIndex && !isNaN(pageIndex) && pageIndex <= 1) {
       delete ft.page;
@@ -393,31 +443,16 @@ function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
           if (typeof objValue === 'string' || typeof objValue === 'number') {
             if (key === limit) {
               if (objValue !== resources.limit) {
-                if (url.indexOf('?') === -1) {
-                  url += "?" + key + "=" + objValue;
-                }
-                else {
-                  url += "&" + key + "=" + objValue;
-                }
+                url += getPrefix(url) + (key + "=" + objValue);
               }
             }
             else {
-              if (url.indexOf('?') === -1) {
-                url += "?" + key + "=" + objValue;
-              }
-              else {
-                url += "&" + key + "=" + objValue;
-              }
+              url += getPrefix(url) + (key + "=" + objValue);
             }
           }
           else if (typeof objValue === 'object') {
             if (objValue instanceof Date) {
-              if (url.indexOf('?') === -1) {
-                url += "?" + key + "=" + objValue.toISOString();
-              }
-              else {
-                url += "&" + key + "=" + objValue.toISOString();
-              }
+              url += getPrefix(url) + (key + "=" + objValue.toISOString());
             }
             else {
               if (Array.isArray(objValue)) {
@@ -432,12 +467,7 @@ function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
                       strs.push(subValue.toString());
                     }
                   }
-                  if (url.indexOf('?') === -1) {
-                    url += "?" + key + "=" + strs.join(',');
-                  }
-                  else {
-                    url += "&" + key + "=" + strs.join(',');
-                  }
+                  url += getPrefix(url) + (key + "=" + strs.join(','));
                 }
               }
               else {
@@ -445,21 +475,11 @@ function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
                 for (var _b = 0, keysLvl2_1 = keysLvl2; _b < keysLvl2_1.length; _b++) {
                   var key2 = keysLvl2_1[_b];
                   var objValueLvl2 = objValue[key2];
-                  if (url.indexOf('?') === -1) {
-                    if (objValueLvl2 instanceof Date) {
-                      url += "?" + key + "." + key2 + "=" + objValueLvl2.toISOString();
-                    }
-                    else {
-                      url += "?" + key + "." + key2 + "=" + objValueLvl2;
-                    }
+                  if (objValueLvl2 instanceof Date) {
+                    url += getPrefix(url) + (key + "." + key2 + "=" + objValueLvl2.toISOString());
                   }
                   else {
-                    if (objValueLvl2 instanceof Date) {
-                      url += "&" + key + "." + key2 + "=" + objValueLvl2.toISOString();
-                    }
-                    else {
-                      url += "&" + key + "." + key2 + "=" + objValueLvl2;
-                    }
+                    url += getPrefix(url) + (key + "." + key2 + "=" + objValueLvl2);
                   }
                 }
               }
@@ -471,7 +491,7 @@ function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
     var p = 'http://';
     var loc = window.location.href;
     if (loc.length >= 8) {
-      var ss = loc.substr(0, 8);
+      var ss = loc.substring(0, 8);
       if (ss === 'https://') {
         p = 'https://';
       }
@@ -480,6 +500,50 @@ function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
   }
 }
 exports.addParametersIntoUrl = addParametersIntoUrl;
+function buildSort(filter) {
+  var sort = {};
+  var st = filter.sort;
+  if (st && st.length > 0) {
+    var ch = st.charAt(0);
+    if (ch === "+" || ch === "-") {
+      sort.field = st.substring(1);
+      sort.type = ch;
+    }
+    else {
+      sort.field = st;
+      sort.type = "";
+    }
+  }
+  return sort;
+}
+exports.buildSort = buildSort;
+function buildSortFilter(obj, sortable) {
+  var filter = reflect_1.clone(obj);
+  if (sortable.sortField && sortable.sortField.length > 0) {
+    filter.sort = sortable.sortType === "-" ? "-" + sortable.sortField : sortable.sortField;
+  }
+  else {
+    delete filter.sort;
+  }
+  delete filter.fields;
+  return filter;
+}
+exports.buildSortFilter = buildSortFilter;
+function handleToggle(target, on) {
+  var off = !on;
+  if (target) {
+    if (on) {
+      if (!target.classList.contains('on')) {
+        target.classList.add('on');
+      }
+    }
+    else {
+      target.classList.remove('on');
+    }
+  }
+  return off;
+}
+exports.handleToggle = handleToggle;
 function handleSortEvent(event, com) {
   if (event && event.target) {
     var target = event.target;
@@ -490,6 +554,10 @@ function handleSortEvent(event, com) {
   }
 }
 exports.handleSortEvent = handleSortEvent;
+function getSortElement(target) {
+  return target.nodeName === "I" ? target.parentElement : target;
+}
+exports.getSortElement = getSortElement;
 function handleSort(target, previousTarget, sortField, sortType) {
   var type = target.getAttribute('sort-type');
   var field = toggleSortStyle(target);

package/lib/useSearch.js

@@ -40,7 +40,6 @@ exports.callSearch = function (se, search3, showResults3, searchError3, lc, next
   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);
@@ -132,9 +131,8 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   var getCurrencyCode = p && p.getCurrencyCode ? p.getCurrencyCode : _getCurrencyCode;
   var _c = merge_1.useMergeState(p), component = _c[0], setComponent = _c[1];
   var toggleFilter = function (event) {
-    var x = !component.hideFilter;
-    core_1.handleToggle(event.target, !x);
-    setComponent({ hideFilter: x });
+    var hideFilter = search_1.handleToggle(event.target, component.hideFilter);
+    setComponent({ hideFilter: hideFilter });
   };
   var _getFields = function () {
     var fields = component.fields, initFields = component.initFields;
@@ -331,7 +329,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
       setList(results, setState);
       setComponent({ tmpPageIndex: s.page });
       if (s.limit) {
-        var m1 = search_1.buildMessage(p1.resource, s.page, s.limit, sr.list, sr.total);
+        var m1 = search_1.buildMessage(p1.resource.resource(), sr.list, s.limit, s.page, sr.total);
         p1.showMessage(m1);
       }
     }

package/package.json

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

package/src/core.ts

@@ -502,14 +502,3 @@ export function getDecodeFromForm(u?: UIParameter, d?: (form: HTMLFormElement, l
   return (u && u.ui ? u.ui.decodeFromForm : undefined);
 }
 */
-export function handleToggle(target?: HTMLInputElement, on?: boolean): void {
-  if (target) {
-    if (on) {
-      if (!target.classList.contains('on')) {
-        target.classList.add('on');
-      }
-    } else {
-      target.classList.remove('on');
-    }
-  }
-}

package/src/reflect.ts

@@ -1,3 +1,5 @@
+import { NavigateFunction } from "react-router-dom"
+
 export function clone(obj: any): any {
   if (!obj) {
     return obj;
@@ -135,6 +137,28 @@ export function makeDiff<T>(o1: T, o2: T, keys?: string[], version?: string): Pa
   }
   return obj3;
 }
+export function hasDiff<T>(o1: T, o2: T, keys?: string[], version?: string): boolean {
+  const diff = makeDiff(o1, o2, keys, version)
+  return !isEmptyObject(diff)
+}
+interface StringMap {
+  [key: string]: string;
+}
+export function goBack<T>(
+  navigate: NavigateFunction,
+  confirm: (msg: string, yesCallback?: () => void) => void,
+  resource: StringMap,
+  o1: T,
+  o2: T,
+  keys?: string[],
+  version?: string,
+) {
+  if (!hasDiff(o1, o2, keys, version)) {
+    navigate(-1)
+  } else {
+    confirm(resource.msg_confirm_back, () => navigate(-1))
+  }
+}
 
 export function notIn(s1: string[], s2: string[]): string[] {
   const r = [];

package/src/route.ts

@@ -1,6 +1,7 @@
+import { Filter } from "./core";
 import * as qs from "query-string";
 
-export function buildFromUrl<S>(modelT?: S): S {
+export function buildFromUrl<S extends Filter>(modelT?: S): S {
   return buildParameters<S>(window.location.search, modelT);
 }
 export function buildParameters<T>(url: string, model?: T): T {

package/src/search.ts

@@ -1,10 +1,15 @@
+import { StringMap } from "./core";
+import { clone } from "./reflect";
+
 // tslint:disable-next-line:class-name
 export class resources {
   static limit = 24;
+  static pages = [12, 24, 60, 100, 120, 180, 300, 600];
+  static pageMaxSize = 7;
 }
 interface Filter {
   page?: number;
-  limit?: number;
+  limit: number;
   firstLimit?: number;
   fields?: string[];
   sort?: string;
@@ -35,8 +40,8 @@ export interface Sortable {
 
 export interface Pagination {
   initPageSize?: number;
-  pageSize?: number;
-  limit?: number;
+  pageSize: number;
+  // limit: number;
   pageIndex?: number;
   total?: number;
   pages?: number;
@@ -49,32 +54,47 @@ export interface Pagination {
 interface Searchable extends Pagination, Sortable {
 }
 
-export function mergeFilter<S extends Filter>(obj: S, b?: S, pageSizes?: number[], arrs?: string[]|any) {
-  let a: any = b;
+export function getOffset(limit: number, page?: number, firstLimit?: number): number {
+  const p = page && page > 0 ? page : 1
+  if (firstLimit && firstLimit > 0) {
+    const offset = limit * (p - 2) + firstLimit
+    return offset < 0 ? 0 : offset
+  } else {
+    const offset = limit * (p - 1)
+    return offset < 0 ? 0 : offset
+  }
+}
+export function mergeFilter<S extends Filter>(obj: S, b?: S, pageSizes?: number[], arrs?: string[] | any) {
+  let a: any = b
   if (!b) {
-    a = {};
+    a = {}
+  }
+  const keys = Object.keys(obj)
+  for (const key of keys) {
+    const p = a[key]
+    const v = (obj as any)[key]
+    if (v && v !== "") {
+      a[key] = isArray(key, p, arrs) ? v.split(",") : v
+    }
+  }
+  const spage: any = obj["page"]
+  if (!isNaN(spage)) {
+    const page = parseInt(spage, 10)
+    a.page = page > 1 ? page : undefined
   }
-  const slimit: any = obj['limit'];
+  const slimit: any = obj["limit"]
   if (!isNaN(slimit)) {
-    const limit = parseInt(slimit, 10);
+    const limit = parseInt(slimit, 10)
     if (pageSizes && pageSizes.length > 0) {
       if (pageSizes.indexOf(limit) >= 0) {
-        a.limit = limit;
+        a.limit = limit
+        return a
       }
     } else {
-      a.limit = limit;
-    }
-  }
-  delete obj['limit'];
-  const keys = Object.keys(obj);
-  for (const key of keys) {
-    const p = a[key];
-    const v = (obj as any)[key];
-    if (v && v !== '') {
-      a[key] = (isArray(key, p, arrs) ? v.split(',') : v);
+      a.limit = limit > 0 ? limit : 12
     }
   }
-  return a;
+  return a
 }
 export function isArray(key: string, p: any, arrs: string[]|any): boolean {
   if (p) {
@@ -172,18 +192,14 @@ export function changePage(com: Pagination, pageIndex: number, pageSize: number)
   com.append = false;
 }
 export function optimizeFilter<S extends Filter>(obj: S, searchable: Searchable, fields?: string[]): S {
-  const sLimit = searchable.limit;
+  // const sLimit = searchable.limit;
   obj.fields = fields;
   if (searchable.pageIndex && searchable.pageIndex > 1) {
     obj.page = searchable.pageIndex;
   } else {
     delete obj.page;
   }
-  if (sLimit){
-    obj.limit = searchable.limit;
-  }else{
-    obj.limit = searchable.pageSize;
-  }
+  obj.limit = searchable.pageSize;
 
   if (searchable.appendMode && searchable.initPageSize !== searchable.pageSize) {
     obj.firstLimit = searchable.initPageSize;
@@ -196,7 +212,7 @@ export function optimizeFilter<S extends Filter>(obj: S, searchable: Searchable,
     delete obj.sort;
   }
   if(searchable) {
-    mapObjects(obj, searchable as S);
+    mapObjects(obj, searchable as any);
   }
   return obj;
 }
@@ -268,40 +284,43 @@ export function showPaging<T>(com: Pagination, list: T[], pageSize?: number, tot
   com.showPaging = (!total || com.pages <= 1 || (list && list.length >= total) ? false : true);
 }
 
-export function getFields(form?: HTMLFormElement): string[]|undefined {
+export function getFields(form?: HTMLFormElement, arr?: string[]): string[] | undefined {
+  if (arr && arr.length > 0) {
+    return arr
+  }
   if (!form) {
-    return undefined;
+    return undefined
   }
-  let nodes = form.nextSibling as HTMLElement;
+  let nodes = form.nextSibling as HTMLElement
   if (!nodes.querySelector) {
     if (!form.nextSibling) {
-      return [];
+      return []
     } else {
-      nodes = form.nextSibling.nextSibling as HTMLElement;
+      nodes = form.nextSibling.nextSibling as HTMLElement
     }
   }
   if (!nodes.querySelector) {
-    return [];
+    return undefined
   }
-  const table = nodes.querySelector('table');
-  const fields: string[] = [];
+  const table = nodes.querySelector("table")
+  const fields: string[] = []
   if (table) {
-    const thead = table.querySelector('thead');
+    const thead = table.querySelector("thead")
     if (thead) {
-      const ths = thead.querySelectorAll('th');
+      const ths = thead.querySelectorAll("th")
       if (ths) {
-        const l = ths.length;
+        const l = ths.length
         for (let i = 0; i < l; i++) {
-          const  th = ths[i];
-          const field = th.getAttribute('data-field');
+          const th = ths[i]
+          const field = th.getAttribute("data-field")
           if (field) {
-            fields.push(field);
+            fields.push(field)
           }
         }
       }
     }
   }
-  return fields;
+  return fields.length > 0 ? fields : undefined
 }
 interface Component<T> {
   pageIndex?: number;
@@ -376,22 +395,41 @@ export function getPageTotal(pageSize?: number, total?: number): number {
   }
 }
 
-export function buildMessage<T>(r: ResourceService, pageIndex: number|undefined, pageSize: number, results: T[], total?: number): string {
+export function formatText(...args: any[]): string {
+  let formatted = args[0]
+  if (!formatted || formatted === "") {
+    return ""
+  }
+  if (args.length > 1 && Array.isArray(args[1])) {
+    const params = args[1]
+    for (let i = 0; i < params.length; i++) {
+      const regexp = new RegExp("\\{" + i + "\\}", "gi")
+      formatted = formatted.replace(regexp, params[i])
+    }
+  } else {
+    for (let i = 1; i < args.length; i++) {
+      const regexp = new RegExp("\\{" + (i - 1) + "\\}", "gi")
+      formatted = formatted.replace(regexp, args[i])
+    }
+  }
+  return formatted
+}
+export function buildMessage<T>(resource: StringMap, results: T[], pageSize: number, pageIndex: number | undefined, total?: number): string {
   if (!results || results.length === 0) {
-    return r.value('msg_no_data_found');
+    return resource.msg_no_data_found
   } else {
     if (!pageIndex) {
-      pageIndex = 1;
+      pageIndex = 1
     }
-    const fromIndex = (pageIndex - 1) * pageSize + 1;
-    const toIndex = fromIndex + results.length - 1;
-    const pageTotal = getPageTotal(pageSize, total);
+    const fromIndex = (pageIndex - 1) * pageSize + 1
+    const toIndex = fromIndex + results.length - 1
+    const pageTotal = getPageTotal(pageSize, total)
     if (pageTotal > 1) {
-      const msg2 = r.format(r.value('msg_search_result_page_sequence'), fromIndex, toIndex, total, pageIndex, pageTotal);
-      return msg2;
+      const msg2 = formatText(resource.msg_search_result_page_sequence, fromIndex, toIndex, total, pageIndex, pageTotal)
+      return msg2
     } else {
-      const msg3 = r.format(r.value('msg_search_result_sequence'), fromIndex, toIndex);
-      return msg3;
+      const msg3 = formatText(resource.msg_search_result_sequence, fromIndex, toIndex)
+      return msg3
     }
   }
 }
@@ -402,7 +440,10 @@ function removeFormatUrl(url: string): string {
 }
 
 
-export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: boolean, fields?: string, limit?: string): void {
+function getPrefix(url: string): string {
+  return url.indexOf("?") >= 0 ? "&" : "?"
+}
+export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: boolean, page?: number, fields?: string, limit?: string): void {
   if (!isFirstLoad) {
     if (!fields || fields.length === 0) {
       fields = 'fields';
@@ -410,6 +451,11 @@ export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: bool
     if (!limit || limit.length === 0) {
       limit = 'limit';
     }
+    if (page && page > 1) {
+      if (!ft.page || ft.page <= 1) {
+        ft.page = page;
+      }
+    }
     const pageIndex = ft.page;
     if (pageIndex && !isNaN(pageIndex) && pageIndex <= 1) {
       delete ft.page;
@@ -424,30 +470,18 @@ export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: bool
           if (typeof objValue === 'string' || typeof objValue === 'number') {
             if (key === limit) {
               if (objValue !== resources.limit) {
-                if (url.indexOf('?') === -1) {
-                  url += `?${key}=${objValue}`;
-                } else {
-                  url += `&${key}=${objValue}`;
-                }
+                url += getPrefix(url) + `${key}=${objValue}`;
               }
             } else {
-              if (url.indexOf('?') === -1) {
-                url += `?${key}=${objValue}`;
-              } else {
-                url += `&${key}=${objValue}`;
-              }
+              url += getPrefix(url) + `${key}=${objValue}`;
             }
           } else if (typeof objValue === 'object') {
             if (objValue instanceof Date) {
-              if (url.indexOf('?') === -1) {
-                url += `?${key}=${objValue.toISOString()}`;
-              } else {
-                url += `&${key}=${objValue.toISOString()}`;
-              }
+              url += getPrefix(url) + `${key}=${objValue.toISOString()}`;
             } else {
               if (Array.isArray(objValue)) {
                 if (objValue.length > 0) {
-                  const strs = [];
+                  const strs: string[] = [];
                   for (const subValue of objValue) {
                     if (typeof subValue === 'string') {
                       strs.push(subValue);
@@ -455,28 +489,16 @@ export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: bool
                       strs.push(subValue.toString());
                     }
                   }
-                  if (url.indexOf('?') === -1) {
-                    url += `?${key}=${strs.join(',')}`;
-                  } else {
-                    url += `&${key}=${strs.join(',')}`;
-                  }
+                  url += getPrefix(url) + `${key}=${strs.join(',')}`;
                 }
               } else {
                 const keysLvl2 = Object.keys(objValue);
                 for (const key2 of keysLvl2) {
                   const objValueLvl2 = objValue[key2];
-                  if (url.indexOf('?') === -1) {
-                    if (objValueLvl2 instanceof Date) {
-                      url += `?${key}.${key2}=${objValueLvl2.toISOString()}`;
-                    } else {
-                      url += `?${key}.${key2}=${objValueLvl2}`;
-                    }
+                  if (objValueLvl2 instanceof Date) {
+                    url += getPrefix(url) + `${key}.${key2}=${objValueLvl2.toISOString()}`;
                   } else {
-                    if (objValueLvl2 instanceof Date) {
-                      url += `&${key}.${key2}=${objValueLvl2.toISOString()}`;
-                    } else {
-                      url += `&${key}.${key2}=${objValueLvl2}`;
-                    }
+                    url += getPrefix(url) + `${key}.${key2}=${objValueLvl2}`;
                   }
                 }
               }
@@ -488,7 +510,7 @@ export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: bool
     let p = 'http://';
     const loc = window.location.href;
     if (loc.length >= 8) {
-      const ss = loc.substr(0, 8);
+      const ss = loc.substring(0, 8);
       if (ss === 'https://') {
         p = 'https://';
       }
@@ -501,7 +523,44 @@ export interface Sort {
   field?: string;
   type?: string;
 }
-
+export function buildSort<F extends Filter>(filter: F): Sort {
+  const sort: Sort = {}
+  const st = filter.sort
+  if (st && st.length > 0) {
+    const ch = st.charAt(0)
+    if (ch === "+" || ch === "-") {
+      sort.field = st.substring(1)
+      sort.type = ch
+    } else {
+      sort.field = st
+      sort.type = ""
+    }
+  }
+  return sort
+}
+export function buildSortFilter<S extends Filter>(obj: S, sortable: Sortable): S {
+  const filter: any = clone(obj)
+  if (sortable.sortField && sortable.sortField.length > 0) {
+    filter.sort = sortable.sortType === "-" ? "-" + sortable.sortField : sortable.sortField
+  } else {
+    delete filter.sort
+  }
+  delete filter.fields
+  return filter
+}
+export function handleToggle(target?: HTMLInputElement, on?: boolean): boolean {
+  const off = !on
+  if (target) {
+    if (on) {
+      if (!target.classList.contains('on')) {
+        target.classList.add('on');
+      }
+    } else {
+      target.classList.remove('on');
+    }
+  }
+  return off
+}
 export function handleSortEvent(event: Event, com: Sortable): void {
   if (event && event.target) {
     const target = event.target as HTMLElement;
@@ -512,6 +571,9 @@ export function handleSortEvent(event: Event, com: Sortable): void {
   }
 }
 
+export function getSortElement(target: HTMLElement): HTMLElement {
+  return target.nodeName === "I" ? (target.parentElement as HTMLElement) : target
+}
 export function handleSort(target: HTMLElement, previousTarget?: HTMLElement, sortField?: string, sortType?: string): Sort {
   const type = target.getAttribute('sort-type');
   const field = toggleSortStyle(target);

package/src/useSearch.ts

@@ -1,9 +1,9 @@
 import {useEffect, useState} from 'react';
-import {error, getName, getRemoveError, getValidateForm, handleToggle, hideLoading, initForm, Locale, PageChange, pageSizes, removeFormError, ResourceService, SearchParameter, SearchResult, SearchService, showLoading} from './core';
+import {error, getName, getRemoveError, getValidateForm, hideLoading, initForm, Locale, PageChange, pageSizes, removeFormError, ResourceService, SearchParameter, SearchResult, SearchService, showLoading} from './core';
 import {DispatchWithCallback, useMergeState} from './merge';
 import {clone} from './reflect';
 import {buildFromUrl} from './route';
-import {addParametersIntoUrl, append, buildMessage, formatResults, getFieldsFromForm, getModel, handleAppend, handleSort, initFilter, mergeFilter as mergeFilter2, Pagination, removeSortStatus, showPaging, Sortable, validate} from './search';
+import {addParametersIntoUrl, append, buildMessage, formatResults, getFieldsFromForm, getModel, handleAppend, handleSort, handleToggle, initFilter, mergeFilter as mergeFilter2, Pagination, removeSortStatus, showPaging, Sortable, validate} from './search';
 import {enLocale} from './state';
 import {useUpdate} from './update';
 
@@ -13,7 +13,7 @@ export interface Searchable extends Pagination, Sortable {
 }
 interface Filter {
   page?: number;
-  limit?: number;
+  limit: number;
   firstLimit?: number;
   fields?: string[];
   sort?: string;
@@ -39,7 +39,7 @@ export const callSearch = <T, S extends Filter>(se: S, search3: (s: S, limit?: n
   const fields = se.fields;
   delete se['page'];
   delete se['fields'];
-  delete se['limit'];
+  // delete se['limit'];
   delete se['firstLimit'];
   search3(s, limit, next, fields).then(sr => {
     showResults3(s, sr, lc);
@@ -74,7 +74,7 @@ export interface SearchComponentParam<T, M extends Filter> {
   appendMode?: boolean;
   pageSizes?: number[];
   pageIndex?: number;
-  pageSize?: number;
+  pageSize: number;
   initPageSize?: number;
   pageMaxSize?: number;
   ignoreUrlParam?: boolean;
@@ -257,9 +257,8 @@ export const useCoreSearch = <T, S extends Filter, ST>(
   const [component, setComponent] = useMergeState<SearchComponentState<T, S>>(p);
 
   const toggleFilter = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>): void => {
-    const x = !component.hideFilter;
-    handleToggle(event.target as HTMLInputElement, !x);
-    setComponent({ hideFilter: x });
+    const hideFilter = handleToggle(event.target as HTMLInputElement, component.hideFilter);
+    setComponent({ hideFilter });
   };
 
   const _getFields = (): string[]|undefined => {
@@ -304,7 +303,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
     const runSearch = doSearch;
     if (auto) {
       setTimeout(() => {
-        runSearch((obj2 as Searchable), true);
+        runSearch((obj2 as any), true);
       }, 0);
     }
   };
@@ -464,7 +463,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
       setList(results, setState as any);
       setComponent({ tmpPageIndex: s.page });
       if (s.limit) {
-        const m1 = buildMessage(p1.resource, s.page, s.limit, sr.list, sr.total);
+        const m1 = buildMessage(p1.resource.resource(), sr.list, s.limit, s.page, sr.total);
         p1.showMessage(m1);
       }
     }

package/tsconfig.json

@@ -17,7 +17,8 @@
       "dom",
       "es6",
       "es7",
-      "es2017"
+      "es2017",
+      "es2022"
     ]
   },
   "include": [