From f29bc05dd9f53144ef56440033a6f747c112e83d Mon Sep 17 00:00:00 2001
From: Soybean <2570172956@qq.com>
Date: Fri, 17 Sep 2021 19:50:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(projects):=20=E5=A4=9A=E9=A1=B5=E7=AD=BE?=
=?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/enum/route.ts | 3 +
src/hooks/common/useRouterChange.ts | 8 ++-
src/interface/theme.ts | 8 +--
.../components/GlobalTab/index.vue | 51 +++++++++++---
.../components/PageFunc/index.vue | 4 +-
.../components/PageView/index.vue | 2 +-
src/router/index.ts | 25 +------
src/router/routes.ts | 50 +++++++++-----
src/router/setup.ts | 18 +++++
src/settings/theme.ts | 2 +-
src/store/modules/app/index.ts | 69 ++++++++++++++++++-
src/store/modules/theme/index.ts | 2 +-
src/views/system/reload/index.vue | 18 +++++
13 files changed, 195 insertions(+), 65 deletions(-)
create mode 100644 src/router/setup.ts
create mode 100644 src/views/system/reload/index.vue
diff --git a/src/enum/route.ts b/src/enum/route.ts
index 40e74c40..67c824c3 100644
--- a/src/enum/route.ts
+++ b/src/enum/route.ts
@@ -5,6 +5,7 @@ export enum EnumRoutePath {
'not-found' = '/404',
'no-permission' = '/403',
'service-error' = '/500',
+ 'reload' = '/reload',
// 自定义路由
'dashboard' = '/dashboard',
'dashboard-analysis' = '/dashboard/analysis',
@@ -22,6 +23,8 @@ export enum EnumRouteTitle {
'not-found' = '未找到',
'no-permission' = '无权限',
'service-error' = '服务器错误',
+ 'reload' = '重载',
+ // 自定义路由
'dashboard' = '仪表盘',
'dashboard-analysis' = '分析页',
'dashboard-workbench' = '工作台',
diff --git a/src/hooks/common/useRouterChange.ts b/src/hooks/common/useRouterChange.ts
index f2c58f2d..ca723fce 100644
--- a/src/hooks/common/useRouterChange.ts
+++ b/src/hooks/common/useRouterChange.ts
@@ -1,5 +1,6 @@
import { useRouter, useRoute } from 'vue-router';
import type { RouteLocationRaw } from 'vue-router';
+import { EnumRoutePath } from '@/enum';
import { router as globalRouter, RouteNameMap } from '@/router';
import type { LoginModuleType } from '@/interface';
@@ -61,9 +62,14 @@ export default function useRouterChange(inSetup: boolean = true) {
}
}
+ function toReload(redirectUrl: string) {
+ router.push({ path: EnumRoutePath.reload, query: { redirectUrl } });
+ }
+
return {
toHome,
toLogin,
- toCurrentLogin
+ toCurrentLogin,
+ toReload
};
}
diff --git a/src/interface/theme.ts b/src/interface/theme.ts
index caca774a..3d80e768 100644
--- a/src/interface/theme.ts
+++ b/src/interface/theme.ts
@@ -15,13 +15,13 @@ export interface ThemeSettings {
menuStyle: MenuStyle;
/** 头部样式 */
headerStyle: HeaderStyle;
- /** 多标签样式 */
+ /** 多页签样式 */
multiTabStyle: MultiTabStyle;
/** 面包屑样式 */
crumbsStyle: CrumbsStyle;
/** 页面样式 */
pageStyle: PageStyle;
- /** 固定头部和多标签 */
+ /** 固定头部和多页签 */
fixedHeaderAndTab: boolean;
/** 显示重载按钮 */
showReload: boolean;
@@ -70,9 +70,9 @@ interface MenuStyle {
}
interface MultiTabStyle {
- /** 多标签高度 */
+ /** 多页签高度 */
height: number;
- /** 多标签可见 */
+ /** 多页签可见 */
visible: boolean;
/** 背景颜色 */
bgColor: string;
diff --git a/src/layouts/BasicLayout/components/GlobalTab/index.vue b/src/layouts/BasicLayout/components/GlobalTab/index.vue
index ccfdaeb4..d8e706ab 100644
--- a/src/layouts/BasicLayout/components/GlobalTab/index.vue
+++ b/src/layouts/BasicLayout/components/GlobalTab/index.vue
@@ -1,25 +1,33 @@
- 爱在西元前
- 不该
- 超人不会飞
- 手写的从前
- 哪里都是你
- 这是MultiTab组件
+
+ {{ item.meta?.title }}
+
+
+
+