From 157cf51f8a1d4d7ad5b82a36e212f052dc6a8053 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Mon, 22 Jul 2024 15:16:05 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87=E7=82=B9=E5=87=BB=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/UserInfo/src/UserInfo.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue
index 174db7d2..c613abfe 100644
--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -65,17 +65,17 @@ const toDocument = () => {
     </div>
     <template #dropdown>
       <ElDropdownMenu>
-        <ElDropdownItem>
+        <ElDropdownItem @click="toProfile">
           <Icon icon="ep:tools" />
-          <div @click="toProfile">{{ t('common.profile') }}</div>
+          <div>{{ t('common.profile') }}</div>
         </ElDropdownItem>
         <ElDropdownItem>
           <Icon icon="ep:menu" />
           <div @click="toDocument">{{ t('common.document') }}</div>
         </ElDropdownItem>
-        <ElDropdownItem divided>
+        <ElDropdownItem divided @click="lockScreen">
           <Icon icon="ep:lock" />
-          <div @click="lockScreen">{{ t('lock.lockScreen') }}</div>
+          <div>{{ t('lock.lockScreen') }}</div>
         </ElDropdownItem>
         <ElDropdownItem divided @click="loginOut">
           <Icon icon="ep:switch-button" />
-- 
Gitee


From b07367ec78188c722613b9b879e1ce0a6c54c9ac Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Mon, 22 Jul 2024 15:22:25 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87=E7=82=B9=E5=87=BB=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/UserInfo/src/UserInfo.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue
index c613abfe..6e0dab8b 100644
--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -69,9 +69,9 @@ const toDocument = () => {
           <Icon icon="ep:tools" />
           <div>{{ t('common.profile') }}</div>
         </ElDropdownItem>
-        <ElDropdownItem>
+        <ElDropdownItem @click="toDocument">
           <Icon icon="ep:menu" />
-          <div @click="toDocument">{{ t('common.document') }}</div>
+          <div>{{ t('common.document') }}</div>
         </ElDropdownItem>
         <ElDropdownItem divided @click="lockScreen">
           <Icon icon="ep:lock" />
-- 
Gitee


From e1e161322f97cac2341b1dea8415657029114d3d Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 31 Jul 2024 14:49:52 +0800
Subject: [PATCH 3/5] =?UTF-8?q?XTable=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E6=97=B6loading=E4=B8=8D=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XTable/src/XTable.vue | 40 +++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/components/XTable/src/XTable.vue b/src/components/XTable/src/XTable.vue
index 4ef431a0..a2588d92 100644
--- a/src/components/XTable/src/XTable.vue
+++ b/src/components/XTable/src/XTable.vue
@@ -160,26 +160,42 @@ const getProxyConfig = (options: XTableProps) => {
               queryParams.pageSize = page.pageSize
               queryParams.pageNo = page.currentPage
             }
-            return new Promise(async (resolve) => {
-              resolve(await getListApi(queryParams))
+            return new Promise(async (resolve, reject) => {
+              try {
+                resolve(await getListApi(queryParams))
+              } catch (e) {
+                reject(e)
+              }
             })
           },
           delete: ({ body }) => {
-            return new Promise(async (resolve) => {
+            return new Promise(async (resolve, reject) => {
               if (options.deleteApi) {
-                resolve(await options.deleteApi(JSON.stringify(body)))
+                try {
+                  resolve(await options.deleteApi(JSON.stringify(body)))
+                } catch (e) {
+                  reject(e)
+                }
               } else {
-                Promise.reject('未设置deleteApi')
+                reject('未设置deleteApi')
               }
             })
           },
           queryAll: ({ form }) => {
             const queryParams = Object.assign({}, JSON.parse(JSON.stringify(form)))
-            return new Promise(async (resolve) => {
+            return new Promise(async (resolve, reject) => {
               if (options.getAllListApi) {
-                resolve(await options.getAllListApi(queryParams))
+                try {
+                  resolve(await options.getAllListApi(queryParams))
+                } catch (e) {
+                  reject(e)
+                }
               } else {
-                resolve(await getListApi(queryParams))
+                try {
+                  resolve(await getListApi(queryParams))
+                } catch (e) {
+                  reject(e)
+                }
               }
             })
           }
@@ -196,8 +212,12 @@ const getProxyConfig = (options: XTableProps) => {
             if (options?.params) {
               queryParams = Object.assign(queryParams, options.params)
             }
-            return new Promise(async (resolve) => {
-              resolve(await getListApi(queryParams))
+            return new Promise(async (resolve, reject) => {
+              try {
+                resolve(await getListApi(queryParams))
+              } catch (e) {
+                reject(e)
+              }
             })
           }
         }
-- 
Gitee


From a574f3ca543f80a4ae540d611fafc773f9ede4e3 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 31 Jul 2024 14:53:05 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=94=81=E5=AE=9A=E5=B1=8F=E5=B9=95-?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=99=BB=E5=BD=95=E9=A1=B5=EF=BC=8C=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=AD=A3=E7=A1=AE=E5=AF=86=E7=A0=81=E5=90=8E=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=B7=B3=E8=BD=AC=E8=BF=9B=E5=85=A5=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/UserInfo/src/components/LockPage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/UserInfo/src/components/LockPage.vue b/src/layout/components/UserInfo/src/components/LockPage.vue
index 6b9bada5..9909e847 100644
--- a/src/layout/components/UserInfo/src/components/LockPage.vue
+++ b/src/layout/components/UserInfo/src/components/LockPage.vue
@@ -53,9 +53,9 @@ async function goLogin() {
   // 登出后清理
   deleteUserCache() // 清空用户缓存
   tagsViewStore.delAllViews()
-  resetRouter() // 重置静态路由表
+  // resetRouter() // 重置静态路由表
   lockStore.resetLockInfo()
-  replace('/login')
+  replace('/login?redirect=/index')
 }
 
 function handleShowForm(show = false) {
-- 
Gitee


From 2e871977cf8860ef47ed0eae896fcd32dcdc1b6a Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 7 Aug 2024 19:47:10 +0800
Subject: [PATCH 5/5] BUG

---
 src/permission.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/permission.ts b/src/permission.ts
index d538303b..41f1de27 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -69,7 +69,11 @@ router.beforeEach(async (to, from, next) => {
       const userStore = useUserStoreWithOut()
       const permissionStore = usePermissionStoreWithOut()
       if (!dictStore.getIsSetDict) {
-        await dictStore.setDictMap()
+        try {
+          await dictStore.setDictMap()
+        } catch (e) {
+          console.log(e)
+        }
       }
       if (!userStore.getIsSetUser) {
         isRelogin.show = true
-- 
Gitee