2d62574eba 
								
							
								 
							
						 
						
							
							
								
								chore: format  
							
							
							
						 
						
							2025-05-27 19:54:20 +08:00  
				
					
						
							
							
								 
						
							
							
								4736a5b3fe 
								
							
								 
							
						 
						
							
							
								
								fix: error  
							
							
							
						 
						
							2025-05-27 19:53:44 +08:00  
				
					
						
							
							
								 
						
							
							
								8e111921dd 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'yudao/dev' into dev  
							
							
							
						 
						
							2025-05-27 18:43:18 +08:00  
				
					
						
							
							
								 
						
							
							
								d49def855f 
								
							
								 
							
						 
						
							
							
								
								feat: Simple 模型 - 审批人节点 80%  
							
							
							
						 
						
							2025-05-27 18:40:52 +08:00  
				
					
						
							
							
								 
						
							
							
								09942f0257 
								
							
								 
							
						 
						
							
							
								
								feat: add cashier views  
							
							
							
						 
						
							2025-05-27 18:40:02 +08:00  
				
					
						
							
							
								 
						
							
							
								7398bab010 
								
							
								 
							
						 
						
							
							
								
								feat: add pay svg  
							
							
							
						 
						
							2025-05-27 18:39:40 +08:00  
				
					
						
							
							
								 
						
							
							
								612d4930e2 
								
							
								 
							
						 
						
							
							
								
								feat: add pay wallet  
							
							
							
						 
						
							2025-05-27 15:31:19 +08:00  
				
					
						
							
							
								 
						
							
							
								64cd606c87 
								
							
								 
							
						 
						
							
							
								
								feat: add formatNumber  
							
							
							
						 
						
							2025-05-27 15:31:06 +08:00  
				
					
						
							
							
								 
						
							
							
								d46c17293c 
								
							
								 
							
						 
						
							
							
								
								feat: pay tansfer  
							
							
							
						 
						
							2025-05-27 14:38:38 +08:00  
				
					
						
							
							
								 
						
							
							
								3b25efcc7e 
								
							
								 
							
						 
						
							
							
								
								feat: pay demo  
							
							
							
						 
						
							2025-05-27 14:20:07 +08:00  
				
					
						
							
							
								 
						
							
							
								48a593749b 
								
							
								 
							
						 
						
							
							
								
								chore: remove ant-design/icons-vue  
							
							
							
						 
						
							2025-05-27 14:19:27 +08:00  
				
					
						
							
							
								 
						
							
							
								b67e4faab4 
								
							
								 
							
						 
						
							
							
								
								feat: add pay cashier route  
							
							
							
						 
						
							2025-05-27 11:50:16 +08:00  
				
					
						
							
							
								 
						
							
							
								d6e1273199 
								
							
								 
							
						 
						
							
							
								
								fix: warn  
							
							
							
						 
						
							2025-05-27 11:43:56 +08:00  
				
					
						
							
							
								 
						
							
							
								cdd136d4fd 
								
							
								 
							
						 
						
							
							
								
								feat: 移除slots  
							
							
							
						 
						
							2025-05-27 10:39:06 +08:00  
				
					
						
							
							
								 
						
							
							
								62198ec69c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/vbenjs/vue-vben-admin  into dev  
							
							
							
						 
						
							2025-05-27 10:36:30 +08:00  
				
					
						
							
							
								 
						
							
							
								806051e038 
								
							
								 
							
						 
						
							
							
								
								perf: 去掉边框颜色  
							
							
							
						 
						
							2025-05-26 19:06:13 +08:00  
				
					
						
							
							
								 
						
							
							
								6098e84119 
								
							
								 
							
						 
						
							
							
								
								feat: add height  
							
							
							
						 
						
							2025-05-26 19:05:45 +08:00  
				
					
						
							
							
								 
						
							
							
								f15f7d4fc2 
								
							
								 
							
						 
						
							
							
								
								perf: code style  
							
							
							
						 
						
							2025-05-26 19:05:31 +08:00  
				
					
						
							
							
								 
						
							
							
								68a160cfb2 
								
							
								 
							
						 
						
							
							
								
								fix: 注释  
							
							
							
						 
						
							2025-05-26 18:51:52 +08:00  
				
					
						
							
							
								 
						
							
							
								7b886b315b 
								
							
								 
							
						 
						
							
							
								
								feat: 去除 slotName 使用input upload  
							
							
							
						 
						
							2025-05-26 18:48:27 +08:00  
				
					
						
							
							
								 
						
							
							
								ba18eb37da 
								
							
								 
							
						 
						
							
							
								
								feat: add input upload  
							
							
							
						 
						
							2025-05-26 18:46:06 +08:00  
				
					
						
							
							
								 
						
							
							
								3c4f954b77 
								
									
								
							
								 
							
						 
						
							
							
								
								!115  Merge remote-tracking branch 'yudao/dev' into dev  
							
							... 
							
							
							
							Merge pull request !115  from Jason/dev 
							
						 
						
							2025-05-26 09:30:11 +00:00  
				
					
						
							
							
								 
						
							
							
								281a2ebae0 
								
							
								 
							
						 
						
							
							
								
								fix: formatAmount 重复定义  
							
							
							
						 
						
							2025-05-26 17:29:34 +08:00  
				
					
						
							
							
								 
						
							
							
								ae7b549879 
								
							
								 
							
						 
						
							
							
								
								refactor: pay  
							
							
							
						 
						
							2025-05-26 17:22:09 +08:00  
				
					
						
							
							
								 
						
							
							
								ce02f7d520 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'yudao/dev' into dev  
							
							
							
						 
						
							2025-05-26 16:58:43 +08:00  
				
					
						
							
							
								 
						
							
							
								a602decde9 
								
							
								 
							
						 
						
							
							
								
								refactor: pay app  
							
							
							
						 
						
							2025-05-26 16:52:11 +08:00  
				
					
						
							
							
								 
						
							
							
								ef93c9824a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'yudao/dev' into dev  
							
							
							
						 
						
							2025-05-26 16:44:20 +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  
				
					
						
							
							
								 
						
							
							
								44cc41ec92 
								
							
								 
							
						 
						
							
							
								
								feat: 使用 v-dompurify-html 替换 v-html  
							
							
							
						 
						
							2025-05-26 14:21:05 +08:00  
				
					
						
							
							
								 
						
							
							
								11f32258e6 
								
							
								 
							
						 
						
							
							
								
								feat: Simple 流程模型- 发起人节点配置  
							
							
							
						 
						
							2025-05-26 14:20:32 +08:00  
				
					
						
							
							
								 
						
							
							
								53304514b6 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: Update index.ts ( #6268 )  
							
							... 
							
							
							
							* Update index.ts
VxeGridPropTypes.原文件缺少这个,现在补全!
* Update index.ts
增加空格! 
							
						 
						
							2025-05-26 13:29:27 +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  
				
					
						
							
							
								 
						
							
							
								3355024e42 
								
									
								
							
								 
							
						 
						
							
							
								
								!114  Merge remote-tracking branch 'yudao/dev' into dev  
							
							... 
							
							
							
							Merge pull request !114  from Jason/dev 
							
						 
						
							2025-05-26 02:23:22 +00:00  
				
					
						
							
							
								 
						
							
							
								f07f81bdce 
								
									
								
							
								 
							
						 
						
							
							
								
								!113  fix: 【BPM 工作流】修复流程表单操作列宽,消除控制台警告  
							
							... 
							
							
							
							Merge pull request !113  from 子夜/dev-bpm 
							
						 
						
							2025-05-26 02:23:08 +00:00  
				
					
						
							
							
								 
						
							
							
								6fbf1387f5 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: reset slider-captcha after login failed ( #6275 )  
							
							
							
						 
						
							2025-05-25 16:04:56 +08:00  
				
					
						
							
							
								 
						
							
							
								deefea6a18 
								
							
								 
							
						 
						
							
							
								
								perf: review todo 的修改  
							
							
							
						 
						
							2025-05-25 08:46:09 +08:00  
				
					
						
							
							
								 
						
							
							
								8e88db8d11 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'yudao/dev' into dev  
							
							
							
						 
						
							2025-05-24 23:31:18 +08:00  
				
					
						
							
							
								 
						
							
							
								6649301dba 
								
							
								 
							
						 
						
							
							
								
								feat: simple 模型设计样式规范修改  
							
							
							
						 
						
							2025-05-24 23:29:28 +08:00  
				
					
						
							
							
								 
						
							
							
								0f576e006b 
								
							
								 
							
						 
						
							
							
								
								feat: 流程设计- Simple 模型设计 20%  
							
							
							
						 
						
							2025-05-24 23:02:24 +08:00  
				
					
						
							
							
								 
						
							
							
								e3948bbc50 
								
							
								 
							
						 
						
							
							
								
								fix: 【BPM 工作流】修复流程表单操作列宽,消除控制台警告  
							
							
							
						 
						
							2025-05-24 16:53:59 +08:00  
				
					
						
							
							
								 
						
							
							
								7762059537 
								
							
								 
							
						 
						
							
							
								
								fix:  优化待办任务摘要字段的渲染方式  
							
							
							
						 
						
							2025-05-24 16:43:44 +08:00  
				
					
						
							
							
								 
						
							
							
								e1434c7b2d 
								
							
								 
							
						 
						
							
							
								
								feat: 【BPM 工作流】新增OA请假示例详情页面,完善请假信息展示和数据获取逻辑  
							
							
							
						 
						
							2025-05-24 16:29:38 +08:00  
				
					
						
							
							
								 
						
							
							
								370c257cf5 
								
							
								 
							
						 
						
							
							
								
								fix: 【BPM 工作流】选择发起人时 activityId 类型转换导致无法正确选择发起人的问题。  
							
							
							
						 
						
							2025-05-24 16:07:18 +08:00  
				
					
						
							
							
								 
						
							
							
								01f929e10f 
								
							
								 
							
						 
						
							
							
								
								feat: 【BPM 工作流】完善操作按钮、流程签名组件  
							
							
							
						 
						
							2025-05-24 15:10:03 +08:00  
				
					
						
							
							
								 
						
							
							
								e5c937396d 
								
									
								
							
								 
							
						 
						
							
							
								
								fix: json-bigint parse used in vxeTable ( #6271 )  
							
							... 
							
							
							
							* 修复vxeTable不能加载json-bigint解析的数据的问题 
							
						 
						
							2025-05-24 13:01:58 +08:00  
				
					
						
							
							
								 
						
							
							
								66ac3de5c1 
								
							
								 
							
						 
						
							
							
								
								feat:【BPM 工作流】 完善流转记录列表  
							
							
							
						 
						
							2025-05-24 10:51:57 +08:00  
				
					
						
							
							
								 
						
							
							
								e39e5a4ed8 
								
							
								 
							
						 
						
							
							
								
								feat: 增加用户选择模态框中的部门树节点深度限制,部门按名称检索  
							
							
							
						 
						
							2025-05-24 09:50:36 +08:00  
				
					
						
							
							
								 
						
							
							
								c0a82df7f4 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev-bpm  
							
							
							
						 
						
							2025-05-24 09:35:54 +08: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