Merge branch 'dev' into flow

src/router/routes/index.ts

@@ -123,31 +123,6 @@ const dynamicConstantRoutes: ElegantRoute[] = [
       icon: 'material-symbols:account-circle-full',
       hideInMenu: true
     }
-  },
-  {
-    name: 'system',
-    path: '/system',
-    component: 'layout.base',
-    meta: {
-      title: 'system',
-      i18nKey: 'route.system',
-      localIcon: 'menu-system',
-      order: 1
-    },
-    children: [
-      {
-        name: 'system_oss-config',
-        path: '/system/oss-config',
-        component: 'view.system_oss-config',
-        meta: {
-          title: 'system_oss-config',
-          i18nKey: 'route.system_oss-config',
-          constant: true,
-          hideInMenu: true,
-          icon: 'hugeicons:configuration-01'
-        }
-      }
-    ]
   }
 ];
 

src/service/api/system/user.ts

@@ -80,6 +80,9 @@ export function fetchResetUserPassword(userId: CommonType.IdType, password: stri
   return request<boolean>({
     url: '/system/user/resetPwd',
     method: 'put',
+    headers: {
+      isEncrypt: true
+    },
     data: { userId, password }
   });
 }

src/store/modules/route/index.ts

@@ -100,6 +100,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
     authRoutes.value = Array.from(authRoutesMap.values());
   }
 
+  // eslint-disable-next-line complexity
   function parseRouter(route: ElegantConstRoute, parent?: ElegantConstRoute) {
     route.meta = route.meta ? route.meta : { title: route.name };
     const isLayout = route.component === 'Layout';
@@ -129,6 +130,10 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
 
     // @ts-expect-error no hidden field
     route.meta.hideInMenu = route.hidden;
+    if (route.meta.hideInMenu && parent) {
+      // @ts-expect-error parent.name is activeMenu type
+      route.meta.activeMenu = parent.name;
+    }
     // 是否需要keepAlive
     route.meta.keepAlive = !route.meta.noCache;