react-hook-core 0.4.8 → 0.4.9

package/lib/core.js

@@ -1,6 +1,5 @@
 "use strict"
 Object.defineProperty(exports, "__esModule", { value: true })
-var formutil_1 = require("./formutil")
 exports.pageSizes = [12, 24, 60, 100, 120, 180, 300, 600]
 exports.sizes = exports.pageSizes
 var resources = (function () {
@@ -17,120 +16,3 @@ var resources = (function () {
   return resources
 })()
 exports.resources = resources
-function removePhoneFormat(phone) {
-  if (phone) {
-    return phone.replace(resources.phone, "")
-  } else {
-    return phone
-  }
-}
-exports.removePhoneFormat = removePhoneFormat
-exports.datetimeToString = function (inputDate) {
-  var date = new Date(inputDate)
-  var year = date.getFullYear()
-  var month = String(date.getMonth() + 1).padStart(2, "0")
-  var day = String(date.getDate()).padStart(2, "0")
-  var hours = String(date.getHours()).padStart(2, "0")
-  var minutes = String(date.getMinutes()).padStart(2, "0")
-  var seconds = String(date.getSeconds()).padStart(2, "0")
-  return year + "-" + month + "-" + day + "T" + hours + ":" + minutes + ":" + seconds
-}
-exports.dateToString = function (inputDate) {
-  var year = inputDate.getFullYear()
-  var month = String(inputDate.getMonth() + 1).padStart(2, "0")
-  var day = String(inputDate.getDate()).padStart(2, "0")
-  return year + "-" + month + "-" + day
-}
-function initForm(form, initMat) {
-  if (form) {
-    setTimeout(function () {
-      if (initMat) {
-        initMat(form)
-      }
-      formutil_1.focusFirstElement(form)
-    }, 100)
-  }
-  return form
-}
-exports.initForm = initForm
-function getName(d, n) {
-  return n && n.length > 0 ? n : d
-}
-exports.getName = getName
-function getModelName(form, name) {
-  if (form) {
-    var a = form.getAttribute("model-name")
-    if (a && a.length > 0) {
-      return a
-    }
-    var b = form.name
-    if (b) {
-      if (b.endsWith("Form")) {
-        return b.substring(0, b.length - 4)
-      }
-      return b
-    }
-  }
-  if (name && name.length > 0) {
-    return name
-  }
-  return ""
-}
-exports.getModelName = getModelName
-exports.scrollToFocus = function (e, isUseTimeOut) {
-  try {
-    var element = e.target
-    var form = element.form
-    if (form) {
-      var container_1 = form.childNodes[1]
-      var elementRect_1 = element.getBoundingClientRect()
-      var absoluteElementTop = elementRect_1.top + window.pageYOffset
-      var middle_1 = absoluteElementTop - window.innerHeight / 2
-      var scrollTop_1 = container_1.scrollTop
-      var timeOut = isUseTimeOut ? 300 : 0
-      var isChrome_1 = navigator.userAgent.search("Chrome") > 0
-      setTimeout(function () {
-        if (isChrome_1) {
-          var scrollPosition = scrollTop_1 === 0 ? elementRect_1.top + 64 : scrollTop_1 + middle_1
-          container_1.scrollTo(0, Math.abs(scrollPosition))
-        } else {
-          container_1.scrollTo(0, Math.abs(scrollTop_1 + middle_1))
-        }
-      }, timeOut)
-    }
-  } catch (e) {
-    console.log(e)
-  }
-}
-function showLoading(s) {
-  if (s) {
-    s.showLoading()
-  }
-}
-exports.showLoading = showLoading
-function hideLoading(s) {
-  if (s) {
-    s.hideLoading()
-  }
-}
-exports.hideLoading = hideLoading
-function getRemoveError(u, rmErr) {
-  if (rmErr) {
-    return rmErr
-  }
-  return u && u.ui ? u.ui.removeError : undefined
-}
-exports.getRemoveError = getRemoveError
-function removeFormError(u, f) {
-  if (f && u && u.ui) {
-    u.ui.removeFormError(f)
-  }
-}
-exports.removeFormError = removeFormError
-function getValidateForm(u, vf) {
-  if (vf) {
-    return vf
-  }
-  return u && u.ui ? u.ui.validateForm : undefined
-}
-exports.getValidateForm = getValidateForm

package/lib/formutil.js

@@ -46,34 +46,6 @@ function setReadOnly(form) {
   }
 }
 exports.setReadOnly = setReadOnly
-function focusFirstElement(form) {
-  var i = 0
-  var len = form.length
-  for (i = 0; i < len; i++) {
-    var ctrl = form[i]
-    if (!(ctrl.readOnly || ctrl.disabled)) {
-      var nodeName = ctrl.nodeName
-      var type = ctrl.getAttribute("type")
-      if (type) {
-        var t = type.toUpperCase()
-        if (t === "BUTTON" || t === "SUBMIT") {
-          ctrl.focus()
-        }
-        if (nodeName === "INPUT") {
-          nodeName = t
-        }
-      }
-      if (nodeName !== "BUTTON" && nodeName !== "RESET" && nodeName !== "SUBMIT" && nodeName !== "CHECKBOX" && nodeName !== "RADIO") {
-        ctrl.focus()
-        try {
-          ctrl.setSelectionRange(0, ctrl.value.length)
-        } catch (err) {}
-        return
-      }
-    }
-  }
-}
-exports.focusFirstElement = focusFirstElement
 function focusFirstError(form, className) {
   if (!form) {
     return

package/lib/index.js

@@ -156,3 +156,28 @@ function getNumber(event) {
   return parseInt(event.currentTarget.value, 10)
 }
 exports.getNumber = getNumber
+exports.scrollToFocus = function (e, isUseTimeOut) {
+  try {
+    var element = e.target
+    var form = element.form
+    if (form) {
+      var container_1 = form.childNodes[1]
+      var elementRect_1 = element.getBoundingClientRect()
+      var absoluteElementTop = elementRect_1.top + window.pageYOffset
+      var middle_1 = absoluteElementTop - window.innerHeight / 2
+      var scrollTop_1 = container_1.scrollTop
+      var timeOut = isUseTimeOut ? 300 : 0
+      var isChrome_1 = navigator.userAgent.search("Chrome") > 0
+      setTimeout(function () {
+        if (isChrome_1) {
+          var scrollPosition = scrollTop_1 === 0 ? elementRect_1.top + 64 : scrollTop_1 + middle_1
+          container_1.scrollTo(0, Math.abs(scrollPosition))
+        } else {
+          container_1.scrollTo(0, Math.abs(scrollTop_1 + middle_1))
+        }
+      }, timeOut)
+    }
+  } catch (e) {
+    console.log(e)
+  }
+}

package/lib/input.js

@@ -59,3 +59,52 @@ function getErrorFunc(p, showErr) {
   return p.showError
 }
 exports.getErrorFunc = getErrorFunc
+function showLoading(s) {
+  if (s) {
+    s.showLoading()
+  }
+}
+exports.showLoading = showLoading
+function hideLoading(s) {
+  if (s) {
+    s.hideLoading()
+  }
+}
+exports.hideLoading = hideLoading
+function initForm(form, initMat) {
+  if (form) {
+    setTimeout(function () {
+      if (initMat) {
+        initMat(form)
+      }
+      focusFirstElement(form)
+    }, 100)
+  }
+  return form
+}
+exports.initForm = initForm
+function focusFirstElement(form) {
+  var i = 0
+  var len = form.length
+  for (i = 0; i < len; i++) {
+    var ctrl = form[i]
+    if (!(ctrl.readOnly || ctrl.disabled)) {
+      var nodeName = ctrl.nodeName
+      var type = ctrl.getAttribute("type")
+      if (type) {
+        var t = type.toUpperCase()
+        if (t === "BUTTON" || t === "SUBMIT") {
+          ctrl.focus()
+        }
+        if (nodeName === "INPUT") {
+          nodeName = t
+        }
+      }
+      if (nodeName !== "BUTTON" && nodeName !== "RESET" && nodeName !== "SUBMIT" && nodeName !== "CHECKBOX" && nodeName !== "RADIO") {
+        ctrl.focus()
+        return
+      }
+    }
+  }
+}
+exports.focusFirstElement = focusFirstElement

package/lib/reflect.js

@@ -151,16 +151,6 @@ function hasDiff(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/route.js

@@ -1,6 +1,17 @@
 "use strict"
 Object.defineProperty(exports, "__esModule", { value: true })
 var qs = require("query-string")
+var reflect_1 = require("./reflect")
+function goBack(navigate, confirm, resource, o1, o2, keys, version) {
+  if (!reflect_1.hasDiff(o1, o2, keys, version)) {
+    navigate(-1)
+  } else {
+    confirm(resource.msg_confirm_back, function () {
+      return navigate(-1)
+    })
+  }
+}
+exports.goBack = goBack
 function buildFromUrl(modelT) {
   return buildParameters(window.location.search, modelT)
 }

package/lib/search.js

@@ -111,13 +111,6 @@ function initFilter(m, com) {
   return m
 }
 exports.initFilter = initFilter
-function showPaging(com, list, pageSize, total) {
-  com.total = total
-  var pageTotal = getPageTotal(pageSize, total)
-  com.pages = pageTotal
-  com.showPaging = !total || com.pages <= 1 || (list && list.length >= total) ? false : true
-}
-exports.showPaging = showPaging
 function getFields(form, arr) {
   if (arr && arr.length > 0) {
     return arr
@@ -157,20 +150,6 @@ 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++) {
@@ -195,6 +174,20 @@ 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
@@ -355,16 +348,6 @@ function handleToggle(target, on) {
   return off
 }
 exports.handleToggle = handleToggle
-function handleSortEvent(event, com) {
-  if (event && event.target) {
-    var target = event.target
-    var s = handleSort(target, com.sortTarget, com.sortField, com.sortType)
-    com.sortField = s.field
-    com.sortType = s.type
-    com.sortTarget = target
-  }
-}
-exports.handleSortEvent = handleSortEvent
 function getSortElement(target) {
   return target.nodeName === "I" ? target.parentElement : target
 }

package/lib/update.js

@@ -18,9 +18,37 @@ 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) {
+    return phone.replace(core_1.resources.phone, "")
+  } else {
+    return phone
+  }
+}
+exports.removePhoneFormat = removePhoneFormat
+function getModelName(form, name) {
+  if (form) {
+    var a = form.getAttribute("model-name")
+    if (a && a.length > 0) {
+      return a
+    }
+    var b = form.name
+    if (b) {
+      if (b.endsWith("Form")) {
+        return b.substring(0, b.length - 4)
+      }
+      return b
+    }
+  }
+  if (name && name.length > 0) {
+    return name
+  }
+  return ""
+}
+exports.getModelName = getModelName
 var m = "model"
 var _getModelName = function (f2) {
-  return core_1.getModelName(f2, m)
+  return getModelName(f2, m)
 }
 exports.useUpdate = function (initialState, getName, getLocale, removeErr) {
   var _a = merge_1.useMergeState(initialState),
@@ -38,7 +66,7 @@ exports.useUpdate = function (initialState, getName, getLocale, removeErr) {
   var updatePhoneState = function (event) {
     var re = /^[0-9\b]+$/
     var target = event.currentTarget
-    var value = core_1.removePhoneFormat(target.value)
+    var value = removePhoneFormat(target.value)
     if (re.test(value) || !value) {
       updateState(event)
     } else {

package/lib/useEdit.js

@@ -20,6 +20,7 @@ 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")
@@ -119,7 +120,7 @@ exports.useEdit = function (refForm, initialState, service, p2, p) {
   react_1.useEffect(function () {
     if (refForm) {
       var registerEvents = p2.ui ? p2.ui.registerEvents : undefined
-      core_1.initForm(baseProps.refForm.current, registerEvents)
+      input_1.initForm(baseProps.refForm.current, registerEvents)
     }
     var n = baseProps.getModelName(refForm.current)
     var obj = {}
@@ -144,7 +145,7 @@ exports.useEdit = function (refForm, initialState, service, p2, p) {
         baseProps.load(id, p ? p.callback : undefined)
       } catch (error) {
         p2.showError(error)
-        core_1.hideLoading(p2.loading)
+        input_1.hideLoading(p2.loading)
       }
     }
   }, [])
@@ -156,7 +157,7 @@ exports.useEditProps = function (props, refForm, initialState, service, p2, p) {
   react_1.useEffect(function () {
     if (refForm) {
       var registerEvents = p2.ui ? p2.ui.registerEvents : undefined
-      core_1.initForm(baseProps.refForm.current, registerEvents)
+      input_1.initForm(baseProps.refForm.current, registerEvents)
     }
     var n = baseProps.getModelName(refForm.current)
     var obj = {}
@@ -197,7 +198,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     if (p && p.name && p.name.length > 0) {
       return p.name
     }
-    return core_1.getModelName(f)
+    return update_1.getModelName(f)
   }
   var baseProps = update_1.useUpdate(initialState, getModelName, p1.getLocale)
   var state = baseProps.state,
@@ -414,7 +415,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var _handleError = function (err) {
     if (err) {
       setRunning(false)
-      core_1.hideLoading(p1.loading)
+      input_1.hideLoading(p1.loading)
       var errHeader = p1.resource.value("error")
       var errMsg = p1.resource.value("error_internal")
       var data = err && err.response ? err.response : err
@@ -429,7 +430,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var handleError = p && p.handleError ? p.handleError : _handleError
   var _postSave = function (r, origin, version, isPatch, backOnSave) {
     setRunning(false)
-    core_1.hideLoading(p1.loading)
+    input_1.hideLoading(p1.loading)
     var x = r
     var successMsg = p1.resource.value("msg_save_success")
     var newMod = flag.newMode
@@ -473,7 +474,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var handleDuplicateKey = p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey
   var _doSave = function (obj, body, version, isBack) {
     setRunning(true)
-    core_1.showLoading(p1.loading)
+    input_1.showLoading(p1.loading)
     var isBackO = isBack != null && isBack !== undefined ? isBack : false
     var patchable = p ? p.patchable : true
     if (flag.newMode === false) {
@@ -506,7 +507,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     var id = _id
     if (id != null && id !== "") {
       setRunning(true)
-      core_1.showLoading(p1.loading)
+      input_1.showLoading(p1.loading)
       service
         .load(id)
         .then(function (obj) {
@@ -521,7 +522,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
             }
           }
           setRunning(false)
-          core_1.hideLoading(p1.loading)
+          input_1.hideLoading(p1.loading)
         })
         .catch(function (err) {
           var _a, _b, _c
@@ -549,7 +550,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
             }
           }
           setRunning(false)
-          core_1.hideLoading(p1.loading)
+          input_1.hideLoading(p1.loading)
         })
     } else {
       var obj = createModel()

package/lib/useSearch.js

@@ -24,12 +24,40 @@ Object.defineProperty(exports, "__esModule", { value: true })
 var react_1 = require("react")
 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")
 var state_1 = require("./state")
 var update_1 = require("./update")
+function showPaging(com, list, pageSize, total) {
+  com.total = total
+  var pageTotal = search_1.getPageTotal(pageSize, total)
+  com.pages = pageTotal
+  com.showPaging = !total || com.pages <= 1 || (list && list.length >= total) ? false : true
+}
+exports.showPaging = showPaging
+function removeFormError(u, f) {
+  if (f && u && u.ui) {
+    u.ui.removeFormError(f)
+  }
+}
+exports.removeFormError = removeFormError
+function getValidateForm(u, vf) {
+  if (vf) {
+    return vf
+  }
+  return u && u.ui ? u.ui.validateForm : undefined
+}
+exports.getValidateForm = getValidateForm
+function getRemoveError(u, rmErr) {
+  if (rmErr) {
+    return rmErr
+  }
+  return u && u.ui ? u.ui.removeError : undefined
+}
+exports.getRemoveError = getRemoveError
 function getModel(state, modelName, searchable, fields, excluding) {
   var obj2 = getModelFromState(state, modelName)
   var obj = obj2 ? obj2 : {}
@@ -259,7 +287,7 @@ exports.useSearch = function (refForm, initialState, service, p2, p) {
       searchError = baseProps.searchError
     if (refForm) {
       var registerEvents = p2.ui ? p2.ui.registerEvents : undefined
-      core_1.initForm(refForm.current, registerEvents)
+      input_1.initForm(refForm.current, registerEvents)
     }
     if (p && p.initialize) {
       p.initialize(load, setState, component)
@@ -281,16 +309,20 @@ exports.useSearchOneProps = function (p) {
 exports.useSearchOne = function (p) {
   return exports.useCoreSearch(p.refForm, p.initialState, p.service, p, p)
 }
+function getName(d, n) {
+  return n && n.length > 0 ? n : d
+}
+exports.getName = getName
 exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   var p = mergeParam(p2)
   var _a = react_1.useState(),
     running = _a[0],
     setRunning = _a[1]
   var _getModelName = function () {
-    return core_1.getName("filter", p && p.name ? p.name : undefined)
+    return getName("filter", p && p.name ? p.name : undefined)
   }
   var getModelName = p && p.getModelName ? p.getModelName : _getModelName
-  var baseProps = update_1.useUpdate(initialState, getModelName, p1.getLocale, core_1.getRemoveError(p1))
+  var baseProps = update_1.useUpdate(initialState, getModelName, p1.getLocale, getRemoveError(p1))
   var state = baseProps.state,
     setState = baseProps.setState
   var _b = react_1.useState(false),
@@ -359,7 +391,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   }
   var load = p && p.load ? p.load : _load
   var doSearch = function (se, isFirstLoad) {
-    core_1.removeFormError(p1, refForm.current)
+    removeFormError(p1, refForm.current)
     var s = getFilter(se)
     if (isFirstLoad) {
       setState(state)
@@ -370,7 +402,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
         return
       }
       setRunning(true)
-      core_1.showLoading(p1.loading)
+      input_1.showLoading(p1.loading)
       if (p && !p.ignoreUrlParam) {
         search_1.addParametersIntoUrl(s, isFirstLoad)
       }
@@ -383,7 +415,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     })
   }
   var _validateSearch = function (se, callback) {
-    validate(se, callback, refForm.current, p1.getLocale ? p1.getLocale() : undefined, core_1.getValidateForm(p1))
+    validate(se, callback, refForm.current, p1.getLocale ? p1.getLocale() : undefined, getValidateForm(p1))
   }
   var validateSearch = p && p.validateSearch ? p.validateSearch : _validateSearch
   var pageSizeChanged = function (event) {
@@ -473,7 +505,7 @@ 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)
-    core_1.hideLoading(p1.loading)
+    input_1.hideLoading(p1.loading)
   }
   var appendList = p && p.appendList ? p.appendList : appendListOfState
   var setList = p && p.setList ? p.setList : setListOfState
@@ -500,7 +532,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
         setList(results, setState)
       }
     } else {
-      search_1.showPaging(component, sr.list, s.limit, sr.total)
+      showPaging(component, sr.list, s.limit, sr.total)
       setList(results, setState)
       setComponent({ tmpPageIndex: s.page })
       if (s.limit) {
@@ -509,7 +541,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
       }
     }
     setRunning(false)
-    core_1.hideLoading(p1.loading)
+    input_1.hideLoading(p1.loading)
     if (component.triggerSearch) {
       setComponent({ triggerSearch: false })
       resetAndSearch()

package/lib/util.js

@@ -72,15 +72,15 @@ function getStringCurrency(value, datatype, locale, maxLength, isOnBlur) {
     }
   }
   var dotPosition = value.indexOf(".")
-  var beforeDot = dotPosition >= 0 ? value.substr(0, dotPosition) : value
+  var beforeDot = dotPosition >= 0 ? value.substring(0, dotPosition) : value
   if (datatype === "string-currency" || isOnBlur) {
     beforeDot = beforeDot.replace(new RegExp("\\B(?=(\\d{" + groupDigits + "})+(?!\\d))", "g"), groupSeparator)
   }
   var afterDot
   if (dotPosition > 0) {
-    afterDot = value.substr(dotPosition + 1)
+    afterDot = value.substring(dotPosition + 1)
     if (afterDot.length > decimalDigits) {
-      afterDot = afterDot.substr(0, decimalDigits)
+      afterDot = afterDot.substring(0, decimalDigits)
     }
   }
   if (maxLength && beforeDot.length > maxLength - (decimalDigits + 1)) {

package/package.json

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

package/src/core.ts

@@ -1,5 +1,3 @@
-import { focusFirstElement } from "./formutil"
-
 export interface LoadingService {
   showLoading(firstTime?: boolean): void
   hideLoading(): void
@@ -19,13 +17,6 @@ export class resources {
   static pageMaxSize = 7
 }
 
-export function removePhoneFormat(phone: string): string {
-  if (phone) {
-    return phone.replace(resources.phone, "")
-  } else {
-    return phone
-  }
-}
 export interface StringMap {
   [key: string]: string
 }
@@ -98,125 +89,3 @@ export interface Attribute {
 export interface Attributes {
   [key: string]: Attribute
 }
-
-export const datetimeToString = (inputDate: Date) => {
-  const date = new Date(inputDate)
-  const year = date.getFullYear()
-  const month = String(date.getMonth() + 1).padStart(2, "0")
-  const day = String(date.getDate()).padStart(2, "0")
-  const hours = String(date.getHours()).padStart(2, "0")
-  const minutes = String(date.getMinutes()).padStart(2, "0")
-  const seconds = String(date.getSeconds()).padStart(2, "0")
-  return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`
-}
-
-export const dateToString = (inputDate: Date) => {
-  const year = inputDate.getFullYear()
-  const month = String(inputDate.getMonth() + 1).padStart(2, "0")
-  const day = String(inputDate.getDate()).padStart(2, "0")
-  return `${year}-${month}-${day}`
-}
-
-export function initForm(form?: HTMLFormElement, initMat?: (f: HTMLFormElement) => void): HTMLFormElement | undefined {
-  if (form) {
-    setTimeout(() => {
-      if (initMat) {
-        initMat(form)
-      }
-      focusFirstElement(form)
-    }, 100)
-  }
-  return form
-}
-export function getName(d: string, n?: string): string {
-  return n && n.length > 0 ? n : d
-}
-export function getModelName(form?: HTMLFormElement | null, name?: string): string {
-  if (form) {
-    const a = form.getAttribute("model-name")
-    if (a && a.length > 0) {
-      return a
-    }
-    const b = form.name
-    if (b) {
-      if (b.endsWith("Form")) {
-        return b.substring(0, b.length - 4)
-      }
-      return b
-    }
-  }
-  if (name && name.length > 0) {
-    return name
-  }
-  return ""
-}
-
-export const scrollToFocus = (e: any, isUseTimeOut?: boolean) => {
-  try {
-    const element = e.target as HTMLInputElement
-    const form = element.form
-    if (form) {
-      const container = form.childNodes[1] as HTMLElement
-      const elementRect = element.getBoundingClientRect()
-      const absoluteElementTop = elementRect.top + window.pageYOffset
-      const middle = absoluteElementTop - window.innerHeight / 2
-      const scrollTop = container.scrollTop
-      const timeOut = isUseTimeOut ? 300 : 0
-      const isChrome = navigator.userAgent.search("Chrome") > 0
-      setTimeout(() => {
-        if (isChrome) {
-          const scrollPosition = scrollTop === 0 ? elementRect.top + 64 : scrollTop + middle
-          container.scrollTo(0, Math.abs(scrollPosition))
-        } else {
-          container.scrollTo(0, Math.abs(scrollTop + middle))
-        }
-      }, timeOut)
-    }
-  } catch (e) {
-    console.log(e)
-  }
-}
-export interface LoadingParameter {
-  loading?: LoadingService
-}
-export function showLoading(s?: LoadingService): void {
-  if (s) {
-    s.showLoading()
-  }
-}
-export function hideLoading(s?: LoadingService): void {
-  if (s) {
-    s.hideLoading()
-  }
-}
-export interface UIParameter {
-  ui?: UIService
-}
-export function getRemoveError(u?: UIParameter, rmErr?: (el: HTMLInputElement) => void): ((el: HTMLInputElement) => void) | undefined {
-  if (rmErr) {
-    return rmErr
-  }
-  return u && u.ui ? u.ui.removeError : undefined
-}
-export function removeFormError(u?: UIParameter, f?: HTMLFormElement): void {
-  if (f && u && u.ui) {
-    u.ui.removeFormError(f)
-  }
-}
-export function getValidateForm(
-  u?: UIParameter,
-  vf?: (form: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean) => boolean,
-): ((form: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean) => boolean) | undefined {
-  if (vf) {
-    return vf
-  }
-  return u && u.ui ? u.ui.validateForm : undefined
-}
-/*
-export function getDecodeFromForm(u?: UIParameter, d?: (form: HTMLFormElement, locale?: Locale, currencyCode?: string) => any): ((form: HTMLFormElement, locale?: Locale, currencyCode?: string) => any) | undefined {
-  if (d) {
-    return d;
-  }
-  return (u && u.ui ? u.ui.decodeFromForm : undefined);
-}
-*/

package/src/formutil.ts

@@ -40,33 +40,6 @@ export function setReadOnly(form?: HTMLFormElement | null, ...args: string[]): v
     }
   }
 }
-export function focusFirstElement(form: HTMLFormElement): void {
-  let i = 0
-  const len = form.length
-  for (i = 0; i < len; i++) {
-    const ctrl = form[i] as HTMLInputElement
-    if (!(ctrl.readOnly || ctrl.disabled)) {
-      let nodeName = ctrl.nodeName
-      const type = ctrl.getAttribute("type")
-      if (type) {
-        const t = type.toUpperCase()
-        if (t === "BUTTON" || t === "SUBMIT") {
-          ctrl.focus()
-        }
-        if (nodeName === "INPUT") {
-          nodeName = t
-        }
-      }
-      if (nodeName !== "BUTTON" && nodeName !== "RESET" && nodeName !== "SUBMIT" && nodeName !== "CHECKBOX" && nodeName !== "RADIO") {
-        ctrl.focus()
-        try {
-          ctrl.setSelectionRange(0, ctrl.value.length)
-        } catch (err) {}
-        return
-      }
-    }
-  }
-}
 export function focusFirstError(form?: HTMLFormElement | null, className?: string): void {
   if (!form) {
     return

package/src/index.ts

@@ -203,3 +203,29 @@ export function datetimeToString(date?: Date | string): string | undefined {
 export function getNumber(event: ChangeEvent<HTMLSelectElement | HTMLInputElement>): number {
   return parseInt(event.currentTarget.value, 10)
 }
+
+export const scrollToFocus = (e: any, isUseTimeOut?: boolean) => {
+  try {
+    const element = e.target as HTMLInputElement
+    const form = element.form
+    if (form) {
+      const container = form.childNodes[1] as HTMLElement
+      const elementRect = element.getBoundingClientRect()
+      const absoluteElementTop = elementRect.top + window.pageYOffset
+      const middle = absoluteElementTop - window.innerHeight / 2
+      const scrollTop = container.scrollTop
+      const timeOut = isUseTimeOut ? 300 : 0
+      const isChrome = navigator.userAgent.search("Chrome") > 0
+      setTimeout(() => {
+        if (isChrome) {
+          const scrollPosition = scrollTop === 0 ? elementRect.top + 64 : scrollTop + middle
+          container.scrollTo(0, Math.abs(scrollPosition))
+        } else {
+          container.scrollTo(0, Math.abs(scrollTop + middle))
+        }
+      }, timeOut)
+    }
+  } catch (e) {
+    console.log(e)
+  }
+}

package/src/input.ts

@@ -81,23 +81,55 @@ export function getErrorFunc(
   }
   return (p as any).showError
 }
-/*
-export interface EditStatusParameter {
-  status?: EditStatusConfig;
-}
-export function getEditStatusFunc(p: ResourceService|EditStatusParameter, status?: EditStatusConfig): EditStatusConfig {
-  if (status) {
-    return status;
+
+export function showLoading(s?: LoadingService): void {
+  if (s) {
+    s.showLoading()
   }
-  return (p as any).status;
 }
-export interface DiffStatusParameter {
-  status?: DiffStatusConfig;
+export function hideLoading(s?: LoadingService): void {
+  if (s) {
+    s.hideLoading()
+  }
 }
-export function getDiffStatusFunc(p: ResourceService|DiffStatusParameter, status?: DiffStatusConfig): DiffStatusConfig {
-  if (status) {
-    return status;
+
+export function initForm(form?: HTMLFormElement, initMat?: (f: HTMLFormElement) => void): HTMLFormElement | undefined {
+  if (form) {
+    setTimeout(() => {
+      if (initMat) {
+        initMat(form)
+      }
+      focusFirstElement(form)
+    }, 100)
+  }
+  return form
+}
+export function focusFirstElement(form: HTMLFormElement): void {
+  let i = 0
+  const len = form.length
+  for (i = 0; i < len; i++) {
+    const ctrl = form[i] as HTMLInputElement
+    if (!(ctrl.readOnly || ctrl.disabled)) {
+      let nodeName = ctrl.nodeName
+      const type = ctrl.getAttribute("type")
+      if (type) {
+        const t = type.toUpperCase()
+        if (t === "BUTTON" || t === "SUBMIT") {
+          ctrl.focus()
+        }
+        if (nodeName === "INPUT") {
+          nodeName = t
+        }
+      }
+      if (nodeName !== "BUTTON" && nodeName !== "RESET" && nodeName !== "SUBMIT" && nodeName !== "CHECKBOX" && nodeName !== "RADIO") {
+        ctrl.focus()
+        /*
+        try {
+          ctrl.setSelectionRange(0, ctrl.value.length)
+        } catch (err) {}
+         */
+        return
+      }
+    }
   }
-  return (p as any).status;
 }
-*/

package/src/reflect.ts

@@ -1,6 +1,3 @@
-import { NavigateFunction } from "react-router-dom"
-import { StringMap } from "./core"
-
 export function clone(obj: any): any {
   if (!obj) {
     return obj
@@ -143,22 +140,6 @@ export function hasDiff<T>(o1: T, o2: T, keys?: string[], version?: string): boo
   return !isEmptyObject(diff)
 }
 
-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 = []
   for (const s of s2) {

package/src/route.ts

@@ -1,6 +1,25 @@
 import * as qs from "query-string"
+import { NavigateFunction } from "react-router-dom"
+import { StringMap } from "./core"
+import { hasDiff } from "./reflect"
 import { Filter } from "./search"
 
+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 buildFromUrl<S extends Filter>(modelT?: S): S {
   return buildParameters<S>(window.location.search, modelT)
 }

package/src/search.ts

@@ -42,7 +42,7 @@ export interface Pagination {
   appendable?: boolean
 }
 
-export interface Searchable extends Pagination, Sortable {}
+interface Searchable extends Pagination, Sortable {}
 
 export function getOffset(limit: number, page?: number, firstLimit?: number): number {
   const p = page && page > 0 ? page : 1
@@ -156,13 +156,6 @@ export function initFilter<S extends Filter>(m: S, com: Searchable): S {
   return m
 }
 
-export function showPaging<T>(com: Pagination, list: T[], pageSize?: number, total?: number): void {
-  com.total = total
-  const pageTotal = getPageTotal(pageSize, total)
-  com.pages = pageTotal
-  com.showPaging = !total || com.pages <= 1 || (list && list.length >= total) ? false : true
-}
-
 export function getFields(form?: HTMLFormElement, arr?: string[]): string[] | undefined {
   if (arr && arr.length > 0) {
     return arr
@@ -202,20 +195,6 @@ 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 === "") {
@@ -235,6 +214,19 @@ 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
@@ -393,15 +385,6 @@ export function handleToggle(target?: HTMLElement, on?: boolean): boolean {
   }
   return off
 }
-export function handleSortEvent(event: Event, com: Sortable): void {
-  if (event && event.target) {
-    const target = event.target as HTMLElement
-    const s = handleSort(target, com.sortTarget, com.sortField, com.sortType)
-    com.sortField = s.field
-    com.sortType = s.type
-    com.sortTarget = target
-  }
-}
 
 export function getSortElement(target: HTMLElement): HTMLElement {
   return target.nodeName === "I" ? (target.parentElement as HTMLElement) : target

package/src/update.ts

@@ -1,11 +1,38 @@
 import { useEffect, useState } from "react"
-import { getModelName as getModelName2, Locale, removePhoneFormat } from "./core"
+import { Locale, resources } from "./core"
 import { useMergeState } from "./merge"
 import { buildFlatState, buildState, handleEvent, localeOf } from "./state"
 
+export function removePhoneFormat(phone: string): string {
+  if (phone) {
+    return phone.replace(resources.phone, "")
+  } else {
+    return phone
+  }
+}
+
+export function getModelName(form?: HTMLFormElement | null, name?: string): string {
+  if (form) {
+    const a = form.getAttribute("model-name")
+    if (a && a.length > 0) {
+      return a
+    }
+    const b = form.name
+    if (b) {
+      if (b.endsWith("Form")) {
+        return b.substring(0, b.length - 4)
+      }
+      return b
+    }
+  }
+  if (name && name.length > 0) {
+    return name
+  }
+  return ""
+}
 const m = "model"
 const _getModelName = (f2?: HTMLFormElement | null): string => {
-  return getModelName2(f2, m)
+  return getModelName(f2, m)
 }
 export const useUpdate = <T>(
   initialState: T,

package/src/useEdit.ts

@@ -1,26 +1,14 @@
 import { useEffect, useState } from "react"
 import { Params, useNavigate, useParams } from "react-router"
-import {
-  Attribute,
-  Attributes,
-  ErrorMessage,
-  getModelName as getModelName2,
-  hideLoading,
-  initForm,
-  LoadingService,
-  Locale,
-  resources,
-  ResourceService,
-  showLoading,
-  UIService,
-} from "./core"
+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 { useUpdate } from "./update"
+import { getModelName as getModelName2, useUpdate } from "./update"
 
 export function buildKeys(attributes: Attributes): string[] {
   if (!attributes) {

package/src/useSearch.ts

@@ -1,20 +1,7 @@
 import { useEffect, useState } from "react"
-import {
-  getName,
-  getRemoveError,
-  getValidateForm,
-  hideLoading,
-  initForm,
-  LoadingService,
-  Locale,
-  pageSizes,
-  removeFormError,
-  resources,
-  ResourceService,
-  showLoading,
-  UIService,
-} from "./core"
+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"
@@ -23,6 +10,7 @@ import {
   buildMessage,
   Filter,
   getFields,
+  getPageTotal,
   handleSort,
   handleToggle,
   initFilter,
@@ -32,13 +20,19 @@ import {
   removeSortStatus,
   SearchResult,
   SearchService,
-  showPaging,
   Sortable,
 } from "./search"
 import { enLocale } from "./state"
 import { useUpdate } from "./update"
 
-export interface Searchable extends Pagination, Sortable {
+export function showPaging<T>(com: Pagination, list: T[], pageSize?: number, total?: number): void {
+  com.total = total
+  const pageTotal = getPageTotal(pageSize, total)
+  com.pages = pageTotal
+  com.showPaging = !total || com.pages <= 1 || (list && list.length >= total) ? false : true
+}
+
+interface Searchable extends Pagination, Sortable {
   nextPageToken?: string
   excluding?: string[] | number[]
 }
@@ -52,6 +46,30 @@ export interface SearchParameter {
   auto?: boolean
 }
 
+export interface UIParameter {
+  ui?: UIService
+}
+export function removeFormError(u?: UIParameter, f?: HTMLFormElement): void {
+  if (f && u && u.ui) {
+    u.ui.removeFormError(f)
+  }
+}
+export function getValidateForm(
+  u?: UIParameter,
+  vf?: (form: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean) => boolean,
+): ((form: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean) => boolean) | undefined {
+  if (vf) {
+    return vf
+  }
+  return u && u.ui ? u.ui.validateForm : undefined
+}
+export function getRemoveError(u?: UIParameter, rmErr?: (el: HTMLInputElement) => void): ((el: HTMLInputElement) => void) | undefined {
+  if (rmErr) {
+    return rmErr
+  }
+  return u && u.ui ? u.ui.removeError : undefined
+}
+
 export function getModel<S extends Filter>(state: any, modelName: string, searchable: Searchable, fields?: string[], excluding?: string[] | number[]): S {
   let obj2 = getModelFromState(state, modelName)
 
@@ -122,6 +140,7 @@ export function getFieldsFromForm(fields?: string[], initFields?: boolean, form?
   }
   return fields
 }
+
 export function append<T>(list?: T[], results?: T[]): T[] {
   if (list && results) {
     for (const obj of results) {
@@ -425,6 +444,10 @@ export const useSearchOneProps = <T, S extends Filter, ST extends SearchComponen
 export const useSearchOne = <T, S extends Filter, ST extends SearchComponentState<T, S>>(p: HookBaseSearchParameter<T, S, ST>) => {
   return useCoreSearch(p.refForm, p.initialState, p.service, p, p)
 }
+
+export function getName(d: string, n?: string): string {
+  return n && n.length > 0 ? n : d
+}
 export const useCoreSearch = <T, S extends Filter, ST>(
   refForm: any,
   initialState: ST,

package/src/util.ts

@@ -77,7 +77,7 @@ function getStringCurrency(value: string, datatype: string, locale?: Locale, max
 
   const dotPosition = value.indexOf(".")
   // Format thousands
-  let beforeDot = dotPosition >= 0 ? value.substr(0, dotPosition) : value
+  let beforeDot = dotPosition >= 0 ? value.substring(0, dotPosition) : value
   if (datatype === "string-currency" || isOnBlur) {
     beforeDot = beforeDot.replace(new RegExp("\\B(?=(\\d{" + groupDigits + "})+(?!\\d))", "g"), groupSeparator)
   }
@@ -85,9 +85,9 @@ function getStringCurrency(value: string, datatype: string, locale?: Locale, max
   // Cut after dot
   let afterDot
   if (dotPosition > 0) {
-    afterDot = value.substr(dotPosition + 1)
+    afterDot = value.substring(dotPosition + 1)
     if (afterDot.length > decimalDigits) {
-      afterDot = afterDot.substr(0, decimalDigits)
+      afterDot = afterDot.substring(0, decimalDigits)
     }
   }
   if (maxLength && beforeDot.length > maxLength - (decimalDigits + 1)) {