From 03b10947a65be30d81ece2913d3197f1c512d885 Mon Sep 17 00:00:00 2001
From: hooray <304327508@qq.com>
Date: Sat, 30 Jul 2022 00:12:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                 | 2 +-
 src/layout/components/AppSetting/index.vue  | 9 +++++----
 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       | 7 ++++---
 src/layout/components/Topbar/index.vue      | 2 +-
 src/layout/index.vue                        | 6 +++---
 src/settings.js                             | 8 +-------
 src/views/keep_alive_example/page.vue       | 5 ++---
 src/views/login.vue                         | 5 +++--
 src/views/permission_example/index.vue      | 5 +++--
 src/views/personal/edit.password.vue        | 3 ++-
 15 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d93b9a6e..d7a5908b 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'
+
 const settingsStore = useSettingsStore()
 
 // 侧边栏主导航当前实际宽度
diff --git a/src/layout/components/AppSetting/index.vue b/src/layout/components/AppSetting/index.vue
index 981161bb..f6b7f3ff 100644
--- a/src/layout/components/AppSetting/index.vue
+++ b/src/layout/components/AppSetting/index.vue
@@ -1,15 +1,17 @@
 <script setup name="AppSetting">
+import { useClipboard } from '@vueuse/core'
+import useSettingsStore from '@/store/modules/settings'
+import useMenuStore from '@/store/modules/menu'
+import globalSettings from '@/settings'
+
 const { proxy } = getCurrentInstance()
 const route = useRoute()
 
-import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import useMenuStore from '@/store/modules/menu'
 const menuStore = useMenuStore()
 
 const isShow = ref(false)
 
-import globalSettings from '@/settings'
 const settings = ref(globalSettings)
 
 watch(() => settings, () => {
@@ -26,7 +28,6 @@ onMounted(() => {
     })
 })
 
