n20-common-lib 2.8.25 → 2.8.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.8.25",
+  "version": "2.8.27",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -714,22 +714,7 @@ export default {
     },
     // APP权限申请
     applyForApp() {
-      this.$msgbox
-        .prompt(null, 'App权限申请理由', {
-          inputType: 'textarea',
-          showCancelButton: true,
-          confirmButtonText: '确认',
-          cancelButtonText: '取消'
-        })
-        .then(async ({ value }) => {
-          const { code, data } = axios.post(
-            `/bems/wfUserAppMid/startFlow/{uno}`,
-            { appRemarks: value, uno: this.userNo },
-            {
-              OperationDesc: '申请APP权限'
-            }
-          )
-        })
+      linkPush('/user-web/appAuth')
     },
 
     setLang(val) {

package/src/utils/auth.js

@@ -57,12 +57,15 @@ const auth = {
     reqLang = langMap[langKey]
   },
   setHeaders(headers, desc) {
-    let OperationDesc = localStorage.getItem('currentMenu')
-
+    let OperationDesc = 'default'
+    let currentMenu = localStorage.getItem('currentMenu')
+    if (currentMenu !== 'undefined') {
+      OperationDesc = currentMenu
+    }
     let token = auth.getToken()
     let defaultHd = {
       Authorization: token ? 'Bearer ' + token : 'Basic TlNUQzpWVkIxVG1sVlVURlNMemxyTkhoc2VtNXdObFJaUVQwOQ==',
-      OperationDesc: desc ? encodeURI(desc) : OperationDesc ? encodeURI(OperationDesc) : 'default',
+      OperationDesc: desc ? encodeURI(desc) : encodeURI(OperationDesc),
       timestamp: Date.now(),
       requestKey: Date.now(),
       lang: reqLang

package/src/utils/handleTab.js

@@ -1,3 +1,5 @@
+import monitor from './monitor'
+
 // 操作切换路由生成的页签
 const dN = process.env.VUE_APP_NAME
 /** 打开页签,push对应路由 */
@@ -78,6 +80,8 @@ function getName(baseUrl) {
 /** 子模块在门户中打开页签 */
 export function setTabs(baseUrl, to, tab = true) {
   let { path, name, meta = {}, query } = to
+  monitor.setCurrentRoute(meta?.desc || meta?.title)
+
   let { i18n, title } = getI18n(meta, name)
   let route = getPath(baseUrl, path)
 

package/src/utils/monitor.js

@@ -1,22 +1,31 @@
 // 监控类 用户点击菜单时记录当前菜单,用于统一请求体的OperationDesc
 class Monitor {
   constructor(opt) {
-    this.opt = opt
-    this.init()
+    this.options = opt
+    this._init()
   }
-  init() {
-    this.clickEvent()
+  _init() {
+    this._clickEvent()
   }
   setRouter(router) {
     this.router = router
   }
-  clickEvent() {
+  setCurrentRoute(value) {
+    this.desc = value
+  }
+
+  getCurrentRoute() {
+    return this.router?.currentRoute
+  }
+  _clickEvent() {
     // 监听点击事件
     document.addEventListener('click', (e) => {
-      const currentMenu = this.router?.currentRoute
+      const currentMenu = this.getCurrentRoute()
       if (currentMenu) {
-        const { meta } = currentMenu
-        window.localStorage.setItem('currentMenu', meta?.desc)
+        const { meta } = currentMenu || {}
+        if (this.desc || meta?.desc) {
+          window.localStorage.setItem('currentMenu', this.desc || meta?.desc)
+        }
       }
     })
   }