diff --git a/src/design/index.less b/src/design/index.less index 3d3b936359afa0976620dd84f145a5ffbccaeda5..35947da4d030e38c783d9246d43f38393c6bb7db 100644 --- a/src/design/index.less +++ b/src/design/index.less @@ -52,12 +52,6 @@ body { } } -// remove the clear button of a text input control in IE10+ -input::-ms-clear, -input::-ms-reveal { - display: none; -} - body { font-family: 'BlinkMacSystemFont,segoe ui,Microsoft YaHei,Arial,sans-serif,Helvetica Neue,Helvetica,Pingfang SC,Hiragino Sans GB,Roboto,helvetica neue,Arial,noto sans,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol,noto color emoji'; font-style: normal; diff --git a/src/design/public.less b/src/design/public.less index 42089df7ad2765351120f109f6240453f9e2d2bb..a07447fbc6cf489a550a9eb61c978c268527dda0 100644 --- a/src/design/public.less +++ b/src/design/public.less @@ -24,3 +24,21 @@ ::-webkit-scrollbar-thumb:hover { background: @border-color-dark; } + +// ================================= +// ==============nprogress========== +// ================================= +#nprogress { + pointer-events: none; + + .bar { + position: fixed; + top: 0; + left: 0; + z-index: 99999; + width: 100%; + height: 2px; + background-color: @primary-color; + opacity: 0.75; + } +} diff --git a/src/router/guard/progressGuard.ts b/src/router/guard/progressGuard.ts index 4c73e859f739221e0b4dd9a20695fec3bb190d1c..9b3a4ce37612a7dcccc199c9bb410d8d568bccf7 100644 --- a/src/router/guard/progressGuard.ts +++ b/src/router/guard/progressGuard.ts @@ -2,8 +2,8 @@ import type { Router } from 'vue-router'; import { useTransitionSetting } from '/@/hooks/setting/useTransitionSetting'; -import NProgress from 'nprogress'; -import 'nprogress/nprogress.css'; +import nProgress from 'nprogress'; + import { unref } from 'vue'; const { getOpenNProgress } = useTransitionSetting(); @@ -11,13 +11,13 @@ const { getOpenNProgress } = useTransitionSetting(); export function createProgressGuard(router: Router) { router.beforeEach(async (to) => { if (to.meta.loaded) return true; - unref(getOpenNProgress) && NProgress.start(); + unref(getOpenNProgress) && nProgress.start(); return true; }); router.afterEach(async (to) => { if (to.meta.loaded) return true; - unref(getOpenNProgress) && NProgress.done(); + unref(getOpenNProgress) && nProgress.done(); return true; }); }