fix:vue router name重复

README.md

@@ -12,10 +12,12 @@
 
 我深信，付费后台管理系统将为您带来更多的价值和便利，帮助您提升工作效率
 
+## 其他版本
+- [tp8 新版本](https://gitee.com/catchamin/catchadmin-tp)
+- [webman 高性能版本](https://gitee.com/catchamin/catchadmin-webman)
 
 ## ⚠️Thinkphp 用户注意
 由于新版本使用 `Laravel` 开发，所以请使用 `thinkphp` 分支或者 tag2.6.2，thinkphp 版本已经非常稳定了。
-[thinkphp 8.0 仓库，开发中...](https://gitee.com/catchamin/catchadmin-tp)
 
 ## 功能
 - [x] 用户管理 后台用户管理

package.json

@@ -11,7 +11,7 @@
         "@heroicons/vue": "^2.1.3",
         "@tinymce/tinymce-vue": "^5.1.1",
         "@vueuse/core": "^10.9.0",
-        "element-plus": "^2.6.2",
+        "element-plus": "^2.6.3",
         "nprogress": "^0.2.0",
         "pinia": "^2.1.7",
         "terser": "^5.29.2",

resources/admin/components/admin/table/search.vue

@@ -30,4 +30,8 @@ defineProps({
 })
 </script>
 
-<style scoped></style>
+<style scoped>
+:deep(.el-form-item) {
+    min-width: 240px;
+}
+</style>

resources/admin/layout/components/Menu/item.vue

@@ -9,7 +9,7 @@
     <slot />
   </el-sub-menu>
 
-  <el-menu-item v-else class="ct-menu-item" :index="menu?.path" @click="isMiniScreen() && store.changeExpaned()" :key="menu?.name">
+  <el-menu-item v-else class="ct-menu-item" :index="menu?.path" @click="isMiniScreen() && store.changeExpaned()" :key="menu?.path">
     <el-icon>
       <Icon :name="menu?.meta?.icon" v-if="menu?.meta?.icon" class="text-sm" />
     </el-icon>

resources/admin/stores/modules/tabs/index.ts

@@ -82,9 +82,15 @@ export const useNavTabStore = defineStore('nav_tabs', {
         },
 
         removeTab(index: number): void {
-            const goPath = this.tabs[index - 1].fullPath
+            const activeIndex = this.getActiveTabIndex()
+            if (index === activeIndex) {
+                this.tabs = this.tabs.filter((_, idx) => idx !== index);
+                router.push(this.tabs[index - 1].fullPath)
+            } else {
+                const goPath = activeIndex ? this.tabs[activeIndex].fullPath : this.tabs[index - 1].fullPath
                 this.tabs = this.tabs.filter((_, idx) => idx !== index);
                 router.push(goPath)
+            }
         },
 
 

resources/admin/stores/modules/user/permissions.ts

@@ -135,7 +135,7 @@ export const usePermissionsStore = defineStore('PermissionsStore', {
           }
           const menu: Menu = Object.assign({
             path: this.resolveRoutePathRoutePath(permission.route, path),
-            name: permission.module + '_' + permission.permission_mark,
+              name: permission.module + '_' + permission.permission_mark + permission.route.replace('/', '_'),
             component: importComponent,
             redirect: permission.redirect,
             meta: Object.assign({ title: permission.permission_name, icon: permission.icon, hidden: permission.hidden, active_menu: permission.active_menu }),