react-hook-core 0.4.7 → 0.4.9

package/lib/core.js

@@ -1,7 +1,7 @@
 "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 () {
   function resources() {}
   resources.phone = / |-|\.|\(|\)/g
@@ -16,171 +16,3 @@ var resources = (function () {
   return resources
 })()
 exports.resources = resources
-exports.size = exports.pageSizes
-function getCurrencyCode(form) {
-  if (form) {
-    var x = form.getAttribute("currency-code")
-    if (x) {
-      return x
-    }
-  }
-  return undefined
-}
-exports.getCurrencyCode = getCurrencyCode
-function removePhoneFormat(phone) {
-  if (phone) {
-    return phone.replace(resources.phone, "")
-  } else {
-    return phone
-  }
-}
-exports.removePhoneFormat = removePhoneFormat
-function buildKeys(attributes) {
-  if (!attributes) {
-    return []
-  }
-  var ks = Object.keys(attributes)
-  var ps = []
-  for (var _i = 0, ks_1 = ks; _i < ks_1.length; _i++) {
-    var k = ks_1[_i]
-    var attr = attributes[k]
-    if (attr.key === true) {
-      ps.push(k)
-    }
-  }
-  return ps
-}
-exports.buildKeys = buildKeys
-function buildId(p, keys) {
-  if (!keys || keys.length === 0 || keys.length === 1) {
-    if (keys && keys.length === 1) {
-      if (p[keys[0]]) {
-        return p[keys[0]]
-      }
-    }
-    return p["id"]
-  }
-  var id = {}
-  for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-    var key = keys_1[_i]
-    var v = p[key]
-    if (!v) {
-      v = p[key]
-      if (!v) {
-        return null
-      }
-    }
-    id[key] = v
-  }
-  return id
-}
-exports.buildId = buildId
-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.substr(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,10 +20,51 @@ 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")
+function buildKeys(attributes) {
+  if (!attributes) {
+    return []
+  }
+  var ks = Object.keys(attributes)
+  var ps = []
+  for (var _i = 0, ks_1 = ks; _i < ks_1.length; _i++) {
+    var k = ks_1[_i]
+    var attr = attributes[k]
+    if (attr.key === true) {
+      ps.push(k)
+    }
+  }
+  return ps
+}
+exports.buildKeys = buildKeys
+function buildId(p, keys) {
+  if (!keys || keys.length === 0 || keys.length === 1) {
+    if (keys && keys.length === 1) {
+      if (p[keys[0]]) {
+        return p[keys[0]]
+      }
+    }
+    return p["id"]
+  }
+  var id = {}
+  for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+    var key = keys_1[_i]
+    var v = p[key]
+    if (!v) {
+      v = p[key]
+      if (!v) {
+        return null
+      }
+    }
+    id[key] = v
+  }
+  return id
+}
+exports.buildId = buildId
 function build(attributes, name) {
   if (!attributes) {
     return undefined
@@ -47,8 +88,8 @@ function buildMetaModel(attributes) {
   var md = {}
   var pks = new Array()
   var keys = Object.keys(attributes)
-  for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-    var key = keys_1[_i]
+  for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
+    var key = keys_2[_i]
     var attr = attributes[key]
     if (attr) {
       if (attr.version) {
@@ -79,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 = {}
@@ -96,7 +137,7 @@ exports.useEdit = function (refForm, initialState, service, p2, p) {
         p.version = version
       }
     }
-    var id = core_1.buildId(params, keys)
+    var id = buildId(params, keys)
     if (p && p.initialize) {
       p.initialize(id, baseProps.load, baseProps.setState, p.callback)
     } else {
@@ -104,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)
       }
     }
   }, [])
@@ -116,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 = {}
@@ -133,7 +174,7 @@ exports.useEditProps = function (props, refForm, initialState, service, p2, p) {
         p.version = version
       }
     }
-    var id = core_1.buildId(params, keys)
+    var id = buildId(params, keys)
     if (p && p.initialize) {
       p.initialize(id, baseProps.load, baseProps.setState, p.callback)
     } else {
@@ -157,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,
@@ -374,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
@@ -389,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
@@ -414,8 +455,8 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
       if (isPatch) {
         var keys = Object.keys(result)
         var a = origin
-        for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
-          var k = keys_2[_i]
+        for (var _i = 0, keys_3 = keys; _i < keys_3.length; _i++) {
+          var k = keys_3[_i]
           a[k] = result[k]
         }
         succeed(successMsg, a, undefined, backOnSave, a)
@@ -433,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) {
@@ -466,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) {
@@ -481,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
@@ -509,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()