From 9479feaba37087e5aa6e05e4a962478e0e88ac08 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 22 Sep 2025 16:52:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(enum):=20:bug:=20=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9E=9A=E4=B8=BE=E6=96=87=E4=BB=B6=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E5=AF=BC=E5=85=A5=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                      |  3 +--
 src/api/system/menu-api.ts                       |  2 +-
 src/components/Hamburger/index.vue               |  4 ++--
 src/components/LangSelect/index.vue              |  2 +-
 src/components/SizeSelect/index.vue              |  2 +-
 src/composables/layout/useDeviceDetection.ts     |  2 +-
 src/enums/api/code-enum.ts                       |  4 ++--
 src/enums/index.ts                               | 16 ++++++++--------
 src/layouts/components/Menu/BasicMenu.vue        |  2 +-
 src/layouts/components/Menu/MixTopMenu.vue       |  2 +-
 .../NavBar/components/NavbarActions.vue          |  4 ++--
 src/layouts/index.vue                            |  2 +-
 src/store/modules/app-store.ts                   |  4 ++--
 src/store/modules/settings-store.ts              |  4 ++--
 src/types/global.d.ts                            |  2 +-
 src/utils/request.ts                             |  8 ++++----
 src/views/codegen/index.vue                      |  4 ++--
 src/views/demo/curd-demo.vue                     |  2 +-
 src/views/demo/curd/config/edit.ts               |  2 +-
 src/views/demo/curd/config2/edit.ts              |  2 +-
 src/views/system/menu/index.vue                  |  4 ++--
 src/views/system/role/index.vue                  |  2 +-
 src/views/system/user/components/UserImport.vue  |  4 ++--
 src/views/system/user/index.vue                  |  2 +-
 24 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7a5f3ff6..b014e1d6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,8 +15,7 @@
 <script setup lang="ts">
 import { useAppStore, useSettingsStore } from "@/store";
 import { defaultSettings } from "@/settings";
-import { ThemeMode } from "@/enums/settings/theme.enum";
-import { ComponentSize } from "@/enums/settings/layout.enum";
+import { ThemeMode, ComponentSize } from "@/enums";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
diff --git a/src/api/system/menu-api.ts b/src/api/system/menu-api.ts
index b4be9d35..a568a96f 100644
--- a/src/api/system/menu-api.ts
+++ b/src/api/system/menu-api.ts
@@ -42,7 +42,7 @@ export interface MenuQuery {
   /** 搜索关键字 */
   keywords?: string;
 }
