abec9982fb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/main' into merge_from_upstream  
						
						 
						
						
						
					 
					
						2024-03-14 22:19:15 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ab66403507 
							
						 
					 
					
						
						
							
							fix: ant design icon error in mobile  
						
						 
						
						
						
					 
					
						2024-03-14 22:14:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							cc09966d63 
							
						 
					 
					
						
						
							
							feat: support add collection to collectionManager  
						
						 
						
						
						
					 
					
						2024-03-14 22:14:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							8ccfdf5828 
							
						 
					 
					
						
						
							
							chore(version): upgrade rental  
						
						 
						
						
						
					 
					
						2024-03-14 22:14:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6e77717946 
							
						 
					 
					
						
						
							
							fix: 修改汇总区块NaN  
						
						 
						
						
						
					 
					
						2024-03-14 19:32:01 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zeke Zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							286af35ff8 
							
						 
					 
					
						
						
							
							refactor: add blocks in a unified way ( #3668 )  
						
						 
						
						... 
						
						
						
						* refactor: rename filterMenuItemChildren to filterCollections
* refactor: revert parameters to destructured object
* refactor(Details): unify details block between page and popup
* refactor(Form): refactor(Details): unify form block between page and popup
* refactor: table & list & grid card
* refactor: form
* refactor: association details
* chore: useVisible
* refactor: calendar
* chore: remove relationshipBlocks
* refactor: unify Details schema
* fix: avoid error
* chore: add translate
* chore: add tag to association fields
* fix: add block useChildren and children merge
* test: fix e2e
* test: fix e2e
* fix: fix Calendar
* fix: fix search
* test: add e2e for search
* fix: fix T-3554
* fix: fix T-3551
* feat: add no data for details block
* chore: fix unit test
* chore: fix unit test
* chore: change text
* chore: optimize text
* chore: add translation
* style: fix memu item style
* refactor: rename
* test: fix e2e
* test: fix e2e
---------
Co-authored-by: dream2023 <1098626505@qq.com> 
						
					 
					
						2024-03-14 19:20:02 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zeke Zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ba1e44c527 
							
						 
					 
					
						
						
							
							feat: support to set data loading mode ( #3712 )  
						
						 
						
						... 
						
						
						
						* feat: add setDataLoadingModeSettingItem
* feat: support to set data loading mode
* chore: add translation
* chore: refresh the block immediately after the configuration has been changed
* feat: the data loading mode should also work for the filter buttons
* feat: support old version
* fix: data scope
* fix: fix known bugs
* fix: add setting for table selector
* test: fix e2e 
						
					 
					
						2024-03-14 18:10:54 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							b35dbec2fd 
							
						 
					 
					
						
						
							
							feat: schemaInitializerManager  
						
						 
						
						
						
					 
					
						2024-03-14 16:55:27 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							e347a0d17b 
							
						 
					 
					
						
						
							
							fix: 工单完成  fix   #371   fix   #370  
						
						 
						
						
						
					 
					
						2024-03-14 16:35:59 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							fe268d5f15 
							
						 
					 
					
						
						
							
							fix: 订单pdf报价实际重量/小结报价实际重量/运输单上边距  
						
						 
						
						
						
					 
					
						2024-03-14 16:32:52 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zeke Zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							51de34251a 
							
						 
					 
					
						
						
							
							refactor(SchemaInitializers): unify naming style ( #3604 )  
						
						 
						
						... 
						
						
						
						* refactor(SchemaSettings): unify naming style
* refactor(SchemaInitializers): unify naming stle
* refactor: replace CreateFormBlockInitializers to blockInitializers:createForm
* refactor: replace to blockInitializers:customizeCreateForm
* refactor: replace block intializers name
* refactor: replace action initializers name
* refactor: replace field initializers name
* style: fix hover style for column action (T-3297)
* refactor: revert some codes
* chore: update comment
* chore: replace iframeBlockSchemaSettings to blockSettings:iframe
* chore: delete pro-packages
* feat: add CompatibleSchemaInitializer
* test: add unit tests
* chore: add @internal for CompatibleSchemaInitializer
* chore: block
* chore: field
* chore: ations
* fix: build
* chore: typo
* fix: fix unit tests
* test: fix e2e
* chore: remove igone
* refactor: page:addBlock
* refactor: popup:addNew:addBlock
* fix: fix max call stack
* refactor: popup:addRecord:addBlock
* refactor: remove blockInitializers:recordForm
* refactor: popup:tableSelector:addBlock
* refactor: popup:view:addBlock
* refactor: popup:bulkEdit:addBlock & charts:addBlock
* refactor: mobilePage:addBlock
* refactor: popup:snapshot:addBlock
* refactor: popup:workflowManual:configureUserInterface:addBlock
* fix: avoid crashing
* chore: optimize
* refactor: popup:common:addBlock
* refactor: workflowManual:popup:configureUserInterface:addBlock
* refactor: details:configureFields
* refactor: form:configureFields
* refactor: table:configureColumns
* refactor: filterForm:configureFields
* refactor: associationFilterInitializer
* refactor: assignFieldValuesForm:configureFields
* refactor: bulkEditForm:configureFields
* refactor: auditLogsTable:configureColumns
* refactor: chartFilterForm:configureFields
* refactor: kanban:configureItemFields
* refactor: workflowManual:customForm:configureFields
* refactor: detailsWithPaging:configureActions
* refactor: details:configureActions
* refactor: createForm:configureActions
* refactor: editForm:configureActions
* refactor: gridCard:configureActions
* refactor: gridCard:configureItemActions
* refactor: list:configureActions
* refactor: list:configureItemActions
* refactor: table:configureItemActions
* refactor: table:configureActions
* refactor: filterForm:configureActions
* refactor: subTable:configureActions
* refactor: bulkEditForm:configureActions
* refactor: auditLogsTable:configureItemActions
* refactor: auditLogsTable:configureActions
* refactor: calendar:configureActions
* refactor: chartFilterForm:configureActions
* refactor: gantt:configureActions
* refactor: kanban:configureActions
* refactor: map:configureActions
* refactor: workflowManual:form:configureActions
* feat: use 'createForm:configureActions' in page
* feat: use 'details:configureActions' in Calendar
* feat: register deleteEvent initializer in calendar plugin
* fix: fix delete event action
* test: fix e2e
* test: fix e2e
* chore: only run workflow's e2e
* Revert "chore: only run workflow's e2e"
This reverts commit 9e5b4af41e40e8d616007a5ab97291fb2370d88a.
* fix: use isInitializersSame to fix some case 
						
					 
					
						2024-03-14 14:13:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							1d14cd82e8 
							
						 
					 
					
						
						
							
							fix: 新建自动结算合同,多创建数据  
						
						 
						
						
						
					 
					
						2024-03-14 11:32:33 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							83deef45d0 
							
						 
					 
					
						
						
							
							Merge pull request 'feat: 订单打印上边距可调整' ( #367 ) from feat_recordpdf_top_margin into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#367 
Reviewed-by: sealday <zhanglin@daoyoucloud.com> 
						
					 
					
						2024-03-14 10:33:29 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							2125c8ddae 
							
						 
					 
					
						
						
							
							feat: 更新数据参数规范  
						
						 
						
						
						
					 
					
						2024-03-14 10:32:18 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								YANG QIA 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							69ff55ba90 
							
						 
					 
					
						
						
							
							fix(data-vi): update antv version ( #3710 )  
						
						 
						
						
						
					 
					
						2024-03-13 23:03:15 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
						
						
							
						
						
							40a22943b9 
							
						 
					 
					
						
						
							
							chore(versions):  😊  publish v0.20.0-alpha.10  
						
						 
						
						
						
					 
					
						2024-03-13 22:41:12 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							eb476a95e2 
							
						 
					 
					
						
						
							
							feat: 订单打印上边距可调整  
						
						 
						
						
						
					 
					
						2024-03-13 21:29:43 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							048b7776b0 
							
						 
					 
					
						
						
							
							chore(version): upgrade core & rental  
						
						 
						
						
						
					 
					
						2024-03-13 20:22:48 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								katherinehhh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e5c1bef8de 
							
						 
					 
					
						
						
							
							fix(client): size undefined in nanoid ( #3708 )  
						
						 
						
						... 
						
						
						
						* fix(data-source): foreignkey
* fix: size undefined in nanoid 
						
					 
					
						2024-03-13 19:00:28 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							e14f99341a 
							
						 
					 
					
						
						
							
							fix: 编辑直发单,对应生成单单号保持不变  
						
						 
						
						
						
					 
					
						2024-03-13 18:53:44 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								katherinehhh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0779a4eab3 
							
						 
					 
					
						
						
							
							refactor(radio): radio support multiple field types ( #3706 )  
						
						 
						
						... 
						
						
						
						* style: fieldTitleInput style improve
* refactor: radio support mutiple type
* refactor: code improve 
						
					 
					
						2024-03-13 16:44:17 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ChengLei Shao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f6590d1331 
							
						 
					 
					
						
						
							
							fix: get async json schema ( #3705 )  
						
						 
						
						... 
						
						
						
						* fix: get async json schema
* fix: test 
						
					 
					
						2024-03-13 16:17:18 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							5a7c78d791 
							
						 
					 
					
						
						
							
							chore(version): upgrade core & rental  
						
						 
						
						
						
					 
					
						2024-03-13 15:29:08 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7a77536fc1 
							
						 
					 
					
						
						
							
							Merge pull request 'fix: 修改汇总区块NaN,添加自定义组件的理论重量' ( #363 ) from fix_group into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#363 
Reviewed-by: sealday <zhanglin@daoyoucloud.com> 
						
					 
					
						2024-03-13 15:26:32 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							12fe07e197 
							
						 
					 
					
						
						
							
							update ( #362 )  
						
						 
						
						... 
						
						
						
						<!-- Note -->
<!-- This is a template for submitting a new feature.
Use the bug fix template if you're submitting a bug fix pull request by adding `template=bug_fix.md` to your pull request URL. -->
# Description
<!-- Describe the new feature or modification to an existing feature clearly and consciously. -->
# Motivation
<!-- Explain the reason for adding or modifying this feature. -->
# Key changes
<!-- Provide a technically detailed description of the key changes made. -->
- Frontend
- Backend
# Test plan
## Suggestions
<!-- Provide any suggestions or recommendations for improvements in the testing plan. -->
## Underlying risk
<!-- Identify any potential risks or issues that may arise from the new feature or modification. -->
# Showcase
<!-- Including any screenshots of the new feature or modification. -->
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#362  
						
					 
					
						2024-03-13 15:11:31 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							5e2d8e871f 
							
						 
					 
					
						
						
							
							Merge pull request 'chore(version): upgrade core & rental' ( #361 ) from update into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#361  
						
					 
					
						2024-03-13 15:09:45 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							5ad280a8b3 
							
						 
					 
					
						
						
							
							fix: 修改汇总区块NaN,添加自定义组件的理论重量  
						
						 
						
						
						
					 
					
						2024-03-13 15:07:24 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							2099be026a 
							
						 
					 
					
						
						
							
							feat: recodpdf kg不换算吨  
						
						 
						
						
						
					 
					
						2024-03-13 14:29:21 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							65f3f838c6 
							
						 
					 
					
						
						
							
							chore(version): upgrade core & rental  
						
						 
						
						
						
					 
					
						2024-03-13 14:01:13 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							bd5bcadd3a 
							
						 
					 
					
						
						
							
							fix: 订单pdf单位数据错误  
						
						 
						
						
						
					 
					
						2024-03-13 13:58:37 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a7049de998 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/main' into merge_from_upstream  
						
						 
						
						
						
					 
					
						2024-03-13 12:17:01 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Junyi 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4015cf1c0d 
							
						 
					 
					
						
						
							
							fix(plugin-workflow): fix duplicated triggering schedule event ( #3692 )  
						
						 
						
						
						
					 
					
						2024-03-13 11:42:00 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zeke Zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d904d13c52 
							
						 
					 
					
						
						
							
							fix(Form): should be created instead of updated when clicking submit ( #3687 )  
						
						 
						
						... 
						
						
						
						* fix(Form): should be created instead of updated when clicking submit
* test: add e2e
* test: optimize e2e 
						
					 
					
						2024-03-13 10:13:02 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							58ac16a9b6 
							
						 
					 
					
						
						
							
							chore(version): upgrade  rental  
						
						 
						
						
						
					 
					
						2024-03-12 23:20:21 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fa0d01fd47 
							
						 
					 
					
						
						
							
							fix: stack overflow  
						
						 
						
						
						
					 
					
						2024-03-12 23:19:36 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							95452630b3 
							
						 
					 
					
						
						
							
							chore(version): upgrade  rental  
						
						 
						
						
						
					 
					
						2024-03-12 21:59:56 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							2245cd84e7 
							
						 
					 
					
						
						
							
							fix: 小结理论重量更正,报价总金额工单修改,购销单pdf工单修改,订单导入hook停用,出库入筛选基地仓库  
						
						 
						
						
						
					 
					
						2024-03-12 21:33:51 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1f6b802b61 
							
						 
					 
					
						
						
							
							chore(version): upgrade core & rental  
						
						 
						
						
						
					 
					
						2024-03-12 21:21:29 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chenos 
							
						 
					 
					
						
						
						
						
							
						
						
							2e7da6e29b 
							
						 
					 
					
						
						
							
							chore(versions):  😊  publish v0.20.0-alpha.9  
						
						 
						
						
						
					 
					
						2024-03-12 21:15:51 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							02fbf868a5 
							
						 
					 
					
						
						
							
							Merge pull request 'feat: 小结完成,recordhook小调整' ( #350 ) from feat_record_summary into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#350 
Reviewed-by: sealday <zhanglin@daoyoucloud.com> 
						
					 
					
						2024-03-12 20:13:00 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lyx 
							
						 
					 
					
						
						
						
						
							
						
						
							52a17ca60c 
							
						 
					 
					
						
						
							
							feat: 小结完成  
						
						 
						
						
						
					 
					
						2024-03-12 20:07:27 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ae8d1a47b0 
							
						 
					 
					
						
						
							
							fix: undefined promises throw error  
						
						 
						
						
						
					 
					
						2024-03-12 20:03:34 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1737a0f83b 
							
						 
					 
					
						
						
							
							Merge pull request 'main' ( #349 ) from main into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#349  
						
					 
					
						2024-03-12 20:00:15 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							71ccf55d77 
							
						 
					 
					
						
						
							
							Merge pull request 'feat: 修改录单跳转问题' ( #348 ) from fix_recordNavigate into @hera/dev  
						
						 
						
						... 
						
						
						
						Reviewed-on: daoyoucloud/tachycode#348 
Reviewed-by: sealday <zhanglin@daoyoucloud.com> 
						
					 
					
						2024-03-12 16:41:50 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							847a1fae9a 
							
						 
					 
					
						
						
							
							feat: 修改录单跳转问题  
						
						 
						
						
						
					 
					
						2024-03-12 16:08:27 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chareice 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							023096b1a9 
							
						 
					 
					
						
						
							
							fix: pagination error in roles collections resourcer  
						
						 
						
						
						
					 
					
						2024-03-12 15:15:24 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jack zhang 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							de6e8469d3 
							
						 
					 
					
						
						
							
							fix: data source add field refresh(T-3253) ( #3645 )  
						
						 
						
						
						
					 
					
						2024-03-12 15:13:56 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							07068febbd 
							
						 
					 
					
						
						
							
							feat: 添加汇总的提供请求链接地址  
						
						 
						
						
						
					 
					
						2024-03-12 14:29:15 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ChengLei Shao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							94cbbf93b8 
							
						 
					 
					
						
						
							
							fix: upgrade app after restore ( #3680 )  
						
						 
						
						
						
					 
					
						2024-03-12 11:34:22 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ChengLei Shao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cdf9f4818f 
							
						 
					 
					
						
						
							
							fix: acl should return true when resource allowed ( #3675 )  
						
						 
						
						... 
						
						
						
						* fix: acl should return true when resource allowed
* chore: test 
						
					 
					
						2024-03-12 09:08:15 +08:00