n20-common-lib 1.2.43 → 1.2.44

package/src/utils/relaNo.js

@@ -1,72 +1,72 @@
-import forEachs from './forEachs'
-
-const name = process.env.VUE_APP_RelaAppNo || process.env.VUE_APP_NAME
-
-let relaObj = {
-  appNo: name,
-  relaNos: []
-}
-
-export function getRela() {
-  return relaObj
-}
-
-export function setRela() {
-  let relaNosStr = sessionStorage.getItem('relaNos')
-  if (relaNosStr) {
-    let relaNos = JSON.parse(relaNosStr)
-    Object.assign(
-      relaObj,
-      relaNos.find((r) => r.appNo === name)
-    )
-    console.log(relaObj, 'has权限列表')
-
-    relaObj.relaNosGlobal = relaNos.map((item) => item.relaNos).flat()
-    return
-  }
-  /* 兼容旧门户 */
-  let resourcesStr = sessionStorage.getItem('resources')
-  if (resourcesStr) {
-    let resources = JSON.parse(resourcesStr)
-    let relaNos = []
-    forEachs(resources, (item) => {
-      relaNos.push(item.relaNo)
-    })
-    relaObj.relaNos = relaNos
-    relaObj.relaNosGlobal = relaNos
-  }
-}
-
-let cltrelaNos = undefined
-export function getCltRela(clt) {
-  /* 获取全部单位权限 */
-  if (!cltrelaNos) {
-    let cltrelaNosStr = sessionStorage.getItem('cltrelaNos')
-    if (cltrelaNosStr) {
-      cltrelaNos = JSON.parse(cltrelaNosStr)
-    } else {
-      cltrelaNos = {}
-    }
-  }
-
-  if (Array.isArray(clt)) {
-    let clts = clt
-    let cltI = clts[0]
-    let cltRela = cltrelaNos[cltI]
-
-    for (let i = 1; i < clt.length; i++) {
-      cltRela = aandb(cltRela, cltrelaNos[clts[i]])
-    }
-    return cltRela || []
-  } else {
-    return cltrelaNos[clt] || []
-  }
-}
-
-function aandb(a = [], b = []) {
-  if (a.length === 0 || b.length === 0) {
-    return []
-  } else {
-    return a.filter((ai) => b.includes(ai))
-  }
-}
+import forEachs from './forEachs'
+
+const name = process.env.VUE_APP_RelaAppNo || process.env.VUE_APP_NAME
+
+let relaObj = {
+  appNo: name,
+  relaNos: []
+}
+
+export function getRela() {
+  return relaObj
+}
+
+export function setRela() {
+  let relaNosStr = sessionStorage.getItem('relaNos')
+  if (relaNosStr) {
+    let relaNos = JSON.parse(relaNosStr)
+    Object.assign(
+      relaObj,
+      relaNos.find((r) => r.appNo === name)
+    )
+    console.log(relaObj, 'has权限列表')
+
+    relaObj.relaNosGlobal = relaNos.map((item) => item.relaNos).flat()
+    return
+  }
+  /* 兼容旧门户 */
+  let resourcesStr = sessionStorage.getItem('resources')
+  if (resourcesStr) {
+    let resources = JSON.parse(resourcesStr)
+    let relaNos = []
+    forEachs(resources, (item) => {
+      relaNos.push(item.relaNo)
+    })
+    relaObj.relaNos = relaNos
+    relaObj.relaNosGlobal = relaNos
+  }
+}
+
+let cltrelaNos = undefined
+export function getCltRela(clt) {
+  /* 获取全部单位权限 */
+  if (!cltrelaNos) {
+    let cltrelaNosStr = sessionStorage.getItem('cltrelaNos')
+    if (cltrelaNosStr) {
+      cltrelaNos = JSON.parse(cltrelaNosStr)
+    } else {
+      cltrelaNos = {}
+    }
+  }
+
+  if (Array.isArray(clt)) {
+    let clts = clt
+    let cltI = clts[0]
+    let cltRela = cltrelaNos[cltI]
+
+    for (let i = 1; i < clt.length; i++) {
+      cltRela = aandb(cltRela, cltrelaNos[clts[i]])
+    }
+    return cltRela || []
+  } else {
+    return cltrelaNos[clt] || []
+  }
+}
+
+function aandb(a = [], b = []) {
+  if (a.length === 0 || b.length === 0) {
+    return []
+  } else {
+    return a.filter((ai) => b.includes(ai))
+  }
+}

package/src/utils/repairElementUI.js

