From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:36:18 +0800
Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev

---
 src/router/index.ts |   53 ++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 76a81bc..2ab09dd 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createWebHistory, createRouter, RouteOption } from 'vue-router';
+import { createWebHistory, createRouter, RouteRecordRaw } from 'vue-router';
 /* Layout */
 import Layout from '@/layout/index.vue';
 
@@ -25,7 +25,7 @@
  */
 
 // 鍏叡璺敱
-export const constantRoutes: RouteOption[] = [
+export const constantRoutes: RouteRecordRaw[] = [
   {
     path: '/redirect',
     component: Layout,
@@ -38,9 +38,9 @@
     ]
   },
   {
-    path: '/social-login',
+    path: '/social-callback',
     hidden: true,
-    component: () => import('@/layout/components/SocialLogin/index.vue')
+    component: () => import('@/layout/components/SocialCallback/index.vue')
   },
   {
     path: '/login',
@@ -92,7 +92,7 @@
 ];
 
 // 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
-export const dynamicRoutes: RouteOption[] = [
+export const dynamicRoutes: RouteRecordRaw[] = [
   {
     path: '/system/user-auth',
     component: Layout,
@@ -103,7 +103,7 @@
         path: 'role/:userId(\\d+)',
         component: () => import('@/views/system/user/authRole.vue'),
         name: 'AuthRole',
-        meta: { title: '鍒嗛厤瑙掕壊', activeMenu: '/system/user', icon: '' }
+        meta: { title: '鍒嗛厤瑙掕壊', activeMenu: '/system/user', icon: '', noCache: true }
       }
     ]
   },
@@ -117,7 +117,7 @@
         path: 'user/:roleId(\\d+)',
         component: () => import('@/views/system/role/authUser.vue'),
         name: 'AuthUser',
-        meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role', icon: '' }
+        meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role', icon: '', noCache: true }
       }
     ]
   },
@@ -131,7 +131,7 @@
         path: 'index/:dictId(\\d+)',
         component: () => import('@/views/system/dict/data.vue'),
         name: 'Data',
-        meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict', icon: '' }
+        meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict', icon: '', noCache: true }
       }
     ]
   },
@@ -139,13 +139,13 @@
     path: '/system/oss-config',
     component: Layout,
     hidden: true,
-    permissions: ['system:oss:list'],
+    permissions: ['system:ossConfig:list'],
     children: [
       {
         path: 'index',
         component: () => import('@/views/system/oss/config.vue'),
         name: 'OssConfig',
-        meta: { title: '閰嶇疆绠＄悊', activeMenu: '/system/oss', icon: '' }
+        meta: { title: '閰嶇疆绠＄悊', activeMenu: '/system/oss', icon: '', noCache: true }
       }
     ]
   },
@@ -159,7 +159,35 @@
         path: 'index/:tableId(\\d+)',
         component: () => import('@/views/tool/gen/editTable.vue'),
         name: 'GenEdit',
-        meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen', icon: '' }
+        meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen', icon: '', noCache: true }
+      }
+    ]
+  },
+  {
+    path: '/workflow/leaveEdit',
+    component: Layout,
+    hidden: true,
+    permissions: ['workflow:leave:edit'],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/workflow/leave/leaveEdit.vue'),
+        name: 'leaveEdit',
+        meta: { title: '璇峰亣鐢宠', activeMenu: '/workflow/leave', noCache: true }
+      }
+    ]
+  },
+  {
+    path: '/workflow/design',
+    component: Layout,
+    hidden: true,
+    permissions: ['workflow:leave:edit'],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/workflow/processDefinition/design.vue'),
+        name: 'design',
+        meta: { title: '娴佺▼璁捐', activeMenu: '/workflow/processDefinition', noCache: true }
       }
     ]
   }
@@ -175,9 +203,8 @@
   scrollBehavior(to, from, savedPosition) {
     if (savedPosition) {
       return savedPosition;
-    } else {
-      return { top: 0 };
     }
+    return { top: 0 };
   }
 });
 

--
Gitblit v1.9.3