gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						9285f3809b
					 | 
					
						
						
							
							浏览器缩放会导致保存按钮被下面的bpmnjs图挡住
						
						
						
						
						
						
					 | 
					
						2023-03-08 10:42:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4c47ca9166
					 | 
					
						
						
							
							vue3 重构:增加操作栏、搜索栏
						
						
						
						
						
						
					 | 
					
						2023-03-08 09:49:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ee9474fdb4
					 | 
					
						
						
							
							vue3 重构:使用 el 原生实现
						
						
						
						
						
						
					 | 
					
						2023-03-08 08:15:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4d16795eab
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						 Conflicts:
	src/types/auto-components.d.ts 
						
						
					 | 
					
						2023-03-07 20:30:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						e2895bafa5
					 | 
					
						
						
							
							!15 修复了一些小问题
						
						
						
						
						
						
						
						Merge pull request !15 from puhui999/master 
						
						
					 | 
					
						2023-03-07 12:13:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						03bf50d605
					 | 
					
						
						
							
							!18 系统管理中id显示序号bug
						
						
						
						
						
						
						
						Merge pull request !18 from 周建/master 
						
						
					 | 
					
						2023-03-07 12:11:49 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5df7a8c951
					 | 
					
						
						
							
							增加 optimize 文件列表,避免 reload
						
						
						
						
						
						
					 | 
					
						2023-03-07 19:40:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						dac20068cc
					 | 
					
						
						
							
							系统管理中id显示序号bug
						
						
						
						
						
						
					 | 
					
						2023-03-07 16:22:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						585a667352
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/master'
						
						
						
						
						
						
					 | 
					
						2023-03-07 10:34:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						cab8c9ad15
					 | 
					
						
						
							
							fix: search warn
						
						
						
						
						
						
					 | 
					
						2023-03-07 10:29:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						211298c55a
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/master'
						
						
						
						
						
						
					 | 
					
						2023-03-07 10:12:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						7fea89f5f9
					 | 
					
						
						
							
							feat: aotu import
						
						
						
						
						
						
					 | 
					
						2023-03-07 10:05:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						d35d27d197
					 | 
					
						
						
							
							fix: devmode
						
						
						
						
						
						
					 | 
					
						2023-03-07 10:01:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						212681a419
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/master'
						
						
						
						
						
						
						
						# Conflicts:
#	src/components/XTable/src/XTable.vue
#	src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue 
						
						
					 | 
					
						2023-03-07 10:00:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						004d214a11
					 | 
					
						
						
							
							fix: bugs
						
						
						
						
						
						
					 | 
					
						2023-03-07 09:41:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						65e3652534
					 | 
					
						
						
							
							style: 抽屉弹出样式问题
						
						
						
						
						
						
					 | 
					
						2023-03-07 09:38:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						01971a94b4
					 | 
					
						
						
							
							style: 调整主题切换样式
						
						
						
						
						
						
					 | 
					
						2023-03-07 09:37:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						19de304f32
					 | 
					
						
						
							
							!17 xTable警告
						
						
						
						
						
						
						
						Merge pull request !17 from 周建/master 
						
						
					 | 
					
						2023-03-07 00:33:42 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						71219a2f93
					 | 
					
						
						
							
							xTable报错
						
						
						
						
						
						
					 | 
					
						2023-03-06 22:58:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						016472b829
					 | 
					
						
						
							
							!16 1.角色提交问题修改 2.XTable var修改
						
						
						
						
						
						
						
						Merge pull request !16 from 毕梅/master 
						
						
					 | 
					
						2023-03-06 13:51:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						c5d05f1d45
					 | 
					
						
						
							
							id警告问题
						
						
						
						
						
						
					 | 
					
						2023-03-06 20:53:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						28f659f5bc
					 | 
					
						
						
							
							注释
						
						
						
						
						
						
					 | 
					
						2023-03-06 19:42:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						68e7b76775
					 | 
					
						
						
							
							注释
						
						
						
						
						
						
					 | 
					
						2023-03-06 19:30:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								bimei
							
						 
					 | 
					
						
						
							
						
						ece4cf2760
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/meibe/yudao-ui-admin-vue3
						
						
						
						
						
						
					 | 
					
						2023-03-06 18:20:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						cc7fb7e43f
					 | 
					
						
						
							
							loading问题
						
						
						
						
						
						
					 | 
					
						2023-03-06 15:57:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						01837ad502
					 | 
					
						
						
							
							解决导入css报警告的问题
						
						
						
						
						
						
						
						解决方法来源 https://github.com/vitejs/vite/pull/10762 
						
						
					 | 
					
						2023-03-06 15:34:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						d95de359e3
					 | 
					
						
						
							
							解决运行时报Variable 'id' is already declared in the upper scope  vue/no-template-shadow
						
						
						
						
						
						
					 | 
					
						2023-03-06 15:33:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						269aabd6df
					 | 
					
						
						
							
							详情动态表单按钮不显示,我的流程流程分类显示问题
						
						
						
						
						
						
					 | 
					
						2023-03-06 15:28:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						6b25601936
					 | 
					
						
						
							
							手机号必填
						
						
						
						
						
						
					 | 
					
						2023-03-06 13:29:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						cbc21c33b1
					 | 
					
						
						
							
							1、解决自定义字典标签值为零时标签不渲染的问题
						
						
						
						
						
						
						
						2、添加标签的文字颜色为白色,解决自定义背景颜色时标签文字看不清的问题 
						
						
					 | 
					
						2023-03-06 11:48:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						84e802fe93
					 | 
					
						
						
							
							使用const let替换掉var
						
						
						
						
						
						
					 | 
					
						2023-03-06 11:46:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						853dab7ffb
					 | 
					
						
						
							
							搜索日期显示不全
						
						
						
						
						
						
					 | 
					
						2023-03-04 16:40:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						8e575f359f
					 | 
					
						
						
							
							生成json和options
						
						
						
						
						
						
					 | 
					
						2023-03-04 16:00:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						3c6554c058
					 | 
					
						
						
							
							租户和角色管理的菜单权限不能滚动
						
						
						
						
						
						
					 | 
					
						2023-03-04 13:44:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						cea7b41ae8
					 | 
					
						
						
							
							租户和角色管理的菜单权限不能滚动
						
						
						
						
						
						
						
						租户新增菜单权限校验不通过
