diff --git a/src/common/components/SearchMenu/Modal.vue b/src/common/components/SearchMenu/Modal.vue index 0aada22..0576b00 100644 --- a/src/common/components/SearchMenu/Modal.vue +++ b/src/common/components/SearchMenu/Modal.vue @@ -2,8 +2,8 @@ import type { ElScrollbar } from "element-plus" import type { RouteRecordName, RouteRecordRaw } from "vue-router" import { usePermissionStore } from "@/pinia/stores/permission" -import { isExternal } from "@/utils/validate" import { useDevice } from "@@/composables/useDevice" +import { isExternal } from "@@/utils/validate" import { ElMessage } from "element-plus" import { cloneDeep, debounce } from "lodash-es" import { computed, ref, shallowRef } from "vue" diff --git a/src/common/composables/useTheme.ts b/src/common/composables/useTheme.ts index 8181f1a..9bf778b 100644 --- a/src/common/composables/useTheme.ts +++ b/src/common/composables/useTheme.ts @@ -1,4 +1,4 @@ -import { getActiveThemeName, setActiveThemeName } from "@/utils/cache/local-storage" +import { getActiveThemeName, setActiveThemeName } from "@@/utils/cache/local-storage" import { ref, watchEffect } from "vue" const DEFAULT_THEME_NAME = "normal" diff --git a/src/common/directives/permission.ts b/src/common/directives/permission.ts index e858b75..d833ec9 100644 --- a/src/common/directives/permission.ts +++ b/src/common/directives/permission.ts @@ -1,6 +1,6 @@ import type { Directive } from "vue" import { useUserStore } from "@/pinia/stores/user" -import { isArray } from "@/utils/validate" +import { isArray } from "@@/utils/validate" /** * @name 权限指令 diff --git a/src/utils/cache/cookies.ts b/src/common/utils/cache/cookies.ts similarity index 100% rename from src/utils/cache/cookies.ts rename to src/common/utils/cache/cookies.ts diff --git a/src/utils/cache/local-storage.ts b/src/common/utils/cache/local-storage.ts similarity index 100% rename from src/utils/cache/local-storage.ts rename to src/common/utils/cache/local-storage.ts diff --git a/src/utils/css.ts b/src/common/utils/css.ts similarity index 100% rename from src/utils/css.ts rename to src/common/utils/css.ts diff --git a/src/utils/datetime.ts b/src/common/utils/datetime.ts similarity index 100% rename from src/utils/datetime.ts rename to src/common/utils/datetime.ts diff --git a/src/utils/permission.ts b/src/common/utils/permission.ts similarity index 91% rename from src/utils/permission.ts rename to src/common/utils/permission.ts index 2367e83..b8d35f5 100644 --- a/src/utils/permission.ts +++ b/src/common/utils/permission.ts @@ -1,5 +1,5 @@ import { useUserStore } from "@/pinia/stores/user" -import { isArray } from "@/utils/validate" +import { isArray } from "@@/utils/validate" /** 全局权限判断函数,和权限指令 v-permission 功能类似 */ export function checkPermission(permissionRoles: string[]): boolean { diff --git a/src/utils/validate.ts b/src/common/utils/validate.ts similarity index 100% rename from src/utils/validate.ts rename to src/common/utils/validate.ts diff --git a/src/http/request.ts b/src/http/request.ts index 4d0c4a1..17d9a31 100644 --- a/src/http/request.ts +++ b/src/http/request.ts @@ -1,6 +1,6 @@ import type { AxiosInstance, AxiosRequestConfig } from "axios" import { useUserStore } from "@/pinia/stores/user" -import { getToken } from "@/utils/cache/cookies" +import { getToken } from "@@/utils/cache/cookies" import axios from "axios" import { ElMessage } from "element-plus" import { get, merge } from "lodash-es" diff --git a/src/layouts/components/Settings/index.vue b/src/layouts/components/Settings/index.vue index 570dafd..5abd6bd 100644 --- a/src/layouts/components/Settings/index.vue +++ b/src/layouts/components/Settings/index.vue @@ -1,7 +1,7 @@ diff --git a/src/pinia/stores/app.ts b/src/pinia/stores/app.ts index 601cb09..efe6ab2 100644 --- a/src/pinia/stores/app.ts +++ b/src/pinia/stores/app.ts @@ -1,6 +1,6 @@ import { pinia } from "@/pinia" -import { getSidebarStatus, setSidebarStatus } from "@/utils/cache/local-storage" import { DeviceEnum, SIDEBAR_CLOSED, SIDEBAR_OPENED } from "@@/constants/app-key" +import { getSidebarStatus, setSidebarStatus } from "@@/utils/cache/local-storage" import { defineStore } from "pinia" import { reactive, ref, watch } from "vue" diff --git a/src/pinia/stores/settings.ts b/src/pinia/stores/settings.ts index b9af8b1..83395cb 100644 --- a/src/pinia/stores/settings.ts +++ b/src/pinia/stores/settings.ts @@ -2,7 +2,7 @@ import type { LayoutsConfig } from "@/layouts/config" import type { Ref } from "vue" import { layoutsConfig } from "@/layouts/config" import { pinia } from "@/pinia" -import { setLayoutsConfig } from "@/utils/cache/local-storage" +import { setLayoutsConfig } from "@@/utils/cache/local-storage" import { defineStore } from "pinia" import { ref, watch } from "vue" diff --git a/src/pinia/stores/tags-view.ts b/src/pinia/stores/tags-view.ts index 31df341..2987b43 100644 --- a/src/pinia/stores/tags-view.ts +++ b/src/pinia/stores/tags-view.ts @@ -1,6 +1,6 @@ import type { RouteLocationNormalized } from "vue-router" import { pinia } from "@/pinia" -import { getCachedViews, getVisitedViews, setCachedViews, setVisitedViews } from "@/utils/cache/local-storage" +import { getCachedViews, getVisitedViews, setCachedViews, setVisitedViews } from "@@/utils/cache/local-storage" import { defineStore } from "pinia" import { ref, watchEffect } from "vue" import { useSettingsStore } from "./settings" diff --git a/src/pinia/stores/user.ts b/src/pinia/stores/user.ts index 9371fc5..b337958 100644 --- a/src/pinia/stores/user.ts +++ b/src/pinia/stores/user.ts @@ -3,7 +3,7 @@ import { getUserInfoApi, loginApi } from "@/http/apis/login" import { pinia } from "@/pinia" import { resetRouter } from "@/router" import { routerConfig } from "@/router/config" -import { getToken, removeToken, setToken } from "@/utils/cache/cookies" +import { getToken, removeToken, setToken } from "@@/utils/cache/cookies" import { defineStore } from "pinia" import { ref } from "vue" import { useSettingsStore } from "./settings" diff --git a/src/router/guard.ts b/src/router/guard.ts index 76bf48c..11524b5 100644 --- a/src/router/guard.ts +++ b/src/router/guard.ts @@ -3,9 +3,9 @@ import { usePermissionStore } from "@/pinia/stores/permission" import { useUserStore } from "@/pinia/stores/user" import { routerConfig } from "@/router/config" import { isWhiteList } from "@/router/whitelist" -import { getToken } from "@/utils/cache/cookies" import { setRouteChange } from "@@/composables/useRouteListener" import { useTitle } from "@@/composables/useTitle" +import { getToken } from "@@/utils/cache/cookies" import { ElMessage } from "element-plus" import NProgress from "nprogress" import "nprogress/nprogress.css" diff --git a/tests/utils/validate.test.ts b/tests/utils/validate.test.ts index 9005deb..4c94ad0 100644 --- a/tests/utils/validate.test.ts +++ b/tests/utils/validate.test.ts @@ -1,4 +1,4 @@ -import { isArray } from "@/utils/validate" +import { isArray } from "@@/utils/validate" import { describe, expect, it } from "vitest" describe("isArray", () => {