-import type { MenuTypeEnum } from "@/enums/system/menu.enum";
+import type { MenuTypeEnum } from "@/enums/system/menu-enum";
 export interface MenuVO {
   /** 子菜单 */
   children?: MenuVO[];
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 1ad9db84..9955af61 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -6,8 +6,8 @@
 
 <script setup lang="ts">
 import { useSettingsStore } from "@/store";
-import { ThemeMode, SidebarColor } from "@/enums/settings/theme.enum";
-import { LayoutMode } from "@/enums/settings/layout.enum";
+import { ThemeMode, SidebarColor } from "@/enums/settings/theme-enum";
+import { LayoutMode } from "@/enums/settings/layout-enum";
 
 defineProps({
   isActive: { type: Boolean, required: true },
diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue
index 3c366bcb..7fcdb607 100644
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -18,7 +18,7 @@
 
 <script setup lang="ts">
 import { useAppStore } from "@/store/modules/app-store";
-import { LanguageEnum } from "@/enums/settings/locale.enum";
+import { LanguageEnum } from "@/enums/settings/locale-enum";
 
 defineProps({
   size: {
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index d24fe776..8b150ebe 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script setup lang="ts">
-import { ComponentSize } from "@/enums/settings/layout.enum";
+import { ComponentSize } from "@/enums/settings/layout-enum";
 import { useAppStore } from "@/store/modules/app-store";
 
 const { t } = useI18n();
diff --git a/src/composables/layout/useDeviceDetection.ts b/src/composables/layout/useDeviceDetection.ts
index 8fe9513b..ccb735ca 100644
--- a/src/composables/layout/useDeviceDetection.ts
+++ b/src/composables/layout/useDeviceDetection.ts
@@ -1,7 +1,7 @@
 import { watchEffect, computed } from "vue";
 import { useWindowSize } from "@vueuse/core";
 import { useAppStore } from "@/store";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 
 /**
  * 设备检测和响应式处理
diff --git a/src/enums/api/code-enum.ts b/src/enums/api/code-enum.ts
index 349a6289..6afe5904 100644
--- a/src/enums/api/code-enum.ts
+++ b/src/enums/api/code-enum.ts
@@ -1,7 +1,7 @@
 /**
- * 响应码枚举
+ * API响应码枚举
  */
-export const enum ResultEnum {
+export const enum ApiCodeEnum {
   /**
    * 成功
    */
diff --git a/src/enums/index.ts b/src/enums/index.ts
index d56b6ad7..79189297 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -1,11 +1,11 @@
-export * from "./api/result.enum";
+export * from "./api/code-enum";
 
-export * from "./codegen/form.enum";
-export * from "./codegen/query.enum";
+export * from "./codegen/form-enum";
+export * from "./codegen/query-enum";
 
-export * from "./settings/layout.enum";
-export * from "./settings/theme.enum";
-export * from "./settings/locale.enum";
-export * from "./settings/device.enum";
+export * from "./settings/layout-enum";
+export * from "./settings/theme-enum";
+export * from "./settings/locale-enum";
+export * from "./settings/device-enum";
 
-export * from "./system/menu.enum";
+export * from "./system/menu-enum";
diff --git a/src/layouts/components/Menu/BasicMenu.vue b/src/layouts/components/Menu/BasicMenu.vue
index 1f9be972..593c2baf 100644
--- a/src/layouts/components/Menu/BasicMenu.vue
+++ b/src/layouts/components/Menu/BasicMenu.vue
@@ -29,7 +29,7 @@ import { useRoute } from "vue-router";
 import path from "path-browserify";
 import type { MenuInstance } from "element-plus";
 import type { RouteRecordRaw } from "vue-router";
-import { SidebarColor } from "@/enums/settings/theme.enum";
+import { SidebarColor } from "@/enums/settings/theme-enum";
 import { useSettingsStore, useAppStore } from "@/store";
 import { isExternal } from "@/utils/index";
 import MenuItem from "./components/MenuItem.vue";
diff --git a/src/layouts/components/Menu/MixTopMenu.vue b/src/layouts/components/Menu/MixTopMenu.vue
index a3b2620e..eda86fa2 100644
--- a/src/layouts/components/Menu/MixTopMenu.vue
+++ b/src/layouts/components/Menu/MixTopMenu.vue
@@ -40,7 +40,7 @@ defineOptions({
 import { LocationQueryRaw, RouteRecordRaw } from "vue-router";
 import { usePermissionStore, useAppStore, useSettingsStore } from "@/store";
 import variables from "@/styles/variables.module.scss";
-import { SidebarColor } from "@/enums/settings/theme.enum";
+import { SidebarColor } from "@/enums/settings/theme-enum";
 
 const router = useRouter();
 const appStore = useAppStore();
diff --git a/src/layouts/components/NavBar/components/NavbarActions.vue b/src/layouts/components/NavBar/components/NavbarActions.vue
index 72ec1f87..3806c3d2 100644
--- a/src/layouts/components/NavBar/components/NavbarActions.vue
+++ b/src/layouts/components/NavBar/components/NavbarActions.vue
@@ -63,9 +63,9 @@
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";
 import { defaultSettings } from "@/settings";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 import { useAppStore, useSettingsStore, useUserStore } from "@/store";
-import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
+import { SidebarColor, ThemeMode } from "@/enums/settings/theme-enum";
 import { LayoutMode } from "@/enums";
 
 // 导入子组件
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index ffc7717a..915b9c9d 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -14,7 +14,7 @@ import LeftLayout from "@/layouts/modes/left/index.vue";
 import TopLayout from "@/layouts/modes/top/index.vue";
 import MixLayout from "@/layouts/modes/mix/index.vue";
 import Settings from "./components/Settings/index.vue";
-import { LayoutMode } from "@/enums/settings/layout.enum";
+import { LayoutMode } from "@/enums/settings/layout-enum";
 import { defaultSettings } from "@/settings";
 
 const { currentLayout } = useLayout();
diff --git a/src/store/modules/app-store.ts b/src/store/modules/app-store.ts
index 21ed6e1a..bd8e6863 100644
--- a/src/store/modules/app-store.ts
+++ b/src/store/modules/app-store.ts
@@ -4,8 +4,8 @@ import { defaultSettings } from "@/settings";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
 import en from "element-plus/es/locale/lang/en";
 import { store } from "@/store";
-import { DeviceEnum } from "@/enums/settings/device.enum";
-import { SidebarStatus } from "@/enums/settings/layout.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
+import { SidebarStatus } from "@/enums/settings/layout-enum";
 import { STORAGE_KEYS } from "@/constants";
 
 export const useAppStore = defineStore("app", () => {
diff --git a/src/store/modules/settings-store.ts b/src/store/modules/settings-store.ts
index 8a260e83..3f90ec1c 100644
--- a/src/store/modules/settings-store.ts
+++ b/src/store/modules/settings-store.ts
@@ -1,6 +1,6 @@
 import { defaultSettings } from "@/settings";
-import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
-import type { LayoutMode } from "@/enums/settings/layout.enum";
+import { SidebarColor, ThemeMode } from "@/enums/settings/theme-enum";
+import type { LayoutMode } from "@/enums/settings/layout-enum";
 import { applyTheme, generateThemeColors, toggleDarkMode, toggleSidebarColor } from "@/utils/theme";
 import { STORAGE_KEYS } from "@/constants";
 
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 25487ca1..6e08fd75 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -67,7 +67,7 @@ declare global {
     /** 主题颜色 */
     themeColor: string;
     /** 主题模式(dark|light) */
-    theme: import("@/enums/settings/theme.enum").ThemeMode;
+    theme: import("@/enums/settings/theme-enum").ThemeMode;
     /** 布局大小(default |large |small) */
     size: string;
     /** 语言( zh-cn| en) */
diff --git a/src/utils/request.ts b/src/utils/request.ts
index ae585b2e..dda7f134 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,7 +1,7 @@
 import axios, { type InternalAxiosRequestConfig, type AxiosResponse } from "axios";
 import qs from "qs";
 import { useUserStoreHook } from "@/store/modules/user-store";
-import { ResultEnum } from "@/enums/api/result.enum";
+import { ApiCodeEnum } from "@/enums/api/code-enum";
 import { AuthStorage } from "@/utils/auth";
 import router from "@/router";
 
@@ -50,7 +50,7 @@ httpRequest.interceptors.response.use(
     const { code, data, msg } = response.data;
 
     // 请求成功
-    if (code === ResultEnum.SUCCESS) {
+    if (code === ApiCodeEnum.SUCCESS) {
       return data;
     }
 
@@ -72,11 +72,11 @@ httpRequest.interceptors.response.use(
     const { code, msg } = response.data as ApiResponse;
 
     switch (code) {
-      case ResultEnum.ACCESS_TOKEN_INVALID:
+      case ApiCodeEnum.ACCESS_TOKEN_INVALID:
         // Access Token 过期，尝试刷新
         return refreshTokenAndRetry(config);
 
-      case ResultEnum.REFRESH_TOKEN_INVALID:
+      case ApiCodeEnum.REFRESH_TOKEN_INVALID:
         // Refresh Token 过期，跳转登录页
         await redirectToLogin("登录已过期，请重新登录");
         return Promise.reject(new Error(msg || "Refresh Token Invalid"));
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index d4c281a7..d91cdf15 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -522,8 +522,8 @@ import Codemirror from "codemirror-editor-vue3";
 import type { CmComponentRef } from "codemirror-editor-vue3";
 import type { EditorConfiguration } from "codemirror";
 
-import { FormTypeEnum } from "@/enums/codegen/form.enum";
-import { QueryTypeEnum } from "@/enums/codegen/query.enum";
+import { FormTypeEnum } from "@/enums/codegen/form-enum";
+import { QueryTypeEnum } from "@/enums/codegen/query-enum";
 
 import GeneratorAPI, {
   TablePageVO,
diff --git a/src/views/demo/curd-demo.vue b/src/views/demo/curd-demo.vue
index 6f62b0dd..04f3103b 100644
--- a/src/views/demo/curd-demo.vue
+++ b/src/views/demo/curd-demo.vue
@@ -73,7 +73,7 @@ import DeptAPI from "@/api/system/dept-api";
 import RoleAPI from "@/api/system/role-api";
 import type { UserForm, UserPageQuery } from "@/api/system/user-api";
 import type { IObject, IModalConfig, IContentConfig, ISearchConfig } from "@/components/CURD/types";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 import { useAppStore } from "@/store";
 import usePage from "@/components/CURD/usePage";
 
diff --git a/src/views/demo/curd/config/edit.ts b/src/views/demo/curd/config/edit.ts
index 94726b54..708ca5cb 100644
--- a/src/views/demo/curd/config/edit.ts
+++ b/src/views/demo/curd/config/edit.ts
@@ -1,6 +1,6 @@
 import UserAPI, { type UserForm } from "@/api/system/user-api";
 import type { IModalConfig } from "@/components/CURD/types";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 import { useAppStore } from "@/store";
 import { deptArr, roleArr } from "./options";
 
diff --git a/src/views/demo/curd/config2/edit.ts b/src/views/demo/curd/config2/edit.ts
index 0fccc5d0..71273793 100644
--- a/src/views/demo/curd/config2/edit.ts
+++ b/src/views/demo/curd/config2/edit.ts
@@ -1,5 +1,5 @@
 import type { IModalConfig } from "@/components/CURD/types";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 import { useAppStore } from "@/store";
 
 const modalConfig: IModalConfig = {
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 2a7e1482..9c045549 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -341,10 +341,10 @@
 
 <script setup lang="ts">
 import { useAppStore } from "@/store/modules/app-store";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 
 import MenuAPI, { MenuQuery, MenuForm, MenuVO } from "@/api/system/menu-api";
-import { MenuTypeEnum } from "@/enums/system/menu.enum";
+import { MenuTypeEnum } from "@/enums/system/menu-enum";
 
 defineOptions({
   name: "SysMenu",
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 9c5829bf..cfc3bfb5 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -213,7 +213,7 @@
 
 <script setup lang="ts">
 import { useAppStore } from "@/store/modules/app-store";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 
 import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/system/role-api";
 import MenuAPI from "@/api/system/menu-api";
diff --git a/src/views/system/user/components/UserImport.vue b/src/views/system/user/components/UserImport.vue
index 7dafa52b..0f00f9ee 100644
--- a/src/views/system/user/components/UserImport.vue
+++ b/src/views/system/user/components/UserImport.vue
@@ -90,7 +90,7 @@
 <script lang="ts" setup>
 import { ElMessage, type UploadUserFile } from "element-plus";
 import UserAPI from "@/api/system/user-api";
-import { ResultEnum } from "@/enums/api/result.enum";
+import { ApiCodeEnum } from "@/enums/api/code-enum";
 
 const emit = defineEmits(["import-success"]);
 const visible = defineModel("modelValue", {
@@ -163,7 +163,7 @@ const handleUpload = async () => {
 
   try {
     const result = await UserAPI.import("1", importFormData.files[0].raw as File);
-    if (result.code === ResultEnum.SUCCESS && result.invalidCount === 0) {
+    if (result.code === ApiCodeEnum.SUCCESS && result.invalidCount === 0) {
       ElMessage.success("导入成功，导入数据：" + result.validCount + "条");
       emit("import-success");
       handleClose();
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 2f31eb24..47ee4797 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -245,7 +245,7 @@
 
 <script setup lang="ts">
 import { useAppStore } from "@/store/modules/app-store";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 
 import UserAPI, { UserForm, UserPageQuery, UserPageVO } from "@/api/system/user-api";
 import DeptAPI from "@/api/system/dept-api";