fix Bug Features CHANGELOG.ms

2026-03-01 00:23:11 +08:00 · 2021-07-19 16:42:11 +08:00
parent 46dc7eb69e
commit b689fabfdd
148 changed files with 5829 additions and 4268 deletions
@@ -11,34 +11,34 @@ import { RouteRecordRaw } from 'vue-router'
 * @param parent
 * @returns {*}
 */
-export const routerGenerator = (routerMap, parent?):any[] => {
-  return routerMap.map(item => {
-    const currentRouter:any = {
-      // 路由地址 动态拼接生成如 /dashboard/workplace
-      path: `${ parent && parent.path || '' }/${ item.path }`,
-      // 路由名称，建议唯一
-      name: item.name || '',
-      // 该路由对应页面的 组件
-      component: constantRouterComponents[item.component],
-      // meta: 页面标题, 菜单图标, 页面权限(供指令权限用，可去掉)
-      meta: {
-        ...item.meta,
-        label: item.meta.title,
-        icon: constantRouterIcon[item.meta.icon] || null,
-        permission: item.meta.permission || null
-      }
-    }
-    // 为了防止出现后端返回结果不规范，处理有可能出现拼接出两个 反斜杠
-    currentRouter.path = currentRouter.path.replace('//', '/')
-    // 重定向
-    item.redirect && (currentRouter.redirect = item.redirect)
-    // 是否有子菜单，并递归处理
-    if (item.children && item.children.length > 0) {
-      // Recursion
-      currentRouter.children = routerGenerator(item.children, currentRouter)
-    }
-    return currentRouter
-  })
+export const routerGenerator = (routerMap, parent?): any[] => {
+    return routerMap.map(item => {
+        const currentRouter: any = {
+            // 路由地址 动态拼接生成如 /dashboard/workplace
+            path: `${ parent && parent.path || '' }/${ item.path }`,
+            // 路由名称，建议唯一
+            name: item.name || '',
+            // 该路由对应页面的 组件
+            component: constantRouterComponents[item.component],
+            // meta: 页面标题, 菜单图标, 页面权限(供指令权限用，可去掉)
+            meta: {
+                ...item.meta,
+                label: item.meta.title,
+                icon: constantRouterIcon[item.meta.icon] || null,
+                permission: item.meta.permission || null
+            }
+        }
+        // 为了防止出现后端返回结果不规范，处理有可能出现拼接出两个 反斜杠
+        currentRouter.path = currentRouter.path.replace('//', '/')
+        // 重定向
+        item.redirect && (currentRouter.redirect = item.redirect)
+        // 是否有子菜单，并递归处理
+        if (item.children && item.children.length > 0) {
+            // Recursion
+            currentRouter.children = routerGenerator(item.children, currentRouter)
+        }
+        return currentRouter
+    })
 }


@@ -48,18 +48,18 @@ export const routerGenerator = (routerMap, parent?):any[] => {
 * @returns {Promise<Router>}
 */
 export const generatorDynamicRouter = (): Promise<RouteRecordRaw[]> => {
-  return new Promise((resolve, reject) => {
-    adminMenus()
-      .then((result) => {
-        const routeList = routerGenerator(result)
-        const asyncRoutesList = [...constantRouter, ...routeList]
-        asyncRoutesList.forEach(item => {
-          router.addRoute(item)
-        })
-        resolve(asyncRoutesList)
-      })
-      .catch((err) => {
-        reject(err)
-      })
-  })
+    return new Promise((resolve, reject) => {
+        adminMenus()
+            .then((result) => {
+                const routeList = routerGenerator(result)
+                const asyncRoutesList = [...constantRouter, ...routeList]
+                asyncRoutesList.forEach(item => {
+                    router.addRoute(item)
+                })
+                resolve(asyncRoutesList)
+            })
+            .catch((err) => {
+                reject(err)
+            })
+    })
 }