From f3cb18c8363ec15d8482ccb70b8b021f67881f47 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期五, 08 一月 2021 10:46:36 +0800
Subject: [PATCH] !161 修复导入数据为负浮点数时，导入结果会丢失精度问题 Merge pull request !161 from 嘿白熊/master

---
 ruoyi-ui/src/store/modules/permission.js |   54 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index da937ae..ab109fc 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -1,17 +1,22 @@
 import { constantRoutes } from '@/router'
 import { getRouters } from '@/api/menu'
 import Layout from '@/layout/index'
+import ParentView from '@/components/ParentView';
 
 const permission = {
   state: {
     routes: [],
-    addRoutes: []
+    addRoutes: [],
+    sidebarRouters: []
   },
   mutations: {
     SET_ROUTES: (state, routes) => {
       state.addRoutes = routes
       state.routes = constantRoutes.concat(routes)
-    }
+    },
+    SET_SIDEBAR_ROUTERS: (state, routers) => {
+      state.sidebarRouters = constantRoutes.concat(routers)
+    },
   },
   actions: {
     // 鐢熸垚璺敱
@@ -19,9 +24,14 @@
       return new Promise(resolve => {
         // 鍚戝悗绔姹傝矾鐢辨暟鎹�
         getRouters().then(res => {
-          const accessedRoutes = filterAsyncRouter(res.data)
-          commit('SET_ROUTES', accessedRoutes)
-          resolve(accessedRoutes)
+          const sdata = JSON.parse(JSON.stringify(res.data))
+          const rdata = JSON.parse(JSON.stringify(res.data))
+          const sidebarRoutes = filterAsyncRouter(sdata)
+          const rewriteRoutes = filterAsyncRouter(rdata, true)
+          rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
+          commit('SET_ROUTES', rewriteRoutes)
+          commit('SET_SIDEBAR_ROUTERS', sidebarRoutes)
+          resolve(rewriteRoutes)
         })
       })
     }
@@ -29,25 +39,51 @@
 }
 
 // 閬嶅巻鍚庡彴浼犳潵鐨勮矾鐢卞瓧绗︿覆锛岃浆鎹负缁勪欢瀵硅薄
-function filterAsyncRouter(asyncRouterMap) {
+function filterAsyncRouter(asyncRouterMap, isRewrite = false) {
   return asyncRouterMap.filter(route => {
+    if (isRewrite && route.children) {
+      route.children = filterChildren(route.children)
+    }
     if (route.component) {
-      // Layout缁勪欢鐗规畩澶勭悊
+      // Layout ParentView 缁勪欢鐗规畩澶勭悊
       if (route.component === 'Layout') {
         route.component = Layout
+      } else if (route.component === 'ParentView') {
+        route.component = ParentView
       } else {
         route.component = loadView(route.component)
       }
     }
     if (route.children != null && route.children && route.children.length) {
-      route.children = filterAsyncRouter(route.children)
+      route.children = filterAsyncRouter(route.children, route, isRewrite)
     }
     return true
   })
 }
 
+function filterChildren(childrenMap) {
+  var children = []
+  childrenMap.forEach((el, index) => {
+    if (el.children && el.children.length) {
+      if (el.component === 'ParentView') {
+        el.children.forEach(c => {
+          c.path = el.path + '/' + c.path
+          if (c.children && c.children.length) {
+            children = children.concat(filterChildren(c.children, c))
+            return
+          }
+          children.push(c)
+        })
+        return
+      }
+    }
+    children = children.concat(el)
+  })
+  return children
+}
+
 export const loadView = (view) => { // 璺敱鎳掑姞杞�
-  return () => import(`@/views/${view}`)
+  return (resolve) => require([`@/views/${view}`], resolve)
 }
 
 export default permission

--
Gitblit v1.9.3