角色管理详情页不展示对应的部门
XTable中主题颜色不跟随项目主体一起切换 
						
						
					 | 
					
						2023-03-04 13:19:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						7a5a08d9a2
					 | 
					
						
						
							
							租户列表新增校验问题
						
						
						
						
						
						
					 | 
					
						2023-03-04 10:37:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						f63bccd1fe
					 | 
					
						
						
							
							查看OA请假返回流程详情
						
						
						
						
						
						
					 | 
					
						2023-03-03 15:27:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								bimei
							
						 
					 | 
					
						
						
							
						
						7c325ee96d
					 | 
					
						
						
							
							fix: 主题切换XTable颜色修改
						
						
						
						
						
						
					 | 
					
						2023-03-03 13:13:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						c5cb59f4ba
					 | 
					
						
						
							
							任务分配规则页面vxe操作栏显示隐藏bug
						
						
						
						
						
						
					 | 
					
						2023-03-02 16:46:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						31505ae35b
					 | 
					
						
						
							
							用户管理校验导致工作流报错bug
						
						
						
						
						
						
					 | 
					
						2023-03-02 16:08:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						9e66efdc50
					 | 
					
						
						
							
							用户管理校验
						
						
						
						
						
						
					 | 
					
						2023-03-02 15:57:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								周建
							
						 
					 | 
					
						
						
							
						
						b5d45e5444
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:yudaocode/yudao-ui-admin-vue3 into master
						
						
						
						
						
						
						
						Signed-off-by: 周建 <1348660141@qq.com> 
						
						
					 | 
					
						2023-03-02 07:40:19 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						3156606c90
					 | 
					
						
						
							
							用户管理添加用户需要填写手机号(工作流创建需要,不然会报错)
						
						
						
						
						
						
					 | 
					
						2023-03-02 15:34:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						60691df3a6
					 | 
					
						
						
							
							bpmnjs流程图 流转条件切换问题
						
						
						
						
						
						
					 | 
					
						2023-03-02 11:26:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								bimei
							
						 
					 | 
					
						
						
							
						
						21e20021e8
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/meibe/yudao-ui-admin-vue3
						
						
						
						
						
						
					 | 
					
						2023-03-02 09:56:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								bimei
							
						 
					 | 
					
						
						
							
						
						a16751f258
					 | 
					
						
						
							
							底座bug修改
						
						
						
						
						
						
					 | 
					
						2023-03-02 09:47:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						2d3227c5bc
					 | 
					
						
						
							
							1、发起流程页面 流程分类无法显示
						
						
						
						
						
						
						
						2、邮箱校验统一
3、角色管理页面角色编号换成id字段(之前是序号,vue2版本为id,测试说容易和显示顺序搞混)
4、bpmnjs流转条件无法自动保存回显问题 
						
						
					 | 
					
						2023-03-01 14:51:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						265302d7dd
					 | 
					
						
						
							
							!6 修改测试出的多项bug
						
						
						
						
						
						
						
						Merge pull request !6 from 周建/master 
						
						
					 | 
					
						2023-03-01 00:54:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						10c64effa1
					 | 
					
						
						
							
							!4 规范代码(eslint)
						
						
						
						
						
						
						
						Merge pull request !4 from 孔思宇/feat-eslintformat 
						
						
					 | 
					
						2023-03-01 00:50:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						4dfff16174
					 | 
					
						
						
							
							!2 遇到多个问题并修改
						
						
						
						
						
						
						
						Merge pull request !2 from 毕梅/master 
						
						
					 | 
					
						2023-03-01 00:47:39 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |