feat(setting): add openNProgress setting

This commit is contained in:
陈文彬
2020-10-08 01:38:41 +08:00
parent faf3f4602e
commit 67d0ff0e25
4 changed files with 11 additions and 3 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "vben-admin-2.0", "name": "vben-admin-2.0",
"version": "2.0.0-beta.2", "version": "2.0.0-beta.3",
"scripts": { "scripts": {
"bootstrap": "yarn install", "bootstrap": "yarn install",
"serve": "ts-node --project ./build/tsconfig.json ./build/script/preserve && cross-env NODE_ENV=development vite", "serve": "ts-node --project ./build/tsconfig.json ./build/script/preserve && cross-env NODE_ENV=development vite",

View File

@@ -6,9 +6,12 @@ import { createPageTitleGuard } from './pageTitleGuard';
import { createProgressGuard } from './progressGuard'; import { createProgressGuard } from './progressGuard';
import { createPermissionGuard } from './permissionGuard'; import { createPermissionGuard } from './permissionGuard';
import { createPageLoadingGuard } from './pageLoadingGuard'; import { createPageLoadingGuard } from './pageLoadingGuard';
import { useSetting } from '/@/hooks/core/useSetting';
const axiosCanceler = new AxiosCanceler(); const { projectSetting } = useSetting();
export function createGuard(router: Router) { export function createGuard(router: Router) {
const axiosCanceler = new AxiosCanceler();
router.beforeEach(async () => { router.beforeEach(async () => {
try { try {
Modal.destroyAll(); Modal.destroyAll();
@@ -20,7 +23,7 @@ export function createGuard(router: Router) {
console.warn('basic guard error:' + error); console.warn('basic guard error:' + error);
} }
}); });
createProgressGuard(router); projectSetting.openNProgress && createProgressGuard(router);
createPermissionGuard(router); createPermissionGuard(router);
createPageTitleGuard(router); createPageTitleGuard(router);
createPageLoadingGuard(router); createPageLoadingGuard(router);

View File

@@ -111,6 +111,9 @@ const setting: ProjectConfig = {
// 是否开启回到顶部 // 是否开启回到顶部
useOpenBackTop: true, useOpenBackTop: true,
// 开启顶部进度条
openNProgress: isProdMode(),
// 是否可以嵌入iframe页面 // 是否可以嵌入iframe页面
canEmbedIFramePage: true, canEmbedIFramePage: true,
}; };

View File

@@ -98,6 +98,8 @@ export interface ProjectConfig {
openPageLoading: boolean; openPageLoading: boolean;
// 是否开启回到顶部 // 是否开启回到顶部
useOpenBackTop: boolean; useOpenBackTop: boolean;
// 开启顶部进度条
openNProgress: boolean;
// 是否可以嵌入iframe页面 // 是否可以嵌入iframe页面
canEmbedIFramePage: boolean; canEmbedIFramePage: boolean;
} }