f40fb6684f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/main' into merge_from_upstream_2  
						
						 
						
						
						
					 
					
						2024-03-17 23:29:16 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								katherinehhh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7e32842a6d 
							
						 
					 
					
						
						
							
							fix: collections undefined inuseCollectionState ( #3741 )  
						
						 
						
						
						
					 
					
						2024-03-17 22:16:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								katherinehhh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							93091a92f7 
							
						 
					 
					
						
						
							
							test(acl):column action acl e2e  ( #3738 )  
						
						 
						
						... 
						
						
						
						* test: acl e2e test support new data block
* test: acl e2e test support new data block
* test: acl e2e test support new data block
* test: acl e2e test support new data block 
						
					 
					
						2024-03-17 17:29:23 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							4919a372bd 
							
						 
					 
					
						
						
							
							fix: plugin-mobile version error  
						
						 
						
						
						
					 
					
						2024-03-17 17:26:57 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								katherinehhh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							483f45765d 
							
						 
					 
					
						
						
							
							refactor: colDivider style improve for draging overing ( #3709 )  
						
						 
						
						... 
						
						
						
						* refactor: colDivider style improve for draging overing
* refactor: stle improve
* style: grid.Col style improve 
						
					 
					
						2024-03-17 16:35:59 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								YANG QIA 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3be6b7c0c6 
							
						 
					 
					
						
						
							
							fix(data-vi): association fields transform bug ( #3737 )  
						
						 
						
						... 
						
						
						
						* fix(data-vi): association fields transform bug
* fix: bug 
						
					 
					
						2024-03-17 15:16:06 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								katherinehhh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4cf560b177 
							
						 
					 
					
						
						
							
							fix(acl): invalid action permission judgment ( #3735 )  
						
						 
						
						... 
						
						
						
						* fix: x-acl-action is missing in action schema
* fix: useACLRoleContext
* fix: useACLRoleContext
* fix: useACLRoleContext 
						
					 
					
						2024-03-17 09:26:35 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chareice 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							820352f280 
							
						 
					 
					
						
						
							
							fix: console command  
						
						 
						
						
						
					 
					
						2024-03-17 09:20:14 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d07932e9eb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/main' into merge_from_upstream_1  
						
						 
						
						
						
					 
					
						2024-03-17 04:28:06 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							cd62e83403 
							
						 
					 
					
						
						
							
							add mobile plugin and other refactors ( #396 )  
						
						 
						
						... 
						
						
						
						Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#396  
						
					 
					
						2024-03-17 04:20:33 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
						
						
							
						
						
							c1be864124 
							
						 
					 
					
						
						
							
							chore(versions):  😊  publish v0.20.0-alpha.12  
						
						 
						
						
						
					 
					
						2024-03-16 23:18:19 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								YANG QIA 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							542fb65b50 
							
						 
					 
					
						
						
							
							fix: compatibility of @ant-design/plots 2.x ( #3734 )  
						
						 
						
						... 
						
						
						
						* fix: compatibility of @ant-design/plots 2.x
* fix: dual-axes chart bug
* fix: auto infer bug 
						
					 
					
						2024-03-16 23:04:57 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
						
						
							
						
						
							c191f149f9 
							
						 
					 
					
						
						
							
							fix: yarn dev error  
						
						 
						
						
						
					 
					
						2024-03-16 22:44:57 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
						
						
							
						
						
							15ef81854e 
							
						 
					 
					
						
						
							
							chore(versions):  😊  publish v0.20.0-alpha.11  
						
						 
						
						
						
					 
					
						2024-03-16 20:05:34 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b359f9eac6 
							
						 
					 
					
						
						
							
							feat: supports subdirectory deployment ( #3731 )  
						
						 
						
						... 
						
						
						
						* feat: supports subdirectory deployment
* feat: auto publicPath
* fix: buildIndexHtml
* fix: format
* fix: regexp
* fix: test error
* fix: nocobase.conf
* fix: path
* fix: nocobase.conf
* fix: bugs
* fix: resourcer prefix
* fix: cas 
						
					 
					
						2024-03-16 20:01:34 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							24471c7fbe 
							
						 
					 
					
						
						
							
							chore: upgrade plugin-rental  
						
						 
						
						
						
					 
					
						2024-03-16 00:51:12 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							25e170aada 
							
						 
					 
					
						
						
							
							fix: delete logic error  
						
						 
						
						
						
					 
					
						2024-03-16 00:48:07 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zeke Zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							126f60c959 
							
						 
					 
					
						
						
							
							fix(variables): fix varaibles for table selector ( #3725 )  
						
						 
						
						... 
						
						
						
						* fix(variables): fix varaibles for table selector
* test: add e2e
* chore: fix build
* fix: should not display current record in create form
* fix: fix known bugs
* test: fix e2e 
						
					 
					
						2024-03-15 22:56:35 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chareice 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1cdbe0de96 
							
						 
					 
					
						
						
							
							chore: upgrade dotenv version  
						
						 
						
						
						
					 
					
						2024-03-15 21:48:43 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b8b9e844cd 
							
						 
					 
					
						
						
							
							chore: upgrade plugin-core & plugin-rental  
						
						 
						
						
						
					 
					
						2024-03-15 20:45:16 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							4b212084f8 
							
						 
					 
					
						
						
							
							fix: post data error  
						
						 
						
						
						
					 
					
						2024-03-15 20:40:05 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							edac378ae9 
							
						 
					 
					
						
						
							
							Merge pull request 'feat: 汇总后端计算' ( #395 ) from feat_group_backend into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#395 
Reviewed-by: sealday <zhanglin@daoyoucloud.com> 
						
					 
					
						2024-03-15 20:29:02 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ee82c00a64 
							
						 
					 
					
						
						
							
							Merge pull request 'fix: 修改自动补全筛选失效问题' ( #394 ) from fix_multipleSelect into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#394 
Reviewed-by: sealday <zhanglin@daoyoucloud.com> 
						
					 
					
						2024-03-15 20:23:01 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							12fcff604b 
							
						 
					 
					
						
						
							
							feat: 汇总后端计算  
						
						 
						
						
						
					 
					
						2024-03-15 20:21:33 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7f856cffb0 
							
						 
					 
					
						
						
							
							fix: 修改自动补全筛选失效问题  
						
						 
						
						
						
					 
					
						2024-03-15 20:15:46 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thiago Rodrigues 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8801ba625f 
							
						 
					 
					
						
						
							
							fixing timezone header when it is negative value ( #3732 )  
						
						 
						
						
						
					 
					
						2024-03-15 19:40:27 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fd5c5cf5de 
							
						 
					 
					
						
						
							
							chore: upgrade plugin-audit-logs  
						
						 
						
						
						
					 
					
						2024-03-15 19:27:31 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							99e866eae4 
							
						 
					 
					
						
						
							
							chore: upgrade plugin-core & plugin-rental & plugin-audit-logs  
						
						 
						
						
						
					 
					
						2024-03-15 19:24:34 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							bf091d0247 
							
						 
					 
					
						
						
							
							Merge pull request 'audit_logs_i18n' ( #393 ) from audit_logs_i18n into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#393  
						
					 
					
						2024-03-15 19:20:13 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e5038e2e96 
							
						 
					 
					
						
						
							
							fix: i18n  
						
						 
						
						
						
					 
					
						2024-03-15 19:19:32 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ebd35abeb0 
							
						 
					 
					
						
						
							
							chore: update i18n  
						
						 
						
						
						
					 
					
						2024-03-15 19:15:05 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							759f51dae8 
							
						 
					 
					
						
						
							
							Merge pull request 'fix: 修改多选下拉框数据问题' ( #392 ) from fix_multipleSelect into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#392 
Reviewed-by: sealday <zhanglin@daoyoucloud.com> 
						
					 
					
						2024-03-15 19:13:40 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c544ae80f1 
							
						 
					 
					
						
						
							
							fix: 修改多选下拉框数据问题  
						
						 
						
						
						
					 
					
						2024-03-15 19:06:15 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ece1e59c9a 
							
						 
					 
					
						
						
							
							chore: clean codes  
						
						 
						
						
						
					 
					
						2024-03-15 18:58:29 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3e23aaa894 
							
						 
					 
					
						
						
							
							chore: clean auditlogs codes  
						
						 
						
						
						
					 
					
						2024-03-15 18:47:48 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							30f84b7ca3 
							
						 
					 
					
						
						
							
							Merge pull request 'fix: audit logs loads error' ( #391 ) from fix_audit_logs into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#391  
						
					 
					
						2024-03-15 18:34:33 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							227e2dbf47 
							
						 
					 
					
						
						
							
							fix: audit logs loads error  
						
						 
						
						
						
					 
					
						2024-03-15 18:33:28 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3920cb20c3 
							
						 
					 
					
						
						
							
							fix: 通过区块的类型配置动作  
						
						 
						
						
						
					 
					
						2024-03-15 17:53:13 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d8590a6a95 
							
						 
					 
					
						
						
							
							fix: subtable copy error  
						
						 
						
						
						
					 
					
						2024-03-15 17:34:32 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9af29e3e5c 
							
						 
					 
					
						
						
							
							Merge pull request 'fix: 修改过滤自定义数据范围变量' ( #388 ) from fix_filterData into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#388 
Reviewed-by: sealday <zhanglin@daoyoucloud.com> 
						
					 
					
						2024-03-15 17:28:59 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							0d9f13f596 
							
						 
					 
					
						
						
							
							Merge pull request 'fix: 修改自定义筛选框数据范围问题' ( #387 ) from fix_customFilter into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#387 
Reviewed-by: sealday <zhanglin@daoyoucloud.com> 
						
					 
					
						2024-03-15 17:28:49 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							65a4281ad5 
							
						 
					 
					
						
						
							
							fix: 修改过滤自定义数据范围变量  
						
						 
						
						
						
					 
					
						2024-03-15 17:13:50 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a6bd972beb 
							
						 
					 
					
						
						
							
							fix: 修改自定义筛选框数据范围问题  
						
						 
						
						
						
					 
					
						2024-03-15 16:37:14 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1f5c9fbdf5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/main' into merge_from_upstream  
						
						 
						
						
						
					 
					
						2024-03-15 16:04:04 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e2a1a570e8 
							
						 
					 
					
						
						
							
							Merge pull request 'fix: tval import error' ( #385 ) from audit_logs into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#385  
						
					 
					
						2024-03-15 16:00:47 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jack zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							04ee7b84ec 
							
						 
					 
					
						
						
							
							feat: add data source filter ( #3724 )  
						
						 
						
						
						
					 
					
						2024-03-15 15:38:33 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							ecd4d560b2 
							
						 
					 
					
						
						
							
							fix: 合同小结计算理论重量,订单保存避免合同数据不全引发报错  
						
						 
						
						
						
					 
					
						2024-03-15 15:38:13 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c5a1299912 
							
						 
					 
					
						
						
							
							fix: tval import error  
						
						 
						
						
						
					 
					
						2024-03-15 15:06:19 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ccabd6a849 
							
						 
					 
					
						
						
							
							Merge pull request 'chore: using plugin locale' ( #383 ) from audit_logs into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#383  
						
					 
					
						2024-03-15 15:03:08 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							bca3a324e4 
							
						 
					 
					
						
						
							
							chore: using plugin locale  
						
						 
						
						
						
					 
					
						2024-03-15 15:02:23 +08:00