From 464218e72ca2aa32dfe1c14177c32b4d86ac76a7 Mon Sep 17 00:00:00 2001
From: pany <939630029@qq.com>
Date: Thu, 21 Nov 2024 21:03:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20store/modules=20=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BA=20pinia/stores?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchMenu/SearchModal.vue         | 2 +-
 src/composables/useDevice.ts                      | 2 +-
 src/composables/useGreyAndColorWeakness.ts        | 2 +-
 src/composables/useLayoutMode.ts                  | 2 +-
 src/directives/permission/index.ts                | 2 +-
 src/layouts/LeftMode.vue                          | 4 ++--
 src/layouts/LeftTopMode.vue                       | 4 ++--
 src/layouts/TopMode.vue                           | 2 +-
 src/layouts/components/AppMain.vue                | 4 ++--
 src/layouts/components/NavigationBar/index.vue    | 6 +++---
 src/layouts/components/Settings/index.vue         | 2 +-
 src/layouts/components/Sidebar/index.vue          | 6 +++---
 src/layouts/components/TagsView/ScrollPane.vue    | 2 +-
 src/layouts/components/TagsView/index.vue         | 6 +++---
 src/layouts/composables/useResize.ts              | 2 +-
 src/layouts/index.vue                             | 2 +-
 src/main.ts                                       | 2 +-
 src/{store => pinia}/index.ts                     | 0
 src/{store/modules => pinia/stores}/app.ts        | 2 +-
 src/{store/modules => pinia/stores}/permission.ts | 2 +-
 src/{store/modules => pinia/stores}/settings.ts   | 2 +-
 src/{store/modules => pinia/stores}/tags-view.ts  | 2 +-
 src/{store/modules => pinia/stores}/user.ts       | 2 +-
 src/router/permission.ts                          | 4 ++--
 src/utils/cache/local-storage.ts                  | 2 +-
 src/utils/permission.ts                           | 2 +-
 src/utils/service.ts                              | 2 +-
 src/views/dashboard/index.vue                     | 2 +-
 src/views/login/index.vue                         | 2 +-
 src/views/permission/components/SwitchRoles.vue   | 2 +-
 30 files changed, 39 insertions(+), 39 deletions(-)
 rename src/{store => pinia}/index.ts (100%)
 rename src/{store/modules => pinia/stores}/app.ts (98%)
 rename src/{store/modules => pinia/stores}/permission.ts (98%)
 rename src/{store/modules => pinia/stores}/settings.ts (98%)
 rename src/{store/modules => pinia/stores}/tags-view.ts (98%)
 rename src/{store/modules => pinia/stores}/user.ts (98%)

diff --git a/src/components/SearchMenu/SearchModal.vue b/src/components/SearchMenu/SearchModal.vue
index e39ab1b..6ae39e6 100644
--- a/src/components/SearchMenu/SearchModal.vue
+++ b/src/components/SearchMenu/SearchModal.vue
@@ -2,7 +2,7 @@
 import type { ElScrollbar } from "element-plus"
 import type { RouteRecordName, RouteRecordRaw } from "vue-router"
 import { useDevice } from "@/composables/useDevice"
-import { usePermissionStore } from "@/store/modules/permission"
+import { usePermissionStore } from "@/pinia/stores/permission"
 import { isExternal } from "@/utils/validate"
 import { ElMessage } from "element-plus"
 import { cloneDeep, debounce } from "lodash-es"
diff --git a/src/composables/useDevice.ts b/src/composables/useDevice.ts
index 5da0c48..a27f587 100644
--- a/src/composables/useDevice.ts
+++ b/src/composables/useDevice.ts
@@ -1,5 +1,5 @@
 import { DeviceEnum } from "@/constants/app-key"
-import { useAppStore } from "@/store/modules/app"
+import { useAppStore } from "@/pinia/stores/app"
 import { computed } from "vue"
 
 const appStore = useAppStore()
