From 51e7cd95a6b45351565dfc1dba5f76b729ee066a Mon Sep 17 00:00:00 2001
From: pany <939630029@qq.com>
Date: Mon, 25 Nov 2024 17:42:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=85=88=E9=87=87?=
=?UTF-8?q?=E7=94=A8=E6=99=AE=E9=80=9A=E5=AF=BC=E5=87=BA=E8=80=8C=E4=B8=8D?=
=?UTF-8?q?=E6=98=AF=E9=BB=98=E8=AE=A4=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/config/route.ts | 4 +---
src/config/white-list.ts | 4 +---
src/constants/cache-key.ts | 4 +---
src/pages/table/vxe-table/index.vue | 4 ++--
src/pages/table/vxe-table/tsx/RoleColumnSolts.tsx | 4 +---
src/pages/table/vxe-table/tsx/StatusColumnSolts.tsx | 4 +---
src/pinia/stores/permission.ts | 2 +-
src/pinia/stores/user.ts | 2 +-
src/router/index.ts | 2 +-
src/router/permission.ts | 4 ++--
src/utils/cache/cookies.ts | 2 +-
src/utils/cache/local-storage.ts | 2 +-
12 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/src/config/route.ts b/src/config/route.ts
index ad77af3..3b896cb 100644
--- a/src/config/route.ts
+++ b/src/config/route.ts
@@ -21,10 +21,8 @@ interface RouteSettings {
thirdLevelRouteCache: boolean
}
-const routeSettings: RouteSettings = {
+export const routeSettings: RouteSettings = {
dynamic: true,
defaultRoles: ["DEFAULT_ROLE"],
thirdLevelRouteCache: false
}
-
-export default routeSettings
diff --git a/src/config/white-list.ts b/src/config/white-list.ts
index d17258f..cc43381 100644
--- a/src/config/white-list.ts
+++ b/src/config/white-list.ts
@@ -7,9 +7,7 @@ const whiteListByPath: string[] = ["/login"]
const whiteListByName: RouteRecordNameGeneric[] = []
/** 判断是否在白名单 */
-function isWhiteList(to: RouteLocationNormalized) {
+export function isWhiteList(to: RouteLocationNormalized) {
// path 和 name 任意一个匹配上即可
return whiteListByPath.includes(to.path) || whiteListByName.includes(to.name)
}
-
-export default isWhiteList
diff --git a/src/constants/cache-key.ts b/src/constants/cache-key.ts
index 9ffed02..8b6fc64 100644
--- a/src/constants/cache-key.ts
+++ b/src/constants/cache-key.ts
@@ -1,7 +1,7 @@
const SYSTEM_NAME = "v3-admin-vite"
/** 缓存数据时用到的 Key */
-class CacheKey {
+export class CacheKey {
static readonly TOKEN = `${SYSTEM_NAME}-token-key`
static readonly CONFIG_LAYOUT = `${SYSTEM_NAME}-config-layout-key`
static readonly SIDEBAR_STATUS = `${SYSTEM_NAME}-sidebar-status-key`
@@ -9,5 +9,3 @@ class CacheKey {
static readonly VISITED_VIEWS = `${SYSTEM_NAME}-visited-views-key`
static readonly CACHED_VIEWS = `${SYSTEM_NAME}-cached-views-key`
}
-
-export default CacheKey
diff --git a/src/pages/table/vxe-table/index.vue b/src/pages/table/vxe-table/index.vue
index f8f4a24..fdcb87a 100644
--- a/src/pages/table/vxe-table/index.vue
+++ b/src/pages/table/vxe-table/index.vue
@@ -5,8 +5,8 @@ import type { VxeFormInstance, VxeFormProps, VxeGridInstance, VxeGridProps, VxeM
import { deleteTableDataApi, getTableDataApi } from "@/http/table"
import { ElMessage, ElMessageBox } from "element-plus"
import { nextTick, reactive, ref } from "vue"
-import RoleColumnSolts from "./tsx/RoleColumnSolts"
-import StatusColumnSolts from "./tsx/StatusColumnSolts"
+import { RoleColumnSolts } from "./tsx/RoleColumnSolts"
+import { StatusColumnSolts } from "./tsx/StatusColumnSolts"
defineOptions({
// 命名当前组件
diff --git a/src/pages/table/vxe-table/tsx/RoleColumnSolts.tsx b/src/pages/table/vxe-table/tsx/RoleColumnSolts.tsx
index 2ad78c9..92884ea 100644
--- a/src/pages/table/vxe-table/tsx/RoleColumnSolts.tsx
+++ b/src/pages/table/vxe-table/tsx/RoleColumnSolts.tsx
@@ -1,11 +1,9 @@
import type { VxeColumnPropTypes } from "vxe-table/types/column"
-const solts: VxeColumnPropTypes.Slots = {
+export const RoleColumnSolts: VxeColumnPropTypes.Slots = {
default: ({ row, column }) => {
const cellValue = row[column.field]
const type = cellValue === "admin" ? "primary" : "warning"
return [<span class={`el-tag el-tag--${type} el-tag--plain`}>{cellValue}</span>]
}
}
-
-export default solts
diff --git a/src/pages/table/vxe-table/tsx/StatusColumnSolts.tsx b/src/pages/table/vxe-table/tsx/StatusColumnSolts.tsx
index 13ccd8b..123a260 100644
--- a/src/pages/table/vxe-table/tsx/StatusColumnSolts.tsx
+++ b/src/pages/table/vxe-table/tsx/StatusColumnSolts.tsx
@@ -1,11 +1,9 @@
import type { VxeColumnPropTypes } from "vxe-table/types/column"
-const solts: VxeColumnPropTypes.Slots = {
+export const StatusColumnSolts: VxeColumnPropTypes.Slots = {
default: ({ row, column }) => {
const cellValue = row[column.field]
const [type, value] = cellValue ? ["success", "启用"] : ["danger", "禁用"]
return [<span class={`el-tag el-tag--${type} el-tag--plain`}>{value}</span>]
}
}
-
-export default solts
diff --git a/src/pinia/stores/permission.ts b/src/pinia/stores/permission.ts
index 448ad35..0cb6cb4 100644
--- a/src/pinia/stores/permission.ts
+++ b/src/pinia/stores/permission.ts
@@ -1,5 +1,5 @@
import type { RouteRecordRaw } from "vue-router"
-import routeSettings from "@/config/route"
+import { routeSettings } from "@/config/route"
import { pinia } from "@/pinia"
import { constantRoutes, dynamicRoutes } from "@/router"
import { flatMultiLevelRoutes } from "@/router/helper"
diff --git a/src/pinia/stores/user.ts b/src/pinia/stores/user.ts
index fb24160..06f5f18 100644
--- a/src/pinia/stores/user.ts
+++ b/src/pinia/stores/user.ts
@@ -1,5 +1,5 @@
import type { LoginRequestData } from "@/http/login/types/login"
-import routeSettings from "@/config/route"
+import { routeSettings } from "@/config/route"
import { getUserInfoApi, loginApi } from "@/http/login"
import { pinia } from "@/pinia"
import { resetRouter } from "@/router"
diff --git a/src/router/index.ts b/src/router/index.ts
index 73f348b..20a2d56 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,5 +1,5 @@
import type { RouteRecordRaw } from "vue-router"
-import routeSettings from "@/config/route"
+import { routeSettings } from "@/config/route"
import { createRouter } from "vue-router"
import { flatMultiLevelRoutes, history } from "./helper"
diff --git a/src/router/permission.ts b/src/router/permission.ts
index c551d4f..d16ff4a 100644
--- a/src/router/permission.ts
+++ b/src/router/permission.ts
@@ -1,7 +1,7 @@
import { setRouteChange } from "@/composables/useRouteListener"
import { useTitle } from "@/composables/useTitle"
-import routeSettings from "@/config/route"
-import isWhiteList from "@/config/white-list"
+import { routeSettings } from "@/config/route"
+import { isWhiteList } from "@/config/white-list"
import { usePermissionStore } from "@/pinia/stores/permission"
import { useUserStore } from "@/pinia/stores/user"
import { router } from "@/router"
diff --git a/src/utils/cache/cookies.ts b/src/utils/cache/cookies.ts
index 57c27ed..aeadda6 100644
--- a/src/utils/cache/cookies.ts
+++ b/src/utils/cache/cookies.ts
@@ -1,6 +1,6 @@
// 统一处理 Cookie
-import CacheKey from "@/constants/cache-key"
+import { CacheKey } from "@/constants/cache-key"
import Cookies from "js-cookie"
export function getToken() {
diff --git a/src/utils/cache/local-storage.ts b/src/utils/cache/local-storage.ts
index 1e0639e..bc6b52e 100644
--- a/src/utils/cache/local-storage.ts
+++ b/src/utils/cache/local-storage.ts
@@ -4,7 +4,7 @@ import type { ThemeName } from "@/composables/useTheme"
import type { LayoutSettings } from "@/config/layouts"
import type { SidebarClosed, SidebarOpened } from "@/constants/app-key"
import type { TagView } from "@/pinia/stores/tags-view"
-import CacheKey from "@/constants/cache-key"
+import { CacheKey } from "@/constants/cache-key"
// #region 系统布局配置
export function getConfigLayout() {