react-hook-core 0.4.8 → 0.4.10

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

@@ -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,60 @@ function getErrorFunc(p, showErr) {
   return p.showError
 }
 exports.getErrorFunc = getErrorFunc
+function showLoading(loading) {
+  if (loading) {
+    if (typeof loading === "function") {
+      loading()
+    } else {
+      loading.showLoading()
+    }
+  }
+}
+exports.showLoading = showLoading
+function hideLoading(loading) {
+  if (loading) {
+    if (typeof loading === "function") {
+      loading()
+    } else {
+      loading.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

@@ -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)) {
@@ -151,16 +113,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++) {
@@ -285,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/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

@@ -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) {
@@ -111,13 +100,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
@@ -355,16 +337,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
 }
@@ -437,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,14 +16,66 @@ 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) {
+    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)
+}
+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),
@@ -38,7 +90,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 {