From 255534d23da9d01c6d41b6f146ef18f29dff3ca7 Mon Sep 17 00:00:00 2001
From: Hooray <304327508@qq.com>
Date: Tue, 10 May 2022 14:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96pinia=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plop-templates/store/index.hbs              |  9 +--
 src/App.vue                                 |  2 +-
 src/api/index.js                            | 11 ++-
 src/components/Copyright/index.vue          |  2 +-
 src/layout/components/AppSetting/index.vue  |  4 +-
 src/layout/components/Header/index.vue      |  4 +-
 src/layout/components/Logo/index.vue        |  2 +-
 src/layout/components/MainSidebar/index.vue |  4 +-
 src/layout/components/Search/index.vue      |  6 +-
 src/layout/components/SubSidebar/index.vue  |  4 +-
 src/layout/components/Tools/index.vue       |  4 +-
 src/layout/components/Topbar/index.vue      |  2 +-
 src/layout/index.vue                        |  6 +-
 src/main.js                                 |  8 +--
 src/router/index.js                         | 74 ++++++++++-----------
 src/store/index.js                          |  5 +-
 src/store/modules/keepAlive.js              |  9 +--
 src/store/modules/menu.js                   | 14 ++--
 src/store/modules/route.js                  | 12 ++--
 src/store/modules/settings.js               |  8 +--
 src/store/modules/user.js                   | 12 ++--
 src/util/index.js                           | 12 ++--
 src/views/login.vue                         |  4 +-
 src/views/personal/edit.password.vue        |  2 +-
 vite/plugins/auto-import.js                 |  3 +-
 25 files changed, 99 insertions(+), 124 deletions(-)

