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 cd4c33d8b..6977038cf 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ 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 {