Commit 67d0ff0e251f584883d50fd71b2413b6ca94729d

Authored by 陈文彬
1 parent faf3f460

feat(setting): add openNProgress setting

package.json
1 { 1 {
2 "name": "vben-admin-2.0", 2 "name": "vben-admin-2.0",
3 - "version": "2.0.0-beta.2", 3 + "version": "2.0.0-beta.3",
4 "scripts": { 4 "scripts": {
5 "bootstrap": "yarn install", 5 "bootstrap": "yarn install",
6 "serve": "ts-node --project ./build/tsconfig.json ./build/script/preserve && cross-env NODE_ENV=development vite", 6 "serve": "ts-node --project ./build/tsconfig.json ./build/script/preserve && cross-env NODE_ENV=development vite",
src/router/guard/index.ts
@@ -6,9 +6,12 @@ import { createPageTitleGuard } from './pageTitleGuard'; @@ -6,9 +6,12 @@ import { createPageTitleGuard } from './pageTitleGuard';
6 import { createProgressGuard } from './progressGuard'; 6 import { createProgressGuard } from './progressGuard';
7 import { createPermissionGuard } from './permissionGuard'; 7 import { createPermissionGuard } from './permissionGuard';
8 import { createPageLoadingGuard } from './pageLoadingGuard'; 8 import { createPageLoadingGuard } from './pageLoadingGuard';
  9 +import { useSetting } from '/@/hooks/core/useSetting';
9 10
10 -const axiosCanceler = new AxiosCanceler(); 11 +const { projectSetting } = useSetting();
11 export function createGuard(router: Router) { 12 export function createGuard(router: Router) {
  13 + const axiosCanceler = new AxiosCanceler();
  14 +
12 router.beforeEach(async () => { 15 router.beforeEach(async () => {
13 try { 16 try {
14 Modal.destroyAll(); 17 Modal.destroyAll();
@@ -20,7 +23,7 @@ export function createGuard(router: Router) { @@ -20,7 +23,7 @@ export function createGuard(router: Router) {
20 console.warn('basic guard error:' + error); 23 console.warn('basic guard error:' + error);
21 } 24 }
22 }); 25 });
23 - createProgressGuard(router); 26 + projectSetting.openNProgress && createProgressGuard(router);
24 createPermissionGuard(router); 27 createPermissionGuard(router);
25 createPageTitleGuard(router); 28 createPageTitleGuard(router);
26 createPageLoadingGuard(router); 29 createPageLoadingGuard(router);
src/settings/projectSetting.ts
@@ -111,6 +111,9 @@ const setting: ProjectConfig = { @@ -111,6 +111,9 @@ const setting: ProjectConfig = {
111 // 是否开启回到顶部 111 // 是否开启回到顶部
112 useOpenBackTop: true, 112 useOpenBackTop: true,
113 113
  114 + // 开启顶部进度条
  115 + openNProgress: isProdMode(),
  116 +
114 // 是否可以嵌入iframe页面 117 // 是否可以嵌入iframe页面
115 canEmbedIFramePage: true, 118 canEmbedIFramePage: true,
116 }; 119 };
src/types/config.d.ts
@@ -98,6 +98,8 @@ export interface ProjectConfig { @@ -98,6 +98,8 @@ export interface ProjectConfig {
98 openPageLoading: boolean; 98 openPageLoading: boolean;
99 // 是否开启回到顶部 99 // 是否开启回到顶部
100 useOpenBackTop: boolean; 100 useOpenBackTop: boolean;
  101 + // 开启顶部进度条
  102 + openNProgress: boolean;
101 // 是否可以嵌入iframe页面 103 // 是否可以嵌入iframe页面
102 canEmbedIFramePage: boolean; 104 canEmbedIFramePage: boolean;
103 } 105 }