diff --git a/src/composables/useGreyAndColorWeakness.ts b/src/composables/useGreyAndColorWeakness.ts
index 54d37b2..0262097 100644
--- a/src/composables/useGreyAndColorWeakness.ts
+++ b/src/composables/useGreyAndColorWeakness.ts
@@ -1,4 +1,4 @@
-import { useSettingsStore } from "@/store/modules/settings"
+import { useSettingsStore } from "@/pinia/stores/settings"
 import { watchEffect } from "vue"
 
 const GREY_MODE = "grey-mode"
diff --git a/src/composables/useLayoutMode.ts b/src/composables/useLayoutMode.ts
index 098ff7e..2c66369 100644
--- a/src/composables/useLayoutMode.ts
+++ b/src/composables/useLayoutMode.ts
@@ -1,5 +1,5 @@
 import { LayoutModeEnum } from "@/constants/app-key"
-import { useSettingsStore } from "@/store/modules/settings"
+import { useSettingsStore } from "@/pinia/stores/settings"
 import { computed } from "vue"
 
 const settingsStore = useSettingsStore()
diff --git a/src/directives/permission/index.ts b/src/directives/permission/index.ts
index aa74e21..cce30ab 100644
--- a/src/directives/permission/index.ts
+++ b/src/directives/permission/index.ts
@@ -1,5 +1,5 @@
 import type { Directive } from "vue"
-import { useUserStore } from "@/store/modules/user"
+import { useUserStore } from "@/pinia/stores/user"
 import { isArray } from "@/utils/validate"
 
 /** 权限指令，和权限判断函数 checkPermission 功能类似 */
diff --git a/src/layouts/LeftMode.vue b/src/layouts/LeftMode.vue
index 9a1a31a..1875d45 100644
--- a/src/layouts/LeftMode.vue
+++ b/src/layouts/LeftMode.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
 import { useDevice } from "@/composables/useDevice"
 import { useLayoutMode } from "@/composables/useLayoutMode"
-import { useAppStore } from "@/store/modules/app"
-import { useSettingsStore } from "@/store/modules/settings"
+import { useAppStore } from "@/pinia/stores/app"
+import { useSettingsStore } from "@/pinia/stores/settings"
 import { storeToRefs } from "pinia"
 import { computed } from "vue"
 import { AppMain, NavigationBar, Sidebar, TagsView } from "./components"
diff --git a/src/layouts/LeftTopMode.vue b/src/layouts/LeftTopMode.vue
index 88899de..ab1e2a0 100644
--- a/src/layouts/LeftTopMode.vue
+++ b/src/layouts/LeftTopMode.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import { useAppStore } from "@/store/modules/app"
-import { useSettingsStore } from "@/store/modules/settings"
+import { useAppStore } from "@/pinia/stores/app"
+import { useSettingsStore } from "@/pinia/stores/settings"
 import { storeToRefs } from "pinia"
 import { computed } from "vue"
 import { AppMain, Logo, NavigationBar, Sidebar, TagsView } from "./components"
diff --git a/src/layouts/TopMode.vue b/src/layouts/TopMode.vue
index 18c4a73..f507789 100644
--- a/src/layouts/TopMode.vue
+++ b/src/layouts/TopMode.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useSettingsStore } from "@/store/modules/settings"
+import { useSettingsStore } from "@/pinia/stores/settings"
 import { storeToRefs } from "pinia"
 import { AppMain, Logo, NavigationBar, TagsView } from "./components"
 
diff --git a/src/layouts/components/AppMain.vue b/src/layouts/components/AppMain.vue
index ab6c60b..caa3de7 100644
--- a/src/layouts/components/AppMain.vue
+++ b/src/layouts/components/AppMain.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import { useSettingsStore } from "@/store/modules/settings"
-import { useTagsViewStore } from "@/store/modules/tags-view"
+import { useSettingsStore } from "@/pinia/stores/settings"
+import { useTagsViewStore } from "@/pinia/stores/tags-view"
 import Footer from "./Footer/index.vue"
 
 const tagsViewStore = useTagsViewStore()
