n20-common-lib 2.1.8 → 2.1.9

package/package.json

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

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

@@ -232,7 +232,7 @@ import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration)
 
-import { getMenuAndRela } from '../../LoginTemporary/utils'
+import { siteTree2menus } from '../../LoginTemporary/utils'
 
 const prefix = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_URL || '/'
 
@@ -431,10 +431,10 @@ export default {
       window.localStorage.setItem('pageLang', this.langVal)
       Cookies.set('language', ['zh-cn', 'zh-hk'].includes(this.langVal) ? 'zh' : this.langVal, { expires: 365 })
       auth.setReqLang()
-
-      let asyncRelaNos = JSON.parse(sessionStorage.getItem('isAsyncGetRela'))
-      let extraForm = JSON.parse(sessionStorage.getItem('extraFormToGetMenu')) || {}
-      getMenuAndRela(asyncRelaNos, extraForm).then(() => {
+      axios.get('/bems/1.0/menuTree/tree').then(({ data }) => {
+        data || (data = [])
+        let layoutMenus = siteTree2menus(data)
+        sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
         window.location.reload()
       })
     },

package/src/components/LoginSetting/setItem.vue

@@ -199,7 +199,7 @@ export default {
           },
           {
             NO: 'JRWG',
-            NAME: '金融网管系统',
+            NAME: '金融网关系统',
             ICON: '',
             LOGIN_MODE: [],
             OPEN: false

package/src/components/LoginTemporary/form.vue

@@ -143,7 +143,7 @@ import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
 import auth from '../../utils/auth'
 import qrCode from './qrcode.vue'
-import { getMenuAndRela } from './utils'
+import { siteTree2menus, siteTree2RelaNos } from './utils'
 import importG from '../../utils/importGlobal.js'
 
 function encode(pwd = '', key = 0) {
@@ -572,9 +572,24 @@ export default {
     // 获取子应用相关列表
     async getMicroAppsInfo() {
       this.loadingAdd()
-      await getMenuAndRela(this.asyncRelaNos, this.extraForm, this.loadingSub)
-      sessionStorage.setItem('isAsyncGetRela', this.asyncRelaNos)
-      sessionStorage.setItem('extraFormToGetMenu', JSON.stringify(this.extraForm))
+      let { data } = await axios.get(
+        '/bems/1.0/menuTree/tree',
+        {
+          resType: this.asyncRelaNos ? '1' : undefined,
+          ...this.extraForm
+        },
+        { loading: this.loadingSub }
+      )
+      data || (data = [])
+
+      let layoutMenus = siteTree2menus(data)
+      sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
+
+      let relaNos = siteTree2RelaNos(data)
+      sessionStorage.setItem('relaNos', JSON.stringify(relaNos))
+
+      // XXX: 兼容旧版resources
+      sessionStorage.setItem('resources', JSON.stringify(data))
     },
     // 新增不同单位对应不同角色,具有不同权限
     getCltRelaNos() {

package/src/components/LoginTemporary/indexN.vue

@@ -238,7 +238,7 @@ export default {
           },
           {
             NO: 'JRWG',
-            NAME: '金融网管系统',
+            NAME: '金融网关系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false

package/src/components/LoginTemporary/utils.js

@@ -84,25 +84,3 @@ export function siteTree2RelaNos(siteTree) {
   let relaNos = Object.values(relaNosMap)
   return relaNos
 }
-
-import axios from '../../utils/axios'
-export async function getMenuAndRela(asyncRelaNos, extraForm, loadingSub) {
-  let { data } = await axios.get(
-    '/bems/1.0/menuTree/tree',
-    {
-      resType: asyncRelaNos ? '1' : undefined,
-      ...extraForm
-    },
-    { loading: loadingSub }
-  )
-  data || (data = [])
-
-  let layoutMenus = siteTree2menus(data)
-  sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
-
-  let relaNos = siteTree2RelaNos(data)
-  sessionStorage.setItem('relaNos', JSON.stringify(relaNos))
-
-  // XXX: 兼容旧版resources
-  sessionStorage.setItem('resources', JSON.stringify(data))
-}