From e2f4bb1533dcf3c72f99cf17b01fe91337c5688a Mon Sep 17 00:00:00 2001
From: pany <939630029@qq.com>
Date: Fri, 19 Aug 2022 17:03:38 +0800
Subject: [PATCH] refactor: other view

---
 src/App.vue                                   |  6 ++-
 src/views/error-page/403.vue                  | 17 +++++++-
 src/views/error-page/404.vue                  | 17 +++++++-
 .../permission/components/SwitchRoles.vue     | 24 +++++++----
 src/views/permission/directive.vue            | 43 ++++++++++---------
 src/views/permission/page.vue                 | 13 +++---
 src/views/redirect/index.vue                  |  6 +--
 7 files changed, 81 insertions(+), 45 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5f6e41a..3f0bedd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,8 +2,10 @@
 import { useAppStore } from "@/store/modules/app"
 import zhCn from "element-plus/lib/locale/lang/zh-cn"
 
-useAppStore().initTheme() // 初始化主题
-const locale = zhCn // 将 Element-Plus 的语言设置为中文
+/** 初始化主题 */
+useAppStore().initTheme()
+/** 将 Element-Plus 的语言设置为中文 */
+const locale = zhCn
 </script>
 
 <template>
diff --git a/src/views/error-page/403.vue b/src/views/error-page/403.vue
index 8b0a362..a4eea91 100644
--- a/src/views/error-page/403.vue
+++ b/src/views/error-page/403.vue
@@ -1,6 +1,19 @@
 <template>
   <div>
-    <p style="text-align: center; font-size: 140px; margin-bottom: 50px">403</p>
-    <p style="text-align: center; font-size: 40px">你没有权限去该页面</p>
+    <p class="code">403</p>
+    <p class="describe">你没有权限去该页面</p>
   </div>
 </template>
+
+<style lang="scss" scoped>
+.code {
+  text-align: center;
+  font-size: 140px;
+  margin-bottom: 50px;
+}
+
+.describe {
+  text-align: center;
+  font-size: 40px;
+}
+</style>
diff --git a/src/views/error-page/404.vue b/src/views/error-page/404.vue
index 3c0798a..f031e23 100644
--- a/src/views/error-page/404.vue
+++ b/src/views/error-page/404.vue
@@ -1,6 +1,19 @@
 <template>
   <div>
-    <p style="text-align: center; font-size: 140px; margin-bottom: 50px">404</p>
-    <p style="text-align: center; font-size: 40px">未找到你想要的页面</p>
+    <p class="code">404</p>
+    <p class="describe">未找到你想要的页面</p>
   </div>
 </template>
+
+<style lang="scss" scoped>
+.code {
+  text-align: center;
+  font-size: 140px;
+  margin-bottom: 50px;
+}
+
+.describe {
+  text-align: center;
+  font-size: 40px;
+}
+</style>
diff --git a/src/views/permission/components/SwitchRoles.vue b/src/views/permission/components/SwitchRoles.vue
index 98fb93c..aca6a86 100644
--- a/src/views/permission/components/SwitchRoles.vue
+++ b/src/views/permission/components/SwitchRoles.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup>
-import { computed, ref, watch } from "vue"
+import { ref, watch } from "vue"
 import { useUserStore } from "@/store/modules/user"
 
-const userStore = useUserStore()
-
 const emit = defineEmits(["change"])
 
