From 80182c54c3f2bfca863be3d393a5b6bedf5a3288 Mon Sep 17 00:00:00 2001
From: hooray <304327508@qq.com>
Date: Sat, 30 Jul 2022 00:39:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=85=A8=E5=B1=80=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plop-templates/component/index.hbs          |  3 +-
 plop-templates/page/index.hbs               |  1 -
 src/layout/components/AppSetting/index.vue  |  4 +-
 src/layout/components/Header/index.vue      |  5 +-
 src/layout/components/MainSidebar/index.vue |  5 +-
 src/layout/components/Search/index.vue      | 56 ++++++++++++---------
 src/layout/components/Tools/index.vue       |  9 ++--
 src/layout/index.vue                        | 32 +++---------
 src/main.js                                 |  3 --
 src/util/composables/index.js               |  6 ++-
 src/util/composables/mainPage/index.js      | 15 ++++++
 src/util/composables/menu/index.js          | 24 +++++++++
 src/util/eventBus.js                        |  3 ++
 src/util/global.properties.js               | 21 --------
 src/views/login.vue                         | 17 ++++---
 src/views/permission_example/index.vue      |  8 +--
 src/views/personal/edit.password.vue        |  7 +--
 src/views/personal/setting.vue              |  1 +
 18 files changed, 117 insertions(+), 103 deletions(-)
 create mode 100644 src/util/composables/mainPage/index.js
 create mode 100644 src/util/composables/menu/index.js
 create mode 100644 src/util/eventBus.js
 delete mode 100644 src/util/global.properties.js

