react-hook-core 0.4.9 → 0.4.11

package/lib/common.js

@@ -0,0 +1,30 @@
+"use strict"
+Object.defineProperty(exports, "__esModule", { value: true })
+function messageByHttpStatus(status, resource) {
+  var k = "error_" + status
+  var msg = resource[k]
+  if (!msg || msg.length === 0) {
+    msg = resource.error_500
+  }
+  return msg
+}
+exports.messageByHttpStatus = messageByHttpStatus
+function error(err, resource, ae) {
+  var title = resource.error
+  var msg = resource.error_internal
+  if (!err) {
+    ae(msg, undefined, title)
+    return
+  }
+  var data = err && err.response ? err.response : err
+  if (data) {
+    var status_1 = data.status
+    if (status_1 && !isNaN(status_1)) {
+      msg = messageByHttpStatus(status_1, resource)
+    }
+    ae(msg, undefined, title)
+  } else {
+    ae(msg, undefined, title)
+  }
+}
+exports.error = error

package/lib/core.js

@@ -4,7 +4,7 @@ exports.pageSizes = [12, 24, 60, 100, 120, 180, 300, 600]
 exports.sizes = exports.pageSizes
 var resources = (function () {
   function resources() {}
-  resources.phone = / |-|\.|\(|\)/g
+  resources.phone = / |\-|\.|\(|\)/g
   resources._cache = {}
   resources.cache = true
   resources.fields = "fields"

package/lib/index.js

@@ -10,7 +10,6 @@ __export(require("./core"))
 __export(require("./diff"))
 __export(require("./edit"))
 __export(require("./formutil"))
-__export(require("./merge"))
 __export(require("./reflect"))
 __export(require("./route"))
 __export(require("./search"))

package/lib/input.js

@@ -59,15 +59,23 @@ function getErrorFunc(p, showErr) {
   return p.showError
 }
 exports.getErrorFunc = getErrorFunc
-function showLoading(s) {
-  if (s) {
-    s.showLoading()
+function showLoading(loading) {
+  if (loading) {
+    if (typeof loading === "function") {
+      loading()
+    } else {
+      loading.showLoading()
+    }
   }
 }
 exports.showLoading = showLoading
-function hideLoading(s) {
-  if (s) {
-    s.hideLoading()
+function hideLoading(loading) {
+  if (loading) {
+    if (typeof loading === "function") {
+      loading()
+    } else {
+      loading.hideLoading()
+    }
   }
 }
 exports.hideLoading = hideLoading

package/lib/reflect.js

@@ -40,44 +40,6 @@ function clone(obj) {
   return x
 }
 exports.clone = clone
-function getDirectValue(obj, key) {
-  if (obj && obj.hasOwnProperty(key)) {
-    return obj[key]
-  }
-  return null
-}
-exports.getDirectValue = getDirectValue
-function setValue(obj, key, value) {
-  var replaceKey = key.replace(/\[/g, ".[").replace(/\.\./g, ".")
-  if (replaceKey.indexOf(".") === 0) {
-    replaceKey = replaceKey.slice(1, replaceKey.length)
-  }
-  var keys = replaceKey.split(".")
-  var firstKey = keys.shift()
-  if (!firstKey) {
-    return
-  }
-  var isArrayKey = /\[([0-9]+)\]/.test(firstKey)
-  if (keys.length > 0) {
-    var firstKeyValue = obj[firstKey] || {}
-    var returnValue = setValue(firstKeyValue, keys.join("."), value)
-    return setKey(obj, isArrayKey, firstKey, returnValue)
-  }
-  return setKey(obj, isArrayKey, firstKey, value)
-}
-exports.setValue = setValue
-var setKey = function (_object, _isArrayKey, _key, _nextValue) {
-  if (_isArrayKey) {
-    if (_object.length > _key) {
-      _object[_key] = _nextValue
-    } else {
-      _object.push(_nextValue)
-    }
-  } else {
-    _object[_key] = _nextValue
-  }
-  return _object
-}
 function isEmptyObject(obj) {
   for (var key in obj) {
     if (obj.hasOwnProperty(key)) {
@@ -275,3 +237,41 @@ function equalAll(list, name, v) {
   return true
 }
 exports.equalAll = equalAll
+function getDirectValue(obj, key) {
+  if (obj && obj.hasOwnProperty(key)) {
+    return obj[key]
+  }
+  return null
+}
+exports.getDirectValue = getDirectValue
+function setValue(obj, key, value) {
+  var replaceKey = key.replace(/\[/g, ".[").replace(/\.\./g, ".")
+  if (replaceKey.indexOf(".") === 0) {
+    replaceKey = replaceKey.slice(1, replaceKey.length)
+  }
+  var keys = replaceKey.split(".")
+  var firstKey = keys.shift()
+  if (!firstKey) {
+    return
+  }
+  var isArrayKey = /\[([0-9]+)\]/.test(firstKey)
+  if (keys.length > 0) {
+    var firstKeyValue = obj[firstKey] || {}
+    var returnValue = setValue(firstKeyValue, keys.join("."), value)
+    return setKey(obj, isArrayKey, firstKey, returnValue)
+  }
+  return setKey(obj, isArrayKey, firstKey, value)
+}
+exports.setValue = setValue
+var setKey = function (_object, _isArrayKey, _key, _nextValue) {
+  if (_isArrayKey) {
+    if (_object.length > _key) {
+      _object[_key] = _nextValue
+    } else {
+      _object.push(_nextValue)
+    }
+  } else {
+    _object[_key] = _nextValue
+  }
+  return _object
+}

package/lib/search.js

@@ -2,17 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true })
 var core_1 = require("./core")
 var reflect_1 = require("./reflect")
-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) {
@@ -150,6 +139,20 @@ function getFields(form, arr) {
   return fields.length > 0 ? fields : undefined
 }
 exports.getFields = getFields
+function getPageTotal(pageSize, total) {
+  if (!pageSize || pageSize <= 0) {
+    return 1
+  } else {
+    if (!total) {
+      total = 0
+    }
+    if (total % pageSize === 0) {
+      return Math.floor(total / pageSize)
+    }
+    return Math.floor(total / pageSize + 1)
+  }
+}
+exports.getPageTotal = getPageTotal
 function formatText() {
   var args = []
   for (var _i = 0; _i < arguments.length; _i++) {
@@ -174,20 +177,6 @@ function formatText() {
   return formatted
 }
 exports.formatText = formatText
-function getPageTotal(pageSize, total) {
-  if (!pageSize || pageSize <= 0) {
-    return 1
-  } else {
-    if (!total) {
-      total = 0
-    }
-    if (total % pageSize === 0) {
-      return Math.floor(total / pageSize)
-    }
-    return Math.floor(total / pageSize + 1)
-  }
-}
-exports.getPageTotal = getPageTotal
 function buildMessage(resource, results, limit, page, total) {
   if (!results || results.length === 0) {
     return resource.msg_no_data_found
@@ -420,3 +409,14 @@ function toggleSortStyle(target) {
   return field
 }
 exports.toggleSortStyle = toggleSortStyle
+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

package/lib/update.js

@@ -16,7 +16,6 @@ var __assign =
 Object.defineProperty(exports, "__esModule", { value: true })
 var react_1 = require("react")
 var core_1 = require("./core")
-var merge_1 = require("./merge")
 var state_1 = require("./state")
 function removePhoneFormat(phone) {
   if (phone) {
@@ -50,8 +49,33 @@ var m = "model"
 var _getModelName = function (f2) {
   return getModelName(f2, m)
 }
+function useMergeState(initialState) {
+  var _a = react_1.useState(initialState ? initialState : {}),
+    state = _a[0],
+    _setState = _a[1]
+  var callbackRef = react_1.useRef()
+  var setState = react_1.useCallback(
+    function (newState, callback) {
+      callbackRef.current = callback
+      _setState(function (prevState) {
+        return Object.assign({}, prevState, newState)
+      })
+    },
+    [state],
+  )
+  react_1.useEffect(
+    function () {
+      if (callbackRef.current) {
+        callbackRef.current(state)
+      }
+    },
+    [state],
+  )
+  return [state, setState]
+}
+exports.useMergeState = useMergeState
 exports.useUpdate = function (initialState, getName, getLocale, removeErr) {
-  var _a = merge_1.useMergeState(initialState),
+  var _a = useMergeState(initialState),
     state = _a[0],
     setState = _a[1]
   var _b = react_1.useState(false),

package/lib/useEdit.js

@@ -16,12 +16,11 @@ var __assign =
 Object.defineProperty(exports, "__esModule", { value: true })
 var react_1 = require("react")
 var react_router_1 = require("react-router")
+var common_1 = require("./common")
 var core_1 = require("./core")
 var edit_1 = require("./edit")
-var error_1 = require("./error")
 var formutil_1 = require("./formutil")
 var input_1 = require("./input")
-var merge_1 = require("./merge")
 var reflect_1 = require("./reflect")
 var state_1 = require("./state")
 var update_1 = require("./update")
@@ -203,7 +202,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var baseProps = update_1.useUpdate(initialState, getModelName, p1.getLocale)
   var state = baseProps.state,
     setState = baseProps.setState
-  var _b = merge_1.useMergeState({
+  var _b = update_1.useMergeState({
       newMode: false,
       setBack: false,
       readOnly: p ? p.readOnly : undefined,
@@ -226,16 +225,16 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     showModel(model)
   }
   var _handleNotFound = function (form) {
-    var msg = error_1.message(p1.resource.value, "error_404", "error")
     if (form) {
       formutil_1.setReadOnly(form)
     }
+    var resource = p1.resource.resource()
     p1.showError(
-      msg.message,
+      resource.error_404,
       function () {
         return window.history.back
       },
-      msg.title,
+      resource.error,
     )
   }
   var handleNotFound = p && p.handleNotFound ? p.handleNotFound : _handleNotFound
@@ -261,15 +260,15 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
       if (objKeys.length === 0) {
         navigate(-1)
       } else {
-        var msg = error_1.message(p1.resource.value, "msg_confirm_back", "confirm", "yes", "no")
+        var resource = p1.resource.resource()
         p1.confirm(
-          msg.message,
+          resource.msg_confirm_back,
           function () {
             navigate(-1)
           },
-          msg.title,
-          msg.no,
-          msg.yes,
+          resource.confirm,
+          resource.no,
+          resource.yes,
         )
       }
     }
@@ -297,13 +296,12 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     }
   }
   var _onSave = function (isBack) {
+    var resource = p1.resource.resource()
     if (p && p.readOnly) {
       if (flag.newMode === true) {
-        var m = error_1.message(p1.resource.value, "error_permission_add", "error_permission")
-        p1.showError(m.message, undefined, m.title)
+        p1.showError(resource.error_permission_add, undefined, resource.error_permission)
       } else {
-        var msg = error_1.message(p1.resource.value, "error_permission_edit", "error_permission")
-        p1.showError(msg.message, undefined, msg.title)
+        p1.showError(resource.error_permission_edit, undefined, resource.error_permission)
       }
     } else {
       if (running === true) {
@@ -320,15 +318,14 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
       }
       if (flag.newMode) {
         validate(obj_1, function () {
-          var msg = error_1.message(p1.resource.value, "msg_confirm_save", "confirm", "yes", "no")
           p1.confirm(
-            msg.message,
+            resource.msg_confirm_save,
             function () {
               doSave(obj_1, undefined, version_1, isBack)
             },
-            msg.title,
-            msg.no,
-            msg.yes,
+            resource.confirm,
+            resource.no,
+            resource.yes,
           )
         })
       } else {
@@ -338,15 +335,14 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
           p1.showMessage(p1.resource.value("msg_no_change"))
         } else {
           validate(obj_1, function () {
-            var msg = error_1.message(p1.resource.value, "msg_confirm_save", "confirm", "yes", "no")
             p1.confirm(
-              msg.message,
+              resource.msg_confirm_save,
               function () {
                 doSave(obj_1, diffObj_1, version_1, isBack)
               },
-              msg.title,
-              msg.no,
-              msg.yes,
+              resource.confirm,
+              resource.no,
+              resource.yes,
             )
           })
         }
@@ -468,8 +464,8 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   }
   var postSave = p && p.postSave ? p.postSave : _postSave
   var _handleDuplicateKey = function (result) {
-    var msg = error_1.message(p1.resource.value, "error_duplicate_key", "error")
-    p1.showError(msg.message, undefined, msg.title)
+    var resource = p1.resource.resource()
+    p1.showError(resource.error_duplicate_key, undefined, resource.error)
   }
   var handleDuplicateKey = p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey
   var _doSave = function (obj, body, version, isBack) {
@@ -527,9 +523,9 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         .catch(function (err) {
           var _a, _b, _c
           var data = err && err.response ? err.response : err
-          var r = p1.resource
-          var title = r.value("error")
-          var msg = r.value("error_internal")
+          var resource = p1.resource.resource()
+          var title = resource.error
+          var msg = resource.error_internal
           if (data && data.status === 422) {
             fail((_a = err.response) === null || _a === void 0 ? void 0 : _a.data)
             var obj = (_c = (_b = err.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.value
@@ -541,7 +537,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
               handleNotFound(refForm.current)
             } else {
               if (data.status && !isNaN(data.status)) {
-                msg = error_1.messageByHttpStatus(data.status, r.value)
+                msg = common_1.messageByHttpStatus(data.status, resource)
               }
               if (data && (data.status === 401 || data.status === 403)) {
                 formutil_1.setReadOnly(refForm.current)

package/lib/useSearch.js

@@ -22,10 +22,9 @@ var __spreadArrays =
   }
 Object.defineProperty(exports, "__esModule", { value: true })
 var react_1 = require("react")
+var common_1 = require("./common")
 var core_1 = require("./core")
-var error_1 = require("./error")
 var input_1 = require("./input")
-var merge_1 = require("./merge")
 var reflect_1 = require("./reflect")
 var route_1 = require("./route")
 var search_1 = require("./search")
@@ -338,7 +337,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     return refForm && refForm.current ? refForm.current.getAttribute("currency-code") : "USD"
   }
   var getCurrencyCode = p && p.getCurrencyCode ? p.getCurrencyCode : _getCurrencyCode
-  var _c = merge_1.useMergeState(p),
+  var _c = update_1.useMergeState(p),
     component = _c[0],
     setComponent = _c[1]
   var toggleFilter = function (event) {
@@ -504,7 +503,8 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   }
   var searchError = function (err) {
     setComponent({ page: component.tmpPageIndex })
-    error_1.error(err, p1.resource.value, p1.showError)
+    var resource = p1.resource.resource()
+    common_1.error(err, resource, p1.showError)
     input_1.hideLoading(p1.loading)
   }
   var appendList = p && p.appendList ? p.appendList : appendListOfState

package/package.json

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

package/src/common.ts

@@ -0,0 +1,28 @@
+import { StringMap } from "./core"
+
+export function messageByHttpStatus(status: number, resource: StringMap): string {
+  const k = "error_" + status
+  let msg = resource[k]
+  if (!msg || msg.length === 0) {
+    msg = resource.error_500
+  }
+  return msg
+}
+export function error(err: any, resource: StringMap, ae: (msg: string, callback?: () => void, header?: string) => void) {
+  const title = resource.error
+  let msg = resource.error_internal
+  if (!err) {
+    ae(msg, undefined, title)
+    return
+  }
+  const data = err && err.response ? err.response : err
+  if (data) {
+    const status = data.status
+    if (status && !isNaN(status)) {
+      msg = messageByHttpStatus(status, resource)
+    }
+    ae(msg, undefined, title)
+  } else {
+    ae(msg, undefined, title)
+  }
+}

package/src/core.ts

@@ -6,7 +6,7 @@ export const pageSizes = [12, 24, 60, 100, 120, 180, 300, 600]
 export const sizes = pageSizes
 // tslint:disable-next-line:class-name
 export class resources {
-  static phone = / |-|\.|\(|\)/g
+  static phone = / |\-|\.|\(|\)/g
   static _cache: any = {}
   static cache = true
   static fields = "fields"
@@ -46,7 +46,6 @@ export interface ErrorMessage {
 }
 export interface UIService {
   getValue(el: HTMLInputElement, locale?: Locale, currencyCode?: string): string | number | boolean | null | undefined
-  // decodeFromForm(form: HTMLFormElement, locale?: Locale, currencyCode?: string | null): any;
 
   validateForm(form?: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean): boolean
   removeFormError(form: HTMLFormElement): void
@@ -57,7 +56,7 @@ export interface UIService {
   registerEvents?(form: HTMLFormElement): void
 }
 
-export type DataType =
+export type Type =
   | "ObjectId"
   | "date"
   | "datetime"
@@ -79,9 +78,21 @@ export type DataType =
   | "datetimes"
   | "times"
 
+export type Format = "currency" | "percentage" | "email" | "url" | "phone" | "fax" | "ipv4" | "ipv6"
+
+export interface Attribute {
+  name?: string
+  type?: Type
+  format?: Format
+  key?: boolean
+  version?: boolean
+  typeof?: Attributes
+  scale?: number
+  noformat?: boolean
+}
 export interface Attribute {
   name?: string
-  type?: DataType
+  type?: Type
   key?: boolean
   version?: boolean
   typeof?: Attributes

package/src/index.ts

@@ -5,7 +5,6 @@ export * from "./core"
 export * from "./diff"
 export * from "./edit"
 export * from "./formutil"
-export * from "./merge"
 export * from "./reflect"
 export * from "./route"
 export * from "./search"

package/src/input.ts

@@ -82,14 +82,22 @@ export function getErrorFunc(
   return (p as any).showError
 }
 
-export function showLoading(s?: LoadingService): void {
-  if (s) {
-    s.showLoading()
+export function showLoading(loading?: LoadingService | ((firstTime?: boolean) => void)): void {
+  if (loading) {
+    if (typeof loading === "function") {
+      loading()
+    } else {
+      loading.showLoading()
+    }
   }
 }
-export function hideLoading(s?: LoadingService): void {
-  if (s) {
-    s.hideLoading()
+export function hideLoading(loading?: LoadingService | (() => void)): void {
+  if (loading) {
+    if (typeof loading === "function") {
+      loading()
+    } else {
+      loading.hideLoading()
+    }
   }
 }
 

package/src/reflect.ts

@@ -36,43 +36,6 @@ export function clone(obj: any): any {
   return x
 }
 
-export function getDirectValue(obj: any, key: string): any {
-  if (obj && obj.hasOwnProperty(key)) {
-    return obj[key]
-  }
-  return null
-}
-
-export function setValue(obj: any, key: string, value: any): any {
-  let replaceKey = key.replace(/\[/g, ".[").replace(/\.\./g, ".")
-  if (replaceKey.indexOf(".") === 0) {
-    replaceKey = replaceKey.slice(1, replaceKey.length)
-  }
-  const keys = replaceKey.split(".")
-  const firstKey = keys.shift()
-  if (!firstKey) {
-    return
-  }
-  const isArrayKey = /\[([0-9]+)\]/.test(firstKey)
-  if (keys.length > 0) {
-    const firstKeyValue = obj[firstKey] || {}
-    const returnValue = setValue(firstKeyValue, keys.join("."), value)
-    return setKey(obj, isArrayKey, firstKey, returnValue)
-  }
-  return setKey(obj, isArrayKey, firstKey, value)
-}
-const setKey = (_object: any, _isArrayKey: boolean, _key: string, _nextValue: any) => {
-  if (_isArrayKey) {
-    if (_object.length > _key) {
-      _object[_key] = _nextValue
-    } else {
-      _object.push(_nextValue)
-    }
-  } else {
-    _object[_key] = _nextValue
-  }
-  return _object
-}
 export function isEmptyObject(obj: any): boolean {
   for (let key in obj) {
     if (obj.hasOwnProperty(key)) {
@@ -254,3 +217,41 @@ export function equalAll<T>(list: T[] | undefined | null, name: string, v: boole
   }
   return true
 }
+
+export function getDirectValue(obj: any, key: string): any {
+  if (obj && obj.hasOwnProperty(key)) {
+    return obj[key]
+  }
+  return null
+}
+
+export function setValue(obj: any, key: string, value: any): any {
+  let replaceKey = key.replace(/\[/g, ".[").replace(/\.\./g, ".")
+  if (replaceKey.indexOf(".") === 0) {
+    replaceKey = replaceKey.slice(1, replaceKey.length)
+  }
+  const keys = replaceKey.split(".")
+  const firstKey = keys.shift()
+  if (!firstKey) {
+    return
+  }
+  const isArrayKey = /\[([0-9]+)\]/.test(firstKey)
+  if (keys.length > 0) {
+    const firstKeyValue = obj[firstKey] || {}
+    const returnValue = setValue(firstKeyValue, keys.join("."), value)
+    return setKey(obj, isArrayKey, firstKey, returnValue)
+  }
+  return setKey(obj, isArrayKey, firstKey, value)
+}
+const setKey = (_object: any, _isArrayKey: boolean, _key: string, _nextValue: any) => {
+  if (_isArrayKey) {
+    if (_object.length > _key) {
+      _object[_key] = _nextValue
+    } else {
+      _object.push(_nextValue)
+    }
+  } else {
+    _object[_key] = _nextValue
+  }
+  return _object
+}

package/src/search.ts

@@ -44,16 +44,6 @@ export interface Pagination {
 
 interface Searchable extends Pagination, Sortable {}
 
-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) {
@@ -148,11 +138,6 @@ export function initFilter<S extends Filter>(m: S, com: Searchable): S {
       com.sortType = ""
     }
   }
-  /*
-  delete m.page;
-  delete m.limit;
-  delete m.firstLimit;
-  */
   return m
 }
 
@@ -195,6 +180,19 @@ export function getFields(form?: HTMLFormElement, arr?: string[]): string[] | un
   return fields.length > 0 ? fields : undefined
 }
 
+export function getPageTotal(pageSize?: number, total?: number): number {
+  if (!pageSize || pageSize <= 0) {
+    return 1
+  } else {
+    if (!total) {
+      total = 0
+    }
+    if (total % pageSize === 0) {
+      return Math.floor(total / pageSize)
+    }
+    return Math.floor(total / pageSize + 1)
+  }
+}
 export function formatText(...args: any[]): string {
   let formatted = args[0]
   if (!formatted || formatted === "") {
@@ -214,19 +212,6 @@ export function formatText(...args: any[]): string {
   }
   return formatted
 }
-export function getPageTotal(pageSize?: number, total?: number): number {
-  if (!pageSize || pageSize <= 0) {
-    return 1
-  } else {
-    if (!total) {
-      total = 0
-    }
-    if (total % pageSize === 0) {
-      return Math.floor(total / pageSize)
-    }
-    return Math.floor(total / pageSize + 1)
-  }
-}
 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
@@ -456,3 +441,14 @@ export function toggleSortStyle(target: HTMLElement): string {
   }
   return field
 }
+
+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
+  }
+}

package/src/update.ts

@@ -1,6 +1,5 @@
-import { useEffect, useState } from "react"
+import { useCallback, useEffect, useRef, useState } from "react"
 import { Locale, resources } from "./core"
-import { useMergeState } from "./merge"
 import { buildFlatState, buildState, handleEvent, localeOf } from "./state"
 
 export function removePhoneFormat(phone: string): string {
@@ -34,6 +33,32 @@ const m = "model"
 const _getModelName = (f2?: HTMLFormElement | null): string => {
   return getModelName(f2, m)
 }
+
+export type Callback<T> = (value?: T) => void
+export type DispatchWithCallback<T> = (value: T, callback?: Callback<T>) => void
+
+export function useMergeState<T>(initialState?: T | (() => T)): [T, DispatchWithCallback<Partial<T>>] {
+  const [state, _setState] = useState(initialState ? initialState : ({} as any))
+
+  const callbackRef = useRef<Callback<T>>()
+
+  const setState = useCallback(
+    (newState: Partial<T>, callback?: Callback<T>): void => {
+      callbackRef.current = callback
+      _setState((prevState: any) => Object.assign({}, prevState, newState))
+    },
+    [state],
+  )
+
+  useEffect(() => {
+    if (callbackRef.current) {
+      callbackRef.current(state)
+    }
+  }, [state])
+
+  return [state, setState]
+}
+
 export const useUpdate = <T>(
   initialState: T,
   getName?: ((f?: HTMLFormElement | null) => string) | string,

package/src/useEdit.ts

@@ -1,14 +1,13 @@
 import { useEffect, useState } from "react"
 import { Params, useNavigate, useParams } from "react-router"
+import { messageByHttpStatus } from "./common"
 import { Attribute, Attributes, ErrorMessage, LoadingService, Locale, resources, ResourceService, UIService } from "./core"
 import { createModel as createModel2 } from "./edit"
-import { message, messageByHttpStatus } from "./error"
 import { focusFirstError, setReadOnly } from "./formutil"
 import { hideLoading, initForm, showLoading } from "./input"
-import { DispatchWithCallback, useMergeState } from "./merge"
 import { clone, makeDiff } from "./reflect"
 import { localeOf } from "./state"
-import { getModelName as getModelName2, useUpdate } from "./update"
+import { DispatchWithCallback, getModelName as getModelName2, useMergeState, useUpdate } from "./update"
 
 export function buildKeys(attributes: Attributes): string[] {
   if (!attributes) {
@@ -337,11 +336,11 @@ export const useCoreEdit = <T, ID, S, P>(
   }
 
   const _handleNotFound = (form?: any): void => {
-    const msg = message(p1.resource.value, "error_404", "error")
     if (form) {
       setReadOnly(form)
     }
-    p1.showError(msg.message, () => window.history.back, msg.title)
+    const resource = p1.resource.resource()
+    p1.showError(resource.error_404, () => window.history.back, resource.error)
   }
   const handleNotFound = p && p.handleNotFound ? p.handleNotFound : _handleNotFound
 
@@ -368,15 +367,15 @@ export const useCoreEdit = <T, ID, S, P>(
       if (objKeys.length === 0) {
         navigate(-1)
       } else {
-        const msg = message(p1.resource.value, "msg_confirm_back", "confirm", "yes", "no")
+        const resource = p1.resource.resource()
         p1.confirm(
-          msg.message,
+          resource.msg_confirm_back,
           () => {
             navigate(-1)
           },
-          msg.title,
-          msg.no,
-          msg.yes,
+          resource.confirm,
+          resource.no,
+          resource.yes,
         )
       }
     }
@@ -406,13 +405,12 @@ export const useCoreEdit = <T, ID, S, P>(
   }
 
   const _onSave = (isBack?: boolean) => {
+    const resource = p1.resource.resource()
     if (p && p.readOnly) {
       if (flag.newMode === true) {
-        const m = message(p1.resource.value, "error_permission_add", "error_permission")
-        p1.showError(m.message, undefined, m.title)
+        p1.showError(resource.error_permission_add, undefined, resource.error_permission)
       } else {
-        const msg = message(p1.resource.value, "error_permission_edit", "error_permission")
-        p1.showError(msg.message, undefined, msg.title)
+        p1.showError(resource.error_permission_edit, undefined, resource.error_permission)
       }
     } else {
       if (running === true) {
@@ -429,15 +427,14 @@ export const useCoreEdit = <T, ID, S, P>(
       }
       if (flag.newMode) {
         validate(obj, () => {
-          const msg = message(p1.resource.value, "msg_confirm_save", "confirm", "yes", "no")
           p1.confirm(
-            msg.message,
+            resource.msg_confirm_save,
             () => {
               doSave(obj, undefined, version, isBack)
             },
-            msg.title,
-            msg.no,
-            msg.yes,
+            resource.confirm,
+            resource.no,
+            resource.yes,
           )
         })
       } else {
@@ -447,15 +444,14 @@ export const useCoreEdit = <T, ID, S, P>(
           p1.showMessage(p1.resource.value("msg_no_change"))
         } else {
           validate(obj, () => {
-            const msg = message(p1.resource.value, "msg_confirm_save", "confirm", "yes", "no")
             p1.confirm(
-              msg.message,
+              resource.msg_confirm_save,
               () => {
                 doSave(obj, diffObj as any, version, isBack)
               },
-              msg.title,
-              msg.no,
-              msg.yes,
+              resource.confirm,
+              resource.no,
+              resource.yes,
             )
           })
         }
@@ -584,8 +580,8 @@ export const useCoreEdit = <T, ID, S, P>(
   const postSave = p && p.postSave ? p.postSave : _postSave
 
   const _handleDuplicateKey = (result?: T) => {
-    const msg = message(p1.resource.value, "error_duplicate_key", "error")
-    p1.showError(msg.message, undefined, msg.title)
+    const resource = p1.resource.resource()
+    p1.showError(resource.error_duplicate_key, undefined, resource.error)
   }
   const handleDuplicateKey = p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey
 
@@ -641,9 +637,9 @@ export const useCoreEdit = <T, ID, S, P>(
         })
         .catch((err: any) => {
           const data = err && err.response ? err.response : err
-          const r = p1.resource
-          const title = r.value("error")
-          let msg = r.value("error_internal")
+          const resource = p1.resource.resource()
+          const title = resource.error
+          let msg = resource.error_internal
           if (data && data.status === 422) {
             fail(err.response?.data)
             const obj = err.response?.data?.value
@@ -655,7 +651,7 @@ export const useCoreEdit = <T, ID, S, P>(
               handleNotFound(refForm.current)
             } else {
               if (data.status && !isNaN(data.status)) {
-                msg = messageByHttpStatus(data.status, r.value)
+                msg = messageByHttpStatus(data.status, resource)
               }
               if (data && (data.status === 401 || data.status === 403)) {
                 setReadOnly(refForm.current)

package/src/useSearch.ts

@@ -1,8 +1,7 @@
 import { useEffect, useState } from "react"
+import { error } from "./common"
 import { LoadingService, Locale, pageSizes, resources, ResourceService, UIService } from "./core"
-import { error } from "./error"
 import { hideLoading, initForm, showLoading } from "./input"
-import { DispatchWithCallback, useMergeState } from "./merge"
 import { clone } from "./reflect"
 import { buildFromUrl } from "./route"
 import {
@@ -23,7 +22,7 @@ import {
   Sortable,
 } from "./search"
 import { enLocale } from "./state"
-import { useUpdate } from "./update"
+import { DispatchWithCallback, useMergeState, useUpdate } from "./update"
 
 export function showPaging<T>(com: Pagination, list: T[], pageSize?: number, total?: number): void {
   com.total = total
@@ -656,7 +655,8 @@ export const useCoreSearch = <T, S extends Filter, ST>(
 
   const searchError = (err: any): void => {
     setComponent({ page: component.tmpPageIndex })
-    error(err, p1.resource.value, p1.showError)
+    const resource = p1.resource.resource()
+    error(err, resource, p1.showError)
     hideLoading(p1.loading)
   }
   const appendList = p && p.appendList ? p.appendList : appendListOfState

package/lib/error.js

@@ -1,53 +0,0 @@
-"use strict"
-Object.defineProperty(exports, "__esModule", { value: true })
-function getString(key, gv) {
-  if (typeof gv === "function") {
-    return gv(key)
-  } else {
-    return gv[key]
-  }
-}
-exports.getString = getString
-function message(gv, msg, title, yes, no) {
-  var m2 = msg && msg.length > 0 ? getString(msg, gv) : ""
-  var m = { message: m2, title: "" }
-  if (title && title.length > 0) {
-    m.title = getString(title, gv)
-  }
-  if (yes && yes.length > 0) {
-    m.yes = getString(yes, gv)
-  }
-  if (no && no.length > 0) {
-    m.no = getString(no, gv)
-  }
-  return m
-}
-exports.message = message
-function messageByHttpStatus(status, gv) {
-  var k = "error_" + status
-  var msg = getString(k, gv)
-  if (!msg || msg.length === 0) {
-    msg = getString("error_500", gv)
-  }
-  return msg
-}
-exports.messageByHttpStatus = messageByHttpStatus
-function error(err, gv, ae) {
-  var title = getString("error", gv)
-  var msg = getString("error_internal", gv)
-  if (!err) {
-    ae(msg, undefined, title)
-    return
-  }
-  var data = err && err.response ? err.response : err
-  if (data) {
-    var status_1 = data.status
-    if (status_1 && !isNaN(status_1)) {
-      msg = messageByHttpStatus(status_1, gv)
-    }
-    ae(msg, undefined, title)
-  } else {
-    ae(msg, undefined, title)
-  }
-}
-exports.error = error

package/lib/merge.js

@@ -1,28 +0,0 @@
-"use strict"
-Object.defineProperty(exports, "__esModule", { value: true })
-var react_1 = require("react")
-function useMergeState(initialState) {
-  var _a = react_1.useState(initialState ? initialState : {}),
-    state = _a[0],
-    _setState = _a[1]
-  var callbackRef = react_1.useRef()
-  var setState = react_1.useCallback(
-    function (newState, callback) {
-      callbackRef.current = callback
-      _setState(function (prevState) {
-        return Object.assign({}, prevState, newState)
-      })
-    },
-    [state],
-  )
-  react_1.useEffect(
-    function () {
-      if (callbackRef.current) {
-        callbackRef.current(state)
-      }
-    },
-    [state],
-  )
-  return [state, setState]
-}
-exports.useMergeState = useMergeState

package/src/error.ts

@@ -1,55 +0,0 @@
-import { StringMap } from "./core"
-
-export interface Message {
-  message: string
-  title: string
-  yes?: string
-  no?: string
-}
-export function getString(key: string, gv: StringMap | ((key: string) => string)): string {
-  if (typeof gv === "function") {
-    return gv(key)
-  } else {
-    return gv[key]
-  }
-}
-export function message(gv: StringMap | ((key: string) => string), msg: string, title?: string, yes?: string, no?: string): Message {
-  const m2 = msg && msg.length > 0 ? getString(msg, gv) : ""
-  const m: Message = { message: m2, title: "" }
-  if (title && title.length > 0) {
-    m.title = getString(title, gv)
-  }
-  if (yes && yes.length > 0) {
-    m.yes = getString(yes, gv)
-  }
-  if (no && no.length > 0) {
-    m.no = getString(no, gv)
-  }
-  return m
-}
-export function messageByHttpStatus(status: number, gv: StringMap | ((key: string) => string)): string {
-  const k = "error_" + status
-  let msg = getString(k, gv)
-  if (!msg || msg.length === 0) {
-    msg = getString("error_500", gv)
-  }
-  return msg
-}
-export function error(err: any, gv: StringMap | ((key: string) => string), ae: (msg: string, callback?: () => void, header?: string) => void) {
-  const title = getString("error", gv)
-  let msg = getString("error_internal", gv)
-  if (!err) {
-    ae(msg, undefined, title)
-    return
-  }
-  const data = err && err.response ? err.response : err
-  if (data) {
-    const status = data.status
-    if (status && !isNaN(status)) {
-      msg = messageByHttpStatus(status, gv)
-    }
-    ae(msg, undefined, title)
-  } else {
-    ae(msg, undefined, title)
-  }
-}

package/src/merge.ts

@@ -1,26 +0,0 @@
-import { useCallback, useEffect, useRef, useState } from "react"
-
-export type Callback<T> = (value?: T) => void
-export type DispatchWithCallback<T> = (value: T, callback?: Callback<T>) => void
-
-export function useMergeState<T>(initialState?: T | (() => T)): [T, DispatchWithCallback<Partial<T>>] {
-  const [state, _setState] = useState(initialState ? initialState : ({} as any))
-
-  const callbackRef = useRef<Callback<T>>()
-
-  const setState = useCallback(
-    (newState: Partial<T>, callback?: Callback<T>): void => {
-      callbackRef.current = callback
-      _setState((prevState: any) => Object.assign({}, prevState, newState))
-    },
-    [state],
-  )
-
-  useEffect(() => {
-    if (callbackRef.current) {
-      callbackRef.current(state)
-    }
-  }, [state])
-
-  return [state, setState]
-}