From 06a3c7d3596b40417f5958bc0b1737edc254ff22 Mon Sep 17 00:00:00 2001
From: mizhexiaoxiao <1157861072@qq.com>
Date: Tue, 20 Feb 2024 11:50:17 +0800
Subject: [PATCH] Update

---
 web/src/store/modules/user/index.js |  8 +++--
 web/src/views/system/role/index.vue | 49 +++++++++++++++++------------
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/web/src/store/modules/user/index.js b/web/src/store/modules/user/index.js
index 4b10489..1dce1b8 100644
--- a/web/src/store/modules/user/index.js
+++ b/web/src/store/modules/user/index.js
@@ -37,11 +37,15 @@ export const useUserStore = defineStore('user', {
     async getUserInfo() {
       try {
         const res = await api.getUserInfo()
+        if (res.code === 401) {
+          this.logout()
+          return
+        }
         const { id, username, email, avatar, roles, is_superuser, is_active } = res.data
         this.userInfo = { id, username, email, avatar, roles, is_superuser, is_active }
-        return Promise.resolve(res.data)
+        return res.data
       } catch (error) {
-        return Promise.reject(error)
+        return error
       }
     },
     async logout() {
diff --git a/web/src/views/system/role/index.vue b/web/src/views/system/role/index.vue
index 373a1fd..3388530 100644
--- a/web/src/views/system/role/index.vue
+++ b/web/src/views/system/role/index.vue
@@ -90,10 +90,6 @@ function buildApiTree(data) {
 
 onMounted(() => {
   $table.value?.handleSearch()
-  api.getMenus({ page: 1, page_size: 9999 }).then((res) => (menuOption.value = res.data))
-  api
-    .getApis({ page: 1, page_size: 9999 })
-    .then((res) => (apiOption.value = buildApiTree(res.data)))
 })
 
 const columns = [
@@ -144,9 +140,9 @@ const columns = [
             {
               default: () => '编辑',
               icon: renderIcon('material-symbols:edit-outline', { size: 16 }),
-            },
+            }
           ),
-          [[vPermission, 'post/api/v1/role/update']],
+          [[vPermission, 'post/api/v1/role/update']]
         ),
         h(
           NPopconfirm,
@@ -167,12 +163,12 @@ const columns = [
                   {
                     default: () => '删除',
                     icon: renderIcon('material-symbols:delete-outline', { size: 16 }),
-                  },
+                  }
                 ),
-                [[vPermission, 'delete/api/v1/role/delete']],
+                [[vPermission, 'delete/api/v1/role/delete']]
               ),
             default: () => h('div', {}, '确定删除该角色吗?'),
-          },
+          }
         ),
         withDirectives(
           h(
@@ -181,23 +177,36 @@ const columns = [
               size: 'small',
               type: 'primary',
               onClick: async () => {
-                active.value = true
-                role_id.value = row.id
-                const result = await api.getRoleAuthorized({ id: row.id })
-                menu_ids.value = result.data.menus.map((v) => {
-                  return v.id
-                })
-                api_ids.value = result.data.apis.map((v) => {
-                  return v.method.toLowerCase() + v.path
-                })
+                try {
+                  // 使用 Promise.all 来同时发送所有请求
+                  const [menusResponse, apisResponse, roleAuthorizedResponse] = await Promise.all([
+                    api.getMenus({ page: 1, page_size: 9999 }),
+                    api.getApis({ page: 1, page_size: 9999 }),
+                    api.getRoleAuthorized({ id: row.id }),
+                  ])
+
+                  // 处理每个请求的响应
+                  menuOption.value = menusResponse.data
+                  apiOption.value = buildApiTree(apisResponse.data)
+                  menu_ids.value = roleAuthorizedResponse.data.menus.map((v) => v.id)
+                  api_ids.value = roleAuthorizedResponse.data.apis.map(
+                    (v) => v.method.toLowerCase() + v.path
+                  )
+
+                  active.value = true
+                  role_id.value = row.id
+                } catch (error) {
+                  // 错误处理
+                  console.error('Error loading data:', error)
+                }
               },
             },
             {
               default: () => '设置权限',
               icon: renderIcon('material-symbols:edit-outline', { size: 16 }),
-            },
+            }
           ),
-          [[vPermission, 'get/api/v1/role/authorized']],
+          [[vPermission, 'get/api/v1/role/authorized']]
         ),
       ]
     },