diff --git a/plop-templates/component/index.hbs b/plop-templates/component/index.hbs
index e5eb12a2..2ca042bb 100644
--- a/plop-templates/component/index.hbs
+++ b/plop-templates/component/index.hbs
@@ -1,5 +1,6 @@
 <script setup{{#if isGlobal}} name="{{ properCase name }}"{{/if}}>
-// const { proxy } = getCurrentInstance()
+// const router = useRouter()
+// const route = useRoute()
 </script>
 
 <template>
diff --git a/plop-templates/page/index.hbs b/plop-templates/page/index.hbs
index e24a994a..390fefb3 100644
--- a/plop-templates/page/index.hbs
+++ b/plop-templates/page/index.hbs
@@ -1,5 +1,4 @@
 <script setup name="{{ properCase componentName }}">
-// const { proxy } = getCurrentInstance()
 // const router = useRouter()
 // const route = useRoute()
 </script>
diff --git a/src/layout/components/AppSetting/index.vue b/src/layout/components/AppSetting/index.vue
index f6b7f3ff..d1ca2f0e 100644
--- a/src/layout/components/AppSetting/index.vue
+++ b/src/layout/components/AppSetting/index.vue
@@ -1,10 +1,10 @@
 <script setup name="AppSetting">
 import { useClipboard } from '@vueuse/core'
+import eventBus from '@/util/eventBus'
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import globalSettings from '@/settings'
 
-const { proxy } = getCurrentInstance()
 const route = useRoute()
 
 const settingsStore = useSettingsStore()
@@ -23,7 +23,7 @@ watch(() => settings, () => {
 })
 
 onMounted(() => {
-    proxy.$eventBus.on('global-theme-toggle', () => {
+    eventBus.on('global-theme-toggle', () => {
         isShow.value = !isShow.value
     })
 })
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index 381ece60..90575749 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -3,11 +3,10 @@ import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
+import { useMenu } from '@/util/composables'
 
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
-
-const switchMenu = inject('switchMenu')
 </script>
 
 <template>
@@ -19,7 +18,7 @@ const switchMenu = inject('switchMenu')
                     <!-- 顶部模式 -->
                     <div class="nav">
                         <template v-for="(item, index) in menuStore.allMenus">
-                            <div v-if="item.children && item.children.length !== 0" :key="index" class="item" :class="{'active': index == menuStore.actived}" @click="switchMenu(index)">
+                            <div v-if="item.children && item.children.length !== 0" :key="index" class="item" :class="{'active': index == menuStore.actived}" @click="useMenu().switchTo(index)">
                                 <el-icon>
                                     <svg-icon v-if="item.meta.icon" :name="item.meta.icon" />
                                 </el-icon>
diff --git a/src/layout/components/MainSidebar/index.vue b/src/layout/components/MainSidebar/index.vue
index 34dcdf37..53e08954 100644
--- a/src/layout/components/MainSidebar/index.vue
+++ b/src/layout/components/MainSidebar/index.vue
@@ -2,11 +2,10 @@
 import Logo from '../Logo/index.vue'
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
+import { useMenu } from '@/util/composables'
 
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
-
-const switchMenu = inject('switchMenu')
 </script>
 
 <template>
@@ -20,7 +19,7 @@ const switchMenu = inject('switchMenu')
                         v-if="item.children && item.children.length !== 0" :key="index" :class="{
                             'item': true,
                             'active': index === menuStore.actived
-                        }" :title="item.meta.title" @click="switchMenu(index)"
+                        }" :title="item.meta.title" @click="useMenu().switchTo(index)"
                     >
                         <el-icon>
                             <svg-icon v-if="item.meta.icon" :name="item.meta.icon" />
diff --git a/src/layout/components/Search/index.vue b/src/layout/components/Search/index.vue
index 858031fc..310f24b9 100644
--- a/src/layout/components/Search/index.vue
+++ b/src/layout/components/Search/index.vue
@@ -1,11 +1,11 @@
 <script setup name="Search">
+import hotkeys from 'hotkeys-js'
 import { deepClone, isExternalLink } from '@/util'
+import eventBus from '@/util/eventBus'
 import useSettingsStore from '@/store/modules/settings'
 import useRouteStore from '@/store/modules/route'
 import useMenuStore from '@/store/modules/menu'
 
-const { proxy } = getCurrentInstance()
-
 const settingsStore = useSettingsStore()
 const routeStore = useRouteStore()
 const menuStore = useMenuStore()
@@ -15,6 +15,14 @@ const searchInput = ref('')
 const sourceList = ref([])
 const actived = ref(-1)
 
+const inputRef = ref()
+const resultRef = ref()
+const resultItemRef = ref([])
+const setResultItemRef = el => resultItemRef.value.push(el)
+onBeforeUpdate(() => {
+    resultItemRef.value = []
+})
+
 const resultList = computed(() => {
     let result = []
     result = sourceList.value.filter(item => {
@@ -36,19 +44,19 @@ const resultList = computed(() => {
 watch(() => isShow.value, val => {
     if (val) {
         document.querySelector('body').classList.add('hidden')
-        proxy.$refs.search.scrollTop = 0
+        resultRef.value.scrollTop = 0
         // 当搜索显示的时候绑定上、下、回车快捷键，隐藏的时候再解绑。另外当 input 处于 focus 状态时，采用 vue 来绑定键盘事件
-        proxy.$hotkeys('up', keyUp)
-        proxy.$hotkeys('down', keyDown)
-        proxy.$hotkeys('enter', keyEnter)
+        hotkeys('up', keyUp)
+        hotkeys('down', keyDown)
+        hotkeys('enter', keyEnter)
         setTimeout(() => {
-            proxy.$refs.input.focus()
+            inputRef.value.focus()
         }, 500)
     } else {
         document.querySelector('body').classList.remove('hidden')
-        proxy.$hotkeys.unbind('up', keyUp)
-        proxy.$hotkeys.unbind('down', keyDown)
-        proxy.$hotkeys.unbind('enter', keyEnter)
+        hotkeys.unbind('up', keyUp)
+        hotkeys.unbind('down', keyDown)
+        hotkeys.unbind('enter', keyEnter)
         setTimeout(() => {
             searchInput.value = ''
             actived.value = -1
@@ -61,16 +69,16 @@ watch(() => resultList.value, () => {
 })
 
 onMounted(() => {
-    proxy.$eventBus.on('global-search-toggle', () => {
+    eventBus.on('global-search-toggle', () => {
         isShow.value = !isShow.value
     })
-    proxy.$hotkeys('alt+s', e => {
+    hotkeys('alt+s', e => {
         if (settingsStore.topbar.enableNavSearch) {
             e.preventDefault()
             isShow.value = true
         }
     })
-    proxy.$hotkeys('esc', e => {
+    hotkeys('esc', e => {
         if (settingsStore.topbar.enableNavSearch) {
             e.preventDefault()
             isShow.value = false
@@ -154,34 +162,34 @@ function keyDown() {
 }
 function keyEnter() {
     if (actived.value !== -1) {
-        proxy.$refs[`search-item-${actived.value}`][0].click()
+        resultItemRef.value[actived.value].click()
     }
 }
 function handleScroll() {
     let scrollTo = 0
     if (actived.value !== -1) {
-        scrollTo = proxy.$refs['search'].scrollTop
-        const activedOffsetTop = proxy.$refs[`search-item-${actived.value}`][0].offsetTop
-        const activedClientHeight = proxy.$refs[`search-item-${actived.value}`][0].clientHeight
-        const searchScrollTop = proxy.$refs['search'].scrollTop
-        const searchClientHeight = proxy.$refs['search'].clientHeight
+        scrollTo = resultRef.value.scrollTop
+        const activedOffsetTop = resultItemRef.value[actived.value].offsetTop
+        const activedClientHeight = resultItemRef.value[actived.value].clientHeight
+        const searchScrollTop = resultRef.value.scrollTop
+        const searchClientHeight = resultRef.value.clientHeight
         if (activedOffsetTop + activedClientHeight > searchScrollTop + searchClientHeight) {
             scrollTo = activedOffsetTop + activedClientHeight - searchClientHeight
         } else if (activedOffsetTop <= searchScrollTop) {
             scrollTo = activedOffsetTop
         }
     }
-    proxy.$refs['search'].scrollTo({
+    resultRef.value.scrollTo({
         top: scrollTo
     })
 }
 </script>
 
 <template>
-    <div id="search" :class="{'searching': isShow}" @click="isShow && $eventBus.emit('global-search-toggle')">
+    <div id="search" :class="{'searching': isShow}" @click="isShow && eventBus.emit('global-search-toggle')">
         <div class="container">
             <div class="search-box" @click.stop>
-                <el-input ref="input" v-model="searchInput" placeholder="搜索页面，支持标题、URL模糊查询" clearable @keydown.esc="$eventBus.emit('global-search-toggle')" @keydown.up.prevent="keyUp" @keydown.down.prevent="keyDown" @keydown.enter.prevent="keyEnter">
+                <el-input ref="inputRef" v-model="searchInput" placeholder="搜索页面，支持标题、URL模糊查询" clearable @keydown.esc="eventBus.emit('global-search-toggle')" @keydown.up.prevent="keyUp" @keydown.down.prevent="keyDown" @keydown.enter.prevent="keyEnter">
                     <template #prefix>
                         <el-icon>
                             <svg-icon name="ep:search" />
@@ -220,9 +228,9 @@ function handleScroll() {
                     </div>
                 </div>
             </div>
-            <div ref="search" class="result" :class="{'mobile': settingsStore.mode === 'mobile'}">
+            <div ref="resultRef" class="result" :class="{'mobile': settingsStore.mode === 'mobile'}">
                 <router-link v-for="(item, index) in resultList" :key="item.path" v-slot="{ href, navigate }" custom :to="isShow ? item.path : ''">
-                    <a :ref="`search-item-${index}`" :href="isExternalLink(item.path) ? item.path : href" class="item" :class="{'actived': index === actived}" :target="isExternalLink(item.path) ? '_blank' : '_self'" @click="navigate" @mouseover="actived = index">
+                    <a :ref="setResultItemRef" :href="isExternalLink(item.path) ? item.path : href" class="item" :class="{'actived': index === actived}" :target="isExternalLink(item.path) ? '_blank' : '_self'" @click="navigate" @mouseover="actived = index">
                         <el-icon class="icon">
                             <svg-icon v-if="item.icon" :name="item.icon" />
                         </el-icon>
diff --git a/src/layout/components/Tools/index.vue b/src/layout/components/Tools/index.vue
index 71c5ae99..b6018192 100644
--- a/src/layout/components/Tools/index.vue
+++ b/src/layout/components/Tools/index.vue
@@ -1,9 +1,10 @@
 <script setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
+import eventBus from '@/util/eventBus'
+import { useMainPage } from '@/util/composables'
 import useSettingsStore from '@/store/modules/settings'
 import useUserStore from '@/store/modules/user'
 
-const reload = inject('reload')
 const router = useRouter()
 
 const settingsStore = useSettingsStore()
@@ -46,7 +47,7 @@ function pro() {
                 </el-icon>
                 <span class="title">查看专业版</span>
             </span>
-            <span v-if="settingsStore.topbar.enableNavSearch" class="item" @click="$eventBus.emit('global-search-toggle')">
+            <span v-if="settingsStore.topbar.enableNavSearch" class="item" @click="eventBus.emit('global-search-toggle')">
                 <el-icon>
                     <svg-icon name="ep:search" />
                 </el-icon>
@@ -56,7 +57,7 @@ function pro() {
                     <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
                 </el-icon>
             </span>
-            <span v-if="settingsStore.topbar.enablePageReload" class="item" @click="reload()">
+            <span v-if="settingsStore.topbar.enablePageReload" class="item" @click="useMainPage().reload()">
                 <el-icon>
                     <svg-icon name="ep:refresh-right" />
                 </el-icon>
@@ -67,7 +68,7 @@ function pro() {
                     <svg-icon v-show="settingsStore.app.colorScheme === 'dark'" name="ep:moon" />
                 </el-icon>
             </span>
-            <span v-if="settingsStore.topbar.enableAppSetting" class="item" @click="$eventBus.emit('global-theme-toggle')">
+            <span v-if="settingsStore.topbar.enableAppSetting" class="item" @click="eventBus.emit('global-theme-toggle')">
                 <el-icon>
                     <svg-icon name="ep:setting" />
                 </el-icon>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 861589e6..c13cfd5d 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,4 +1,5 @@
 <script setup name="Layout">
+import hotkeys from 'hotkeys-js'
 import Header from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
@@ -6,17 +7,14 @@ import Topbar from './components/Topbar/index.vue'
 import Search from './components/Search/index.vue'
 import AppSetting from './components/AppSetting/index.vue'
 import BuyIt from './components/BuyIt/index.vue'
-import { isExternalLink } from '@/util'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
-import useMenuStore from '@/store/modules/menu'
+import { useMainPage } from '@/util/composables'
 
-const { proxy } = getCurrentInstance()
-const routeInfo = useRoute(), router = useRouter()
+const routeInfo = useRoute()
 
 const settingsStore = useSettingsStore()
 const keepAliveStore = useKeepAliveStore()
-const menuStore = useMenuStore()
 
 const showCopyright = computed(() => {
     return typeof routeInfo.meta.copyright !== 'undefined' ? routeInfo.meta.copyright : settingsStore.copyright.enable
@@ -41,34 +39,16 @@ watch(() => routeInfo.path, () => {
 })
 
 onMounted(() => {
-    proxy.$hotkeys('f5', e => {
+    hotkeys('f5', e => {
         if (settingsStore.topbar.enablePageReload) {
             e.preventDefault()
-            reload()
+            useMainPage().reload()
         }
     })
 })
 onUnmounted(() => {
-    proxy.$hotkeys.unbind('f5')
+    hotkeys.unbind('f5')
 })
-provide('reload', reload)
-function reload() {
-    router.push({
-        name: 'reload'
-    })
-}
-
-provide('switchMenu', switchMenu)
-function switchMenu(index) {
-    menuStore.setActived(index)
-    if (settingsStore.menu.switchMainMenuAndPageJump) {
-        if (isExternalLink(menuStore.sidebarMenusFirstDeepestPath)) {
-            window.open(menuStore.sidebarMenusFirstDeepestPath, '_blank')
-        } else {
-            router.push(menuStore.sidebarMenusFirstDeepestPath)
-        }
-    }
-}
 </script>
 
 <template>
diff --git a/src/main.js b/src/main.js
index 27a5ea47..89dae636 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,9 +10,6 @@ app.use(router)
 
 /* importElementPlusPlaceholder */
 
-import globalProperties from '@/util/global.properties'
-globalProperties(app)
-
 // 自定义指令
 import directive from '@/util/directive'
 directive(app)
diff --git a/src/util/composables/index.js b/src/util/composables/index.js
index 28c96ccb..f3593063 100644
--- a/src/util/composables/index.js
+++ b/src/util/composables/index.js
@@ -1,5 +1,9 @@
 import useAuth from './auth'
+import useMainPage from './mainPage'
+import useMenu from './menu'
 
 export {
-    useAuth
+    useAuth,
+    useMainPage,
+    useMenu
 }
diff --git a/src/util/composables/mainPage/index.js b/src/util/composables/mainPage/index.js
new file mode 100644
index 00000000..52ded1e3
--- /dev/null
+++ b/src/util/composables/mainPage/index.js
@@ -0,0 +1,15 @@
+import router from '@/router'
+
+function useMainPage() {
+    function reload() {
+        router.push({
+            name: 'reload'
+        })
+    }
+
+    return {
+        reload
+    }
+}
+
+export default useMainPage
diff --git a/src/util/composables/menu/index.js b/src/util/composables/menu/index.js
new file mode 100644
index 00000000..599b3099
--- /dev/null
+++ b/src/util/composables/menu/index.js
@@ -0,0 +1,24 @@
+import router from '@/router'
+import useSettingsStore from '@/store/modules/settings'
+import useMenuStore from '@/store/modules/menu'
+import { isExternalLink } from '@/util'
+
+export default function useMenu() {
+    const settingsStore = useSettingsStore()
+    const menuStore = useMenuStore()
+
+    function switchTo(index) {
+        menuStore.setActived(index)
+        if (settingsStore.menu.switchMainMenuAndPageJump) {
+            if (isExternalLink(menuStore.sidebarMenusFirstDeepestPath))
+                window.open(menuStore.sidebarMenusFirstDeepestPath, '_blank')
+
+            else
+                router.push(menuStore.sidebarMenusFirstDeepestPath)
+        }
+    }
+
+    return {
+        switchTo
+    }
+}
diff --git a/src/util/eventBus.js b/src/util/eventBus.js
new file mode 100644
index 00000000..9ea06008
--- /dev/null
+++ b/src/util/eventBus.js
@@ -0,0 +1,3 @@
+import mitt from 'mitt'
+
+export default mitt()
diff --git a/src/util/global.properties.js b/src/util/global.properties.js
deleted file mode 100644
index 8a9d9224..00000000
--- a/src/util/global.properties.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import api from '@/api'
-import { useAuth } from '@/util/composables'
-import dayjs from 'dayjs'
-import 'dayjs/locale/zh-cn'
-import Cookies from 'js-cookie'
-import hotkeys from 'hotkeys-js'
-import mitt from 'mitt'
-
-export default function globalProperties(app) {
-    // 请求
-    app.config.globalProperties.$api = api
-    // 鉴权
-    const { auth, authAll } = useAuth()
-    app.config.globalProperties.$auth = auth
-    app.config.globalProperties.$authAll = authAll
-    dayjs.locale('zh-cn')
-    app.config.globalProperties.$dayjs = dayjs
-    app.config.globalProperties.$cookies = Cookies
-    app.config.globalProperties.$hotkeys = hotkeys
-    app.config.globalProperties.$eventBus = mitt()
-}
diff --git a/src/views/login.vue b/src/views/login.vue
index 17b29397..96164dbd 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -12,7 +12,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useUserStore from '@/store/modules/user'
 
-const { proxy } = getCurrentInstance()
 const route = useRoute(), router = useRouter()
 
 const settingsStore = useSettingsStore()
@@ -25,6 +24,7 @@ const title = import.meta.env.VITE_APP_TITLE
 const formType = ref('login')
 
 // 登录
+const loginFormRef = ref()
 const loginForm = ref({
     account: localStorage.login_account || '',
     password: '',
@@ -40,7 +40,7 @@ const loginRules = ref({
     ]
 })
 function handleLogin() {
-    proxy.$refs.loginFormRef.validate(valid => {
+    loginFormRef.value.validate(valid => {
         if (valid) {
             loading.value = true
             userStore.login(loginForm.value).then(() => {
@@ -59,6 +59,7 @@ function handleLogin() {
 }
 
 // 注册
+const registerFormRef = ref()
 const registerForm = ref({
     account: '',
     captcha: '',
@@ -92,7 +93,7 @@ function handleRegister() {
         message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
         type: 'warning'
     })
-    proxy.$refs.registerFormRef.validate(valid => {
+    registerFormRef.value.validate(valid => {
         if (valid) {
             // 这里编写业务代码
         }
@@ -100,6 +101,7 @@ function handleRegister() {
 }
 
 // 重置密码
+const resetFormRef = ref()
 const resetForm = ref({
     account: localStorage.login_account || '',
     captcha: '',
@@ -122,7 +124,7 @@ function handleReset() {
         message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
         type: 'warning'
     })
-    proxy.$refs.resetFormRef.validate(valid => {
+    resetFormRef.value.validate(valid => {
         if (valid) {
             // 这里编写业务代码
         }
@@ -132,6 +134,7 @@ function handleReset() {
 const loading = ref(false)
 const passwordType = ref('password')
 const redirect = ref(null)
+const passwordRef = ref()
 
 onMounted(() => {
     redirect.value = route.query.redirect ?? '/'
@@ -140,7 +143,7 @@ onMounted(() => {
 function showPassword() {
     passwordType.value = passwordType.value === 'password' ? '' : 'password'
     nextTick(() => {
-        proxy.$refs.password.focus()
+        passwordRef.value.focus()
     })
 }
 
@@ -174,7 +177,7 @@ function testAccount(account) {
                         </el-input>
                     </el-form-item>
                     <el-form-item prop="password">
-                        <el-input ref="password" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+                        <el-input ref="passwordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
                             <template #prefix>
                                 <el-icon>
                                     <svg-icon name="password" />
@@ -230,7 +233,7 @@ function testAccount(account) {
                         </el-input>
                     </el-form-item>
                     <el-form-item prop="password">
-                        <el-input ref="password" v-model="registerForm.password" :type="passwordType" placeholder="密码" tabindex="3" autocomplete="on">
+                        <el-input ref="passwordRef" v-model="registerForm.password" :type="passwordType" placeholder="密码" tabindex="3" autocomplete="on">
                             <template #prefix>
                                 <el-icon>
                                     <svg-icon name="password" />
diff --git a/src/views/permission_example/index.vue b/src/views/permission_example/index.vue
index 1b464265..0f6a557e 100644
--- a/src/views/permission_example/index.vue
+++ b/src/views/permission_example/index.vue
@@ -9,11 +9,11 @@
 <script setup>
 import useSettingsStore from '@/store/modules/settings'
 import useUserStore from '@/store/modules/user'
-
-const { proxy } = getCurrentInstance()
+import { useAuth } from '@/util/composables'
 
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
+const { auth, authAll } = useAuth()
 
 function accountChange(val) {
     ElLoading.service({
@@ -31,14 +31,14 @@ function accountChange(val) {
     })
 }
 function permissionCheck(permissions) {
-    if (proxy.$auth(permissions)) {
+    if (auth(permissions)) {
         ElMessage.success('校验通过')
     } else {
         ElMessage.error('校验不通过')
     }
 }
 function permissionCheck2(permissions) {
-    if (proxy.$authAll(permissions)) {
+    if (authAll(permissions)) {
         ElMessage.success('校验通过')
     } else {
         ElMessage.error('校验不通过')
diff --git a/src/views/personal/edit.password.vue b/src/views/personal/edit.password.vue
index 4f937cea..84a95b67 100644
--- a/src/views/personal/edit.password.vue
+++ b/src/views/personal/edit.password.vue
@@ -9,8 +9,8 @@
 <script setup name="PersonalEditPassword">
 import useUserStore from '@/store/modules/user'
 
-const route = useRoute(), router = useRouter()
-const { proxy } = getCurrentInstance()
+const route = useRoute()
+const router = useRouter()
 
 const userStore = useUserStore()
 
@@ -22,6 +22,7 @@ const validatePassword = (rule, value, callback) => {
     }
 }
 
+const formRef = ref()
 const form = ref({
     password: '',
     newpassword: '',
@@ -43,7 +44,7 @@ const rules = ref({
 })
 
 function onSubmit() {
-    proxy.$refs['formRef'].validate(valid => {
+    formRef.value.validate(valid => {
         if (valid) {
             userStore.editPassword(form.value).then(() => {
                 ElMessage({
diff --git a/src/views/personal/setting.vue b/src/views/personal/setting.vue
index 15d05e8f..989a6ec1 100644
--- a/src/views/personal/setting.vue
+++ b/src/views/personal/setting.vue
@@ -10,6 +10,7 @@
 <script setup name="PersonalSetting">
 const router = useRouter()
 
+const formRef = ref()
 const form = ref({
     headimg: '',
     mobile: '',