b55c291af1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-08-26 16:57:32 +08:00  
				
					
						
							
							
								 
						
							
							
								b0d7b177be 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: 角色管理,授权的树形组件,取消勾选叶子节点,父级节点状态错误 ( #6680 )  
							
							... 
							
							
							
							Co-authored-by: haiyinlong <haiyinlong@uhigame.com> 
							
						 
						
							2025-08-25 21:32:01 +08:00  
				
					
						
							
							
								 
						
							
							
								566d3bdf7c 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: appendToMain warning ( #6684 )  
							
							
							
						 
						
							2025-08-25 21:25:29 +08:00  
				
					
						
							
							
								 
						
							
							
								cf6c4c9aae 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: cannot read properties of null (reading 'nextSibling') ( #6667 )  
							
							
							
						 
						
							2025-08-21 22:26:10 +08:00  
				
					
						
							
							
								 
						
							
							
								2cc78f925f 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: the bug in the lock method of the vbenModal component ( #6648 )  
							
							
							
						 
						
							2025-08-21 15:17:55 +08:00  
				
					
						
							
							
								 
						
							
							
								93f0eea4e7 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: fix the issue of excessive line spacing in vbenForm ( #6653 )  
							
							... 
							
							
							
							* gap-2和 pb-4/2 重叠导致间距过宽,gap-x只保留列间距 
							
						 
						
							2025-08-21 12:41:04 +08:00  
				
					
						
							
							
								 
						
							
							
								8fdbbfad22 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-08-19 17:41:16 +08:00  
				
					
						
							
							
								 
						
							
							
								1d5bfaac5a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://gitee.com/yudaocode/yudao-ui-admin-vben  into dev  
							
							
							
						 
						
							2025-08-19 17:34:00 +08:00  
				
					
						
							
							
								 
						
							
							
								3ad433a50b 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: 修复在 hash 路由模式下无法在新窗口打开路由的问题 ( #6652 )  
							
							... 
							
							
							
							此问题是由于 PR #6583  中新增的 `resolveHref` 函数导致的。其在 hash 路由模式下,得到的 URL 会包含 #/ 前缀。在经过 openRouteInNewWindow 的逻辑后就会出现两次 /# 前缀 
							
						 
						
							2025-08-19 16:47:45 +08:00  
				
					
						
							
							
								 
						
							
							
								8ac2db5b7c 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: fix the issue of `VbenForm` `compact` reactive failure ( #6654 )  
							
							
							
						 
						
							2025-08-19 16:46:14 +08:00  
				
					
						
							
							
								 
						
							
							
								1e6417f95b 
								
									
								
							
								 
							
						 
						
							
							
								
								feat: vBenForm add layout: inline ( #6644 )  
							
							
							
						 
						
							2025-08-16 22:41:08 +08:00  
				
					
						
							
							
								 
						
							
							
								e147a9d2fd 
								
							
								 
							
						 
						
							
							
								
								chore: release 5.5.9  
							
							
							
						 
						
							2025-08-16 22:16:02 +08:00  
				
					
						
							
							
								 
						
							
							
								43c8ce2d7d 
								
									
								
							
								 
							
						 
						
							
							
								
								!194  refactor: (web-ele)优化移动端组件代码结构  
							
							... 
							
							
							
							Merge pull request !194  from 痴货/master 
							
						 
						
							2025-08-16 13:12:10 +00:00  
				
					
						
							
							
								 
						
							
							
								4be6d26375 
								
							
								 
							
						 
						
							
							
								
								feat:【framework 框架】增加 api 加解密能力(优化代码)  
							
							
							
						 
						
							2025-08-16 17:20:45 +08:00  
				
					
						
							
							
								 
						
							
							
								9fc594434f 
								
									
								
							
								 
							
						 
						
							
							
								
								perf: 优化useVbenForm样式 ( #6611 )  
							
							... 
							
							
							
							* perf(style): 优化useVbenForm垂直布局 actions 样式
* perf(style): 优化useVbenForm actions 布局样式
- 操作按钮组显示位置
```
actionPosition?: 'center' | 'left' | 'right';
```
- 操作按钮组的样式
```
actionType?: 'block' | 'inline'
inline: 行类显示,block: 新一行单独显示
```
* perf: 优化useVbenForm actions 布局样式
删除 actionType
增加 actionLayout
- actionLayout?: 'inline' | 'newLine' | 'rowEnd';
- newLine: 在新行显示。rowEnd: 在行内显示,靠右对齐(默认)。inline: 使用grid默认样式
- 删除无用代码 queryFormStyle
* perf: 优化useVbenForm使用案例
* perf: 优化form组件样式
去掉padding,改为gap
* docs: update vben-form.md
* fix: 修复FormMessage位置
* perf: Avoid direct mutation of props object.
-  props.actionLayout = props.actionLayout || 'rowEnd';
-  props.actionPosition = props.actionPosition || 'right';
+  const actionLayout = props.actionLayout || 'rowEnd';
+  const actionPosition = props.actionPosition || 'right';
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
* fix: 修复 wrapperClass 权重
* fix: 全局搜索结果不匹配 #6603 
* fix: 避免FormMessage溢出
---------
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> 
							
						 
						
							2025-08-07 23:48:34 +08:00  
				
					
						
							
							
								 
						
							
							
								2166ce3e4e 
								
							
								 
							
						 
						
							
							
								
								feat: 新增多个组件并优化优惠券相关功能  
							
							... 
							
							
							
							- 新增 AppLinkSelectDialog 组件,用于选择 APP 链接- 新增 NavigationBarCellProperty组件,用于导航栏单元格属性设置
- 新增 CombinationShowcase 和 CombinationTableSelect 组件,用于拼团活动展示和选择- 优化优惠券相关组件,导出所有优惠券相关组件
- 新增 ComponentContainer 组件,用于包裹和样式化 DIY 组件 
							
						 
						
							2025-08-04 09:09:39 +08:00  
				
					
						
							
							
								 
						
							
							
								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