From 77cfb43df68716cf22661ab9962a9b523e2fce28 Mon Sep 17 00:00:00 2001
From: pany <939630029@qq.com>
Date: Wed, 27 Nov 2024 10:17:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=BF=81=E7=A7=BB=20composables=20?=
 =?UTF-8?q?=E5=88=B0=20common=20=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                             | 4 ++--
 src/common/components/SearchMenu/Footer.vue             | 2 +-
 src/common/components/SearchMenu/Modal.vue              | 2 +-
 src/common/components/ThemeSwitch/index.vue             | 4 ++--
 src/{ => common}/composables/useDevice.ts               | 0
 src/{ => common}/composables/useFetchSelect.ts          | 0
 src/{ => common}/composables/useFullscreenLoading.ts    | 0
 src/{ => common}/composables/useGreyAndColorWeakness.ts | 0
 src/{ => common}/composables/useLayoutMode.ts           | 0
 src/{ => common}/composables/usePagination.ts           | 0
 src/{ => common}/composables/useRouteListener.ts        | 0
 src/{ => common}/composables/useTheme.ts                | 0
 src/{ => common}/composables/useTitle.ts                | 0
 src/{ => common}/composables/useWatermark.ts            | 0
 src/layouts/components/Breadcrumb/index.vue             | 2 +-
 src/layouts/components/Logo/index.vue                   | 2 +-
 src/layouts/components/NavigationBar/index.vue          | 4 ++--
 src/layouts/components/Settings/SelectLayoutMode.vue    | 2 +-
 src/layouts/components/Settings/index.vue               | 2 +-
 src/layouts/components/Sidebar/index.vue                | 4 ++--
 src/layouts/components/TagsView/ScrollPane.vue          | 2 +-
 src/layouts/components/TagsView/index.vue               | 2 +-
 src/layouts/composables/useResize.ts                    | 2 +-
 src/layouts/index.vue                                   | 6 +++---
 src/layouts/modes/LeftMode.vue                          | 4 ++--
 src/pages/composable-demo/use-fetch-select.vue          | 2 +-
 src/pages/composable-demo/use-fullscreen-loading.vue    | 2 +-
 src/pages/composable-demo/use-watermark.vue             | 2 +-
 src/pages/table/element-plus/index.vue                  | 2 +-
 src/router/guard.ts                                     | 4 ++--
 src/utils/cache/local-storage.ts                        | 2 +-
 31 files changed, 29 insertions(+), 29 deletions(-)
 rename src/{ => common}/composables/useDevice.ts (100%)
 rename src/{ => common}/composables/useFetchSelect.ts (100%)
 rename src/{ => common}/composables/useFullscreenLoading.ts (100%)
 rename src/{ => common}/composables/useGreyAndColorWeakness.ts (100%)
 rename src/{ => common}/composables/useLayoutMode.ts (100%)
 rename src/{ => common}/composables/usePagination.ts (100%)
 rename src/{ => common}/composables/useRouteListener.ts (100%)
 rename src/{ => common}/composables/useTheme.ts (100%)
 rename src/{ => common}/composables/useTitle.ts (100%)
 rename src/{ => common}/composables/useWatermark.ts (100%)

diff --git a/src/App.vue b/src/App.vue
index 471ef60..ac4fc4d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import { useGreyAndColorWeakness } from "@/composables/useGreyAndColorWeakness"
-import { useTheme } from "@/composables/useTheme"
+import { useGreyAndColorWeakness } from "@@/composables/useGreyAndColorWeakness"
+import { useTheme } from "@@/composables/useTheme"
 import { ElNotification } from "element-plus"
 import zhCn from "element-plus/es/locale/lang/zh-cn" // Element Plus 中文包
 
