8b89a32813 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-07-29 15:21:32 +08:00  
				
					
						
							
							
								 
						
							
							
								06ffdf164a 
								
							
								 
							
						 
						
							
							
								
								feat: add dingding login  
							
							
							
						 
						
							2025-07-25 22:02:55 +08:00  
				
					
						
							
							
								 
						
							
							
								5b75e5e917 
								
									
								
							
								 
							
						 
						
							
							
								
								perf: perf the control logic of `VbenModal` full screen and header ( #6566 )  
							
							... 
							
							
							
							* resolve the issue of header=false and full screen button display but not operable 
							
						 
						
							2025-07-25 21:45:45 +08:00  
				
					
						
							
							
								 
						
							
							
								260e45cd7b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' into feat/add-vben-modal-animation  
							
							
							
						 
						
							2025-07-25 21:33:11 +08:00  
				
					
						
							
							
								 
						
							
							
								27ad777c2c 
								
									
								
							
								 
							
						 
						
							
							
								
								!179  fix: 删除china2相关的地图json  
							
							... 
							
							
							
							Merge pull request !179  from 痴货/master 
							
						 
						
							2025-07-23 05:08:38 +00:00  
				
					
						
							
							
								 
						
							
							
								1575619d53 
								
							
								 
							
						 
						
							
							
								
								chore: release v5.5.8  
							
							
							
						 
						
							2025-07-19 22:19:50 +08:00  
				
					
						
							
							
								 
						
							
							
								879de80857 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-07-19 12:24:22 +08:00  
				
					
						
							
							
								 
						
							
							
								fc9ea347ca 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' into feat/add-vben-modal-animation  
							
							
							
						 
						
							2025-07-18 00:38:54 +08:00  
				
					
						
							
							
								 
						
							
							
								1a9b0509d5 
								
							
								 
							
						 
						
							
							
								
								feat: add animation effects to VbenModal component  
							
							
							
						 
						
							2025-07-18 00:15:40 +08:00  
				
					
						
							
							
								 
						
							
							
								d2a2227c4c 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remote/master'  
							
							... 
							
							
							
							# Conflicts:
#	packages/effects/plugins/src/echarts/use-echarts.ts 
							
						 
						
							2025-07-17 10:09:54 +08:00  
				
					
						
							
							
								 
						
							
							
								4620ede9b9 
								
							
								 
							
						 
						
							
							
								
								feat: 新增商品统计组件和优化数据处理逻辑  
							
							... 
							
							
							
							- 引入商品排行和商品概况组件,展示商品相关统计信息
- 更新商品统计 API,支持时间范围查询和数据格式化
- 优化数据加载逻辑,提升用户体验
- 添加日期范围选择器,增强统计数据的灵活性 
							
						 
						
							2025-07-17 09:53:04 +08:00  
				
					
						
							
							
								 
						
							
							
								07b64ad384 
								
									
								
							
								 
							
						 
						
							
							
								
								feat: add function support for formItemClass prop ( #6511 )  
							
							... 
							
							
							
							* feat: add function support for formItemClass prop
* feat: add try-catch to formItemClass function
* fix: formItemClass function ts error
---------
Co-authored-by: sqchen <chenshiqi@sshlx.com> 
							
						 
						
							2025-07-17 09:37:39 +08:00  
				
					
						
							
							
								 
						
							
							
								8c2f982ab6 
								
							
								 
							
						 
						
							
							
								
								feat: 更新日期格式化方法,新增多个统计卡片组件  
							
							... 
							
							
							
							- 将日期格式化方法从 formatDate 更新为 formatDate2,提升日期处理的灵活性
- 新增会员概览、用户统计、会员终端和交易量趋势等统计卡片组件
- 在商城首页引入新组件以展示关键会员和交易数据
- 优化数据获取逻辑,提升用户体验 
							
						 
						
							2025-07-16 11:01:27 +08:00  
				
					
						
							
							
								 
						
							
							
								379e8e755f 
								
							
								 
							
						 
						
							
							
								
								perf: 将 getUrlValue 放入 vben/utils 下  
							
							
							
						 
						
							2025-07-09 17:11:22 +08:00  
				
					
						
							
							
								 
						
							
							
								a950b7b6e7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-07-08 14:25:47 +08:00  
				
					
						
							
							
								 
						
							
							
								3b673ca915 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' into feature/scroll_to_the_error_field  
							
							
							
						 
						
							2025-07-07 08:21:50 +08:00  
				
					
						
							
							
								 
						
							
							
								bbf0287511 
								
									
								
							
								 
							
						 
						
							
							
								
								chore: fix lint warning ( #6487 )  
							
							
							
						 
						
							2025-07-07 08:21:25 +08:00  
				
					
						
							
							
								 
						
							
							
								f1051c8773 
								
							
								 
							
						 
						
							
							
								
								feat: add scrollToFirstError to the form component  
							
							
							
						 
						
							2025-07-05 00:50:53 +08:00  
				
					
						
							
							
								 
						
							
							
								243f3a201d 
								
							
								 
							
						 
						
							
							
								
								feat: add scrollToFirstError to the form component  
							
							
							
						 
						
							2025-07-05 00:19:12 +08:00  
				
					
						
							
							
								 
						
							
							
								253b0da7d2 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: 接口返回子节点为空数组时,还会显示折叠箭头 ( #6463 )  
							
							
							
						 
						
							2025-07-03 18:35:03 +08:00  
				
					
						
							
							
								 
						
							
							
								77c16cd8e2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-06-28 12:04:15 +08:00  
				
					
						
							
							
								 
						
							
							
								3230781538 
								
									
								
							
								 
							
						 
						
							
							
								
								feat: [vben-tree]增加数据disabled ( #6343 )  
							
							... 
							
							
							
							* feat: [vben-tree]增加数据disabled
* Update packages/@core/ui-kit/shadcn-ui/src/ui/tree/tree.vue
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---------
Co-authored-by: Jin Mao <50581550+jinmao88@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> 
							
						 
						
							2025-06-27 19:09:30 +08:00  
				
					
						
							
							
								 
						
							
							
								2f7d1f009d 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: 全屏状态下弹窗圆角优化 ( #6413 )  
							
							
							
						 
						
							2025-06-24 23:41:54 +08:00  
				
					
						
							
							
								 
						
							
							
								946f91f387 
								
									
								
							
								 
							
						 
						
							
							
								
								feat: optimize modal dragging range( #6414 )  
							
							... 
							
							
							
							* 当弹窗指定了容器时,拖拽将被限制在容器范围内 
							
						 
						
							2025-06-24 17:05:59 +08:00  
				
					
						
							
							
								 
						
							
							
								f15be6eade 
								
							
								 
							
						 
						
							
							
								
								feat: format time utils  
							
							
							
						 
						
							2025-06-21 19:30:43 +08:00  
				
					
						
							
							
								 
						
							
							
								f4b03b6101 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-06-20 10:24:12 +08:00  
				
					
						
							
							
								 
						
							
							
								d09b993bc8 
								
							
								 
							
						 
						
							
							
								
								feat: 将一些utils放到package/core/base/shared/src/utils  
							
							
							
						 
						
							2025-06-16 14:46:59 +08:00  
				
					
						
							
							
								 
						
							
							
								2885dc43bf 
								
							
								 
							
						 
						
							
							
								
								feat: download 统一使用@vben/utils  
							
							
							
						 
						
							2025-06-15 19:46:09 +08:00  
				
					
						
							
							
								 
						
							
							
								fcce15c0b8 
								
							
								 
							
						 
						
							
							
								
								feat: formatNumber 移动到 @vben/utils  
							
							
							
						 
						
							2025-06-11 20:15:27 +08:00  
				
					
						
							
							
								 
						
							
							
								c0962fec18 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: auto close popup on deactivated ( #6368 )  
							
							... 
							
							
							
							* 修复挂载到内容区域的弹窗和抽屉被意外关闭的问题 
							
						 
						
							2025-06-11 12:20:52 +08:00  
				
					
						
							
							
								 
						
							
							
								ea31db17ad 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-06-09 10:19:25 +08:00  
				
					
						
							
							
								 
						
							
							
								8ba7bdf2bd 
								
									
								
							
								 
							
						 
						
							
							
								
								fix(button): 为按钮添加type属性防止表单提交意外触发表单验证机制 ( #6340 )  
							
							... 
							
							
							
							在按钮组件中,按钮元素缺少type="button"属性可能导致在表单中意外提交。添加此属性以确保按钮行为符合预期。
Co-authored-by: yuanwj <ywj6792341@qq.com> 
							
						 
						
							2025-06-08 17:56:24 +08:00  
				
					
						
							
							
								 
						
							
							
								c7013a030e 
								
							
								 
							
						 
						
							
							
								
								feat: treeToString  
							
							
							
						 
						
							2025-06-07 12:54:50 +08:00  
				
					
						
							
							
								 
						
							
							
								b6075a6611 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-06-04 13:49:25 +08:00  
				
					
						
							
							
								 
						
							
							
								b9aef618fe 
								
							
								 
							
						 
						
							
							
								
								chore: release 5.5.7  
							
							
							
						 
						
							2025-06-04 05:33:06 +08:00  
				
					
						
							
							
								 
						
							
							
								4102cc2211 
								
									
								
							
								 
							
						 
						
							
							
								
								feat: improve vbenCheckButtonGroup ( #6329 )  
							
							... 
							
							
							
							* 按钮组支持单选清除和多选限制最大选项数
* 按钮组支持icon插槽来定制图标 
							
						 
						
							2025-06-03 23:11:56 +08:00  
				
					
						
							
							
								 
						
							
							
								b0c5b794fa 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-06-02 19:51:33 +08:00  
				
					
						
							
							
								 
						
							
							
								feb96dc8ea 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: resolve onClosed method failure in connectedComponent of useVbenModal ( #6309 )  
							
							
							
						 
						
							2025-06-02 08:16:48 +08:00  
				
					
						
							
							
								 
						
							
							
								d900aa1d71 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-05-30 22:23:29 +08:00  
				
					
						
							
							
								 
						
							
							
								081d08a7f8 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: alert width fixed in small  screen ( #6312 )  
							
							
							
						 
						
							2025-05-30 19:54:26 +08:00  
				
					
						
							
							
								 
						
							
							
								e3e0b1f1a0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-05-29 11:01:39 +08:00  
				
					
						
							
							
								 
						
							
							
								f31360ba4e 
								
									
								
							
								 
							
						 
						
							
							
								
								feat: support for hybrid permission access control mode ( #6294 )  
							
							... 
							
							
							
							* feat: 添加混合权限访问控制模式
* feat: 文档补充 
							
						 
						
							2025-05-28 17:01:58 +08:00  
				
					
						
							
							
								 
						
							
							
								7b886b315b 
								
							
								 
							
						 
						
							
							
								
								feat: 去除 slotName 使用input upload  
							
							
							
						 
						
							2025-05-26 18:48:27 +08:00  
				
					
						
							
							
								 
						
							
							
								67af898baf 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://gitee.com/yudaocode/yudao-ui-admin-vben  into dev  
							
							
							
						 
						
							2025-05-26 14:49:12 +08:00  
				
					
						
							
							
								 
						
							
							
								be1889a0e0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-05-26 10:50:54 +08:00  
				
					
						
							
							
								 
						
							
							
								f64425b724 
								
									
								
							
								 
							
						 
						
							
							
								
								!88  feat: 添加渠道配置和应用管理功能,更新相关表单和数据结构  
							
							... 
							
							
							
							Merge pull request !88  from 痴货/pay-master 
							
						 
						
							2025-05-26 02:24:11 +00:00  
				
					
						
							
							
								 
						
							
							
								af186f878d 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: repair the unexpected form default value ( #5567 )  
							
							... 
							
							
							
							* fix: Fix inconsistent spacing around search form (issue #5429 )
* fix: repair the unexpected default value in validated form.(issue #5451 )
* Update packages/@core/ui-kit/form-ui/src/use-form-context.ts
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---------
Co-authored-by: Jin Mao <50581550+jinmao88@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> 
							
						 
						
							2025-05-23 16:05:11 +08:00  
				
					
						
							
							
								 
						
							
							
								97894a940e 
								
									
								
							
								 
							
						 
						
							
							
								
								feat: optimize logo display ( #6267 )  
							
							... 
							
							
							
							* feat(VbenAvatar): add fit property to VbenAvatar component
* feat(VbenLogo): add fit property to VbenLogo component
* feat(VbenLogo): add logo fit preference configuration
- Add preferences.logo.fit setting for logo display control
- Include corresponding documentation for the new preference
* feat(preferences): add default value for logo.fit preference
- Set default configuration for logo fit behavior
- Ensures consistent logo display across applications
* test(preferences): update configuration snapshots
---------
Co-authored-by: wyc001122 <wangyongchao@testor.com.cn> 
							
						 
						
							2025-05-23 15:24:01 +08:00  
				
					
						
							
							
								 
						
							
							
								0c3edb10b0 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: getFieldComponentRef will return actual ref within AsyncComponentWrapper ( #6252 )  
							
							... 
							
							
							
							修复异步加载组件时,表单的getFieldComponentRef方法没能获取到正确的组件实例 
							
						 
						
							2025-05-21 14:48:51 +08:00  
				
					
						
							
							
								 
						
							
							
								c88bd198d4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-05-20 10:35:19 +08:00