Merge branch 'dev'

Author: windbytes

bun.lock

@@ -41,7 +41,7 @@
     "react-router": "^7.6.2",
     "screenfull": "^6.0.2",
     "tailwind-merge": "^3.3.1",
-    "zustand": "^5.0.5"
+    "zustand": "^5.0.6"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.0.5",

package.json

@@ -1,5 +1,5 @@
-import { dynamicRoutes } from '@/router/router';
 import { matchRoutes, useLocation } from 'react-router';
+import { dynamicRoutes } from '@/router/router';
 
 /**
  * 获取当前路由的匹配菜单 key

src/hooks/useCurrentMenuKey.ts

@@ -1,23 +1,20 @@
 import { useMenuStore } from '@/stores/store';
-import { useCurrentMenuKey } from './useCurrentMenuKey';
 import { useUserStore } from '@/stores/userStore';
+import { useCurrentMenuKey } from './useCurrentMenuKey';
 
 /**
  * 结合当前菜单权限，判断用户是否有权限
  * @param requiredPermissions 需要检查的权限数组
  * @param mode "AND"（必须全部匹配） | "OR"（只需匹配一个）
  * @returns {boolean} 是否有权限
  */
-export function usePermission(
-  requiredPermissions: string[],
-  mode: 'AND' | 'OR' = 'OR',
-): boolean {
+export function usePermission(requiredPermissions: string[], mode: 'AND' | 'OR' = 'OR'): boolean {
   const { menus } = useMenuStore();
   const { loginUser } = useUserStore();
   const currentMenuKey = useCurrentMenuKey();
   // 获取当前菜单的权限（如果传入了 currentMenuKey）
   const currentMenu = findMenuByKey(menus, currentMenuKey);
-  const menuPermission = currentMenu?.permission || []; // 例如："user:view"
+  const menuPermission = currentMenu?.meta?.permissionList || []; // 例如："user:view"
   // 判断是否是管理员
   const isAdmin = loginUser === 'admin';
   if (isAdmin) {

src/hooks/usePermission.ts

@@ -19,6 +19,7 @@ const translation = {
     upload: 'upload',
     download: 'download',
     preview: 'preview',
+    detail: 'detail',
     copy: 'copy',
     paste: 'paste',
     cut: 'cut',

src/locales/en-US/common.ts

@@ -51,5 +51,9 @@ const menu = {
     main: 'Message',
     template: 'Template',
   },
+  editor: {
+    main: 'Editor',
+    docWriter: 'Doc Writer',
+  },
 };
 export default menu;

src/locales/en-US/menu.ts

@@ -19,6 +19,7 @@ const translation = {
     upload: '上传',
     download: '下载',
     preview: '预览',
+    detail: '详情',
     copy: '复制',
     paste: '粘贴',
     cut: '剪切',

src/locales/zh-CN/common.ts

@@ -51,5 +51,9 @@ const menu = {
     main: '消息中心',
     template: '消息模板',
   },
+  editor: {
+    main: '编辑器',
+    docWriter: '文档编辑器'
+  }
 };
 export default menu;

src/locales/zh-CN/menu.ts

@@ -184,7 +184,7 @@ const Login: React.FC = () => {
           <div className={styles['login-form']}>
             <div className="login-title">
               <p className="text-[28px] text-center m-0">
-                <span className="font-bold">{t('login.title')}</span>
+                <span className="font-bold">{t('login.login')}</span>
               </p>
             </div>
             <div className="form" style={{ marginTop: '40px' }}>
@@ -196,7 +196,7 @@ const Login: React.FC = () => {
                     autoFocus
                     autoComplete="off"
                     allowClear
-                    placeholder="用户名(访问用户):nexus"
+                    placeholder={`${t('login.username')}:nexus`}
                     prefix={<UserOutlined />}
                   />
                 </Form.Item>
@@ -205,7 +205,7 @@ const Login: React.FC = () => {
                     size="large"
                     allowClear
                     autoComplete="off"
-                    placeholder="密码:123456"
+                    placeholder={`${t('login.password')}:123456`}
                     prefix={<LockOutlined />}
                   />
                 </Form.Item>

src/pages/Login/index.tsx

@@ -0,0 +1,12 @@
+/**
+ * 数据库连接
+ * @returns
+ */
+const Database: React.FC = () => {
+  return (
+    <div>
+      <h1>Database</h1>
+    </div>
+  );
+};
+export default Database;