n20-common-lib 2.1.6 → 2.1.8

package/package.json

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

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

@@ -36,7 +36,7 @@
         {{ '单位' | $lc }}: <span class="color-666">{{ userInfo.companyName }}</span>
       </span>
     </sapn>
-    <span v-else-if="byLabel" class="uif-by">{{ byLabel }}</span>
+    <span v-else-if="byLabel && !inBack" class="header-uif-by">{{ byLabel }}</span>
     <el-button v-if="inBack" class="header-hdyy f-s-s" plain round size="mini" @click="toSystem">回到应用</el-button>
     <!-- YSCW-end -->
     <el-dropdown class="m-l-lg" @command="setLang">
@@ -232,7 +232,7 @@ import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration)
 
-import { siteTree2menus } from '../../LoginTemporary/utils'
+import { getMenuAndRela } from '../../LoginTemporary/utils'
 
 const prefix = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_URL || '/'
 
@@ -296,7 +296,7 @@ export default {
       byV: false,
       byLabel: '小毅要卷到地老天荒…',
       headerUserInfoBg: realUrl('/server-assets/userInfoBg.png'),
-      inBack: window.sessionStorage.getItem('pageInType') === 'inBack'
+      inBack: window.localStorage.getItem('pageInType') === 'inBack'
     }
   },
   created() {
@@ -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()
-      axios.get('/bems/1.0/menuTree/tree').then(({ data }) => {
-        data || (data = [])
-        let layoutMenus = siteTree2menus(data)
-        sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
+
+      let asyncRelaNos = JSON.parse(sessionStorage.getItem('isAsyncGetRela'))
+      let extraForm = JSON.parse(sessionStorage.getItem('extraFormToGetMenu')) || {}
+      getMenuAndRela(asyncRelaNos, extraForm).then(() => {
         window.location.reload()
       })
     },
@@ -504,7 +504,7 @@ export default {
       this.themeV = true
     },
     toBack() {
-      window.sessionStorage.setItem('pageInType', 'toBack')
+      window.localStorage.setItem('pageInType', 'toBack')
 
       let { base = '/' } = this.$router.options
       if (!/\/$/.test(base)) base += '/'
@@ -512,7 +512,7 @@ export default {
       window.location.href = window.location.origin + base
     },
     toSystem() {
-      window.sessionStorage.setItem('pageInType', 'toFront')
+      window.localStorage.setItem('pageInType', 'toFront')
 
       let { base = '/' } = this.$router.options
       if (!/\/$/.test(base)) base += '/'
@@ -549,3 +549,10 @@ export default {
   }
 }
 </script>
+<style>
+.header-uif-by {
+  color: #999;
+  font-size: 12px;
+  margin-right: 60px;
+}
+</style>

package/src/components/Layout/indexN.vue

@@ -217,14 +217,14 @@ export default {
       this.tabList = tabList
     },
     setTabList() {
-      let pageInType = sessionStorage.getItem('pageInType')
+      let pageInType = localStorage.getItem('pageInType')
 
       if (pageInType === 'toFront') {
         window.sessionStorage.removeItem('tab-list')
-        window.sessionStorage.setItem('pageInType', 'inFront')
+        window.localStorage.setItem('pageInType', 'inFront')
       } else if (pageInType === 'toBack') {
         window.sessionStorage.removeItem('tab-list')
-        window.sessionStorage.setItem('pageInType', 'inBack')
+        window.localStorage.setItem('pageInType', 'inBack')
       } else {
         window.sessionStorage.setItem('tab-list', JSON.stringify(this.tabList))
       }

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 { siteTree2menus, siteTree2RelaNos } from './utils'
+import { getMenuAndRela } from './utils'
 import importG from '../../utils/importGlobal.js'
 
 function encode(pwd = '', key = 0) {
@@ -572,24 +572,9 @@ export default {
     // 获取子应用相关列表
     async getMicroAppsInfo() {
       this.loadingAdd()
-      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))
+      await getMenuAndRela(this.asyncRelaNos, this.extraForm, this.loadingSub)
+      sessionStorage.setItem('isAsyncGetRela', this.asyncRelaNos)
+      sessionStorage.setItem('extraFormToGetMenu', JSON.stringify(this.extraForm))
     },
     // 新增不同单位对应不同角色,具有不同权限
     getCltRelaNos() {

package/src/components/LoginTemporary/utils.js

@@ -4,7 +4,8 @@ import list2tree from '../../utils/list2tree'
 export function siteTree2menus(siteTree) {
   let list_1 = []
 
-  forEachs(siteTree, (item) => {
+  forEachs(siteTree, (item, i) => {
+    item.sortnum = i + 1
     if (item.resType === '1' || item.resType === '2') {
       list_1.push(item)
     }
@@ -83,3 +84,25 @@ 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))
+}