-import { useClipboard } from '@vueuse/core'
 const { copy, copied, isSupported } = useClipboard()
 
 watch(copied, val => {
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index 7a4df3fa..381ece60 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -1,10 +1,10 @@
 <script setup name="Header">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
-
 import useSettingsStore from '@/store/modules/settings'
-const settingsStore = useSettingsStore()
 import useMenuStore from '@/store/modules/menu'
+
+const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
 const switchMenu = inject('switchMenu')
diff --git a/src/layout/components/Logo/index.vue b/src/layout/components/Logo/index.vue
index 09a54846..b04cff27 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'
+
 const settingsStore = useSettingsStore()
 
 defineProps({
diff --git a/src/layout/components/MainSidebar/index.vue b/src/layout/components/MainSidebar/index.vue
index b4665569..34dcdf37 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'
-const settingsStore = useSettingsStore()
 import useMenuStore from '@/store/modules/menu'
+
+const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
 const switchMenu = inject('switchMenu')
diff --git a/src/layout/components/Search/index.vue b/src/layout/components/Search/index.vue
index ffd45a48..858031fc 100644
--- a/src/layout/components/Search/index.vue
+++ b/src/layout/components/Search/index.vue
@@ -1,13 +1,13 @@
 <script setup name="Search">
 import { deepClone, isExternalLink } from '@/util'
+import useSettingsStore from '@/store/modules/settings'
+import useRouteStore from '@/store/modules/route'
+import useMenuStore from '@/store/modules/menu'
 
 const { proxy } = getCurrentInstance()
 
-import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import useRouteStore from '@/store/modules/route'
 const routeStore = useRouteStore()
-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 706af802..20d574d6 100644
--- a/src/layout/components/SubSidebar/index.vue
+++ b/src/layout/components/SubSidebar/index.vue
@@ -1,10 +1,10 @@
 <script setup name="SubSidebar">
 import Logo from '../Logo/index.vue'
 import SidebarItem from '../SidebarItem/index.vue'
-
 import useSettingsStore from '@/store/modules/settings'
-const settingsStore = useSettingsStore()
 import useMenuStore from '@/store/modules/menu'
+
+const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
 const sidebarScrollTop = ref(0)
diff --git a/src/layout/components/Tools/index.vue b/src/layout/components/Tools/index.vue
index 59c71435..71c5ae99 100644
--- a/src/layout/components/Tools/index.vue
+++ b/src/layout/components/Tools/index.vue
@@ -1,13 +1,14 @@
 <script setup name="Tools">
+import { useFullscreen } from '@vueuse/core'
+import useSettingsStore from '@/store/modules/settings'
+import useUserStore from '@/store/modules/user'
+
 const reload = inject('reload')
 const router = useRouter()
 
-import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import useUserStore from '@/store/modules/user'
 const userStore = useUserStore()
 
-import { useFullscreen } from '@vueuse/core'
 const { isFullscreen, toggle } = useFullscreen()
 
 function userCommand(command) {
diff --git a/src/layout/components/Topbar/index.vue b/src/layout/components/Topbar/index.vue
index 1aa2767e..851a0bef 100644
--- a/src/layout/components/Topbar/index.vue
+++ b/src/layout/components/Topbar/index.vue
@@ -1,10 +1,10 @@
 <script setup name="Topbar">
 import { compile } from 'path-to-regexp'
+import useSettingsStore from '@/store/modules/settings'
 import Tools from '../Tools/index.vue'
 
 const route = useRoute()
 
-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 08070961..861589e6 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -7,15 +7,15 @@ 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'
 
 const { proxy } = getCurrentInstance()
 const routeInfo = useRoute(), router = useRouter()
 
-import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import useKeepAliveStore from '@/store/modules/keepAlive'
 const keepAliveStore = useKeepAliveStore()
-import useMenuStore from '@/store/modules/menu'
 const menuStore = useMenuStore()
 
 const showCopyright = computed(() => {
diff --git a/src/settings.js b/src/settings.js
index b80dc24d..9351269e 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -6,13 +6,7 @@ let globalSettings = {
         elementSize: 'default',
         // 是否将 iconify 图标集中的 Element Plus 图标下载到本地，以便在离线环境下使用
         iconifyOfflineUse: false,
-        /**
-         * 是否开启权限功能，权限功能提供以下鉴权支持：
-         * 1、路由鉴权
-         * 2、鉴权组件：<Auth></Auth>、<AuthAll></AuthAll>
-         * 3、鉴权指令：v-auth、v-auth-all
-         * 4、鉴权函数：this.$auth()、this.$authAll()
-         */
+        // 是否开启权限功能
         enablePermission: false,
         // 是否开启载入进度条
         enableProgress: true,
diff --git a/src/views/keep_alive_example/page.vue b/src/views/keep_alive_example/page.vue
index 1656a3fc..958dd010 100644
--- a/src/views/keep_alive_example/page.vue
+++ b/src/views/keep_alive_example/page.vue
@@ -7,11 +7,10 @@
 </route>
 
 <script setup name="KeepAliveExamplePage">
+import useKeepAliveStore from '@/store/modules/keepAlive'
 import { onBeforeRouteLeave } from 'vue-router'
 
 const router = useRouter()
-
-import useKeepAliveStore from '@/store/modules/keepAlive'
 const keepAliveStore = useKeepAliveStore()
 
 const openKeepAlive = ref(false)
@@ -46,7 +45,7 @@ onBeforeRouteLeave((to, from) => {
 
 <template>
     <div>
-        <page-header title="页面缓存" content="除了可以在路由里配置页面是否需要缓存外，你也可以不使用框架提供的方法，而是在页面里自行实现，该方法目前仅支持在 Options API 中实现。" />
+        <page-header title="页面缓存" content="除了可以在路由里配置页面是否需要缓存外，你也可以不使用框架提供的方法，而是在页面里自行实现。" />
         <page-main>
             <div class="block">
                 <el-switch v-model="openKeepAlive" active-text="开启缓存" inactive-text="关闭缓存" />
diff --git a/src/views/login.vue b/src/views/login.vue
index f8a7fa8d..17b29397 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,12 +9,13 @@
 </route>
 
 <script setup name="Login">
+import useSettingsStore from '@/store/modules/settings'
+import useUserStore from '@/store/modules/user'
+
 const { proxy } = getCurrentInstance()
 const route = useRoute(), router = useRouter()
 
-import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import useUserStore from '@/store/modules/user'
 const userStore = useUserStore()
 
 const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
diff --git a/src/views/permission_example/index.vue b/src/views/permission_example/index.vue
index 2ea3241b..1b464265 100644
--- a/src/views/permission_example/index.vue
+++ b/src/views/permission_example/index.vue
@@ -7,11 +7,12 @@
 </route>
 
 <script setup>
+import useSettingsStore from '@/store/modules/settings'
+import useUserStore from '@/store/modules/user'
+
 const { proxy } = getCurrentInstance()
 
-import useSettingsStore from '@/store/modules/settings'
 const settingsStore = useSettingsStore()
-import useUserStore from '@/store/modules/user'
 const userStore = useUserStore()
 
 function accountChange(val) {
diff --git a/src/views/personal/edit.password.vue b/src/views/personal/edit.password.vue
index 271fb6a9..4f937cea 100644
--- a/src/views/personal/edit.password.vue
+++ b/src/views/personal/edit.password.vue
@@ -7,10 +7,11 @@
 </route>
 
 <script setup name="PersonalEditPassword">
+import useUserStore from '@/store/modules/user'
+
 const route = useRoute(), router = useRouter()
 const { proxy } = getCurrentInstance()
 
-import useUserStore from '@/store/modules/user'
 const userStore = useUserStore()
 
 const validatePassword = (rule, value, callback) => {