Merge remote-tracking branch 'origin/dev'

Author: windbytes

bun.lock

@@ -45,21 +45,21 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.0.5",
-    "@rsbuild/core": "^1.3.22",
+    "@rsbuild/core": "^1.4.0",
     "@rsbuild/plugin-image-compress": "^1.2.0",
     "@rsbuild/plugin-react": "^1.3.2",
     "@rsbuild/plugin-sass": "^1.3.2",
     "@rsbuild/plugin-svgr": "^1.2.0",
     "@rsdoctor/rspack-plugin": "^1.1.4",
-    "@tailwindcss/postcss": "^4.1.10",
+    "@tailwindcss/postcss": "^4.1.11",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.15.33",
     "@types/react": "^18.3.23",
     "@types/react-dom": "^18.3.7",
     "rsbuild-plugin-html-minifier-terser": "^1.1.1",
     "rspack-plugin-mock": "^1.1.0",
-    "tailwindcss": "^4.1.10",
+    "tailwindcss": "^4.1.11",
     "typescript": "^5.8.3"
   }
 }

package.json

@@ -7,6 +7,8 @@ import { pluginReact } from '@rsbuild/plugin-react';
 import { pluginSvgr } from '@rsbuild/plugin-svgr';
 import { pluginSass } from '@rsbuild/plugin-sass';
 
+const isDev = process.env.NODE_ENV === 'development';
+
 export default defineConfig({
   plugins: [
     // 表示将react和router相关的包拆分为单独的chunk
@@ -79,7 +81,7 @@ export default defineConfig({
       },
     },
     // 启用构建缓存
-    buildCache: true,
+    buildCache: !isDev,
     // 移除console.[method]语句
     removeConsole: true,
     // 开启包文件分析

rsbuild.config.ts

@@ -1,41 +1,40 @@
-import ContentCompact from "../icons/ContentCompact";
-import HeaderNav from "../icons/HeaderNav";
-import "./layout.scss";
+import ContentCompact from '../icons/ContentCompact';
+import HeaderNav from '../icons/HeaderNav';
+import './layout.scss';
 
 /**
  * 预设内容布局
  */
 const PRESET = [
   {
     name: 'wide',
-    type: HeaderNav
+    type: HeaderNav,
   },
   {
     name: 'compact',
-    type: ContentCompact
-  }
+    type: ContentCompact,
+  },
 ];
 
 /**
  * 内容设置
- * @returns 
+ * @returns
  */
 const Content: React.FC = () => {
   return (
-    <div style={{display: 'flex', width: '100%', gap: '1.25rem'}}>
-      {
-        PRESET.map((item) => (
-          <div key={item.name} style={{width: '100px', cursor: 'pointer', flexDirection: 'column'}}>
-            <div className="outline-box" style={{display: 'flex', justifyContent: 'center', alignItems: 'center'}}>
-              <item.type />
-            </div>
-            <div className="layoutTitle">
-              {item.name}
-            </div>
+    <div style={{ display: 'flex', width: '100%', gap: '1.25rem' }}>
+      {PRESET.map((item) => (
+        <div key={item.name} style={{ width: '100px', cursor: 'pointer', flexDirection: 'column' }}>
+          <div className="outline-box" style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
+            {(() => {
+              const Comp = item.type;
+              return <Comp />;
+            })()}
           </div>
-        ))
-      }
+          <div className="layoutTitle">{item.name}</div>
+        </div>
+      ))}
     </div>
   );
 };
-export default Content;
+export default Content;

src/layouts/Header/component/Setting/Layout/Content.tsx

@@ -82,7 +82,10 @@ const MyLayout: React.FC = () => {
               justifyContent: 'center',
             }}
           >
-            <item.type />
+            {(() => {
+              const Comp = item.type;
+              return <Comp />;
+            })()}
           </div>
           <div className="layoutTitle">
             {item.name}

src/layouts/Header/component/Setting/Layout/MyLayout.tsx

@@ -171,8 +171,8 @@ const UserDropdown: React.FC = memo(() => {
   return (
     <>
       <Dropdown
-        trigger={['click']}
-        menu={{ items, triggerSubMenuAction: 'click' }}
+        trigger={['hover']}
+        menu={{ items, triggerSubMenuAction: 'hover' }}
         popupRender={renderDropdown}
         placement="bottomLeft"
         overlayStyle={{ width: 240 }}

src/layouts/Header/component/UserDropdown/index.tsx

@@ -97,7 +97,7 @@ const Header: React.FC = memo(() => {
           <Badge count={5}>
             <MailOutlined style={{ cursor: 'pointer', fontSize: '18px' }} />
           </Badge>
-          <Dropdown placement="bottomRight" popupRender={() => <MessageBox />}>
+          <Dropdown placement="bottom" popupRender={() => <MessageBox />}>
             <Badge count={5}>
               <BellOutlined style={{ cursor: 'pointer', fontSize: '18px' }} />
             </Badge>

src/layouts/Header/index.tsx

@@ -9,6 +9,7 @@ const translation = {
       doc: 'Docs',
       profile: 'Profile',
       support: 'Support',
+      switchUser: 'Switch User',
       feedback: 'Feedback',
       question: 'Question',
       refresh: 'Refresh Cache',

src/locales/en-US/layout.ts

@@ -9,6 +9,7 @@ const translation = {
       doc: '文档',
       profile: '个人中心',
       support: '支持',
+      switchUser: '切换用户',
       feedback: '反馈',
       question: '问题',
       refresh: '刷新缓存',

src/locales/zh-CN/layout.ts

@@ -1,7 +1,7 @@
 const menu = {
   home: '首页',
   statics: {
-    main: '统计',
+    main: '数据统计',
     messageSearch: '消息查询',
     errorStatics: '错误统计',
     endpoint: '端点',
@@ -38,7 +38,7 @@ const menu = {
     announcement: '系统公告',
   },
   monitor: {
-    main: '监控',
+    main: '系统监控',
     timer: '定时器',
   },
   integration: {