Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
najiu-frontend
najiu-admin-template
Commits
67d0ff0e
Commit
67d0ff0e
authored
Oct 08, 2020
by
陈文彬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(setting): add openNProgress setting
parent
faf3f460
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
+11
-3
package.json
package.json
+1
-1
index.ts
src/router/guard/index.ts
+5
-2
projectSetting.ts
src/settings/projectSetting.ts
+3
-0
config.d.ts
src/types/config.d.ts
+2
-0
No files found.
package.json
View file @
67d0ff0e
{
"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"
,
...
...
src/router/guard/index.ts
View file @
67d0ff0e
...
...
@@ -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
);
...
...
src/settings/projectSetting.ts
View file @
67d0ff0e
...
...
@@ -111,6 +111,9 @@ const setting: ProjectConfig = {
// 是否开启回到顶部
useOpenBackTop
:
true
,
// 开启顶部进度条
openNProgress
:
isProdMode
(),
// 是否可以嵌入iframe页面
canEmbedIFramePage
:
true
,
};
...
...
src/types/config.d.ts
View file @
67d0ff0e
...
...
@@ -98,6 +98,8 @@ export interface ProjectConfig {
openPageLoading
:
boolean
;
// 是否开启回到顶部
useOpenBackTop
:
boolean
;
// 开启顶部进度条
openNProgress
:
boolean
;
// 是否可以嵌入iframe页面
canEmbedIFramePage
:
boolean
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment