diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id index 62bb89ab..298e7b3f 100644 --- a/package-lock.json.REMOVED.git-id +++ b/package-lock.json.REMOVED.git-id @@ -1 +1 @@ -12048ef98cbc909b11ea70298ee10637ece9fe87 \ No newline at end of file +4d463a54f93007210c2e07a05d8f012c386a0023 \ No newline at end of file diff --git a/package.json b/package.json index 631da2a2..1fd7a8c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "d2-admin", - "version": "1.3.0", + "version": "1.4.1", "private": true, "scripts": { "serve": "vue-cli-service serve --open", @@ -31,6 +31,7 @@ "lowdb": "^1.0.0", "marked": "^0.3.9", "mockjs": "^1.0.1-beta3", + "nprogress": "^0.2.0", "papaparse": "^4.3.6", "particles.js": "^2.0.0", "quill": "^1.3.4", diff --git a/src/assets/style/fixed/n-progress.scss b/src/assets/style/fixed/n-progress.scss new file mode 100644 index 00000000..2de5618d --- /dev/null +++ b/src/assets/style/fixed/n-progress.scss @@ -0,0 +1,8 @@ +#nprogress { + .bar { + background: $color-primary !important; + } + .peg { + box-shadow: 0 0 10px $color-primary, 0 0 5px $color-primary !important; + } +} \ No newline at end of file diff --git a/src/assets/style/public-class.scss b/src/assets/style/public-class.scss index 69e93d71..dc41e4e6 100644 --- a/src/assets/style/public-class.scss +++ b/src/assets/style/public-class.scss @@ -6,6 +6,8 @@ @import '~@/assets/style/fixed/element.scss'; // 补丁 markdown @import '~@/assets/style/fixed/markdown.scss'; +// 补丁 n-progress +@import '~@/assets/style/fixed/n-progress.scss'; // 补丁 vue-splitpane @import '~@/assets/style/fixed/vue-splitpane.scss'; // 补丁 vue-grid-layout diff --git a/src/router/index.js b/src/router/index.js index 32712ec3..244d44db 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,10 @@ import Vue from 'vue' import VueRouter from 'vue-router' +// 进度条 +import NProgress from 'nprogress' +import 'nprogress/nprogress.css' + import store from '@/store/index' import util from '@/libs/util.js' @@ -20,6 +24,8 @@ const router = new VueRouter({ * 权限验证 */ router.beforeEach((to, from, next) => { + // 进度条 + NProgress.start() // 关闭搜索面板 store.commit('d2admin/search/set', false) // 验证当前路由所有的匹配中是否需要有登录验证的 @@ -45,6 +51,8 @@ router.beforeEach((to, from, next) => { }) router.afterEach(to => { + // 进度条 + NProgress.done() // 需要的信息 const app = router.app const { name, params, query } = to