Merge remote-tracking branch 'origin/main'

src/layouts/modules/global-menu/horizontal-mix-menu.vue

@@ -12,7 +12,10 @@ const { routerPushByKey } = useRouterPush();
 
 function handleSelectMixMenu(menu: App.Global.Menu) {
   setActiveFirstLevelMenuKey(menu.key);
-
+  // 选择首个子菜单
+  if (Array.isArray(menu.children) && menu.children.length > 0) {
+    routerPushByKey(menu.children[0].routeKey);
+  }
   if (!menu.children?.length) {
     routerPushByKey(menu.routeKey);
   }

src/locales/langs/en-us.ts

@@ -768,7 +768,6 @@ const local: any = {
       selectGroup:'No Group',
       total:'Total',
       name:'SSID Name',
-      security:'Security',
       none:'None',
       security: {
         security:'Security',

src/locales/langs/zh-cn.ts

@@ -769,12 +769,14 @@ const local:any = {
       selectGroup:'无网络组',
       total:'共',
       name:'SSID名称',
-      security:'安全性',
       none:'无',
-      wpaEnterprise:'WPA-Enterprise',
-      wpaPersonal:'WPA-Personal',
-      ppskWithoutRadius:'PPSK without RADIUS',
-      ppskWithRadius:'PPSK with RADIUS',
+      security: {
+        security:'安全性',
+        wpaEnterprise: 'WPA-Enterprise',
+        wpaPersonal: 'WPA-Personal',
+        ppskWithoutRadius: 'PPSK without RADIUS',
+        ppskWithRadius: 'PPSK with RADIUS',
+      },
       band:'频段',
       guestNetwork:'访客网络',
       enable:'开启',

src/views/manage/user/index.vue

@@ -7,7 +7,7 @@ import { enableStatusRecord } from '@/constants/business';
 import { SimpleScrollbar } from '~/packages/materials/src';
 import UserOperateDrawer from './modules/user-operate-drawer.vue';
 import UserSearch from './modules/user-search.vue';
-import {  LockOutlined } from '@ant-design/icons-vue';
+import { UserOutlined, LockOutlined } from '@ant-design/icons-vue';
 
 const wrapperEl = shallowRef<HTMLElement | null>(null);
 const { height: wrapperElHeight } = useElementSize(wrapperEl);