From 7dce50cb1f70da050bef689deac29de397005f8b Mon Sep 17 00:00:00 2001
From: Vben <anncwb@126.com>
Date: 星期六, 19 六月 2021 22:38:29 +0800
Subject: [PATCH] chore: typo
---
src/router/routes/basic.ts | 4 +-
types/index.d.ts | 1
types/store.d.ts | 0
src/layouts/default/content/useContentContext.ts | 2 -
types/utils.d.ts | 0
src/router/types.ts | 47 +----------------------
types/vue-router.d.ts | 36 ++++++++++++++++++
src/api/sys/model/menuModel.ts | 2
src/layouts/default/content/index.vue | 2 -
9 files changed, 42 insertions(+), 52 deletions(-)
diff --git a/src/api/sys/model/menuModel.ts b/src/api/sys/model/menuModel.ts
index 139c4f7..8d19eea 100644
--- a/src/api/sys/model/menuModel.ts
+++ b/src/api/sys/model/menuModel.ts
@@ -1,4 +1,4 @@
-import { RouteMeta } from '/@/router/types';
+import type { RouteMeta } from 'vue-router';
export interface RouteItem {
path: string;
component: any;
diff --git a/src/layouts/default/content/index.vue b/src/layouts/default/content/index.vue
index a94b0ee..3f6d193 100644
--- a/src/layouts/default/content/index.vue
+++ b/src/layouts/default/content/index.vue
@@ -5,9 +5,7 @@
</template>
<script lang="ts">
import { defineComponent } from 'vue';
-
import PageLayout from '/@/layouts/page/index.vue';
-
import { useDesign } from '/@/hooks/web/useDesign';
import { useRootSetting } from '/@/hooks/setting/useRootSetting';
import { useTransitionSetting } from '/@/hooks/setting/useTransitionSetting';
diff --git a/src/layouts/default/content/useContentContext.ts b/src/layouts/default/content/useContentContext.ts
index 1af2ec4..f12e77b 100644
--- a/src/layouts/default/content/useContentContext.ts
+++ b/src/layouts/default/content/useContentContext.ts
@@ -1,8 +1,6 @@
import type { InjectionKey, ComputedRef } from 'vue';
import { createContext, useContext } from '/@/hooks/core/useContext';
-import {} from 'vue';
-
export interface ContentContextProps {
contentHeight: ComputedRef<number>;
setPageHeight: (height: number) => Promise<void>;
diff --git a/src/router/routes/basic.ts b/src/router/routes/basic.ts
index 6ad8aa2..aabf28b 100644
--- a/src/router/routes/basic.ts
+++ b/src/router/routes/basic.ts
@@ -47,7 +47,7 @@
export const ERROR_LOG_ROUTE: AppRouteRecordRaw = {
path: '/error-log',
- name: 'errorLog',
+ name: 'ErrorLog',
component: LAYOUT,
meta: {
title: 'ErrorLog',
@@ -56,7 +56,7 @@
children: [
{
path: 'list',
- name: 'errorLogList',
+ name: 'ErrorLogList',
component: () => import('/@/views/sys/error-log/index.vue'),
meta: {
title: t('routes.basic.errorLogList'),
diff --git a/src/router/types.ts b/src/router/types.ts
index 759f6f3..7b5ef05 100644
--- a/src/router/types.ts
+++ b/src/router/types.ts
@@ -1,55 +1,11 @@
-import type { RouteRecordRaw } from 'vue-router';
+import type { RouteRecordRaw, RouteMeta } from 'vue-router';
import { RoleEnum } from '/@/enums/roleEnum';
-
import { defineComponent } from 'vue';
export type Component<T extends any = any> =
| ReturnType<typeof defineComponent>
| (() => Promise<typeof import('*.vue')>)
| (() => Promise<T>);
-
-export interface RouteMeta {
- // title
- title: string;
- // Whether to ignore permissions
- ignoreAuth?: boolean;
- // role info
- roles?: RoleEnum[];
- // Whether not to cache
- ignoreKeepAlive?: boolean;
- // Is it fixed on tab
- affix?: boolean;
- // icon on tab
- icon?: string;
-
- frameSrc?: string;
-
- // current page transition
- transitionName?: string;
-
- // Whether the route has been dynamically added
- hideBreadcrumb?: boolean;
-
- // Hide submenu
- hideChildrenInMenu?: boolean;
-
- // Carrying parameters
- carryParam?: boolean;
-
- // Used internally to mark single-level menus
- single?: boolean;
-
- // Currently active menu
- currentActiveMenu?: string;
-
- // Never show in tab
- hideTab?: boolean;
-
- // Never show in menu
- hideMenu?: boolean;
-
- isLink?: boolean;
-}
// @ts-ignore
export interface AppRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> {
@@ -61,6 +17,7 @@
props?: Recordable;
fullPath?: string;
}
+
export interface MenuTag {
type?: 'primary' | 'error' | 'warn' | 'success';
content?: string;
diff --git a/types/index.d.ts b/types/index.d.ts
index 6de9177..b279c0a 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -11,6 +11,7 @@
declare type LabelValueOptions = {
label: string;
value: any;
+ [key: string]: string | number | boolean;
}[];
declare type EmitType = (event: string, ...args: any[]) => void;
diff --git a/types/store.ts b/types/store.d.ts
similarity index 100%
rename from types/store.ts
rename to types/store.d.ts
diff --git a/types/utils.ts b/types/utils.d.ts
similarity index 100%
rename from types/utils.ts
rename to types/utils.d.ts
diff --git a/types/vue-router.d.ts b/types/vue-router.d.ts
new file mode 100644
index 0000000..c842275
--- /dev/null
+++ b/types/vue-router.d.ts
@@ -0,0 +1,36 @@
+export {};
+
+declare module 'vue-router' {
+ interface RouteMeta extends Record<string | number | symbol, unknown> {
+ // title
+ title: string;
+ // Whether to ignore permissions
+ ignoreAuth?: boolean;
+ // role info
+ roles?: RoleEnum[];
+ // Whether not to cache
+ ignoreKeepAlive?: boolean;
+ // Is it fixed on tab
+ affix?: boolean;
+ // icon on tab
+ icon?: string;
+ frameSrc?: string;
+ // current page transition
+ transitionName?: string;
+ // Whether the route has been dynamically added
+ hideBreadcrumb?: boolean;
+ // Hide submenu
+ hideChildrenInMenu?: boolean;
+ // Carrying parameters
+ carryParam?: boolean;
+ // Used internally to mark single-level menus
+ single?: boolean;
+ // Currently active menu
+ currentActiveMenu?: string;
+ // Never show in tab
+ hideTab?: boolean;
+ // Never show in menu
+ hideMenu?: boolean;
+ isLink?: boolean;
+ }
+}
--
Gitblit v1.8.0