From fae0cf84ba53544d72ab964fd178306952090add Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=96=E5=8A=B1=E4=B8=80=E6=9D=AF=E5=B7=A7=E5=85=8B?=
 =?UTF-8?q?=E5=8A=9B?= <321666457@qq.com>
Date: Thu, 28 May 2026 13:22:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Pagination/index.vue | 1 +
 src/views/system/user/authRole.vue  | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index f615f61c..c685fa55 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -17,6 +17,7 @@
 <script setup name="Pagination" lang="ts">
 import { scrollTo } from '@/utils/scroll-to';
 import { propTypes } from '@/utils/propTypes';
+import { computed } from 'vue';
 
 const props = defineProps({
   total: propTypes.number,
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index d322942b..9c476f72 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -56,10 +56,11 @@
 </template>
 
 <script setup name="AuthRole" lang="ts">
+import { getCurrentInstance, nextTick, onMounted, ref } from 'vue';
 import { RoleVO } from '@/api/system/role/types';
 import { getAuthRole, updateAuthRole } from '@/api/system/user';
 import { UserForm } from '@/api/system/user/types';
-import { RouteLocationNormalized } from 'vue-router';
+import { RouteLocationNormalized, useRoute } from 'vue-router';
 import { parseTime } from '@/utils/ruoyi';
 
 const route = useRoute();
@@ -111,7 +112,7 @@ const close = () => {
     redirectedFrom: undefined,
     path: '/system/user'
   };
-  proxy?.$tab.closeOpenPage(obj);
+  proxy?.$tab.closeOpenPage({ path: obj.path });
 };
 /** 提交按钮 */
 const submitForm = async () => {

From 2cc597de444c186e877e2368a28e3fc050a0cf73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=96=E5=8A=B1=E4=B8=80=E6=9D=AF=E5=B7=A7=E5=85=8B?=
 =?UTF-8?q?=E5=8A=9B?= <321666457@qq.com>
Date: Mon, 1 Jun 2026 21:35:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index d5033f1d..8e0e6822 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container home">
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>RuoYi-Vue-Plus多租户管理系统</h2>
+        <h2>RuoYi-Vue-Plus多租户管理系统，这是ts分支</h2>
         <p>
           RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 分布式集群 场景升级(不兼容原框架)
           <br />