diff --git a/src/layouts/components/NavigationBar/index.vue b/src/layouts/components/NavigationBar/index.vue
index 44dc6a4..fb8484d 100644
--- a/src/layouts/components/NavigationBar/index.vue
+++ b/src/layouts/components/NavigationBar/index.vue
@@ -5,9 +5,9 @@ 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 { useAppStore } from "@/store/modules/app"
-import { useSettingsStore } from "@/store/modules/settings"
-import { useUserStore } from "@/store/modules/user"
+import { useAppStore } from "@/pinia/stores/app"
+import { useSettingsStore } from "@/pinia/stores/settings"
+import { useUserStore } from "@/pinia/stores/user"
 import { UserFilled } from "@element-plus/icons-vue"
 import { storeToRefs } from "pinia"
 import { useRouter } from "vue-router"
diff --git a/src/layouts/components/Settings/index.vue b/src/layouts/components/Settings/index.vue
index 99f45db..2d2058c 100644
--- a/src/layouts/components/Settings/index.vue
+++ b/src/layouts/components/Settings/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useLayoutMode } from "@/composables/useLayoutMode"
-import { useSettingsStore } from "@/store/modules/settings"
+import { useSettingsStore } from "@/pinia/stores/settings"
 import { removeConfigLayout } from "@/utils/cache/local-storage"
 import { Refresh } from "@element-plus/icons-vue"
 import { storeToRefs } from "pinia"
diff --git a/src/layouts/components/Sidebar/index.vue b/src/layouts/components/Sidebar/index.vue
index 27c3414..bc1c980 100644
--- a/src/layouts/components/Sidebar/index.vue
+++ b/src/layouts/components/Sidebar/index.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import { useDevice } from "@/composables/useDevice"
 import { useLayoutMode } from "@/composables/useLayoutMode"
-import { useAppStore } from "@/store/modules/app"
-import { usePermissionStore } from "@/store/modules/permission"
-import { useSettingsStore } from "@/store/modules/settings"
+import { useAppStore } from "@/pinia/stores/app"
+import { usePermissionStore } from "@/pinia/stores/permission"
+import { useSettingsStore } from "@/pinia/stores/settings"
 import { getCssVar } from "@/utils/css"
 import { computed } from "vue"
 import { useRoute } from "vue-router"
diff --git a/src/layouts/components/TagsView/ScrollPane.vue b/src/layouts/components/TagsView/ScrollPane.vue
index 2250e60..ae88c5c 100644
--- a/src/layouts/components/TagsView/ScrollPane.vue
+++ b/src/layouts/components/TagsView/ScrollPane.vue
@@ -3,7 +3,7 @@ import type { ElScrollbar } from "element-plus"
 import type { RouterLink } from "vue-router"
 import Screenfull from "@/components/Screenfull/index.vue"
 import { useRouteListener } from "@/composables/useRouteListener"
-import { useSettingsStore } from "@/store/modules/settings"
+import { useSettingsStore } from "@/pinia/stores/settings"
 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 af9426d..1e69128 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 "@/store/modules/tags-view"
+import type { TagView } from "@/pinia/stores/tags-view"
 import type { RouteLocationNormalizedLoaded, RouteRecordRaw, RouterLink } from "vue-router"
 import { useRouteListener } from "@/composables/useRouteListener"
-import { usePermissionStore } from "@/store/modules/permission"
-import { useTagsViewStore } from "@/store/modules/tags-view"
+import { usePermissionStore } from "@/pinia/stores/permission"
+import { useTagsViewStore } from "@/pinia/stores/tags-view"
 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 06167e6..e1f7ab1 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 "@/store/modules/app"
+import { useAppStore } from "@/pinia/stores/app"
 import { onBeforeMount, onBeforeUnmount, onMounted } from "vue"
 
 /** 参考 Bootstrap 的响应式设计将最大移动端宽度设置为 992 */
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 473a72f..10f26b3 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -2,7 +2,7 @@
 import { useDevice } from "@/composables/useDevice"
 import { useLayoutMode } from "@/composables/useLayoutMode"
 import { useWatermark } from "@/composables/useWatermark"
-import { useSettingsStore } from "@/store/modules/settings"
+import { useSettingsStore } from "@/pinia/stores/settings"
 import { getCssVar, setCssVar } from "@/utils/css"
 import { storeToRefs } from "pinia"
 import { watchEffect } from "vue"
diff --git a/src/main.ts b/src/main.ts
index 0a8fa73..728682b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,8 +1,8 @@
 // core
 import App from "@/App.vue"
 import { loadDirectives } from "@/directives"
+import { pinia } from "@/pinia"
 import { router } from "@/router"
-import { pinia } from "@/store"
 import { createApp } from "vue"
 import "@/router/permission"
 // load
diff --git a/src/store/index.ts b/src/pinia/index.ts
similarity index 100%
rename from src/store/index.ts
rename to src/pinia/index.ts
diff --git a/src/store/modules/app.ts b/src/pinia/stores/app.ts
similarity index 98%
rename from src/store/modules/app.ts
rename to src/pinia/stores/app.ts
index 876a954..1b8eb07 100644
--- a/src/store/modules/app.ts
+++ b/src/pinia/stores/app.ts
@@ -1,5 +1,5 @@
 import { DeviceEnum, SIDEBAR_CLOSED, SIDEBAR_OPENED } from "@/constants/app-key"
-import { pinia } from "@/store"
+import { pinia } from "@/pinia"
 import { getSidebarStatus, setSidebarStatus } from "@/utils/cache/local-storage"
 import { defineStore } from "pinia"
 import { reactive, ref, watch } from "vue"
diff --git a/src/store/modules/permission.ts b/src/pinia/stores/permission.ts
similarity index 98%
rename from src/store/modules/permission.ts
rename to src/pinia/stores/permission.ts
index 856a27f..25512fe 100644
--- a/src/store/modules/permission.ts
+++ b/src/pinia/stores/permission.ts
@@ -1,8 +1,8 @@
 import type { RouteRecordRaw } from "vue-router"
 import routeSettings from "@/config/route"
+import { pinia } from "@/pinia"
 import { constantRoutes, dynamicRoutes } from "@/router"
 import { flatMultiLevelRoutes } from "@/router/helper"
-import { pinia } from "@/store"
 import { defineStore } from "pinia"
 import { ref } from "vue"
 
diff --git a/src/store/modules/settings.ts b/src/pinia/stores/settings.ts
similarity index 98%
rename from src/store/modules/settings.ts
rename to src/pinia/stores/settings.ts
index 99c6393..2a717a7 100644
--- a/src/store/modules/settings.ts
+++ b/src/pinia/stores/settings.ts
@@ -1,7 +1,7 @@
 import type { LayoutSettings } from "@/config/layouts"
 import type { Ref } from "vue"
 import { layoutSettings } from "@/config/layouts"
-import { pinia } from "@/store"
+import { pinia } from "@/pinia"
 import { setConfigLayout } from "@/utils/cache/local-storage"
 import { defineStore } from "pinia"
 import { ref, watch } from "vue"
diff --git a/src/store/modules/tags-view.ts b/src/pinia/stores/tags-view.ts
similarity index 98%
rename from src/store/modules/tags-view.ts
rename to src/pinia/stores/tags-view.ts
index 2227391..afaf588 100644
--- a/src/store/modules/tags-view.ts
+++ b/src/pinia/stores/tags-view.ts
@@ -1,5 +1,5 @@
 import type { RouteLocationNormalized } from "vue-router"
-import { pinia } from "@/store"
+import { pinia } from "@/pinia"
 import { getCachedViews, getVisitedViews, setCachedViews, setVisitedViews } from "@/utils/cache/local-storage"
 import { defineStore } from "pinia"
 import { ref, watchEffect } from "vue"
diff --git a/src/store/modules/user.ts b/src/pinia/stores/user.ts
similarity index 98%
rename from src/store/modules/user.ts
rename to src/pinia/stores/user.ts
index e26063a..fc161f3 100644
--- a/src/store/modules/user.ts
+++ b/src/pinia/stores/user.ts
@@ -1,8 +1,8 @@
 import type { LoginRequestData } from "@/api/login/types/login"
 import { getUserInfoApi, loginApi } from "@/api/login"
 import routeSettings from "@/config/route"