@@ -1,95 +1,95 @@
-/* 对ElementUI硬优化 */
-import Popper from 'element-ui/lib/utils/popper.js'
-
-function setPropsDefault(component, props) {
-  let c_props = component.props
-  Object.keys(props).forEach((key) => {
-    c_props[key] = Object.assign({}, c_props[key], props[key])
-  })
-}
-function setMethodsDefault(component, methods) {
-  let c_methods = component.methods
-  Object.keys(methods).forEach((key) => {
-    c_methods[key] = methods[key]
-  })
-}
-
-function repairPopper() {
-  if (!Popper.prototype.repairR) {
-    Popper.prototype.repairR = true
-
-    let __getBoundaries = Popper.prototype._getBoundaries
-    Popper.prototype._getBoundaries = function (data, padding, boundariesElement) {
-      const boundaries = __getBoundaries.call(this, data, padding, boundariesElement)
-
-      if (this._options.boundariesElement === 'viewport') {
-        const root = window
-        const body = root.document.body
-        const html = root.document.documentElement
-        let width = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth)
-        let height = Math.max(
-          body.scrollHeight,
-          body.offsetHeight,
-          html.clientHeight,
-          html.scrollHeight,
-          html.offsetHeight
-        )
-
-        boundaries.right = boundaries.right - root.document.documentElement.clientWidth + width
-        boundaries.bottom = boundaries.bottom - root.document.documentElement.clientHeight + height
-      }
-      return boundaries
-    }
-  }
-}
-
-export default function (ElementUI) {
-  repairPopper()
-
-  // setPropsDefault(ElementUI.Table, {
-  //   tooltipEffect: {
-  //     default: 'light'
-  //   }
-  // })
-
-  setPropsDefault(ElementUI.TableColumn, {
-    filterPlacement: {
-      default: 'bottom'
-    }
-  })
-
-  setPropsDefault(ElementUI.Dropdown, {
-    placement: {
-      default: 'bottom'
-    }
-  })
-
-  setPropsDefault(ElementUI.Dialog, {
-    appendToBody: {
-      default: true
-    }
-  })
-
-  setMethodsDefault(ElementUI.TableColumn, {
-    setColumnWidth(column) {
-      if (this.realWidth) {
-        column.width = this.realWidth
-      }
-      if (this.realMinWidth) {
-        column.minWidth = this.realMinWidth
-      }
-      if (!column.minWidth) {
-        if (!column.width) {
-          let label = column.label || ''
-          let sortable = column.sortable ? 24 : 0
-          let filters = column.filters ? 16 : 0
-          column.minWidth = Math.max(80, label.length * 14 + 22 + sortable + filters)
-        } else {
-          column.minWidth = 80
-        }
-      }
-      column.realWidth = column.width === undefined ? column.minWidth : column.width
-      return column
-    }
-  })
-}
+/* 对ElementUI硬优化 */
+import Popper from 'element-ui/lib/utils/popper.js'
+
+function setPropsDefault(component, props) {
+  let c_props = component.props
+  Object.keys(props).forEach((key) => {
+    c_props[key] = Object.assign({}, c_props[key], props[key])
+  })
+}
+function setMethodsDefault(component, methods) {
+  let c_methods = component.methods
+  Object.keys(methods).forEach((key) => {
+    c_methods[key] = methods[key]
+  })
+}
+
+function repairPopper() {
+  if (!Popper.prototype.repairR) {
+    Popper.prototype.repairR = true
+
+    let __getBoundaries = Popper.prototype._getBoundaries
+    Popper.prototype._getBoundaries = function (data, padding, boundariesElement) {
+      const boundaries = __getBoundaries.call(this, data, padding, boundariesElement)
+
+      if (this._options.boundariesElement === 'viewport') {
+        const root = window
+        const body = root.document.body
+        const html = root.document.documentElement
+        let width = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth)
+        let height = Math.max(
+          body.scrollHeight,
+          body.offsetHeight,
+          html.clientHeight,
+          html.scrollHeight,
+          html.offsetHeight
+        )
+
+        boundaries.right = boundaries.right - root.document.documentElement.clientWidth + width
+        boundaries.bottom = boundaries.bottom - root.document.documentElement.clientHeight + height
+      }
+      return boundaries
+    }
+  }
+}
+
+export default function (ElementUI) {
+  repairPopper()
+
+  // setPropsDefault(ElementUI.Table, {
+  //   tooltipEffect: {
+  //     default: 'light'
+  //   }
+  // })
+
+  setPropsDefault(ElementUI.TableColumn, {
+    filterPlacement: {
+      default: 'bottom'
+    }
+  })
+
+  setPropsDefault(ElementUI.Dropdown, {
+    placement: {
+      default: 'bottom'
+    }
+  })
+
+  setPropsDefault(ElementUI.Dialog, {
+    appendToBody: {
+      default: true
+    }
+  })
+
+  setMethodsDefault(ElementUI.TableColumn, {
+    setColumnWidth(column) {
+      if (this.realWidth) {
+        column.width = this.realWidth
+      }
+      if (this.realMinWidth) {
+        column.minWidth = this.realMinWidth
+      }
+      if (!column.minWidth) {
+        if (!column.width) {
+          let label = column.label || ''
+          let sortable = column.sortable ? 24 : 0
+          let filters = column.filters ? 16 : 0
+          column.minWidth = Math.max(80, label.length * 14 + 22 + sortable + filters)
+        } else {
+          column.minWidth = 80
+        }
+      }
+      column.realWidth = column.width === undefined ? column.minWidth : column.width
+      return column
+    }
+  })
+}

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)
+  }
+}