vue2-client 1.8.28 → 1.8.30

package/CHANGELOG.md

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

package/package.json

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

package/src/router/guards.js

@@ -35,8 +35,9 @@ const progressStart = (to, from, next) => {
  * @param options
  */
 const loginGuard = (to, from, next, options) => {
-  console.log('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')
@@ -89,7 +90,7 @@ const loginGuard = (to, from, next, options) => {
       r: v4LoginData.r
     }
     Vue.$store.commit('account/setLogin', login)
-    // loadRoutes(funcToRouter(v4LoginData.functions))
+    loadRoutes(funcToRouter(v4LoginData.functions))
     next()
   } else {
     const { store, message } = options

package/src/utils/routerUtil.js

@@ -346,6 +346,10 @@ function parsefunc (func) {
       icon: row.icon,
       name: row.name
     }
+    if (row.link.includes('$')) {
+      route.router = row.link.split('$')[1]
+      route.params = row.link.split('$')[0]
+    }
     if (row.children && row.children.length > 0) {
       route.children = parsefunc(row.children)
     }
@@ -358,10 +362,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
 }