mirror of
https://github.com/vbenjs/vue-vben-admin.git
synced 2025-02-03 02:54:40 +08:00
feat(setting): add openNProgress setting
This commit is contained in:
parent
faf3f4602e
commit
67d0ff0e25
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "vben-admin-2.0",
|
||||
"version": "2.0.0-beta.2",
|
||||
"version": "2.0.0-beta.3",
|
||||
"scripts": {
|
||||
"bootstrap": "yarn install",
|
||||
"serve": "ts-node --project ./build/tsconfig.json ./build/script/preserve && cross-env NODE_ENV=development vite",
|
||||
|
@ -6,9 +6,12 @@ import { createPageTitleGuard } from './pageTitleGuard';
|
||||
import { createProgressGuard } from './progressGuard';
|
||||
import { createPermissionGuard } from './permissionGuard';
|
||||
import { createPageLoadingGuard } from './pageLoadingGuard';
|
||||
import { useSetting } from '/@/hooks/core/useSetting';
|
||||
|
||||
const axiosCanceler = new AxiosCanceler();
|
||||
const { projectSetting } = useSetting();
|
||||
export function createGuard(router: Router) {
|
||||
const axiosCanceler = new AxiosCanceler();
|
||||
|
||||
router.beforeEach(async () => {
|
||||
try {
|
||||
Modal.destroyAll();
|
||||
@ -20,7 +23,7 @@ export function createGuard(router: Router) {
|
||||
console.warn('basic guard error:' + error);
|
||||
}
|
||||
});
|
||||
createProgressGuard(router);
|
||||
projectSetting.openNProgress && createProgressGuard(router);
|
||||
createPermissionGuard(router);
|
||||
createPageTitleGuard(router);
|
||||
createPageLoadingGuard(router);
|
||||
|
@ -111,6 +111,9 @@ const setting: ProjectConfig = {
|
||||
// 是否开启回到顶部
|
||||
useOpenBackTop: true,
|
||||
|
||||
// 开启顶部进度条
|
||||
openNProgress: isProdMode(),
|
||||
|
||||
// 是否可以嵌入iframe页面
|
||||
canEmbedIFramePage: true,
|
||||
};
|
||||
|
2
src/types/config.d.ts
vendored
2
src/types/config.d.ts
vendored
@ -98,6 +98,8 @@ export interface ProjectConfig {
|
||||
openPageLoading: boolean;
|
||||
// 是否开启回到顶部
|
||||
useOpenBackTop: boolean;
|
||||
// 开启顶部进度条
|
||||
openNProgress: boolean;
|
||||
// 是否可以嵌入iframe页面
|
||||
canEmbedIFramePage: boolean;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user