From e9536b5b7ccc5f667496c4ec7ab838738f804a71 Mon Sep 17 00:00:00 2001 From: vben Date: Sun, 11 Oct 2020 11:11:05 +0800 Subject: [PATCH] perf: the existing tab switching no longer displays animation and processbar --- README.md | 7 +------ src/assets/images/logo.png | Bin 4042 -> 14626 bytes src/design/var/index.less | 2 +- src/router/guard/index.ts | 5 ++++- src/router/guard/progressGuard.ts | 5 +---- src/views/sys/login/Login.vue | 2 +- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 93a3588bd..23f3e2482 100644 --- a/README.md +++ b/README.md @@ -202,11 +202,8 @@ yarn clean:lib # 删除node_modules,兼容window系统 - [x] 页面加载 loading - [x] 滚动条组件 - [x] 弹窗扩展(可拖拽,全屏,自适应高度) -- [x] 全屏 - [x] 模拟数据 -- [x] 剪贴板封装 - [x] hook 封装 -- [x] 项目可配置 - [x] 表单组件 - [x] 右键菜单 - [x] 水印插件 @@ -214,12 +211,10 @@ yarn clean:lib # 删除node_modules,兼容window系统 - [x] 二维码插件 - [x] 国际化插件 - [x] 详情组件 -- [x] 验证码/验证组件 +- [x] 验证组件 - [x] 树组件 -- [x] 兼容最新`vuex`,`vue-router` - [x] 图片预览组件 - [x] 表格组件 -- [x] 可编辑表格 ## 正在开发的功能 diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index cd4c33d8b71f31d32aaed9fefe14f237b81e764f..6977038cfa560f6ff882af845bf4dec4559d2e0e 100644 GIT binary patch literal 14626 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 diff --git a/src/design/var/index.less b/src/design/var/index.less index b39fcc0a4..cc256f46b 100644 --- a/src/design/var/index.less +++ b/src/design/var/index.less @@ -9,7 +9,7 @@ @header-height: 42px; // logo width -@logo-width: 32px; +@logo-width: 40px; // @sider-drag-z-index: 200; diff --git a/src/router/guard/index.ts b/src/router/guard/index.ts index 46d4c1f23..c295e7cf6 100644 --- a/src/router/guard/index.ts +++ b/src/router/guard/index.ts @@ -7,12 +7,15 @@ import { createProgressGuard } from './progressGuard'; import { createPermissionGuard } from './permissionGuard'; import { createPageLoadingGuard } from './pageLoadingGuard'; import { useSetting } from '/@/hooks/core/useSetting'; +import { getIsOpenTab } from '/@/utils/helper/routeHelper'; const { projectSetting } = useSetting(); export function createGuard(router: Router) { const axiosCanceler = new AxiosCanceler(); - router.beforeEach(async () => { + router.beforeEach(async (to) => { + const isOpen = getIsOpenTab(to.path); + to.meta.inTab = isOpen; try { Modal.destroyAll(); notification.destroy(); diff --git a/src/router/guard/progressGuard.ts b/src/router/guard/progressGuard.ts index 89dbb4cd2..fb64379b7 100644 --- a/src/router/guard/progressGuard.ts +++ b/src/router/guard/progressGuard.ts @@ -2,16 +2,13 @@ import type { Router } from 'vue-router'; import NProgress from 'nprogress'; import 'nprogress/nprogress.css'; -import { getIsOpenTab } from '/@/utils/helper/routeHelper'; export function createProgressGuard(router: Router) { // NProgress.inc(0.1); // NProgress.configure({ easing: 'ease', speed: 200, showSpinner: false }); router.beforeEach(async (to) => { - const isOpen = getIsOpenTab(to.path); - to.meta.inTab = isOpen; - !isOpen && NProgress.start(); + !to.meta.inTab && NProgress.start(); return true; }); router.afterEach(async (to) => { diff --git a/src/views/sys/login/Login.vue b/src/views/sys/login/Login.vue index 9eb644a45..10bcd8231 100644 --- a/src/views/sys/login/Login.vue +++ b/src/views/sys/login/Login.vue @@ -173,7 +173,7 @@ img { display: inline-block; - width: 48px; + width: 80px; } h1 {