192 Commits

Author SHA1 Message Date
zsq
6a443be27b Merge pull request 'develop' (#30) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 4m12s
Reviewed-on: #30
2026-03-31 17:43:06 +08:00
Your Name
4c844e1a12 fix:更新优化
All checks were successful
Build and Push Docker Image / build (push) Successful in 4m14s
2026-03-31 16:45:08 +08:00
Your Name
17e2fca04b feat: add user info (avatar, name, logout) to PageContainer header right side 2026-03-30 17:59:19 +08:00
Your Name
03a170873a refactor: restructure PageContainer header with user info on right side 2026-03-30 17:21:36 +08:00
Your Name
2242e7802b fix: optimize layout right side structure with fixed header and content 2026-03-30 17:16:08 +08:00
Your Name
42612b21ee fix: restore PageContainer header with Tabs display 2026-03-30 17:12:02 +08:00
Your Name
6498edff1b fix: ensure PageContainer affix header displays, hide only generic ant-affix 2026-03-30 17:08:48 +08:00
Your Name
a2fe13a54b style: hide ant-affix fixed positioning elements 2026-03-30 17:07:44 +08:00
Your Name
d6834f2520 fix: ensure header displays with user info, hide breadcrumb properly 2026-03-30 17:02:59 +08:00
Your Name
153a4b9413 fix: hide breadcrumb navigation and header title 2026-03-30 16:55:42 +08:00
Your Name
4a388992cc refactor: use UmiJS built-in header instead of CustomHeader 2026-03-30 16:53:18 +08:00
Your Name
238166ca44 fix: make PageContainer header fixed below CustomHeader with reduced height 2026-03-30 16:41:17 +08:00
Your Name
79a2409ad9 fix: use padding-top instead of fixed positioning for tabs header 2026-03-30 16:36:56 +08:00
Your Name
00c66237d1 fix: prevent tabs header overlap with CustomHeader and reduce height 2026-03-30 16:33:22 +08:00
Your Name
4fe94592e6 fix: adjust z-index and height to prevent overlap, reduce tabs size 2026-03-30 16:30:51 +08:00
Your Name
7c028eb399 fix: reduce gap between CustomHeader and tabs header 2026-03-30 16:24:07 +08:00
Your Name
8c2af70ae3 style: fix tabs header to be fixed below CustomHeader 2026-03-30 16:21:04 +08:00
Your Name
6b4a661f59 fix: use window.location.pathname instead of useLocation hook 2026-03-30 16:07:57 +08:00
Your Name
c2254304ca fix: correct useLocation import from @umijs/max 2026-03-30 16:07:05 +08:00
Your Name
b5ab96874b fix: add fixed CustomHeader in root container with top:0 positioning 2026-03-30 16:06:31 +08:00
Your Name
5de714572a fix: try headerContentRender and force header display 2026-03-30 16:03:05 +08:00
Your Name
602587d5f3 fix: restore headerRender with CustomHeader component 2026-03-30 16:00:41 +08:00
Your Name
0cdf53523e fix: hide sidebar user actions and add navTheme config 2026-03-30 16:00:31 +08:00
Your Name
5141e9c72b fix: remove avatarProps to prevent duplicate user info in sidebar 2026-03-30 15:02:58 +08:00
Your Name
418ff71af0 style: add global styles for custom layout components 2026-03-30 14:58:17 +08:00
Your Name
ac6967024f feat: integrate CustomHeader and CustomLogo into layout
- Add imports for CustomHeader and CustomLogo components
- Add headerRender function to render custom header
- Add logoRenderer function to render custom logo with collapsed state
- Components properly integrated into layout configuration

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-30 14:56:14 +08:00
Your Name
05089b76de chore: add layout components export index 2026-03-30 14:54:54 +08:00
Your Name
1605e698c9 feat: add CustomHeader component with user dropdown 2026-03-30 14:53:42 +08:00
Your Name
4451bc4c2f feat: add CustomLogo component with collapse support 2026-03-30 14:52:54 +08:00
Your Name
4b850b41bc style: update theme tokens to white color scheme
- Update bgLayout to #f5f5f5 (light gray layout background)
- Update header colorBgHeader to #ffffff (white header background)
- Update header text colors to dark (#262626, #595959)
- Increase header height to 64px
- Add comprehensive sider color tokens for white menu theme
- Add selected menu item styling with blue highlight

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-30 14:52:18 +08:00
Your Name
769e5acad5 refactor: change layout mode from mix to side
Changed layout from 'mix' to 'side' mode to optimize the layout structure to a left-right split layout. Also disabled default logo to prepare for custom logo component.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-30 14:51:25 +08:00
Your Name
a7e3edff28 chore: backup layoutConfig before refactoring 2026-03-30 14:50:19 +08:00
Your Name
91047c85fe docs: 添加layout结构优化实施计划
详细的分步实施计划包含15个任务:
- 备份现有配置
- 修改layout模式和主题
- 创建自定义Logo和Header组件
- 添加全局样式
- 完整的测试验收流程

每个任务包含具体的代码、命令和验证标准。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-30 14:48:01 +08:00
Your Name
ba5561b72d docs: 添加layout结构优化设计文档
设计文档详细描述了将layout从mix模式改为side左右分栏结构的方案:
- 左侧:Logo区域 + 导航菜单
- 右侧:Header + 页面内容
- 白色主题,干净整洁的视觉风格
- 侧边栏可折叠,保持现有权限系统

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-30 14:45:40 +08:00
zsq
3f09bf8260 Merge pull request 'fix:更新优化' (#29) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 4m34s
Reviewed-on: #29
2026-03-04 09:51:10 +08:00
Your Name
103b9e7340 fix:更新优化
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m48s
2026-02-26 15:49:53 +08:00
zsq
d81d240917 Merge pull request 'fix:更新员工端权限' (#28) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m37s
Reviewed-on: #28
2026-02-24 17:54:24 +08:00
Your Name
9df9ebb68f fix:更新员工端权限
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m40s
2026-02-24 17:48:53 +08:00
zsq
077117de4b Merge pull request 'fix:更新' (#27) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m39s
Reviewed-on: #27
2026-02-06 17:59:33 +08:00
Your Name
df22f93ca9 fix:更新
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m46s
2026-02-06 17:39:43 +08:00
zsq
9d8eb74d9a Merge pull request 'fix:更新金刚区配置' (#26) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m45s
Reviewed-on: #26
2026-01-30 17:07:29 +08:00
Your Name
713cf3a06a fix:更新金刚区配置
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m51s
2026-01-30 17:07:07 +08:00
zsq
bd77179459 Merge pull request 'develop' (#25) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m55s
Reviewed-on: #25
2026-01-30 09:16:54 +08:00
Your Name
f31633ce95 fix:更新配置主题色
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m44s
2026-01-29 18:44:33 +08:00
Your Name
0b99e45527 fix:添加返回按钮
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m47s
2026-01-29 17:28:51 +08:00
zsq
f0fcc10e61 Merge pull request 'fix:更新金刚区1' (#24) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 4m3s
Reviewed-on: #24
2026-01-29 09:23:34 +08:00
Your Name
5644ee4325 fix:更新金刚区1
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m39s
2026-01-28 18:25:20 +08:00
zsq
d5b695af95 Merge pull request 'fix:更新设置' (#23) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m45s
Reviewed-on: #23
2026-01-27 20:19:44 +08:00
Your Name
4c4992d8d5 fix:更新设置
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m54s
2026-01-27 15:21:02 +08:00
zsq
2a7743206c Merge pull request 'fix:设置' (#22) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m42s
Reviewed-on: #22
2026-01-26 20:29:13 +08:00