vue2-client 1.8.27 → 1.8.29

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.8.27 -2023-1-10 @张振宇**
+**1.8.29 -2023-1-10 @张振宇**
 - 微前端兼容
 
 **1.8.26 -2023-1-10 @杨亚文**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.27",
+  "version": "1.8.29",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/router/guards.js

@@ -8,6 +8,8 @@ import {
   checkSingleAuthorization,
 } from '@vue2-client/utils/login'
 import AES from '@vue2-client/utils/EncryptUtil'
+import Vue from 'vue'
+import { funcToRouter, loadRoutes } from '@vue2-client/utils/routerUtil'
 
 NProgress.configure({ showSpinner: false })
 
@@ -33,19 +35,16 @@ const progressStart = (to, from, next) => {
  * @param options
  */
 const loginGuard = (to, from, next, options) => {
+  if (window.__MICRO_APP_ENVIRONMENT__) {
+    window.microApp.dispatch({ type: '子应用发送给主应用的数据', to: to.path })
+  }
   const urlParams = new URLSearchParams(window.location.search)
   const token = urlParams.get('token')
   const V4_LOGIN_DATA_KEY = localStorage.getItem('v4LoginData')
-  if (token || V4_LOGIN_DATA_KEY) {
-    let info = {}
+  if (token) {
+    const { AESDecrypt } = AES
+    const info = AESDecrypt(token, '3KMKqvgwR8ULbR8Z')
     const { store, message, router } = options
-
-    if (V4_LOGIN_DATA_KEY) {
-      info = JSON.parse(V4_LOGIN_DATA_KEY)
-    } else {
-      const { AESDecrypt } = AES
-      info = AESDecrypt(token, '3KMKqvgwR8ULbR8Z')
-    }
     if (
       (!loginIgnore.includes(to) || to.name === '404') &&
       !checkSingleAuthorization()
@@ -70,6 +69,29 @@ const loginGuard = (to, from, next, options) => {
         next()
       }
     }
+  } else if (V4_LOGIN_DATA_KEY) {
+    const v4LoginData = JSON.parse(localStorage.getItem('userInfo'))
+    const curUser = {
+      name: v4LoginData.name,
+      username: v4LoginData.name,
+      orgid: v4LoginData.name,
+      avatar: '',
+      ename: v4LoginData.ename,
+      id: v4LoginData.id,
+      orgName: v4LoginData.orgs,
+      contact: '',
+      phone: '',
+      orgs: v4LoginData.orgs
+    }
+    Vue.$store.commit('account/setUser', Object.assign(curUser, v4LoginData))
+    const login = {
+      f: v4LoginData,
+      jwt: v4LoginData.id,
+      r: v4LoginData.r
+    }
+    Vue.$store.commit('account/setLogin', login)
+    loadRoutes(funcToRouter(v4LoginData.functions))
+    next()
   } else {
     const { store, message } = options
     if (

package/src/utils/routerUtil.js

@@ -358,10 +358,7 @@ function parsefunc (func) {
  * 资源服务路由排序
  */
 function positionRouter (r) {
-  let router = []
-  for (const row of r) {
-    router[row.position] = row
-  }
+  let router = r.sort((a, b) => a.position - b.position)
   router = arrRemoveEmpty(router)
   return router
 }