n20-common-lib 2.2.8 → 2.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/LoginTemporary/form.vue

@@ -600,6 +600,13 @@ export default {
       // sessionStorage.setItem('relaNos', JSON.stringify(relaNos))
       setItem('relaNos', relaNos)
 
+      let relaNosG = []
+      for (let i = 0; i < relaNos.length; i++) {
+        let item = relaNos[i]
+        relaNosG.push(...item.relaNos)
+      }
+      setItem('relaNosGlobal', relaNosG)
+
       // XXX: 兼容旧版resources
       // sessionStorage.setItem('resources', JSON.stringify(data))
       setItem('resources', data)

package/src/directives/VHas/index.js

@@ -1,4 +1,5 @@
 import { getRela, getCltRela } from '../../utils/relaNo.js'
+import { getItem } from '../../utils/storageEdit'
 
 export function has(vals, clt) {
   let relaNos = []
@@ -19,7 +20,7 @@ export function hasG(vals, clt) {
   if (clt) {
     relaNos = getCltRela(clt)
   } else {
-    relaNos = getRela().relaNosGlobal
+    relaNos = getItem('relaNosGlobal')
   }
   if (typeof vals === 'string') {
     return relaNos.includes(vals)

package/src/utils/asyncGetRelaNos.js

@@ -44,6 +44,10 @@ async function asyncGetRelaNos(appNo, rns) {
   setItem('relaNos', ssRelaNos)
   // sessionStorage.setItem('cltrelaNos', JSON.stringify(ssCltrelaNos))
   setItem('cltrelaNos', ssCltrelaNos)
+
+  let ssRelaNosG = getItem('relaNosGlobal')
+  ssRelaNosG.push(...oRelaNos)
+  setItem('relaNosGlobal', ssRelaNosG)
 }
 
 export default asyncGetRelaNos

package/src/utils/axios.js

@@ -51,7 +51,7 @@ let loadingCount = 0
 function showLoading(opt) {
   let loading = opt.loading
   if (loading === true) {
-    if (loadingCount === 0 && !document.querySelector('.xhr-loading-top')) {
+    if (loadingCount === 0 && !document.querySelector('.xhr-loading-top:not(.el-loading-fade-leave-active)')) {
       loadingBox = _Loading.service({
         lock: true,
         text: $lc('加载中'),

package/src/utils/relaNo.js

@@ -17,15 +17,9 @@ export function setRela() {
   if (_relaNos) {
     let relaNos = _relaNos
     relaObj = relaNos.find((r) => r.appNo === name)
-    console.log(relaObj, 'has权限列表')
-
-    let relaNosG = []
-    for (let i = 0; i < relaNos.length; i++) {
-      let item = relaNos[i]
-      relaNosG.push(...item.relaNos)
-    }
-    relaObj.relaNosGlobal = relaNosG
+    let relaNosG = getItem('relaNosGlobal')
 
+    console.log({ relaObj, relaNosGlobal: relaNosG }, 'has权限列表')
     return
   }
   /* 兼容旧门户 */