mirror of
https://github.com/pure-admin/vue-pure-admin.git
synced 2025-06-07 08:57:19 +08:00
Compare commits
3 Commits
59319aac8b
...
891ad9d6a2
Author | SHA1 | Date | |
---|---|---|---|
|
891ad9d6a2 | ||
|
22ee607aea | ||
|
8255f9063b |
@ -192,6 +192,7 @@ Thank you very much for your in-depth understanding of the source code and your
|
|||||||
| [edgexie](https://github.com/edgexie) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie) |
|
| [edgexie](https://github.com/edgexie) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie) |
|
||||||
| [way-jm](https://github.com/way-jm) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm) |
|
| [way-jm](https://github.com/way-jm) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm) |
|
||||||
| [simple-hui](https://github.com/simple-hui) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui) |
|
| [simple-hui](https://github.com/simple-hui) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui) |
|
||||||
|
| [tinysimple](https://github.com/tinysimple) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=tinysimple) |
|
||||||
|
|
||||||
## Git Contribution submission specification
|
## Git Contribution submission specification
|
||||||
|
|
||||||
|
@ -193,6 +193,7 @@ docker run -dp 8080:80 --name pure-admin vue-pure-admin
|
|||||||
| [edgexie](https://github.com/edgexie) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie) |
|
| [edgexie](https://github.com/edgexie) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie) |
|
||||||
| [way-jm](https://github.com/way-jm) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm) |
|
| [way-jm](https://github.com/way-jm) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm) |
|
||||||
| [simple-hui](https://github.com/simple-hui) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui) |
|
| [simple-hui](https://github.com/simple-hui) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui) |
|
||||||
|
| [tinysimple](https://github.com/tinysimple) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=tinysimple) |
|
||||||
|
|
||||||
## `Git` 贡献提交规范
|
## `Git` 贡献提交规范
|
||||||
|
|
||||||
|
@ -7,7 +7,13 @@ import { buildHierarchyTree } from "@/utils/tree";
|
|||||||
import remainingRouter from "./modules/remaining";
|
import remainingRouter from "./modules/remaining";
|
||||||
import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
|
import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
|
||||||
import { usePermissionStoreHook } from "@/store/modules/permission";
|
import { usePermissionStoreHook } from "@/store/modules/permission";
|
||||||
import { isUrl, openLink, storageLocal, isAllEmpty } from "@pureadmin/utils";
|
import {
|
||||||
|
isUrl,
|
||||||
|
openLink,
|
||||||
|
cloneDeep,
|
||||||
|
isAllEmpty,
|
||||||
|
storageLocal
|
||||||
|
} from "@pureadmin/utils";
|
||||||
import {
|
import {
|
||||||
ascending,
|
ascending,
|
||||||
getTopMenu,
|
getTopMenu,
|
||||||
@ -21,9 +27,9 @@ import {
|
|||||||
} from "./utils";
|
} from "./utils";
|
||||||
import {
|
import {
|
||||||
type Router,
|
type Router,
|
||||||
createRouter,
|
|
||||||
type RouteRecordRaw,
|
type RouteRecordRaw,
|
||||||
type RouteComponent
|
type RouteComponent,
|
||||||
|
createRouter
|
||||||
} from "vue-router";
|
} from "vue-router";
|
||||||
import {
|
import {
|
||||||
type DataInfo,
|
type DataInfo,
|
||||||
@ -55,6 +61,9 @@ export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(
|
|||||||
formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity))))
|
formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity))))
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/** 初始的静态路由,用于退出登录时重置路由 */
|
||||||
|
const initConstantRoutes: Array<RouteRecordRaw> = cloneDeep(constantRoutes);
|
||||||
|
|
||||||
/** 用于渲染菜单,保持原始层级 */
|
/** 用于渲染菜单,保持原始层级 */
|
||||||
export const constantMenus: Array<RouteComponent> = ascending(
|
export const constantMenus: Array<RouteComponent> = ascending(
|
||||||
routes.flat(Infinity)
|
routes.flat(Infinity)
|
||||||
@ -87,17 +96,13 @@ export const router: Router = createRouter({
|
|||||||
|
|
||||||
/** 重置路由 */
|
/** 重置路由 */
|
||||||
export function resetRouter() {
|
export function resetRouter() {
|
||||||
router.getRoutes().forEach(route => {
|
router.clearRoutes();
|
||||||
const { name, meta } = route;
|
for (const route of initConstantRoutes.concat(...(remainingRouter as any))) {
|
||||||
if (name && router.hasRoute(name) && meta?.backstage) {
|
router.addRoute(route);
|
||||||
router.removeRoute(name);
|
|
||||||
router.options.routes = formatTwoStageRoutes(
|
|
||||||
formatFlatteningRoutes(
|
|
||||||
buildHierarchyTree(ascending(routes.flat(Infinity)))
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
});
|
router.options.routes = formatTwoStageRoutes(
|
||||||
|
formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity))))
|
||||||
|
);
|
||||||
usePermissionStoreHook().clearAllCachePage();
|
usePermissionStoreHook().clearAllCachePage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -172,6 +172,8 @@ function handleAsyncRoutes(routeList) {
|
|||||||
const flattenRouters: any = router
|
const flattenRouters: any = router
|
||||||
.getRoutes()
|
.getRoutes()
|
||||||
.find(n => n.path === "/");
|
.find(n => n.path === "/");
|
||||||
|
// 保持router.options.routes[0].children与path为"/"的children一致,防止数据不一致导致异常
|
||||||
|
flattenRouters.children = router.options.routes[0].children;
|
||||||
router.addRoute(flattenRouters);
|
router.addRoute(flattenRouters);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user