diff --git a/src/common/components/SearchMenu/Footer.vue b/src/common/components/SearchMenu/Footer.vue
index 3e6828e..5e61daa 100644
--- a/src/common/components/SearchMenu/Footer.vue
+++ b/src/common/components/SearchMenu/Footer.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useDevice } from "@/composables/useDevice"
+import { useDevice } from "@@/composables/useDevice"
 
 interface Props {
   total: number
diff --git a/src/common/components/SearchMenu/Modal.vue b/src/common/components/SearchMenu/Modal.vue
index 1fa15d7..0aada22 100644
--- a/src/common/components/SearchMenu/Modal.vue
+++ b/src/common/components/SearchMenu/Modal.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import type { ElScrollbar } from "element-plus"
 import type { RouteRecordName, RouteRecordRaw } from "vue-router"
-import { useDevice } from "@/composables/useDevice"
 import { usePermissionStore } from "@/pinia/stores/permission"
 import { isExternal } from "@/utils/validate"
+import { useDevice } from "@@/composables/useDevice"
 import { ElMessage } from "element-plus"
 import { cloneDeep, debounce } from "lodash-es"
 import { computed, ref, shallowRef } from "vue"
diff --git a/src/common/components/ThemeSwitch/index.vue b/src/common/components/ThemeSwitch/index.vue
index 1c65d00..27099b8 100644
--- a/src/common/components/ThemeSwitch/index.vue
+++ b/src/common/components/ThemeSwitch/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { ThemeName } from "@/composables/useTheme"
-import { useTheme } from "@/composables/useTheme"
+import type { ThemeName } from "@@/composables/useTheme"
+import { useTheme } from "@@/composables/useTheme"
 import { MagicStick } from "@element-plus/icons-vue"
 
 const { themeList, activeThemeName, setTheme } = useTheme()
diff --git a/src/composables/useDevice.ts b/src/common/composables/useDevice.ts
similarity index 100%
rename from src/composables/useDevice.ts
rename to src/common/composables/useDevice.ts
diff --git a/src/composables/useFetchSelect.ts b/src/common/composables/useFetchSelect.ts
similarity index 100%
rename from src/composables/useFetchSelect.ts
rename to src/common/composables/useFetchSelect.ts
diff --git a/src/composables/useFullscreenLoading.ts b/src/common/composables/useFullscreenLoading.ts
similarity index 100%
rename from src/composables/useFullscreenLoading.ts
rename to src/common/composables/useFullscreenLoading.ts
diff --git a/src/composables/useGreyAndColorWeakness.ts b/src/common/composables/useGreyAndColorWeakness.ts
similarity index 100%
rename from src/composables/useGreyAndColorWeakness.ts
rename to src/common/composables/useGreyAndColorWeakness.ts
diff --git a/src/composables/useLayoutMode.ts b/src/common/composables/useLayoutMode.ts
similarity index 100%
rename from src/composables/useLayoutMode.ts
rename to src/common/composables/useLayoutMode.ts
diff --git a/src/composables/usePagination.ts b/src/common/composables/usePagination.ts
similarity index 100%
rename from src/composables/usePagination.ts
rename to src/common/composables/usePagination.ts
diff --git a/src/composables/useRouteListener.ts b/src/common/composables/useRouteListener.ts
similarity index 100%
rename from src/composables/useRouteListener.ts
rename to src/common/composables/useRouteListener.ts
diff --git a/src/composables/useTheme.ts b/src/common/composables/useTheme.ts
similarity index 100%
rename from src/composables/useTheme.ts
rename to src/common/composables/useTheme.ts
diff --git a/src/composables/useTitle.ts b/src/common/composables/useTitle.ts
similarity index 100%
rename from src/composables/useTitle.ts
rename to src/common/composables/useTitle.ts
diff --git a/src/composables/useWatermark.ts b/src/common/composables/useWatermark.ts
similarity index 100%
rename from src/composables/useWatermark.ts
rename to src/common/composables/useWatermark.ts
diff --git a/src/layouts/components/Breadcrumb/index.vue b/src/layouts/components/Breadcrumb/index.vue
index f439467..9d3b728 100644
--- a/src/layouts/components/Breadcrumb/index.vue
+++ b/src/layouts/components/Breadcrumb/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { RouteLocationMatched } from "vue-router"
-import { useRouteListener } from "@/composables/useRouteListener"
+import { useRouteListener } from "@@/composables/useRouteListener"
 import { compile } from "path-to-regexp"
 import { ref } from "vue"
 import { useRoute, useRouter } from "vue-router"
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index 05a5c93..8c66dea 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { useLayoutMode } from "@/composables/useLayoutMode"
 import logo from "@@/assets/images/layouts/logo.png?url"
 import logoText1 from "@@/assets/images/layouts/logo-text-1.png?url"
 import logoText2 from "@@/assets/images/layouts/logo-text-2.png?url"
+import { useLayoutMode } from "@@/composables/useLayoutMode"
 
 interface Props {
   collapse?: boolean
diff --git a/src/layouts/components/NavigationBar/index.vue b/src/layouts/components/NavigationBar/index.vue
index 73be425..784bd2c 100644
--- a/src/layouts/components/NavigationBar/index.vue
+++ b/src/layouts/components/NavigationBar/index.vue
@@ -1,6 +1,4 @@
 <script lang="ts" setup>
-import { useDevice } from "@/composables/useDevice"
-import { useLayoutMode } from "@/composables/useLayoutMode"
 import { useAppStore } from "@/pinia/stores/app"
 import { useSettingsStore } from "@/pinia/stores/settings"
 import { useUserStore } from "@/pinia/stores/user"
@@ -8,6 +6,8 @@ import Notify from "@@/components/Notify/index.vue"
 import Screenfull from "@@/components/Screenfull/index.vue"
 import SearchMenu from "@@/components/SearchMenu/index.vue"
 import ThemeSwitch from "@@/components/ThemeSwitch/index.vue"
+import { useDevice } from "@@/composables/useDevice"
+import { useLayoutMode } from "@@/composables/useLayoutMode"
 import { UserFilled } from "@element-plus/icons-vue"
 import { storeToRefs } from "pinia"
 import { useRouter } from "vue-router"
diff --git a/src/layouts/components/Settings/SelectLayoutMode.vue b/src/layouts/components/Settings/SelectLayoutMode.vue
index 1c3957f..3cc14e4 100644
--- a/src/layouts/components/Settings/SelectLayoutMode.vue
+++ b/src/layouts/components/Settings/SelectLayoutMode.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import { useLayoutMode } from "@/composables/useLayoutMode"
 import { LayoutModeEnum } from "@/constants/app-key"
+import { useLayoutMode } from "@@/composables/useLayoutMode"
 
 const { isLeft, isTop, isLeftTop, setLayoutMode } = useLayoutMode()
 </script>
diff --git a/src/layouts/components/Settings/index.vue b/src/layouts/components/Settings/index.vue
index 616ffa1..570dafd 100644
--- a/src/layouts/components/Settings/index.vue
+++ b/src/layouts/components/Settings/index.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import { useLayoutMode } from "@/composables/useLayoutMode"
 import { useSettingsStore } from "@/pinia/stores/settings"
 import { removeLayoutsConfig } from "@/utils/cache/local-storage"
+import { useLayoutMode } from "@@/composables/useLayoutMode"
 import { Refresh } from "@element-plus/icons-vue"
 import { storeToRefs } from "pinia"
 import { watchEffect } from "vue"
diff --git a/src/layouts/components/Sidebar/index.vue b/src/layouts/components/Sidebar/index.vue
index 025448f..7f68597 100644
--- a/src/layouts/components/Sidebar/index.vue
+++ b/src/layouts/components/Sidebar/index.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import { useDevice } from "@/composables/useDevice"
-import { useLayoutMode } from "@/composables/useLayoutMode"
 import { useAppStore } from "@/pinia/stores/app"
 import { usePermissionStore } from "@/pinia/stores/permission"
 import { useSettingsStore } from "@/pinia/stores/settings"
 import { getCssVar } from "@/utils/css"
+import { useDevice } from "@@/composables/useDevice"
+import { useLayoutMode } from "@@/composables/useLayoutMode"
 import { computed } from "vue"
 import { useRoute } from "vue-router"
 import { Logo } from "../index"
diff --git a/src/layouts/components/TagsView/ScrollPane.vue b/src/layouts/components/TagsView/ScrollPane.vue
index 64a2db9..a7656ea 100644
--- a/src/layouts/components/TagsView/ScrollPane.vue
+++ b/src/layouts/components/TagsView/ScrollPane.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import type { ElScrollbar } from "element-plus"
 import type { RouterLink } from "vue-router"
-import { useRouteListener } from "@/composables/useRouteListener"
 import { useSettingsStore } from "@/pinia/stores/settings"
 import Screenfull from "@@/components/Screenfull/index.vue"
+import { useRouteListener } from "@@/composables/useRouteListener"
 import { ArrowLeft, ArrowRight } from "@element-plus/icons-vue"
 import { nextTick, ref } from "vue"
 import { useRoute } from "vue-router"
diff --git a/src/layouts/components/TagsView/index.vue b/src/layouts/components/TagsView/index.vue
index 2f93f36..60a5349 100644
--- a/src/layouts/components/TagsView/index.vue
+++ b/src/layouts/components/TagsView/index.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import type { TagView } from "@/pinia/stores/tags-view"
 import type { RouteLocationNormalizedLoaded, RouteRecordRaw, RouterLink } from "vue-router"
-import { useRouteListener } from "@/composables/useRouteListener"
 import { usePermissionStore } from "@/pinia/stores/permission"
 import { useTagsViewStore } from "@/pinia/stores/tags-view"
+import { useRouteListener } from "@@/composables/useRouteListener"
 import { Close } from "@element-plus/icons-vue"
 import path from "path-browserify"
 import { ref, watch } from "vue"
diff --git a/src/layouts/composables/useResize.ts b/src/layouts/composables/useResize.ts
index a3153d5..f6fa650 100644
--- a/src/layouts/composables/useResize.ts
+++ b/src/layouts/composables/useResize.ts
@@ -1,6 +1,6 @@
-import { useRouteListener } from "@/composables/useRouteListener"
 import { DeviceEnum } from "@/constants/app-key"
 import { useAppStore } from "@/pinia/stores/app"
+import { useRouteListener } from "@@/composables/useRouteListener"
 import { onBeforeMount, onBeforeUnmount, onMounted } from "vue"
 
 /** 参考 Bootstrap 的响应式设计将最大移动端宽度设置为 992 */
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 07c4f7d..93a6602 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
-import { useDevice } from "@/composables/useDevice"
-import { useLayoutMode } from "@/composables/useLayoutMode"
-import { useWatermark } from "@/composables/useWatermark"
 import { useSettingsStore } from "@/pinia/stores/settings"
 import { getCssVar, setCssVar } from "@/utils/css"
+import { useDevice } from "@@/composables/useDevice"
+import { useLayoutMode } from "@@/composables/useLayoutMode"
+import { useWatermark } from "@@/composables/useWatermark"
 import { storeToRefs } from "pinia"
 import { watchEffect } from "vue"
 import { RightPanel, Settings } from "./components"
diff --git a/src/layouts/modes/LeftMode.vue b/src/layouts/modes/LeftMode.vue
index 1c4745c..3998718 100644
--- a/src/layouts/modes/LeftMode.vue
+++ b/src/layouts/modes/LeftMode.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { useDevice } from "@/composables/useDevice"
-import { useLayoutMode } from "@/composables/useLayoutMode"
 import { useAppStore } from "@/pinia/stores/app"
 import { useSettingsStore } from "@/pinia/stores/settings"
+import { useDevice } from "@@/composables/useDevice"
+import { useLayoutMode } from "@@/composables/useLayoutMode"
 import { storeToRefs } from "pinia"
 import { computed } from "vue"
 import { AppMain, NavigationBar, Sidebar, TagsView } from "../components"
diff --git a/src/pages/composable-demo/use-fetch-select.vue b/src/pages/composable-demo/use-fetch-select.vue
index 8666940..e31ce3d 100644
--- a/src/pages/composable-demo/use-fetch-select.vue
+++ b/src/pages/composable-demo/use-fetch-select.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import { useFetchSelect } from "@/composables/useFetchSelect"
 import { getSelectDataApi } from "@/http/apis/composable-demo/use-fetch-select"
+import { useFetchSelect } from "@@/composables/useFetchSelect"
 
 const { loading, options, value } = useFetchSelect({
   api: getSelectDataApi
diff --git a/src/pages/composable-demo/use-fullscreen-loading.vue b/src/pages/composable-demo/use-fullscreen-loading.vue
index 7e16bc0..9d4c30f 100644
--- a/src/pages/composable-demo/use-fullscreen-loading.vue
+++ b/src/pages/composable-demo/use-fullscreen-loading.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import { useFullscreenLoading } from "@/composables/useFullscreenLoading"
 import { getErrorApi, getSuccessApi } from "@/http/apis/composable-demo/use-fullscreen-loading"
+import { useFullscreenLoading } from "@@/composables/useFullscreenLoading"
 import { ElMessage } from "element-plus"
 
 const svg = `
diff --git a/src/pages/composable-demo/use-watermark.vue b/src/pages/composable-demo/use-watermark.vue
index 6b80575..14230a8 100644
--- a/src/pages/composable-demo/use-watermark.vue
+++ b/src/pages/composable-demo/use-watermark.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useWatermark } from "@/composables/useWatermark"
+import { useWatermark } from "@@/composables/useWatermark"
 import { ref } from "vue"
 
 const localRef = ref<HTMLElement | null>(null)
diff --git a/src/pages/table/element-plus/index.vue b/src/pages/table/element-plus/index.vue
index cd942fa..9098384 100644
--- a/src/pages/table/element-plus/index.vue
+++ b/src/pages/table/element-plus/index.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
 import type { CreateOrUpdateTableRequestData, TableData } from "@/http/apis/table/type"
 import type { FormInstance, FormRules } from "element-plus"
-import { usePagination } from "@/composables/usePagination"
 import { createTableDataApi, deleteTableDataApi, getTableDataApi, updateTableDataApi } from "@/http/apis/table"
+import { usePagination } from "@@/composables/usePagination"
 import { CirclePlus, Delete, Download, Refresh, RefreshRight, Search } from "@element-plus/icons-vue"
 import { ElMessage, ElMessageBox } from "element-plus"
 import { cloneDeep } from "lodash-es"
diff --git a/src/router/guard.ts b/src/router/guard.ts
index 9ab2e09..76bf48c 100644
--- a/src/router/guard.ts
+++ b/src/router/guard.ts
@@ -1,11 +1,11 @@
 import type { Router } from "vue-router"
-import { setRouteChange } from "@/composables/useRouteListener"
-import { useTitle } from "@/composables/useTitle"
 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 { ElMessage } from "element-plus"
 import NProgress from "nprogress"
 import "nprogress/nprogress.css"
diff --git a/src/utils/cache/local-storage.ts b/src/utils/cache/local-storage.ts
index 3131014..2d97b2f 100644
--- a/src/utils/cache/local-storage.ts
+++ b/src/utils/cache/local-storage.ts
@@ -1,9 +1,9 @@
 // 统一处理 localStorage
 
-import type { ThemeName } from "@/composables/useTheme"
 import type { SidebarClosed, SidebarOpened } from "@/constants/app-key"
 import type { LayoutsConfig } from "@/layouts/config"
 import type { TagView } from "@/pinia/stores/tags-view"
+import type { ThemeName } from "@@/composables/useTheme"
 import { CacheKey } from "@/constants/cache-key"
 
 // #region 系统布局配置