Merge branch 'dev'

Author: windbytes

.biomeignore

@@ -0,0 +1,6 @@
+node_modules
+dist
+build
+*.min.js
+*.bundle.js
+

biome.json

@@ -6,8 +6,7 @@
     "useIgnoreFile": true
   },
   "files": {
-    "ignoreUnknown": false,
-    "ignore": ["node_modules", "dist", "build", "*.min.js", "*.bundle.js"]
+    "ignoreUnknown": false
   },
   "formatter": {
     "enabled": true,
@@ -18,9 +17,6 @@
     "lineWidth": 120,
     "attributePosition": "auto"
   },
-  "organizeImports": {
-    "enabled": true
-  },
   "linter": {
     "enabled": true,
     "rules": {
@@ -31,21 +27,21 @@
         "useKeyWithMouseEvents": "off",
         "useValidAnchor": "warn",
         "useAltText": "warn",
-        "useAriaPropsForRole": "warn",
-        "useAriaProptypes": "warn",
-        "useAriaProps": "warn"
+        "useAriaPropsForRole": "warn"
       },
       "complexity": {
         "recommended": true,
-        "noForEach": "off"
+        "noForEach": "off",
+        "useArrowFunction": "error"
       },
       "correctness": {
         "recommended": true,
         "noUnusedVariables": "warn",
         "noUnusedImports": "error",
         "noUnusedPrivateClassMembers": "warn",
-        "useExhaustiveDependencies": "warn",
-        "useHookAtTopLevel": "error"
+        "useExhaustiveDependencies": "off",
+        "useHookAtTopLevel": "error",
+        "noUnreachable": "error"
       },
       "performance": {
         "recommended": true
@@ -55,16 +51,10 @@
       },
       "style": {
         "recommended": true,
-        "noVar": "error",
         "useConst": "error",
         "useTemplate": "error",
-        "useArrowFunction": "error",
-        "useShorthandArrayType": "error",
         "useShorthandAssign": "error",
-        "useSingleCaseStatement": "error",
-        "useSingleVarDeclarator": "error",
         "useBlockStatements": "error",
-        "useConstAssertions": "off",
         "useDefaultParameterLast": "error",
         "useExponentiationOperator": "error",
         "useFragmentSyntax": "error",
@@ -73,10 +63,8 @@
         },
         "useNodejsImportProtocol": "off",
         "useNumberNamespace": "error",
-        "useNumericLiterals": "error",
         "useSelfClosingElements": "error",
         "useShorthandFunctionType": "error",
-        "useSingleClassPerFile": "off",
         "useImportType": "error"
       },
       "suspicious": {
@@ -88,15 +76,13 @@
         "noDuplicateObjectKeys": "error",
         "noDuplicateParameters": "error",
         "noEmptyBlockStatements": "warn",
-        "noExtraBooleanCast": "error",
         "noFallthroughSwitchClause": "error",
         "noPrototypeBuiltins": "error",
         "noRedeclare": "error",
         "noShadowRestrictedNames": "error",
-        "noUnreachable": "error",
         "noUnsafeNegation": "error",
-        "useGetterReturn": "error",
-        "useValidTypeof": "error"
+        "noVar": "error",
+        "useGetterReturn": "error"
       },
       "nursery": {
         "useSortedClasses": "off"
@@ -126,7 +112,7 @@
   },
   "overrides": [
     {
-      "include": ["*.ts", "*.tsx"],
+      "includes": ["*.ts", "*.tsx"],
       "linter": {
         "rules": {
           "correctness": {

package.json

@@ -30,16 +30,16 @@
     "@flowgram.ai/shortcuts-plugin": "^1.0.3",
     "@monaco-editor/react": "^4.7.0",
     "@tanstack/react-query": "^5.90.11",
-    "@tanstack/react-router": "^1.139.10",
+    "@tanstack/react-router": "^1.139.12",
     "@zxcvbn-ts/core": "^3.0.4",
     "ahooks": "^3.9.6",
-    "antd": "^6.0.0",
+    "antd": "^6.0.1",
     "axios": "^1.13.2",
     "clsx": "^2.1.1",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.19",
     "echarts": "^6.0.0",
-    "i18next": "^25.6.3",
+    "i18next": "^25.7.1",
     "jsencrypt": "^3.5.4",
     "keepalive-for-react": "^5.0.2",
     "lodash-es": "^4.17.21",
@@ -52,15 +52,15 @@
     "react-is": "^19.2.0",
     "screenfull": "^6.0.2",
     "tailwind-merge": "^3.4.0",
-    "zustand": "^5.0.8"
+    "zustand": "^5.0.9"
   },
   "devDependencies": {
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.28.0",
     "@biomejs/biome": "^2.3.8",
     "@iconify/react": "^6.0.2",
     "@tailwindcss/vite": "^4.1.17",
-    "@tanstack/react-router-devtools": "^1.139.10",
+    "@tanstack/react-router-devtools": "^1.139.12",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.19.1",

src/App.tsx

@@ -1,14 +1,15 @@
-import { Router } from '@/router';
-import { commonService } from '@/services/common';
-import { useMenuStore } from '@/stores/store';
-import { useUserStore } from '@/stores/userStore';
-import { antdUtils } from '@/utils/antdUtil';
 import { Icon } from '@iconify/react';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
 import { App as AntdApp, Spin } from 'antd';
 import type React from 'react';
 import { useEffect } from 'react';
 import { useShallow } from 'zustand/react/shallow';
+import { Router } from '@/router';
+import { commonService } from '@/services/common';
+import { useMenuStore } from '@/stores/store';
+import { useUserStore } from '@/stores/userStore';
+import type { RouteItem } from '@/types/route';
+import { antdUtils } from '@/utils/antdUtil';
 
 /**
  * 主应用
@@ -45,7 +46,7 @@ const App: React.FC = () => {
     if (isLogin && roleId) {
       const cachedMenu = queryClient.getQueryData(['menuData', roleId]);
       if (cachedMenu) {
-        setMenus(cachedMenu as any);
+        setMenus(cachedMenu as RouteItem[]);
       } else {
         refetch();
       }

src/components/HotKeyProvider/index.tsx

@@ -1,23 +1,22 @@
-import { usePlatformHotkey } from "@/hooks/usePlatformHotkey"
-import { useLogout } from "@/hooks/useLogout"
-import useGlobalUIStore from "@/stores/globalUIStore"
-import { type ReactNode } from "react"
-import { useShallow } from "zustand/shallow"
-import { usePreferencesStore } from "@/stores/store"
+import type { ReactNode } from 'react';
+import { useShallow } from 'zustand/shallow';
+import { useLogout } from '@/hooks/useLogout';
+import { usePlatformHotkey } from '@/hooks/usePlatformHotkey';
+import useGlobalUIStore from '@/stores/globalUIStore';
+import { usePreferencesStore } from '@/stores/store';
 
 /**
  * 快捷键提供者
  * @param children 子组件
  * @returns 子组件
  */
 const HotKeyProvider: React.FC<{ children: ReactNode }> = ({ children }: { children: ReactNode }) => {
-
   const { setSearchMenuModalOpen, setSettingMenuModalOpen } = useGlobalUIStore(
     useShallow((state) => ({
       setSearchMenuModalOpen: state.setSearchMenuModalOpen,
       setSettingMenuModalOpen: state.setSettingMenuModalOpen,
     }))
-  )
+  );
 
   const { globalLogout, globalLockScreen, globalPreferences, enable, updatePreferences } = usePreferencesStore(
     useShallow((state) => ({
@@ -27,7 +26,7 @@ const HotKeyProvider: React.FC<{ children: ReactNode }> = ({ children }: { child
       enable: state.preferences.shortcut.enable,
       updatePreferences: state.updatePreferences,
     }))
-  )
+  );
 
   const handleLogout = useLogout();
 
@@ -45,7 +44,7 @@ const HotKeyProvider: React.FC<{ children: ReactNode }> = ({ children }: { child
 
   // 始终注册全局快捷键（偏好设置），通过 enabled 控制是否启用
   usePlatformHotkey({
-    mac: 'meta+,',
+    mac: 'alt+,',
     windows: 'ctrl+alt+s',
     handler: (event) => {
       event.preventDefault();
@@ -57,7 +56,7 @@ const HotKeyProvider: React.FC<{ children: ReactNode }> = ({ children }: { child
 
   // 始终注册全局快捷键（退出登录），通过 enabled 控制是否启用
   usePlatformHotkey({
-    mac: 'option+q',
+    mac: 'alt+q',
     windows: 'alt+q',
     handler: (event) => {
       event.preventDefault();
@@ -69,7 +68,7 @@ const HotKeyProvider: React.FC<{ children: ReactNode }> = ({ children }: { child
 
   // 快捷键锁屏
   usePlatformHotkey({
-    mac: 'option+l',
+    mac: 'alt+l',
     windows: 'alt+l',
     handler: (event) => {
       event.preventDefault();
@@ -81,6 +80,6 @@ const HotKeyProvider: React.FC<{ children: ReactNode }> = ({ children }: { child
 
   // 直接返回 children 即可
   return children;
-}
+};
 
-export default HotKeyProvider;
+export default HotKeyProvider;

src/components/KeepAlive/index.tsx

@@ -1,7 +1,9 @@
-import { useTabStore } from '@/stores/tabStore';
-import KeepAlive, { useKeepAliveRef, type KeepAliveRef } from 'keepalive-for-react';
-import React, { memo, useEffect, useMemo } from 'react';
+import { useLocation } from '@tanstack/react-router';
+import KeepAlive, { type KeepAliveRef, useKeepAliveRef } from 'keepalive-for-react';
+import type React from 'react';
+import { memo, useEffect, useMemo } from 'react';
 import { useShallow } from 'zustand/shallow';
+import { useTabStore } from '@/stores/tabStore';
 
 interface KeepAliveProps {
   children: React.ReactNode;
@@ -17,14 +19,13 @@ const KeepAliveLayout: React.FC<KeepAliveProps> = memo(({ children }) => {
       activeKey: state.activeKey,
     }))
   );
+  const location = useLocation();
 
   const aliveRef = useKeepAliveRef();
 
   // Filter tabs that should be kept alive
   const keepAliveIncludes = useMemo(() => {
-    return tabs
-      .filter((tab) => tab.route?.meta?.keepAlive)
-      .map((tab) => tab.key);
+    return tabs.filter((tab) => tab.route?.meta?.keepAlive).map((tab) => tab.key);
   }, [tabs]);
 
   // Handle Reload
@@ -53,16 +54,16 @@ const KeepAliveLayout: React.FC<KeepAliveProps> = memo(({ children }) => {
   }, [tabs]);
 
   return (
-      <KeepAlive
-        viewTransition
-        aliveRef={aliveRef as React.RefObject<KeepAliveRef | undefined>}
-        activeCacheKey={activeKey}
-        include={keepAliveIncludes}
-        max={10} // Default max, can be configured
-        cacheNodeClassName="h-full w-full" // Ensure cached nodes take full height/width if needed
-      >
-        {children}
-      </KeepAlive>
+    <KeepAlive
+      viewTransition
+      aliveRef={aliveRef as React.RefObject<KeepAliveRef | undefined>}
+      activeCacheKey={activeKey || location.pathname}
+      include={keepAliveIncludes}
+      max={10} // Default max, can be configured
+      cacheNodeClassName="h-full w-full" // Ensure cached nodes take full height/width if needed
+    >
+      {children}
+    </KeepAlive>
   );
 });
 

src/hooks/usePlatformHotkey.ts

@@ -16,11 +16,11 @@ type PlatformHotkeyOptions = {
  * @returns 返回当前使用的快捷键
  */
 export const usePlatformHotkey = ({ mac, windows, handler, enabled = true }: PlatformHotkeyOptions) => {
-  const isMacOS = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
-  const hotkey = isMacOS ? mac : windows;
+  const isMacOS = (navigator as any).userAgentData?.platform === 'macOS';
+  const hotkey = isMacOS ? mac.replace('l', 'KeyL').replace('k', 'KeyK').replace(',', 'KeyComma') : windows;
 
   // 使用 enabled 选项控制快捷键是否启用
-  useHotkeys(hotkey, handler, { enabled });
+  useHotkeys(hotkey, handler, { enabled, enableOnContentEditable: false });
 
   return hotkey;
 };

src/layouts/Content/index.tsx

@@ -34,7 +34,7 @@ const Content = memo(({ children }: ContentProps) => {
 
   return (
     <Layout.Content
-      className="overflow-x-hidden overflow-y-auto h-full relative flex flex-col p-2"
+      className="overflow-x-hidden overflow-y-auto h-full relative flex flex-col p-3"
       style={{ overscrollBehavior: 'contain' }}
     >
       <Suspense fallback={loadingFallback}>

src/layouts/Header/component/BreadcrumbNav.tsx

@@ -1,14 +1,14 @@
-import { useMenuStore, usePreferencesStore } from '@/stores/store';
-import type { RouteItem } from '@/types/route';
-import { getIcon } from '@/utils/optimized-icons';
-import { matchPathname, type MenuCaches } from '@/utils/utils';
 import { Link, useRouterState } from '@tanstack/react-router';
 import { Breadcrumb } from 'antd';
 import { t } from 'i18next';
 import type React from 'react';
-import { memo, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useShallow } from 'zustand/react/shallow';
+import { useMenuStore, usePreferencesStore } from '@/stores/store';
+import type { RouteItem } from '@/types/route';
+import { getIcon } from '@/utils/optimized-icons';
+import { type MenuCaches, matchPathname } from '@/utils/utils';
 import '../header.scss';
 
 /**
@@ -42,7 +42,7 @@ const BreadcrumbNav: React.FC = () => {
   // 组件的DOM内容
   return <Breadcrumb items={items} className="flex justify-between items-center ml-[16px]! nexus-breadcrumb" />;
 };
-export default memo(BreadcrumbNav);
+export default BreadcrumbNav;
 
 /**
  * 根据路径生成面包屑的路径内容
@@ -102,17 +102,18 @@ function patchBreadcrumb(
     const iconNode = joinIcon && menu.meta?.icon ? getIcon(menu.meta.icon) : null;
     const titleContent = t(menu.meta?.title as string);
     const isNotRoute = menu.meta?.menuType !== 2;
-    const title = (isLast || isNotRoute) ? (
-      <>
-        {iconNode}
-        <span className="px-1">{titleContent}</span>
-      </>
-    ) : (
-      <>
-        {iconNode}
-        <Link to={menu.path}>{titleContent}</Link>
-      </>
-    );
+    const title =
+      isLast || isNotRoute ? (
+        <>
+          {iconNode}
+          <span className="px-1">{titleContent}</span>
+        </>
+      ) : (
+        <>
+          {iconNode}
+          <Link to={menu.path}>{titleContent}</Link>
+        </>
+      );
 
     breadcrumbItems.push({
       key: menu.path,