n20-common-lib 1.3.33 → 1.3.34

package/src/utils/urlToGo.js

@@ -1,82 +1,82 @@
-function encode(val) {
-  return encodeURIComponent(val)
-    .replace(/%3A/gi, ':')
-    .replace(/%24/g, '$')
-    .replace(/%2C/gi, ',')
-    .replace(/%20/g, '+')
-    .replace(/%5B/gi, '[')
-    .replace(/%5D/gi, ']')
-}
-function isDate(val) {
-  return toString.call(val) === '[object Date]'
-}
-function isObject(val) {
-  return val !== null && typeof val === 'object'
-}
-
-function buildURL(url, params) {
-  if (!params) {
-    return url
-  }
-
-  let parts = []
-  Object.entries(params).forEach(([key, val]) => {
-    if (val === null || typeof val === 'undefined') {
-      return
-    }
-
-    if (Array.isArray(val)) {
-      key = key + '[]'
-    } else {
-      val = [val]
-    }
-
-    val.forEach((v) => {
-      if (isDate(v)) {
-        v = v.toISOString()
-      } else if (isObject(v)) {
-        v = JSON.stringify(v)
-      }
-      parts.push(encode(key) + '=' + encode(v))
-    })
-  })
-
-  let serializedParams = parts.join('&')
-
-  if (serializedParams) {
-    let hashmarkIndex = url.indexOf('#')
-    if (hashmarkIndex !== -1) {
-      url = url.slice(0, hashmarkIndex)
-    }
-
-    url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams
-  }
-
-  return url
-}
-
-export function linkPush(url, params = {}) {
-  params._fromNo = Date.now()
-  sessionStorage.setItem(params._fromNo, location.href)
-
-  url = buildURL(url, params)
-  history.pushState(null, null, url)
-}
-
-export function linkGo() {
-  let _fromUrl
-  const search = window.location.search
-  let _fromRe = search.includes('_fromNo=') ? /_fromNo=(\d+)/ : /_fromId=(\d+)/
-  let _fromM = search.match(_fromRe)
-  if (_fromM?.[1]) {
-    _fromUrl = sessionStorage.getItem(_fromM[1])
-  }
-
-  if (_fromUrl) {
-    // window.history.go(-1)
-    // window.history.replaceState(null, null, _fromUrl)
-    history.pushState(null, null, _fromUrl)
-  } else {
-    window.history.go(-1)
-  }
-}
+function encode(val) {
+  return encodeURIComponent(val)
+    .replace(/%3A/gi, ':')
+    .replace(/%24/g, '$')
+    .replace(/%2C/gi, ',')
+    .replace(/%20/g, '+')
+    .replace(/%5B/gi, '[')
+    .replace(/%5D/gi, ']')
+}
+function isDate(val) {
+  return toString.call(val) === '[object Date]'
+}
+function isObject(val) {
+  return val !== null && typeof val === 'object'
+}
+
+function buildURL(url, params) {
+  if (!params) {
+    return url
+  }
+
+  let parts = []
+  Object.entries(params).forEach(([key, val]) => {
+    if (val === null || typeof val === 'undefined') {
+      return
+    }
+
+    if (Array.isArray(val)) {
+      key = key + '[]'
+    } else {
+      val = [val]
+    }
+
+    val.forEach((v) => {
+      if (isDate(v)) {
+        v = v.toISOString()
+      } else if (isObject(v)) {
+        v = JSON.stringify(v)
+      }
+      parts.push(encode(key) + '=' + encode(v))
+    })
+  })
+
+  let serializedParams = parts.join('&')
+
+  if (serializedParams) {
+    let hashmarkIndex = url.indexOf('#')
+    if (hashmarkIndex !== -1) {
+      url = url.slice(0, hashmarkIndex)
+    }
+
+    url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams
+  }
+
+  return url
+}
+
+export function linkPush(url, params = {}) {
+  params._fromNo = Date.now()
+  sessionStorage.setItem(params._fromNo, location.href)
+
+  url = buildURL(url, params)
+  history.pushState(null, null, url)
+}
+
+export function linkGo() {
+  let _fromUrl
+  const search = window.location.search
+  let _fromRe = search.includes('_fromNo=') ? /_fromNo=(\d+)/ : /_fromId=(\d+)/
+  let _fromM = search.match(_fromRe)
+  if (_fromM?.[1]) {
+    _fromUrl = sessionStorage.getItem(_fromM[1])
+  }
+
+  if (_fromUrl) {
+    // window.history.go(-1)
+    // window.history.replaceState(null, null, _fromUrl)
+    history.pushState(null, null, _fromUrl)
+  } else {
+    window.history.go(-1)
+  }
+}