n20-common-lib 2.3.3 → 2.3.5

package/package.json

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

package/src/_qiankun/index.js

@@ -8,8 +8,17 @@ const vuePar = {
   abstractRouter: undefined
 }
 
-export function setVueParameters(par) {
-  Object.assign(vuePar, par)
+/***
+ * 参数设置
+ * @param {Object} options 配置参数
+ * @param {Object} options.render render函数
+ * @param {Object} options.router 路由实例对象
+ * @param {Object} options.store vuex实例对象
+ * @param {Object} options.i18n 国际化实例类型
+ * @param {Object} options.abstractRouter 抽象路由实例对象,用于传递块级模块路由实例
+ */
+export function setVueParameters(options) {
+  Object.assign(vuePar, options)
 }
 
 let instance = null
@@ -63,7 +72,8 @@ async function _mountKeep(props) {
     } else {
       delete require.cache[require.resolve('@/router/abstract.js')]
       let res = await import('@/router/abstract.js')
-      _router = res.default
+      _router = res.deimport { options } from './../../bpmn2svg/bpmn2svg.umd';
+fault
     }
     _router.apps.push(...catchRoute_apps)
 

package/src/components/Layout/HeaderWrap/index.vue

@@ -422,8 +422,8 @@ export default {
     logoutA() {
       axios.delete('/bems/prod_1.0/uas/api/authorization/logout').then(() => {
         if (this.afterLogout) {
-          let After = this.afterLogout(auth.removeToken)
-          After.then && After.then(auth.removeToken)
+          let After = this.afterLogout()
+          After.then && After.then(auth.removeToken())
         } else {
           auth.removeToken()
         }

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -521,8 +521,8 @@ export default {
     logoutA() {
       axios.delete('/bems/prod_1.0/uas/api/authorization/logout').then(() => {
         if (this.afterLogout) {
-          let After = this.afterLogout(auth.removeToken)
-          After.then && After.then(auth.removeToken)
+          let After = this.afterLogout()
+          After.then && After.then(auth.removeToken())
         } else {
           auth.removeToken()
         }

package/src/directives/VHas/index.js

@@ -1,4 +1,4 @@
-import { getRela, getCltRela } from '../../utils/relaNo.js'
+import { getCltRela, getRela, setRela } from '../../utils/relaNo.js'
 import { getItem } from '../../utils/storageEdit'
 
 export function has(vals, clt) {
@@ -6,6 +6,11 @@ export function has(vals, clt) {
   if (clt) {
     relaNos = getCltRela(clt)
   } else {
+    // 判断此处有没有同步更新的标识，有标识代表权限更新过重新再取一次数据
+    let isSync = sessionStorage.getItem('isSync')
+    if (isSync === 'true') {
+      setRela()
+    }
     relaNos = getRela().relaNos
   }
   if (typeof vals === 'string') {

package/src/utils/asyncGetRelaNos.js

@@ -58,6 +58,7 @@ async function asyncGetRelaNos(appNo, rns) {
   let ssRelaNosG = getItem('relaNosGlobal')
   ssRelaNosG.push(...oRelaNos)
   setItem('relaNosGlobal', ssRelaNosG, isSync)
+  isSync && sessionStorage.setItem('isSync', isSync)
 }
 
 export default asyncGetRelaNos