diff --git a/plop-templates/store/index.hbs b/plop-templates/store/index.hbs
index e4e81230..838ac111 100644
--- a/plop-templates/store/index.hbs
+++ b/plop-templates/store/index.hbs
@@ -1,7 +1,4 @@
-import { defineStore } from 'pinia'
-import { piniaStore } from '@/store'
-
-export const use{{ properCase name }}Store = defineStore(
+const use{{ properCase name }}Store = defineStore(
     // 唯一ID
     '{{ camelCase name }}',
     {
@@ -11,6 +8,4 @@ export const use{{ properCase name }}Store = defineStore(
     }
 )
 
-export function use{{ properCase name }}OutsideStore() {
-    return use{{ properCase name }}Store(piniaStore)
-}
+export default use{{ properCase name }}Store
diff --git a/src/App.vue b/src/App.vue
index fd3d0813..a83383ca 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,7 @@
 <script setup>
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 
-import { useSettingsStore } from '@/store/modules/settings'
+import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
 
 // 侧边栏主导航当前实际宽度
diff --git a/src/api/index.js b/src/api/index.js
index 9c1d0f36..6bf5f5f8 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -2,11 +2,10 @@ import axios from 'axios'
 // import qs from 'qs'
 import router from '@/router/index'
 import { ElMessage } from 'element-plus'
-import { useUserOutsideStore } from '@/store/modules/user'
+import useUserStore from '@/store/modules/user'
 
 const toLogin = () => {
-    const userOutsideStore = useUserOutsideStore()
-    userOutsideStore.logout().then(() => {
+    useUserStore().logout().then(() => {
         router.push({
             name: 'login',
             query: {
@@ -24,13 +23,13 @@ const api = axios.create({
 
 api.interceptors.request.use(
     request => {
-        const userOutsideStore = useUserOutsideStore()
+        const userStore = useUserStore()
         /**
          * 全局拦截请求发送前提交的参数
          * 以下代码为示例，在请求头里带上 token 信息
          */
-        if (userOutsideStore.isLogin) {
-            request.headers['Token'] = userOutsideStore.token
+        if (userStore.isLogin) {
+            request.headers['Token'] = userStore.token
         }
         // 是否将 POST 请求参数进行字符串化处理
         if (request.method === 'post') {
diff --git a/src/components/Copyright/index.vue b/src/components/Copyright/index.vue
index 4ff0d006..46ea81ab 100644
--- a/src/components/Copyright/index.vue
+++ b/src/components/Copyright/index.vue
@@ -1,5 +1,5 @@
 <script setup name="Copyright">
-import { useSettingsStore } from '@/store/modules/settings'
+import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
 </script>
 
diff --git a/src/layout/components/AppSetting/index.vue b/src/layout/components/AppSetting/index.vue
index 710c2a23..46a8c679 100644
--- a/src/layout/components/AppSetting/index.vue
+++ b/src/layout/components/AppSetting/index.vue
@@ -2,9 +2,9 @@
 const { proxy } = getCurrentInstance()
 const route = useRoute()
 
-import { useSettingsStore } from '@/store/modules/settings'
+import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import { useMenuStore } from '@/store/modules/menu'
+import useMenuStore from '@/store/modules/menu'
 const menuStore = useMenuStore()
 
 const isShow = ref(false)
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index 880d3472..14108b0f 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -2,9 +2,9 @@
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 
-import { useSettingsStore } from '@/store/modules/settings'
+import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import { useMenuStore } from '@/store/modules/menu'
+import useMenuStore from '@/store/modules/menu'
 const menuStore = useMenuStore()
 
 const switchMenu = inject('switchMenu')
diff --git a/src/layout/components/Logo/index.vue b/src/layout/components/Logo/index.vue
index 046ae2de..67e380c8 100644
--- a/src/layout/components/Logo/index.vue
+++ b/src/layout/components/Logo/index.vue
@@ -1,7 +1,7 @@
 <script setup name="Logo">
 import imgLogo from '@/assets/images/logo.png'
 
-import { useSettingsStore } from '@/store/modules/settings'
+import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
 
 defineProps({
diff --git a/src/layout/components/MainSidebar/index.vue b/src/layout/components/MainSidebar/index.vue
index 3a3a056b..2bb1498d 100644
--- a/src/layout/components/MainSidebar/index.vue
+++ b/src/layout/components/MainSidebar/index.vue
@@ -1,9 +1,9 @@
 <script setup name="MainSidebar">
 import Logo from '../Logo/index.vue'
 
-import { useSettingsStore } from '@/store/modules/settings'
+import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import { useMenuStore } from '@/store/modules/menu'
+import useMenuStore from '@/store/modules/menu'
 const menuStore = useMenuStore()
 
 const switchMenu = inject('switchMenu')
diff --git a/src/layout/components/Search/index.vue b/src/layout/components/Search/index.vue
index c8877aac..aa7270cc 100644
--- a/src/layout/components/Search/index.vue
+++ b/src/layout/components/Search/index.vue
@@ -3,11 +3,11 @@ import { deepClone, isExternalLink } from '@/util'
 
 const { proxy } = getCurrentInstance()
 
-import { useSettingsStore } from '@/store/modules/settings'
+import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import { useRouteStore } from '@/store/modules/route'
+import useRouteStore from '@/store/modules/route'
 const routeStore = useRouteStore()
-import { useMenuStore } from '@/store/modules/menu'
+import useMenuStore from '@/store/modules/menu'
 const menuStore = useMenuStore()
 
 const isShow = ref(false)
diff --git a/src/layout/components/SubSidebar/index.vue b/src/layout/components/SubSidebar/index.vue
index 74fbe6de..130792d9 100644
--- a/src/layout/components/SubSidebar/index.vue
+++ b/src/layout/components/SubSidebar/index.vue
@@ -2,9 +2,9 @@
 import Logo from '../Logo/index.vue'
 import SidebarItem from '../SidebarItem/index.vue'
 
-import { useSettingsStore } from '@/store/modules/settings'
+import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import { useMenuStore } from '@/store/modules/menu'
+import useMenuStore from '@/store/modules/menu'
 const menuStore = useMenuStore()
 
 const sidebarScrollTop = ref(0)
diff --git a/src/layout/components/Tools/index.vue b/src/layout/components/Tools/index.vue
index d1a0547d..11f291af 100644
--- a/src/layout/components/Tools/index.vue
+++ b/src/layout/components/Tools/index.vue
@@ -2,9 +2,9 @@
 const reload = inject('reload')
 const router = useRouter()
 
-import { useSettingsStore } from '@/store/modules/settings'
+import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import { useUserStore } from '@/store/modules/user'
+import useUserStore from '@/store/modules/user'
 const userStore = useUserStore()
 
 import { useFullscreen } from '@vueuse/core'
diff --git a/src/layout/components/Topbar/index.vue b/src/layout/components/Topbar/index.vue
index a81d145e..107e3ed8 100644
--- a/src/layout/components/Topbar/index.vue
+++ b/src/layout/components/Topbar/index.vue
@@ -5,7 +5,7 @@ import Tools from '../Tools/index.vue'
 
 const route = useRoute()
 
-import { useSettingsStore } from '@/store/modules/settings'
+import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
 
 const enableSidebarCollapse = computed(() => {
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 88b2a6d0..2325d179 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -10,11 +10,11 @@ import { isExternalLink } from '@/util'
 const { proxy } = getCurrentInstance()
 const routeInfo = useRoute(), router = useRouter()
 
-import { useSettingsStore } from '@/store/modules/settings'
+import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import { useKeepAliveStore } from '@/store/modules/keepAlive'
+import useKeepAliveStore from '@/store/modules/keepAlive'
 const keepAliveStore = useKeepAliveStore()
-import { useMenuStore } from '@/store/modules/menu'
+import useMenuStore from '@/store/modules/menu'
 const menuStore = useMenuStore()
 
 const showCopyright = computed(() => {
diff --git a/src/main.js b/src/main.js
index c618bfe3..8c069b24 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,9 +2,8 @@ import { createApp } from 'vue'
 import App from './App.vue'
 const app = createApp(App)
 
-import { piniaStore } from './store'
-import { useSettingsOutsideStore } from './store/modules/settings'
-app.use(piniaStore)
+import pinia from './store'
+app.use(pinia)
 
 import router from './router'
 app.use(router)
@@ -25,7 +24,8 @@ import 'virtual:svg-icons-register'
 
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
-if (useSettingsOutsideStore().app.iconifyOfflineUse) {
+import useSettingsStore from './store/modules/settings'
+if (useSettingsStore().app.iconifyOfflineUse) {
     downloadAndInstall()
 }
 
diff --git a/src/router/index.js b/src/router/index.js
index 83d656e1..568ea793 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,9 +1,9 @@
 import { createRouter, createWebHashHistory } from 'vue-router'
-import { useSettingsOutsideStore } from '@/store/modules/settings'
-import { useKeepAliveOutsideStore } from '@/store/modules/keepAlive'
-import { useUserOutsideStore } from '@/store/modules/user'
-import { useMenuOutsideStore } from '@/store/modules/menu'
-import { useRouteOutsideStore } from '@/store/modules/route'
+import useSettingsStore from '@/store/modules/settings'
+import useKeepAliveStore from '@/store/modules/keepAlive'
+import useUserStore from '@/store/modules/user'
+import useMenuStore from '@/store/modules/menu'
+import useRouteStore from '@/store/modules/route'
 
 import '@/assets/styles/nprogress.scss'
 import { useNProgress } from '@vueuse/integrations/useNProgress'
@@ -30,8 +30,8 @@ let constantRoutes = [
                 component: () => import('@/views/index.vue'),
                 meta: {
                     title: () => {
-                        const settingsOutsideStore = useSettingsOutsideStore()
-                        return settingsOutsideStore.dashboard.title
+                        const settingsStore = useSettingsStore()
+                        return settingsStore.dashboard.title
                     }
                 }
             },
@@ -96,7 +96,7 @@ const lastRoute = {
 import { setupLayouts } from 'virtual:generated-layouts'
 import generatedRoutes from 'virtual:generated-pages'
 
-if (useSettingsOutsideStore().app.routeBaseOn === 'filesystem') {
+if (useSettingsStore(createPinia()).app.routeBaseOn === 'filesystem') {
     constantRoutes = generatedRoutes.filter(item => {
         return item.meta?.enabled !== false && item.meta?.constant === true
     })
@@ -111,17 +111,17 @@ const router = createRouter({
 })
 
 router.beforeEach(async(to, from, next) => {
-    const settingsOutsideStore = useSettingsOutsideStore()
-    const userOutsideStore = useUserOutsideStore()
-    const menuOutsideStore = useMenuOutsideStore()
-    const routeOutsideStore = useRouteOutsideStore()
-    settingsOutsideStore.app.enableProgress && (isLoading.value = true)
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+    const routeStore = useRouteStore()
+    settingsStore.app.enableProgress && (isLoading.value = true)
     // 是否已登录
-    if (userOutsideStore.isLogin) {
+    if (userStore.isLogin) {
         // 是否已根据权限动态生成并挂载路由
-        if (routeOutsideStore.isGenerate) {
+        if (routeStore.isGenerate) {
             // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
-            settingsOutsideStore.menu.menuMode !== 'single' && menuOutsideStore.setActived(to.path)
+            settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
             if (to.name) {
                 if (to.matched.length !== 0) {
                     // 如果已登录状态下，进入登录页会强制跳转到控制台页面
@@ -130,11 +130,11 @@ router.beforeEach(async(to, from, next) => {
                             name: 'dashboard',
                             replace: true
                         })
-                    } else if (!settingsOutsideStore.dashboard.enable && to.name == 'dashboard') {
+                    } else if (!settingsStore.dashboard.enable && to.name == 'dashboard') {
                         // 如果未开启控制台页面，则默认进入侧边栏导航第一个模块
-                        if (menuOutsideStore.sidebarMenus.length > 0) {
+                        if (menuStore.sidebarMenus.length > 0) {
                             next({
-                                path: menuOutsideStore.sidebarMenusFirstDeepestPath,
+                                path: menuStore.sidebarMenusFirstDeepestPath,
                                 replace: true
                             })
                         } else {
@@ -153,39 +153,39 @@ router.beforeEach(async(to, from, next) => {
                 next()
             }
         } else {
-            switch (settingsOutsideStore.app.routeBaseOn) {
+            switch (settingsStore.app.routeBaseOn) {
                 case 'frontend':
-                    await routeOutsideStore.generateRoutesAtFront(asyncRoutes)
+                    await routeStore.generateRoutesAtFront(asyncRoutes)
                     break
                 case 'backend':
-                    await routeOutsideStore.generateRoutesAtBack()
+                    await routeStore.generateRoutesAtBack()
                     break
                 case 'filesystem':
-                    await routeOutsideStore.generateRoutesAtFilesystem(asyncRoutes)
-                    switch (settingsOutsideStore.menu.baseOn) {
+                    await routeStore.generateRoutesAtFilesystem(asyncRoutes)
+                    switch (settingsStore.menu.baseOn) {
                         case 'frontend':
-                            await menuOutsideStore.generateMenusAtFront()
+                            await menuStore.generateMenusAtFront()
                             break
                         case 'backend':
-                            await menuOutsideStore.generateMenusAtBack()
+                            await menuStore.generateMenusAtBack()
                             break
                     }
                     break
             }
             let removeRoutes = []
-            routeOutsideStore.flatRoutes.forEach(route => {
+            routeStore.flatRoutes.forEach(route => {
                 if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
                     removeRoutes.push(router.addRoute(route))
                 }
             })
-            if (settingsOutsideStore.app.routeBaseOn === 'filesystem') {
+            if (settingsStore.app.routeBaseOn === 'filesystem') {
                 const otherRoutes = generatedRoutes.filter(item => item.meta?.constant !== true && item.meta?.layout === false)
                 otherRoutes.length && removeRoutes.push(router.addRoute(...otherRoutes))
             } else {
                 removeRoutes.push(router.addRoute(lastRoute))
             }
             // 记录的 accessRoutes 路由数据，在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
-            routeOutsideStore.setCurrentRemoveRoutes(removeRoutes)
+            routeStore.setCurrentRemoveRoutes(removeRoutes)
             next({ ...to, replace: true })
         }
     } else {
@@ -203,16 +203,16 @@ router.beforeEach(async(to, from, next) => {
 })
 
 router.afterEach((to, from) => {
-    const settingsOutsideStore = useSettingsOutsideStore()
-    const keepAliveOutsideStore = useKeepAliveOutsideStore()
-    settingsOutsideStore.app.enableProgress && (isLoading.value = false)
+    const settingsStore = useSettingsStore()
+    const keepAliveStore = useKeepAliveStore()
+    settingsStore.app.enableProgress && (isLoading.value = false)
     // 设置页面 title
-    to.meta.title && settingsOutsideStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+    to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
     // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
     if (to.meta.cache) {
         let componentName = to.matched[to.matched.length - 1].components.default.name
         if (componentName) {
-            keepAliveOutsideStore.add(componentName)
+            keepAliveStore.add(componentName)
         } else {
             console.warn('该页面组件未设置组件名，会导致缓存失效，请检查')
         }
@@ -224,18 +224,18 @@ router.afterEach((to, from) => {
         switch (typeof from.meta.cache) {
             case 'string':
                 if (from.meta.cache != to.name) {
-                    keepAliveOutsideStore.remove(componentName)
+                    keepAliveStore.remove(componentName)
                 }
                 break
             case 'object':
                 if (!from.meta.cache.includes(to.name)) {
-                    keepAliveOutsideStore.remove(componentName)
+                    keepAliveStore.remove(componentName)
                 }
                 break
         }
         // 如果进入的是 reload 页面，则也将离开页面的缓存清空
         if (to.name == 'reload') {
-            keepAliveOutsideStore.remove(componentName)
+            keepAliveStore.remove(componentName)
         }
     }
 })
diff --git a/src/store/index.js b/src/store/index.js
index 95e8fe34..a6e3624c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,2 +1,3 @@
-import { createPinia } from 'pinia'
-export const piniaStore = createPinia()
+const pinia = createPinia()
+
+export default pinia
diff --git a/src/store/modules/keepAlive.js b/src/store/modules/keepAlive.js
index ef33d351..f61c87c5 100644
--- a/src/store/modules/keepAlive.js
+++ b/src/store/modules/keepAlive.js
@@ -1,7 +1,4 @@
-import { defineStore } from 'pinia'
-import { piniaStore } from '@/store'
-
-export const useKeepAliveStore = defineStore(
+const useKeepAliveStore = defineStore(
     // 唯一ID
     'keepAlive',
     {
@@ -36,6 +33,4 @@ export const useKeepAliveStore = defineStore(
     }
 )
 
-export function useKeepAliveOutsideStore() {
-    return useKeepAliveStore(piniaStore)
-}
+export default useKeepAliveStore
diff --git a/src/store/modules/menu.js b/src/store/modules/menu.js
index f7948972..890d5f2a 100644
--- a/src/store/modules/menu.js
+++ b/src/store/modules/menu.js
@@ -1,13 +1,11 @@
-import { defineStore } from 'pinia'
-import { piniaStore } from '@/store'
 import { deepClone, resolveRoutePath } from '@/util'
 import path from 'path-browserify'
 import api from '@/api'
 import menu from '@/menu'
 
-import { useSettingsStore } from './settings'
-import { useUserStore } from './user'
-import { useRouteStore } from './route'
+import useSettingsStore from './settings'
+import useUserStore from './user'
+import useRouteStore from './route'
 
 function getDeepestPath(routes, rootPath = '') {
     let retnPath
@@ -66,7 +64,7 @@ function filterAsyncMenus(menus, permissions) {
     return res
 }
 
-export const useMenuStore = defineStore(
+const useMenuStore = defineStore(
     // 唯一ID
     'menu',
     {
@@ -179,6 +177,4 @@ export const useMenuStore = defineStore(
     }
 )
 
-export function useMenuOutsideStore() {
-    return useMenuStore(piniaStore)
-}
+export default useMenuStore
diff --git a/src/store/modules/route.js b/src/store/modules/route.js
index 0b1ca4d8..d8b283ea 100644
--- a/src/store/modules/route.js
+++ b/src/store/modules/route.js
@@ -1,10 +1,8 @@
-import { defineStore } from 'pinia'
-import { piniaStore } from '@/store'
 import { deepClone, isExternalLink } from '@/util'
 import api from '@/api'
 
-import { useSettingsStore } from './settings'
-import { useUserStore } from './user'
+import useSettingsStore from './settings'
+import useUserStore from './user'
 
 function hasPermission(permissions, route) {
     let isAuth = false
@@ -118,7 +116,7 @@ function flatAsyncRoutes(routes, breadcrumb, baseUrl = '') {
     return res
 }
 
-export const useRouteStore = defineStore(
+const useRouteStore = defineStore(
     // 唯一ID
     'route',
     {
@@ -236,6 +234,4 @@ export const useRouteStore = defineStore(
     }
 )
 
-export function useRouteOutsideStore() {
-    return useRouteStore(piniaStore)
-}
+export default useRouteStore
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 1e3a8a8a..e27a5527 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,8 +1,6 @@
-import { defineStore } from 'pinia'
-import { piniaStore } from '@/store'
 import settings from '@/settings'
 
-export const useSettingsStore = defineStore(
+const useSettingsStore = defineStore(
     // 唯一ID
     'settings',
     {
@@ -53,6 +51,4 @@ export const useSettingsStore = defineStore(
     }
 )
 
-export function useSettingsOutsideStore() {
-    return useSettingsStore(piniaStore)
-}
+export default useSettingsStore
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 32a3d585..926c8f3c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,11 +1,9 @@
-import { defineStore } from 'pinia'
-import { piniaStore } from '@/store'
 import api from '@/api'
 
-import { useRouteStore } from './route'
-import { useMenuStore } from './menu'
+import useRouteStore from './route'
+import useMenuStore from './menu'
 
-export const useUserStore = defineStore(
+const useUserStore = defineStore(
     // 唯一ID
     'user',
     {
@@ -92,6 +90,4 @@ export const useUserStore = defineStore(
     }
 )
 
-export function useUserOutsideStore() {
-    return useUserStore(piniaStore)
-}
+export default useUserStore
diff --git a/src/util/index.js b/src/util/index.js
index 1d4852d8..b14fa99e 100644
--- a/src/util/index.js
+++ b/src/util/index.js
@@ -1,6 +1,6 @@
 import path from 'path-browserify'
-import { useSettingsOutsideStore } from '@/store/modules/settings'
-import { useUserOutsideStore } from '@/store/modules/user'
+import useSettingsStore from '@/store/modules/settings'
+import useUserStore from '@/store/modules/user'
 
 export function deepClone(target) {
     // 定义一个变量
@@ -36,10 +36,10 @@ export function deepClone(target) {
 }
 
 function hasPermission(permission) {
-    const settingsOutsideStore = useSettingsOutsideStore()
-    const userOutsideStore = useUserOutsideStore()
-    if (settingsOutsideStore.app.enablePermission) {
-        return userOutsideStore.permissions.some(v => {
+    const settingsStore = useSettingsStore()
+    const userStore = useUserStore()
+    if (settingsStore.app.enablePermission) {
+        return userStore.permissions.some(v => {
             return v === permission
         })
     } else {
diff --git a/src/views/login.vue b/src/views/login.vue
index 4a8c78e8..c355e485 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -12,9 +12,9 @@
 const { proxy } = getCurrentInstance()
 const route = useRoute(), router = useRouter()
 
-import { useSettingsStore } from '@/store/modules/settings'
+import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import { useUserStore } from '@/store/modules/user'
+import useUserStore from '@/store/modules/user'
 const userStore = useUserStore()
 
 const title = import.meta.env.VITE_APP_TITLE
diff --git a/src/views/personal/edit.password.vue b/src/views/personal/edit.password.vue
index a141e6b4..271fb6a9 100644
--- a/src/views/personal/edit.password.vue
+++ b/src/views/personal/edit.password.vue
@@ -10,7 +10,7 @@
 const route = useRoute(), router = useRouter()
 const { proxy } = getCurrentInstance()
 
-import { useUserStore } from '@/store/modules/user'
+import useUserStore from '@/store/modules/user'
 const userStore = useUserStore()
 
 const validatePassword = (rule, value, callback) => {
diff --git a/vite/plugins/auto-import.js b/vite/plugins/auto-import.js
index 837eaa01..57ec6a8b 100644
--- a/vite/plugins/auto-import.js
+++ b/vite/plugins/auto-import.js
@@ -13,7 +13,8 @@ export default function createAutoImport() {
                     'defineExpose',
                     'withDefaults'
                 ]
-            }
+            },
+            'pinia'
         ],
         eslintrc: {
             enabled: true,