Pre Merge pull request !266 from 奖励一杯巧克力/ts

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,

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 />

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 () => {