fix(enum): 🐛 同步调整枚举文件重命名导入路径
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -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[];
|
||||
|
||||
@@ -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 },
|
||||
|
||||
@@ -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: {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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";
|
||||
|
||||
/**
|
||||
* 设备检测和响应式处理
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/**
|
||||
* 响应码枚举
|
||||
* API响应码枚举
|
||||
*/
|
||||
export const enum ResultEnum {
|
||||
export const enum ApiCodeEnum {
|
||||
/**
|
||||
* 成功
|
||||
*/
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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";
|
||||
|
||||
// 导入子组件
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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", () => {
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
2
src/types/global.d.ts
vendored
2
src/types/global.d.ts
vendored
@@ -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) */
|
||||
|
||||
@@ -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"));
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user