-const roles = computed(() => userStore.roles)
-const currentRole = ref(roles.value[0])
-watch(currentRole, async (value) => {
+const userStore = useUserStore()
+const switchRoles = ref(userStore.roles[0])
+watch(switchRoles, async (value) => {
   await userStore.changeRoles(value)
   emit("change")
 })
@@ -16,13 +14,21 @@ watch(currentRole, async (value) => {
 
 <template>
   <div>
-    <div style="margin-bottom: 15px">你的权限：{{ roles }}</div>
-    <div style="display: flex; align-items: center">
+    <div>你的权限：{{ userStore.roles }}</div>
+    <div class="switch-roles">
       <span>切换权限：</span>
-      <el-radio-group v-model="currentRole">
+      <el-radio-group v-model="switchRoles">
         <el-radio-button label="editor" />
         <el-radio-button label="admin" />
       </el-radio-group>
     </div>
   </div>
 </template>
+
+<style lang="scss" scoped>
+.switch-roles {
+  margin-top: 15px;
+  display: flex;
+  align-items: center;
+}
+</style>
diff --git a/src/views/permission/directive.vue b/src/views/permission/directive.vue
index 0b956b0..f122d53 100644
--- a/src/views/permission/directive.vue
+++ b/src/views/permission/directive.vue
@@ -1,26 +1,25 @@
 <script lang="ts" setup>
-import { reactive } from "vue"
-import { checkPermission } from "@/utils/permission" // 权限判断函数
+import { ref } from "vue"
+import { checkPermission } from "@/utils/permission" // checkPermission 权限判断函数
 import SwitchRoles from "./components/SwitchRoles.vue"
 
-const state = reactive({
-  key: 1,
-  handleRolesChange: () => {
-    state.key++
-  }
-})
+/** key 是为了能每次切换权限的时候重新初始化指令 */
+const key = ref(1)
+const handleRolesChange = () => {
+  key.value++
+}
 </script>
 
 <template>
   <div class="app-container">
-    <SwitchRoles @change="state.handleRolesChange" />
-    <div :key="state.key" style="margin-top: 30px">
+    <SwitchRoles @change="handleRolesChange" />
+    <div :key="key" class="margin-top">
       <div>
         <span v-permission="['admin']" class="permission-alert">
           只有
           <el-tag>admin</el-tag>可以看见这个
         </span>
-        <el-tag v-permission="['admin']" class="permission-sourceCode" type="info" size="large">
+        <el-tag v-permission="['admin']" class="permission-code" type="info" size="large">
           v-permission="['admin']"
         </el-tag>
       </div>
@@ -29,7 +28,7 @@ const state = reactive({
           只有
           <el-tag>editor</el-tag>可以看见这个
         </span>
-        <el-tag v-permission="['editor']" class="permission-sourceCode" type="info" size="large">
+        <el-tag v-permission="['editor']" class="permission-code" type="info" size="large">
           v-permission="['editor']"
         </el-tag>
       </div>
@@ -38,28 +37,28 @@ const state = reactive({
           两者
           <el-tag>admin</el-tag>和 <el-tag>editor</el-tag>都可以看见这个
         </span>
-        <el-tag v-permission="['admin', 'editor']" class="permission-sourceCode" type="info" size="large">
+        <el-tag v-permission="['admin', 'editor']" class="permission-code" type="info" size="large">
           v-permission="['admin', 'editor']"
         </el-tag>
       </div>
     </div>
-    <div :key="'checkPermission' + state.key" style="margin-top: 60px">
+    <div :key="'checkPermission' + key" class="margin-top">
       <el-tag type="info" size="large">
-        在某些情况下，不适合使用 v-permission。例如: Element-Plus 的 el-tab 或 el-table-column 以及其它动态渲染 dom
+        在某些情况下，不适合使用 v-permission。例如: Element-Plus 的 el-tab-pane 或 el-table-column 以及其它动态渲染 Dom
         的场景。你只能通过手动设置 v-if 来实现。
       </el-tag>
-      <el-tabs type="border-card" style="width: 550px; margin-top: 60px">
+      <el-tabs type="border-card" class="margin-top">
         <el-tab-pane v-if="checkPermission(['admin'])" label="admin">
           admin 可以看见这个
-          <el-tag class="permission-sourceCode" type="info"> v-if="checkPermission(['admin'])" </el-tag>
+          <el-tag class="permission-code" type="info"> v-if="checkPermission(['admin'])" </el-tag>
         </el-tab-pane>
         <el-tab-pane v-if="checkPermission(['editor'])" label="editor">
           editor 可以看见这个
-          <el-tag class="permission-sourceCode" type="info"> v-if="checkPermission(['editor'])" </el-tag>
+          <el-tag class="permission-code" type="info"> v-if="checkPermission(['editor'])" </el-tag>
         </el-tab-pane>
         <el-tab-pane v-if="checkPermission(['admin', 'editor'])" label="admin 和 editor">
           两者 admin 和 editor 都可以看见这个
-          <el-tag class="permission-sourceCode" type="info"> v-if="checkPermission(['admin', 'editor'])" </el-tag>
+          <el-tag class="permission-code" type="info"> v-if="checkPermission(['admin', 'editor'])" </el-tag>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -77,7 +76,11 @@ const state = reactive({
   display: inline-block;
 }
 
-.permission-sourceCode {
+.permission-code {
   margin-left: 15px;
 }
+
+.margin-top {
+  margin-top: 30px;
+}
 </style>
diff --git a/src/views/permission/page.vue b/src/views/permission/page.vue
index 86b55db..c3c1d45 100644
--- a/src/views/permission/page.vue
+++ b/src/views/permission/page.vue
@@ -3,17 +3,20 @@ import { useRouter } from "vue-router"
 import SwitchRoles from "./components/SwitchRoles.vue"
 
 const router = useRouter()
-
 const handleRolesChange = () => {
-  router.push({ path: "/403" }).catch((err) => {
-    console.warn(err)
-  })
+  router.push({ path: "/403" })
 }
 </script>
 
 <template>
   <div class="app-container">
-    <el-tag type="success" size="large" style="margin-bottom: 15px"> 当前页面只有 admin 权限可见 </el-tag>
+    <el-tag type="success" size="large"> 当前页面只有 admin 权限可见 </el-tag>
     <SwitchRoles @change="handleRolesChange" />
   </div>
 </template>
+
+<style lang="scss" scoped>
+.el-tag {
+  margin-bottom: 15px;
+}
+</style>
diff --git a/src/views/redirect/index.vue b/src/views/redirect/index.vue
index 86ee4e9..3a12b60 100644
--- a/src/views/redirect/index.vue
+++ b/src/views/redirect/index.vue
@@ -4,11 +4,7 @@ import { useRoute, useRouter } from "vue-router"
 const { params, query } = useRoute()
 const { path } = params
 
-useRouter()
-  .replace({ path: "/" + path, query })
-  .catch((err) => {
-    console.warn(err)
-  })
+useRouter().replace({ path: "/" + path, query })
 </script>
 
 <template>