+import { pinia } from "@/pinia"
 import { resetRouter } from "@/router"
-import { pinia } from "@/store"
 import { getToken, removeToken, setToken } from "@/utils/cache/cookies"
 import { defineStore } from "pinia"
 import { ref } from "vue"
diff --git a/src/router/permission.ts b/src/router/permission.ts
index 11c65c1..42d88b7 100644
--- a/src/router/permission.ts
+++ b/src/router/permission.ts
@@ -2,9 +2,9 @@ import { setRouteChange } from "@/composables/useRouteListener"
 import { useTitle } from "@/composables/useTitle"
 import routeSettings from "@/config/route"
 import isWhiteList from "@/config/white-list"
+import { usePermissionStoreOutside } from "@/pinia/stores/permission"
+import { useUserStoreOutside } from "@/pinia/stores/user"
 import { router } from "@/router"
-import { usePermissionStoreOutside } from "@/store/modules/permission"
-import { useUserStoreOutside } from "@/store/modules/user"
 import { getToken } from "@/utils/cache/cookies"
 import { ElMessage } from "element-plus"
 import NProgress from "nprogress"
diff --git a/src/utils/cache/local-storage.ts b/src/utils/cache/local-storage.ts
index ad532b2..1e0639e 100644
--- a/src/utils/cache/local-storage.ts
+++ b/src/utils/cache/local-storage.ts
@@ -3,7 +3,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 "@/store/modules/tags-view"
+import type { TagView } from "@/pinia/stores/tags-view"
 import CacheKey from "@/constants/cache-key"
 
 // #region 系统布局配置
diff --git a/src/utils/permission.ts b/src/utils/permission.ts
index e1a92f3..2367e83 100644
--- a/src/utils/permission.ts
+++ b/src/utils/permission.ts
@@ -1,4 +1,4 @@
-import { useUserStore } from "@/store/modules/user"
+import { useUserStore } from "@/pinia/stores/user"
 import { isArray } from "@/utils/validate"
 
 /** 全局权限判断函数，和权限指令 v-permission 功能类似 */
diff --git a/src/utils/service.ts b/src/utils/service.ts
index 7176a93..c6fcea0 100644
--- a/src/utils/service.ts
+++ b/src/utils/service.ts
@@ -1,5 +1,5 @@
 import type { AxiosInstance, AxiosRequestConfig } from "axios"
-import { useUserStore } from "@/store/modules/user"
+import { useUserStore } from "@/pinia/stores/user"
 import axios from "axios"
 import { ElMessage } from "element-plus"
 import { get, merge } from "lodash-es"
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index a69624c..904f5d8 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useUserStore } from "@/store/modules/user"
+import { useUserStore } from "@/pinia/stores/user"
 import Admin from "./components/Admin.vue"
 import Editor from "./components/Editor.vue"
 
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f307fce..3f47e0c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -3,7 +3,7 @@ import type { LoginRequestData } from "@/api/login/types/login"
 import type { FormInstance, FormRules } from "element-plus"
 import { getLoginCodeApi } from "@/api/login"
 import ThemeSwitch from "@/components/ThemeSwitch/index.vue"
-import { useUserStore } from "@/store/modules/user"
+import { useUserStore } from "@/pinia/stores/user"
 import { Key, Loading, Lock, Picture, User } from "@element-plus/icons-vue"
 import { reactive, ref } from "vue"
 import { useRouter } from "vue-router"
diff --git a/src/views/permission/components/SwitchRoles.vue b/src/views/permission/components/SwitchRoles.vue
index 44f0684..adae176 100644
--- a/src/views/permission/components/SwitchRoles.vue
+++ b/src/views/permission/components/SwitchRoles.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useUserStore } from "@/store/modules/user"
+import { useUserStore } from "@/pinia/stores/user"
 import { ref, watch } from "vue"
 
 const userStore = useUserStore()