diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8b9a3c671..3f2ee38c2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,297 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.6.20](https://github.com/nocobase/nocobase/compare/v1.6.19...v1.6.20) - 2025-04-14
+
+### 🎉 New Features
+
+- **[Departments]** Make Department, Attachment URL, and Workflow response message plugins free ([#6663](https://github.com/nocobase/nocobase/pull/6663)) by @chenos
+
+### 🐛 Bug Fixes
+
+- **[client]**
+  - The filter form should not display the "Unsaved changes" prompt ([#6657](https://github.com/nocobase/nocobase/pull/6657)) by @zhangzhonghe
+
+  - "allow multiple" option not working for relation field ([#6661](https://github.com/nocobase/nocobase/pull/6661)) by @katherinehhh
+
+  - In the filter form, when the filter button is clicked, if there are fields that have not passed validation, the filtering is still triggered ([#6659](https://github.com/nocobase/nocobase/pull/6659)) by @zhangzhonghe
+
+  - Switching to the group menu should not jump to a page that has already been hidden in menu ([#6654](https://github.com/nocobase/nocobase/pull/6654)) by @zhangzhonghe
+
+- **[File storage: S3(Pro)]**
+  - Organize language by @jiannx
+
+  - Individual baseurl and public settings, improve S3 pro storage config UX by @jiannx
+
+- **[Migration manager]** the skip auto backup option becomes invalid if environment variable popup appears during migration by @gchust
+
+## [v1.6.19](https://github.com/nocobase/nocobase/compare/v1.6.18...v1.6.19) - 2025-04-14
+
+### 🐛 Bug Fixes
+
+- **[client]**
+  - Fix the issue of preview images being obscured ([#6651](https://github.com/nocobase/nocobase/pull/6651)) by @zhangzhonghe
+
+  - In the form block, the default value of the field configuration will first be displayed as the original variable string and then disappear ([#6649](https://github.com/nocobase/nocobase/pull/6649)) by @zhangzhonghe
+
+## [v1.6.18](https://github.com/nocobase/nocobase/compare/v1.6.17...v1.6.18) - 2025-04-11
+
+### 🚀 Improvements
+
+- **[client]**
+  - Add default type fallback API for `Variable.Input` ([#6644](https://github.com/nocobase/nocobase/pull/6644)) by @mytharcher
+
+  - Optimize prompts for unconfigured pages ([#6641](https://github.com/nocobase/nocobase/pull/6641)) by @zhangzhonghe
+
+- **[Workflow: Delay node]** Support to use variable for duration ([#6621](https://github.com/nocobase/nocobase/pull/6621)) by @mytharcher
+
+- **[Workflow: Custom action event]** Add refresh settings for trigger workflow button by @mytharcher
+
+### 🐛 Bug Fixes
+
+- **[client]**
+  - subtable description overlapping with add new button ([#6646](https://github.com/nocobase/nocobase/pull/6646)) by @katherinehhh
+
+  - dashed underline caused by horizontal form layout in modal ([#6639](https://github.com/nocobase/nocobase/pull/6639)) by @katherinehhh
+
+- **[File storage: S3(Pro)]** Fix missing await for next call. by @jiannx
+
+- **[Email manager]** Fix missing await for next call. by @jiannx
+
+## [v1.6.17](https://github.com/nocobase/nocobase/compare/v1.6.16...v1.6.17) - 2025-04-09
+
+### 🚀 Improvements
+
+- **[utils]** Add duration extension for dayjs ([#6630](https://github.com/nocobase/nocobase/pull/6630)) by @mytharcher
+
+- **[client]**
+  - Support to search field in Filter component ([#6627](https://github.com/nocobase/nocobase/pull/6627)) by @mytharcher
+
+  - Add `trim` API for `Input` and `Variable.TextArea` ([#6624](https://github.com/nocobase/nocobase/pull/6624)) by @mytharcher
+
+- **[Error handler]** Support custom title in AppError component. ([#6409](https://github.com/nocobase/nocobase/pull/6409)) by @sheldon66
+
+- **[IP restriction]** Update IP restriction message content. by @sheldon66
+
+- **[File storage: S3(Pro)]** Support global variables in storage configuration by @mytharcher
+
+### 🐛 Bug Fixes
+
+- **[client]**
+  - rule with 'any' condition does not take effect when condition list is empty ([#6628](https://github.com/nocobase/nocobase/pull/6628)) by @katherinehhh
+
+  - data issue with Gantt block in tree collection ([#6617](https://github.com/nocobase/nocobase/pull/6617)) by @katherinehhh
+
+  - The relationship fields in the filter form report an error after the page is refreshed because x-data-source is not carried ([#6619](https://github.com/nocobase/nocobase/pull/6619)) by @zhangzhonghe
+
+  - variable parse failure when URL parameters contain Chinese characters ([#6618](https://github.com/nocobase/nocobase/pull/6618)) by @katherinehhh
+
+- **[Users]** Issue with parsing the user profile form schema ([#6635](https://github.com/nocobase/nocobase/pull/6635)) by @2013xile
+
+- **[Mobile]** single-select field with 'contains' filter on mobile does not support multiple selection ([#6629](https://github.com/nocobase/nocobase/pull/6629)) by @katherinehhh
+
+- **[Action: Export records]** missing filter params when exporting data after changing pagination ([#6633](https://github.com/nocobase/nocobase/pull/6633)) by @katherinehhh
+
+- **[Email manager]** fix email management permission cannot view email list by @jiannx
+
+- **[File storage: S3(Pro)]** Throw error to user when upload logo to S3 Pro storage (set to default) by @mytharcher
+
+- **[Workflow: Approval]** Fix `updatedAt` changed after migration by @mytharcher
+
+- **[Migration manager]** migration log creation time is displayed incorrectly in some environments by @gchust
+
+## [v1.6.16](https://github.com/nocobase/nocobase/compare/v1.6.15...v1.6.16) - 2025-04-03
+
+### 🐛 Bug Fixes
+
+- **[client]**
+  - x-disabled property not taking effect on form fields ([#6610](https://github.com/nocobase/nocobase/pull/6610)) by @katherinehhh
+
+  - field label display issue to prevent truncation by colon ([#6599](https://github.com/nocobase/nocobase/pull/6599)) by @katherinehhh
+
+- **[database]** When deleting one-to-many records, both `filter` and `filterByTk` are passed and `filter` includes an association field, the `filterByTk` is ignored ([#6606](https://github.com/nocobase/nocobase/pull/6606)) by @2013xile
+
+## [v1.6.15](https://github.com/nocobase/nocobase/compare/v1.6.14...v1.6.15) - 2025-04-01
+
+### 🚀 Improvements
+
+- **[database]**
+  - Add trim option for text field ([#6603](https://github.com/nocobase/nocobase/pull/6603)) by @mytharcher
+
+  - Add trim option for string field ([#6565](https://github.com/nocobase/nocobase/pull/6565)) by @mytharcher
+
+- **[File manager]** Add trim option for text fields of storages collection ([#6604](https://github.com/nocobase/nocobase/pull/6604)) by @mytharcher
+
+- **[Workflow]** Improve code ([#6589](https://github.com/nocobase/nocobase/pull/6589)) by @mytharcher
+
+- **[Workflow: Approval]** Support to use block template for approval process form by @mytharcher
+
+### 🐛 Bug Fixes
+
+- **[database]** Avoid "datetimeNoTz" field changes when value not changed in updating record ([#6588](https://github.com/nocobase/nocobase/pull/6588)) by @mytharcher
+
+- **[client]**
+  - association field (select) displaying N/A when exposing related collection fields ([#6582](https://github.com/nocobase/nocobase/pull/6582)) by @katherinehhh
+
+  - Fix `disabled` property not works when `SchemaInitializerItem` has `items` ([#6597](https://github.com/nocobase/nocobase/pull/6597)) by @mytharcher
+
+  - cascade  issue: 'The value of xxx cannot be in array format' when deleting and re-selecting ([#6585](https://github.com/nocobase/nocobase/pull/6585)) by @katherinehhh
+
+- **[Collection field: Many to many (array)]** Issue of filtering by fields in an association collection with a many to many (array) field ([#6596](https://github.com/nocobase/nocobase/pull/6596)) by @2013xile
+
+- **[Public forms]** View permissions include list and get ([#6607](https://github.com/nocobase/nocobase/pull/6607)) by @chenos
+
+- **[Authentication]** token assignment in `AuthProvider` ([#6593](https://github.com/nocobase/nocobase/pull/6593)) by @2013xile
+
+- **[Workflow]** Fix sync option display incorrectly ([#6595](https://github.com/nocobase/nocobase/pull/6595)) by @mytharcher
+
+- **[Block: Map]** map management validation should not pass with space input ([#6575](https://github.com/nocobase/nocobase/pull/6575)) by @katherinehhh
+
+- **[Workflow: Approval]**
+  - Fix client variables to use in approval form by @mytharcher
+
+  - Fix branch mode when `endOnReject` configured as `true` by @mytharcher
+
+## [v1.6.14](https://github.com/nocobase/nocobase/compare/v1.6.13...v1.6.14) - 2025-03-29
+
+### 🐛 Bug Fixes
+
+- **[Calendar]** missing data on boundary dates in weekly calendar view ([#6587](https://github.com/nocobase/nocobase/pull/6587)) by @katherinehhh
+
+- **[Auth: OIDC]** Incorrect redirection occurs when the callback path is the string 'null' by @2013xile
+
+- **[Workflow: Approval]** Fix approval node configuration is incorrect after schema changed by @mytharcher
+
+## [v1.6.13](https://github.com/nocobase/nocobase/compare/v1.6.12...v1.6.13) - 2025-03-28
+
+### 🚀 Improvements
+
+- **[Async task manager]** optimize import/export buttons in Pro ([#6531](https://github.com/nocobase/nocobase/pull/6531)) by @chenos
+
+- **[Action: Export records Pro]** optimize import/export buttons in Pro by @katherinehhh
+
+- **[Migration manager]** allow skip automatic backup and restore for migration by @gchust
+
+### 🐛 Bug Fixes
+
+- **[client]** linkage conflict between same-named association fields in different sub-tables within the same form ([#6577](https://github.com/nocobase/nocobase/pull/6577)) by @katherinehhh
+
+- **[Action: Batch edit]** Click the batch edit button, configure the pop-up window, and then open it again, the pop-up window is blank ([#6578](https://github.com/nocobase/nocobase/pull/6578)) by @zhangzhonghe
+
+## [v1.6.12](https://github.com/nocobase/nocobase/compare/v1.6.11...v1.6.12) - 2025-03-27
+
+### 🐛 Bug Fixes
+
+- **[Block: Multi-step form]**
+  - the submit button has the same color in its default and highlighted by @jiannx
+
+  - fixed the bug that form reset is invalid when the field is associated with other field by @jiannx
+
+- **[Workflow: Approval]** Fix approval form values to submit by @mytharcher
+
+## [v1.6.11](https://github.com/nocobase/nocobase/compare/v1.6.10...v1.6.11) - 2025-03-27
+
+### 🚀 Improvements
+
+- **[client]**
+  - Optimize 502 error message ([#6547](https://github.com/nocobase/nocobase/pull/6547)) by @chenos
+
+  - Only support plain text file to preview ([#6563](https://github.com/nocobase/nocobase/pull/6563)) by @mytharcher
+
+- **[Collection field: Sequence]** support setting sequence as the title field for calendar block ([#6562](https://github.com/nocobase/nocobase/pull/6562)) by @katherinehhh
+
+- **[Workflow: Approval]** Support to skip validator in settings by @mytharcher
+
+### 🐛 Bug Fixes
+
+- **[client]**
+  - issue with date field display in data scope filtering ([#6564](https://github.com/nocobase/nocobase/pull/6564)) by @katherinehhh
+
+  - The 'Ellipsis overflow content' option requires a page refresh for the toggle state to take effect ([#6520](https://github.com/nocobase/nocobase/pull/6520)) by @zhangzhonghe
+
+  - Unable to open another modal within a modal ([#6535](https://github.com/nocobase/nocobase/pull/6535)) by @zhangzhonghe
+
+- **[API documentation]** API document page cannot scroll ([#6566](https://github.com/nocobase/nocobase/pull/6566)) by @zhangzhonghe
+
+- **[Workflow]** Make sure workflow key is generated before save ([#6567](https://github.com/nocobase/nocobase/pull/6567)) by @mytharcher
+
+- **[Workflow: Post-action event]** Multiple records in bulk action should trigger multiple times ([#6559](https://github.com/nocobase/nocobase/pull/6559)) by @mytharcher
+
+- **[Authentication]** Localization issue for fields of sign up page ([#6556](https://github.com/nocobase/nocobase/pull/6556)) by @2013xile
+
+- **[Public forms]** issue with public form page title displaying 'Loading...' ([#6569](https://github.com/nocobase/nocobase/pull/6569)) by @katherinehhh
+
+## [v1.6.10](https://github.com/nocobase/nocobase/compare/v1.6.9...v1.6.10) - 2025-03-25
+
+### 🐛 Bug Fixes
+
+- **[client]**
+  - Unable to use 'Current User' variable when adding a link page ([#6536](https://github.com/nocobase/nocobase/pull/6536)) by @zhangzhonghe
+
+  - field assignment with null value is ineffective ([#6549](https://github.com/nocobase/nocobase/pull/6549)) by @katherinehhh
+
+  - `yarn doc` command error ([#6540](https://github.com/nocobase/nocobase/pull/6540)) by @gchust
+
+  - Remove the 'Allow multiple selection' option from dropdown single-select fields in filter forms ([#6515](https://github.com/nocobase/nocobase/pull/6515)) by @zhangzhonghe
+
+  - Relational field's data range linkage is not effective ([#6530](https://github.com/nocobase/nocobase/pull/6530)) by @zhangzhonghe
+
+- **[Collection: Tree]** Migration issue for plugin-collection-tree ([#6537](https://github.com/nocobase/nocobase/pull/6537)) by @2013xile
+
+- **[Action: Custom request]** Unable to download UTF-8 encoded files ([#6541](https://github.com/nocobase/nocobase/pull/6541)) by @2013xile
+
+## [v1.6.9](https://github.com/nocobase/nocobase/compare/v1.6.8...v1.6.9) - 2025-03-23
+
+### 🐛 Bug Fixes
+
+- **[client]** action button transparency causing setting display issue on hover ([#6529](https://github.com/nocobase/nocobase/pull/6529)) by @katherinehhh
+
+## [v1.6.8](https://github.com/nocobase/nocobase/compare/v1.6.7...v1.6.8) - 2025-03-22
+
+### 🐛 Bug Fixes
+
+- **[server]** The upgrade command may cause workflow errors ([#6524](https://github.com/nocobase/nocobase/pull/6524)) by @gchust
+
+- **[client]** the height of the subtable in the form is set along with the form height ([#6518](https://github.com/nocobase/nocobase/pull/6518)) by @katherinehhh
+
+- **[Authentication]**
+  - X-Authenticator missing ([#6526](https://github.com/nocobase/nocobase/pull/6526)) by @chenos
+
+  - Trim authenticator options ([#6527](https://github.com/nocobase/nocobase/pull/6527)) by @2013xile
+
+- **[Block: Map]** map block key management issue causing request failures due to invisible characters ([#6521](https://github.com/nocobase/nocobase/pull/6521)) by @katherinehhh
+
+- **[Backup manager]** Restoration may cause workflow execution errors by @gchust
+
+- **[WeCom]** Resolve environment variables and secrets when retrieving notification configuration. by @2013xile
+
+## [v1.6.7](https://github.com/nocobase/nocobase/compare/v1.6.6...v1.6.7) - 2025-03-20
+
+### 🚀 Improvements
+
+- **[Workflow: mailer node]** Add secure field config description. ([#6510](https://github.com/nocobase/nocobase/pull/6510)) by @sheldon66
+
+- **[Notification: Email]** Add secure field config description. ([#6501](https://github.com/nocobase/nocobase/pull/6501)) by @sheldon66
+
+- **[Calendar]** Calendar plugin with optional settings to enable or disable quick event creation ([#6391](https://github.com/nocobase/nocobase/pull/6391)) by @Cyx649312038
+
+### 🐛 Bug Fixes
+
+- **[client]** time field submission error in Chinese locale (invalid input syntax for type time) ([#6511](https://github.com/nocobase/nocobase/pull/6511)) by @katherinehhh
+
+- **[File manager]** Unable to access files stored in COS ([#6512](https://github.com/nocobase/nocobase/pull/6512)) by @chenos
+
+- **[Block: Map]** secret key fields not triggering validation in map management ([#6509](https://github.com/nocobase/nocobase/pull/6509)) by @katherinehhh
+
+- **[WEB client]** The path in the route management table is different from the actual path ([#6483](https://github.com/nocobase/nocobase/pull/6483)) by @zhangzhonghe
+
+- **[Action: Export records Pro]** Unable to export attachments by @chenos
+
+- **[Workflow: Approval]**
+  - Fix null user caused crash by @mytharcher
+
+  - Fix error thrown when add query node result by @mytharcher
+
 ## [v1.6.6](https://github.com/nocobase/nocobase/compare/v1.6.5...v1.6.6) - 2025-03-18
 
 ### 🎉 New Features
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 5861cd0756..7bb43bdfb4 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -5,6 +5,297 @@
 格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/),
 并且本项目遵循 [语义化版本](https://semver.org/spec/v2.0.0.html)。
 
+## [v1.6.20](https://github.com/nocobase/nocobase/compare/v1.6.19...v1.6.20) - 2025-04-14
+
+### 🎉 新特性
+
+- **[部门]** 商业插件部门、附件 URL、工作流响应消息改为免费提供 ([#6663](https://github.com/nocobase/nocobase/pull/6663)) by @chenos
+
+### 🐛 修复
+
+- **[client]**
+  - 筛选表单不应该显示“未保存修改”提示 ([#6657](https://github.com/nocobase/nocobase/pull/6657)) by @zhangzhonghe
+
+  - 筛选表单中关系字段的“允许多选”设置项不生效 ([#6661](https://github.com/nocobase/nocobase/pull/6661)) by @katherinehhh
+
+  - 筛选表单中，当点击筛选按钮时，如果有字段未校验通过，依然会触发筛选的问题 ([#6659](https://github.com/nocobase/nocobase/pull/6659)) by @zhangzhonghe
+
+  - 切换到分组菜单时，不应该跳转到已经在菜单中被隐藏的页面 ([#6654](https://github.com/nocobase/nocobase/pull/6654)) by @zhangzhonghe
+
+- **[文件存储：S3 (Pro)]**
+  - 整理语言文案 by @jiannx
+
+  - baseurl 和 public 设置不再互相关联，改进 S3 pro 存储的配置交互体验 by @jiannx
+
+- **[迁移管理]** 迁移时若弹出环境变量弹窗，跳过自动备份选项会失效 by @gchust
+
+## [v1.6.19](https://github.com/nocobase/nocobase/compare/v1.6.18...v1.6.19) - 2025-04-14
+
+### 🐛 修复
+
+- **[client]**
+  - 修复预览图片被遮挡的问题 ([#6651](https://github.com/nocobase/nocobase/pull/6651)) by @zhangzhonghe
+
+  - 表单区块中，字段配置的默认值会先显示为原始变量字符串然后再消失 ([#6649](https://github.com/nocobase/nocobase/pull/6649)) by @zhangzhonghe
+
+## [v1.6.18](https://github.com/nocobase/nocobase/compare/v1.6.17...v1.6.18) - 2025-04-11
+
+### 🚀 优化
+
+- **[client]**
+  - 为 `Variable.Input` 组件增加默认退避类型的 API ([#6644](https://github.com/nocobase/nocobase/pull/6644)) by @mytharcher
+
+  - 优化未配置页面时的提示 ([#6641](https://github.com/nocobase/nocobase/pull/6641)) by @zhangzhonghe
+
+- **[工作流：延时节点]** 支持延迟时间使用变量 ([#6621](https://github.com/nocobase/nocobase/pull/6621)) by @mytharcher
+
+- **[工作流：自定义操作事件]** 为触发工作流按钮增加刷新配置项 by @mytharcher
+
+### 🐛 修复
+
+- **[client]**
+  - 子表格中描述信息与操作按钮遮挡 ([#6646](https://github.com/nocobase/nocobase/pull/6646)) by @katherinehhh
+
+  - 弹窗表单在 horizontal 布局下初始宽度计算错误，导致出现提示和 下划虚线 ([#6639](https://github.com/nocobase/nocobase/pull/6639)) by @katherinehhh
+
+- **[文件存储：S3 (Pro)]** 修复next调用缺少await by @jiannx
+
+- **[邮件管理]** 修复next调用缺少await by @jiannx
+
+## [v1.6.17](https://github.com/nocobase/nocobase/compare/v1.6.16...v1.6.17) - 2025-04-09
+
+### 🚀 优化
+
+- **[utils]** 为 dayjs 包增加时长扩展 ([#6630](https://github.com/nocobase/nocobase/pull/6630)) by @mytharcher
+
+- **[client]**
+  - 支持筛选组件中对字段进行搜索 ([#6627](https://github.com/nocobase/nocobase/pull/6627)) by @mytharcher
+
+  - 为 `Input` 和 `Variable.TextArea` 组件增加 `trim` API ([#6624](https://github.com/nocobase/nocobase/pull/6624)) by @mytharcher
+
+- **[错误处理器]** 在 AppError 组件中支持自定义标题。 ([#6409](https://github.com/nocobase/nocobase/pull/6409)) by @sheldon66
+
+- **[IP 限制]** 更新 IP 限制消息内容。 by @sheldon66
+
+- **[文件存储：S3 (Pro)]** 支持存储引擎的配置中使用全局变量 by @mytharcher
+
+### 🐛 修复
+
+- **[client]**
+  - 联动规则条件设置为任意且无条件内容时属性设置不生效 ([#6628](https://github.com/nocobase/nocobase/pull/6628)) by @katherinehhh
+
+  - 树表使用甘特图区块时数据显示异常 ([#6617](https://github.com/nocobase/nocobase/pull/6617)) by @katherinehhh
+
+  - 筛选表单中的关系字段在刷新页面后，由于没有携带 x-data-source 而报错 ([#6619](https://github.com/nocobase/nocobase/pull/6619)) by @zhangzhonghe
+
+  - 链接中中文参数变量值解析失败 ([#6618](https://github.com/nocobase/nocobase/pull/6618)) by @katherinehhh
+
+- **[用户]** 用户个人资料表单 schema 的解析问题 ([#6635](https://github.com/nocobase/nocobase/pull/6635)) by @2013xile
+
+- **[移动端]** 下拉单选字段在移动端设置筛选符为包含时组件未支持多选 ([#6629](https://github.com/nocobase/nocobase/pull/6629)) by @katherinehhh
+
+- **[操作：导出记录]** 筛选数据后切换分页再导出时筛选参数丢失 ([#6633](https://github.com/nocobase/nocobase/pull/6633)) by @katherinehhh
+
+- **[邮件管理]** 邮件管理权限无法查看邮件列表 by @jiannx
+
+- **[文件存储：S3 (Pro)]** 当用户上传 logo 失败时提示错误（设置为默认存储的 S3 Pro） by @mytharcher
+
+- **[工作流：审批]** 修复更新时间在迁移后变化 by @mytharcher
+
+- **[迁移管理]** 部分服务器环境下迁移日志创建日期显示不正确 by @gchust
+
+## [v1.6.16](https://github.com/nocobase/nocobase/compare/v1.6.15...v1.6.16) - 2025-04-03
+
+### 🐛 修复
+
+- **[client]**
+  - 表单字段设置不可编辑不起作用 ([#6610](https://github.com/nocobase/nocobase/pull/6610)) by @katherinehhh
+
+  - 表单字段标题因冒号导致的截断问题 ([#6599](https://github.com/nocobase/nocobase/pull/6599)) by @katherinehhh
+
+- **[database]** 删除一对多记录时，同时传递 `filter` 和 `filterByTk` 参数，`filter` 包含关系字段时，`filterByTk` 参数失效 ([#6606](https://github.com/nocobase/nocobase/pull/6606)) by @2013xile
+
+## [v1.6.15](https://github.com/nocobase/nocobase/compare/v1.6.14...v1.6.15) - 2025-04-01
+
+### 🚀 优化
+
+- **[database]**
+  - 为多行文本类型字段增加去除首尾空白字符的选项 ([#6603](https://github.com/nocobase/nocobase/pull/6603)) by @mytharcher
+
+  - 为单行文本增加自动去除首尾空白字符的选项 ([#6565](https://github.com/nocobase/nocobase/pull/6565)) by @mytharcher
+
+- **[文件管理器]** 为存储引擎表的文本字段增加去除首尾空白字符的选项 ([#6604](https://github.com/nocobase/nocobase/pull/6604)) by @mytharcher
+
+- **[工作流]** 优化代码 ([#6589](https://github.com/nocobase/nocobase/pull/6589)) by @mytharcher
+
+- **[工作流：审批]** 支持审批表单使用区块模板 by @mytharcher
+
+### 🐛 修复
+
+- **[database]** 避免“日期时间（无时区）”字段在值未变动的更新时触发值改变 ([#6588](https://github.com/nocobase/nocobase/pull/6588)) by @mytharcher
+
+- **[client]**
+  - 关系字段（select）放出关系表字段时默认显示 N/A ([#6582](https://github.com/nocobase/nocobase/pull/6582)) by @katherinehhh
+
+  - 修复 `SchemaInitializerItem` 配置了 `items` 时 `disabled` 属性无效的问题 ([#6597](https://github.com/nocobase/nocobase/pull/6597)) by @mytharcher
+
+  - 级联组件删除后重新选择时出现 'The value of xxx cannot be in array format' ([#6585](https://github.com/nocobase/nocobase/pull/6585)) by @katherinehhh
+
+- **[数据表字段：多对多 (数组)]** 主表筛选带有多对多（数组）字段的关联表中的字段报错的问题 ([#6596](https://github.com/nocobase/nocobase/pull/6596)) by @2013xile
+
+- **[公开表单]** 查看权限包括 list 和 get ([#6607](https://github.com/nocobase/nocobase/pull/6607)) by @chenos
+
+- **[用户认证]** `AuthProvider` 中的 token 赋值 ([#6593](https://github.com/nocobase/nocobase/pull/6593)) by @2013xile
+
+- **[工作流]** 修复同步选项展示问题 ([#6595](https://github.com/nocobase/nocobase/pull/6595)) by @mytharcher
+
+- **[区块：地图]** 地图管理必填校验不应通过空格输入 ([#6575](https://github.com/nocobase/nocobase/pull/6575)) by @katherinehhh
+
+- **[工作流：审批]**
+  - 修复审批表单中的前端变量 by @mytharcher
+
+  - 修复分支模式下配置拒绝则结束时的流程问题 by @mytharcher
+
+## [v1.6.14](https://github.com/nocobase/nocobase/compare/v1.6.13...v1.6.14) - 2025-03-29
+
+### 🐛 修复
+
+- **[日历]** 日历区块以周为视图时，边界日期不显示数据 ([#6587](https://github.com/nocobase/nocobase/pull/6587)) by @katherinehhh
+
+- **[认证：OIDC]** 回调路径是字符串'null'时导致跳转不正确 by @2013xile
+
+- **[工作流：审批]** 修复审批节点界面配置变更后数据未同步的问题 by @mytharcher
+
+## [v1.6.13](https://github.com/nocobase/nocobase/compare/v1.6.12...v1.6.13) - 2025-03-28
+
+### 🚀 优化
+
+- **[异步任务管理器]** 优化 Pro 导入导出按钮异步逻辑 ([#6531](https://github.com/nocobase/nocobase/pull/6531)) by @chenos
+
+- **[操作：导出记录 Pro]** 优化 Pro 导入导出按钮 by @katherinehhh
+
+- **[迁移管理]** 允许执行迁移时跳过自动备份还原 by @gchust
+
+### 🐛 修复
+
+- **[client]** 同一表单中不同关系字段的同名关系字段的联动互相影响 ([#6577](https://github.com/nocobase/nocobase/pull/6577)) by @katherinehhh
+
+- **[操作：批量编辑]** 点击批量编辑按钮，配置完弹窗再打开，弹窗是空白的 ([#6578](https://github.com/nocobase/nocobase/pull/6578)) by @zhangzhonghe
+
+## [v1.6.12](https://github.com/nocobase/nocobase/compare/v1.6.11...v1.6.12) - 2025-03-27
+
+### 🐛 修复
+
+- **[区块：分步表单]**
+  - 提交按钮默认和高亮情况下颜色一样 by @jiannx
+
+  - 修复当字段与其他表单字段存在关联时，表单重置无效 by @jiannx
+
+- **[工作流：审批]** 修复审批表单提交值的问题 by @mytharcher
+
+## [v1.6.11](https://github.com/nocobase/nocobase/compare/v1.6.10...v1.6.11) - 2025-03-27
+
+### 🚀 优化
+
+- **[client]**
+  - 优化 502 错误提示 ([#6547](https://github.com/nocobase/nocobase/pull/6547)) by @chenos
+
+  - 仅支持纯文本文件预览 ([#6563](https://github.com/nocobase/nocobase/pull/6563)) by @mytharcher
+
+- **[数据表字段：自动编码]** 支持使用 sequence 作为日历区块的标题字段 ([#6562](https://github.com/nocobase/nocobase/pull/6562)) by @katherinehhh
+
+- **[工作流：审批]** 支持审批处理按钮跳过表单验证的设置 by @mytharcher
+
+### 🐛 修复
+
+- **[client]**
+  - 数据范围中筛选日期字段显示异常 ([#6564](https://github.com/nocobase/nocobase/pull/6564)) by @katherinehhh
+
+  - 选项“省略超出长度的内容”需要刷新页面，开关的状态才生效 ([#6520](https://github.com/nocobase/nocobase/pull/6520)) by @zhangzhonghe
+
+  - 在弹窗中无法再次打开弹窗 ([#6535](https://github.com/nocobase/nocobase/pull/6535)) by @zhangzhonghe
+
+- **[API 文档]** API 文档页面不能滚动 ([#6566](https://github.com/nocobase/nocobase/pull/6566)) by @zhangzhonghe
+
+- **[工作流]** 确保创建工作流之前 key 已生成 ([#6567](https://github.com/nocobase/nocobase/pull/6567)) by @mytharcher
+
+- **[工作流：操作后事件]** 多行记录的批量操作需要触发多次 ([#6559](https://github.com/nocobase/nocobase/pull/6559)) by @mytharcher
+
+- **[用户认证]** 注册页面字段的本地化问题 ([#6556](https://github.com/nocobase/nocobase/pull/6556)) by @2013xile
+
+- **[公开表单]** 公开表单页面标题不应该显示 Loading... ([#6569](https://github.com/nocobase/nocobase/pull/6569)) by @katherinehhh
+
+## [v1.6.10](https://github.com/nocobase/nocobase/compare/v1.6.9...v1.6.10) - 2025-03-25
+
+### 🐛 修复
+
+- **[client]**
+  - 添加链接页面时，无法使用“当前用户”变量 ([#6536](https://github.com/nocobase/nocobase/pull/6536)) by @zhangzhonghe
+
+  - 字段赋值对字段进行“空值”赋值无效 ([#6549](https://github.com/nocobase/nocobase/pull/6549)) by @katherinehhh
+
+  - `yarn doc` 命令报错 ([#6540](https://github.com/nocobase/nocobase/pull/6540)) by @gchust
+
+  - 筛选表单中，移除下拉单选字段的“允许多选”选项 ([#6515](https://github.com/nocobase/nocobase/pull/6515)) by @zhangzhonghe
+
+  - 关系字段的数据范围联动不生效 ([#6530](https://github.com/nocobase/nocobase/pull/6530)) by @zhangzhonghe
+
+- **[数据表：树]** 树表插件的迁移脚本问题 ([#6537](https://github.com/nocobase/nocobase/pull/6537)) by @2013xile
+
+- **[操作：自定义请求]** 无法下载utf8编码的文件 ([#6541](https://github.com/nocobase/nocobase/pull/6541)) by @2013xile
+
+## [v1.6.9](https://github.com/nocobase/nocobase/compare/v1.6.8...v1.6.9) - 2025-03-23
+
+### 🐛 修复
+
+- **[client]** 操作按钮透明状态导致 hover 时按钮 setting 显示异常 ([#6529](https://github.com/nocobase/nocobase/pull/6529)) by @katherinehhh
+
+## [v1.6.8](https://github.com/nocobase/nocobase/compare/v1.6.7...v1.6.8) - 2025-03-22
+
+### 🐛 修复
+
+- **[server]** Upgrade 命令可能造成工作流报错 ([#6524](https://github.com/nocobase/nocobase/pull/6524)) by @gchust
+
+- **[client]** 表单中的子表格高度会随主表单高度一同设置 ([#6518](https://github.com/nocobase/nocobase/pull/6518)) by @katherinehhh
+
+- **[用户认证]**
+  - X-Authenticator 缺失 ([#6526](https://github.com/nocobase/nocobase/pull/6526)) by @chenos
+
+  - 移除认证器配置项前后的空格、换行符 ([#6527](https://github.com/nocobase/nocobase/pull/6527)) by @2013xile
+
+- **[区块：地图]** 地图区块 密钥管理中不可见字符导致的密钥请求失败的问题 ([#6521](https://github.com/nocobase/nocobase/pull/6521)) by @katherinehhh
+
+- **[备份管理器]** 还原过程中可能引起工作流执行报错 by @gchust
+
+- **[企业微信]** 获取通知配置时需要解析环境变量和密钥 by @2013xile
+
+## [v1.6.7](https://github.com/nocobase/nocobase/compare/v1.6.6...v1.6.7) - 2025-03-20
+
+### 🚀 优化
+
+- **[工作流：邮件发送节点]** 增加安全字段配置描述。 ([#6510](https://github.com/nocobase/nocobase/pull/6510)) by @sheldon66
+
+- **[通知：电子邮件]** 增加安全字段配置描述。 ([#6501](https://github.com/nocobase/nocobase/pull/6501)) by @sheldon66
+
+- **[日历]** 日历插件添加开启或关闭快速创建事件可选设置 ([#6391](https://github.com/nocobase/nocobase/pull/6391)) by @Cyx649312038
+
+### 🐛 修复
+
+- **[client]** 时间字段在中文语言下提交时报错 invalid input syntax for type time ([#6511](https://github.com/nocobase/nocobase/pull/6511)) by @katherinehhh
+
+- **[文件管理器]** COS 存储的文件无法访问 ([#6512](https://github.com/nocobase/nocobase/pull/6512)) by @chenos
+
+- **[区块：地图]** 地图管理中密钥必填校验失败 ([#6509](https://github.com/nocobase/nocobase/pull/6509)) by @katherinehhh
+
+- **[WEB 客户端]** 路由管理表格中的路径与实际路径不一样 ([#6483](https://github.com/nocobase/nocobase/pull/6483)) by @zhangzhonghe
+
+- **[操作：导出记录 Pro]** 无法导出附件 by @chenos
+
+- **[工作流：审批]**
+  - 修复空用户造成页面崩溃 by @mytharcher
+
+  - 修复审批人界面配置添加查询节点时的页面崩溃 by @mytharcher
+
 ## [v1.6.6](https://github.com/nocobase/nocobase/compare/v1.6.5...v1.6.6) - 2025-03-18
 
 ### 🎉 新特性
diff --git a/LICENSE.txt b/LICENSE.txt
index b3c87c1e83..babf2bf053 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Updated Date: February 20, 2025
+Updated Date: April 1, 2025
 
 NocoBase License Agreement
 
@@ -88,7 +88,7 @@ Except for Third-Party Open Source Software, the Company owns all copyrights, tr
 
 6.6 Can sell plugins developed for Software in the Marketplace.
 
-6.7 The User with an Enterprise Edition License can sell Upper Layer Application to their clients.
+6.7 The User with a Professional or Enterprise Edition License can sell Upper Layer Application to their clients.
 
 6.8 Not restricted by the AGPL-3.0 agreement.
 
@@ -106,9 +106,9 @@ Except for Third-Party Open Source Software, the Company owns all copyrights, tr
 
 7.4 It is not allowed to provide any form of no-code, zero-code, low-code platform SaaS products to the public using the original or modified Software.
 
-7.5 It is not allowed for the User withot an Enterprise Edition license to sell Upper Layer Application to clients without a Commercial license.
+7.5 It is not allowed for the User withot a Professional or Enterprise Edition license to sell Upper Layer Application to clients without a Commercial license.
 
-7.6 It is not allowed for the User with an Enterprise Edition license to sell Upper Layer Application to clients without a Commercial license with access to further development and configuration.
+7.6 It is not allowed for the User with a Professional or Enterprise Edition license to sell Upper Layer Application to clients without a Commercial license with access to further development and configuration.
 
 7.7 It is not allowed to publicly sell plugins developed for Software outside of the Marketplace.
 
diff --git a/README.ja-JP.md b/README.ja-JP.md
index 2fff33bddd..49e5c1be42 100644
--- a/README.ja-JP.md
+++ b/README.ja-JP.md
@@ -2,14 +2,10 @@
 
 https://github.com/user-attachments/assets/cf08bfe5-e6e6-453c-8b96-350a6a8bed17
 
-## ご協力ありがとうございます！
+<p align="center">
 <a href="https://trendshift.io/repositories/4112" target="_blank"><img src="https://trendshift.io/api/badge/repositories/4112" alt="nocobase%2Fnocobase | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-
 <a href="https://www.producthunt.com/posts/nocobase?embed=true&utm_source=badge-top-post-topic-badge&utm_medium=badge&utm_souce=badge-nocobase" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-topic-badge.svg?post_id=456520&theme=light&period=weekly&topic_id=267" alt="NocoBase - Scalability&#0045;first&#0044;&#0032;open&#0045;source&#0032;no&#0045;code&#0032;platform | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-
-## リリースノート
-
-リリースノートは[ブログ](https://www.nocobase.com/ja/blog/timeline)で随時更新され、週ごとにまとめて公開しています。
+</p>
 
 ## NocoBaseはなに？
 
@@ -28,6 +24,16 @@ https://docs-cn.nocobase.com/
 コミュニティ：  
 https://forum.nocobase.com/
 
+チュートリアル：  
+https://www.nocobase.com/ja/tutorials
+
+顧客のストーリー：  
+https://www.nocobase.com/ja/blog/tags/customer-stories
+
+## リリースノート
+
+リリースノートは[ブログ](https://www.nocobase.com/ja/blog/timeline)で随時更新され、週ごとにまとめて公開しています。
+
 ## 他の製品との違い
 
 ### 1. データモデル駆動 
diff --git a/README.md b/README.md
index 1314bec051..a2cfdb2bc4 100644
--- a/README.md
+++ b/README.md
@@ -2,19 +2,14 @@ English | [中文](./README.zh-CN.md) | [日本語](./README.ja-JP.md)
 
 https://github.com/user-attachments/assets/a50c100a-4561-4e06-b2d2-d48098659ec0
 
-## We'd love your support!
-
+<p align="center">
 <a href="https://trendshift.io/repositories/4112" target="_blank"><img src="https://trendshift.io/api/badge/repositories/4112" alt="nocobase%2Fnocobase | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-
 <a href="https://www.producthunt.com/posts/nocobase?embed=true&utm_source=badge-top-post-topic-badge&utm_medium=badge&utm_souce=badge-nocobase" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-topic-badge.svg?post_id=456520&theme=light&period=weekly&topic_id=267" alt="NocoBase - Scalability&#0045;first&#0044;&#0032;open&#0045;source&#0032;no&#0045;code&#0032;platform | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-
-## Release Notes
-
-Our [blog](https://www.nocobase.com/en/blog/timeline) is regularly updated with release notes and provides a weekly summary.
+</p>
 
 ## What is NocoBase
 
-NocoBase is a scalability-first, open-source no-code development platform.   
+NocoBase is an extensibility-first, open-source no-code development platform.   
 Instead of investing years of time and millions of dollars in research and development, deploy NocoBase in a few minutes and you'll have a private, controllable, and extremely scalable no-code development platform!
 
 Homepage:  
@@ -29,6 +24,17 @@ https://docs.nocobase.com/
 Forum:  
 https://forum.nocobase.com/
 
+Tutorials:  
+https://www.nocobase.com/en/tutorials
+
+Use Cases:  
+https://www.nocobase.com/en/blog/tags/customer-stories
+
+
+## Release Notes
+
+Our [blog](https://www.nocobase.com/en/blog/timeline) is regularly updated with release notes and provides a weekly summary.
+
 ## Distinctive features
 
 ### 1. Data model-driven
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 66e9c281d7..728695efc7 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -2,13 +2,10 @@
  
 https://github.com/nocobase/nocobase/assets/1267426/29623e45-9a48-4598-bb9e-9dd173ade553
 
-## 感谢支持
+<p align="center">
 <a href="https://trendshift.io/repositories/4112" target="_blank"><img src="https://trendshift.io/api/badge/repositories/4112" alt="nocobase%2Fnocobase | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-
 <a href="https://www.producthunt.com/posts/nocobase?embed=true&utm_source=badge-top-post-topic-badge&utm_medium=badge&utm_souce=badge-nocobase" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-topic-badge.svg?post_id=456520&theme=light&period=weekly&topic_id=267" alt="NocoBase - Scalability&#0045;first&#0044;&#0032;open&#0045;source&#0032;no&#0045;code&#0032;platform | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-
-## 发布日志
-我们的[博客](https://www.nocobase.com/cn/blog/timeline)会及时更新发布日志，并每周进行汇总。
+</p>
 
 ## NocoBase 是什么
 
@@ -27,6 +24,15 @@ https://docs-cn.nocobase.com/
 社区：  
 https://forum.nocobase.com/
 
+教程：  
+https://www.nocobase.com/cn/tutorials
+
+用户故事：  
+https://www.nocobase.com/cn/blog/tags/customer-stories
+
+## 发布日志
+我们的[博客](https://www.nocobase.com/cn/blog/timeline)会及时更新发布日志，并每周进行汇总。
+
 ## 与众不同之处
 
 ### 1. 数据模型驱动
diff --git a/lerna.json b/lerna.json
index 9f7e584b89..1c020ae68f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.6.6",
+  "version": "1.6.20",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "npmClientArgs": ["--ignore-engines"],
diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json
index 14318a4306..fd51012a13 100644
--- a/packages/core/acl/package.json
+++ b/packages/core/acl/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "1.6.6",
-    "@nocobase/utils": "1.6.6",
+    "@nocobase/resourcer": "1.6.20",
+    "@nocobase/utils": "1.6.20",
     "minimatch": "^5.1.1"
   },
   "repository": {
diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json
index 76f69b1c68..bea716ae5b 100644
--- a/packages/core/actions/package.json
+++ b/packages/core/actions/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@nocobase/actions",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cache": "1.6.6",
-    "@nocobase/database": "1.6.6",
-    "@nocobase/resourcer": "1.6.6"
+    "@nocobase/cache": "1.6.20",
+    "@nocobase/database": "1.6.20",
+    "@nocobase/resourcer": "1.6.20"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/app/package.json b/packages/core/app/package.json
index 6be8b6ecf7..bc58bcd6d0 100644
--- a/packages/core/app/package.json
+++ b/packages/core/app/package.json
@@ -1,17 +1,17 @@
 {
   "name": "@nocobase/app",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/database": "1.6.6",
-    "@nocobase/preset-nocobase": "1.6.6",
-    "@nocobase/server": "1.6.6"
+    "@nocobase/database": "1.6.20",
+    "@nocobase/preset-nocobase": "1.6.20",
+    "@nocobase/server": "1.6.20"
   },
   "devDependencies": {
-    "@nocobase/client": "1.6.6"
+    "@nocobase/client": "1.6.20"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/app/src/__tests__/commands.test.ts b/packages/core/app/src/__tests__/commands.test.ts
index f300d4cbda..946df74d9c 100644
--- a/packages/core/app/src/__tests__/commands.test.ts
+++ b/packages/core/app/src/__tests__/commands.test.ts
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '@nocobase/database';
+import { createMockDatabase, mockDatabase } from '@nocobase/database';
 import { uid } from '@nocobase/utils';
 import axios from 'axios';
 import execa from 'execa';
@@ -64,7 +64,7 @@ const createDatabase = async () => {
   if (process.env.DB_DIALECT === 'sqlite') {
     return 'nocobase';
   }
-  const db = mockDatabase();
+  const db = await createMockDatabase();
   const name = `d_${uid()}`;
   await db.sequelize.query(`CREATE DATABASE ${name}`);
   await db.close();
diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json
index 8ecfb5bec7..41029ecf8f 100644
--- a/packages/core/auth/package.json
+++ b/packages/core/auth/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.6.6",
-    "@nocobase/cache": "1.6.6",
-    "@nocobase/database": "1.6.6",
-    "@nocobase/resourcer": "1.6.6",
-    "@nocobase/utils": "1.6.6",
+    "@nocobase/actions": "1.6.20",
+    "@nocobase/cache": "1.6.20",
+    "@nocobase/database": "1.6.20",
+    "@nocobase/resourcer": "1.6.20",
+    "@nocobase/utils": "1.6.20",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
diff --git a/packages/core/build/package.json b/packages/core/build/package.json
index cc0bbe18a1..42a41bce84 100644
--- a/packages/core/build/package.json
+++ b/packages/core/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -17,7 +17,7 @@
     "@lerna/project": "4.0.0",
     "@rsbuild/plugin-babel": "^1.0.3",
     "@rsdoctor/rspack-plugin": "^0.4.8",
-    "@rspack/core": "1.1.1",
+    "@rspack/core": "1.3.2",
     "@svgr/webpack": "^8.1.0",
     "@types/gulp": "^4.0.13",
     "@types/lerna__package": "5.1.0",
diff --git a/packages/core/build/src/buildPlugin.ts b/packages/core/build/src/buildPlugin.ts
index f851f37ed8..9b7f228072 100644
--- a/packages/core/build/src/buildPlugin.ts
+++ b/packages/core/build/src/buildPlugin.ts
@@ -347,6 +347,7 @@ export async function buildPluginClient(cwd: string, userConfig: UserConfig, sou
         umdNamedDefine: true,
       },
     },
+    amd: {},
     resolve: {
       tsConfig: path.join(process.cwd(), 'tsconfig.json'),
       extensions: ['.js', '.jsx', '.ts', '.tsx', '.json', '.less', '.css'],
diff --git a/packages/core/cache/package.json b/packages/core/cache/package.json
index b3158707d4..9a62423999 100644
--- a/packages/core/cache/package.json
+++ b/packages/core/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cache",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json
index b0d32d7757..d4158c9467 100644
--- a/packages/core/cli/package.json
+++ b/packages/core/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.6.6",
+    "@nocobase/app": "1.6.20",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,7 +25,7 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "1.6.6"
+    "@nocobase/devtools": "1.6.20"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/cli/src/util.js b/packages/core/cli/src/util.js
index f48dbd4c1d..1c760cd4ba 100644
--- a/packages/core/cli/src/util.js
+++ b/packages/core/cli/src/util.js
@@ -460,6 +460,16 @@ exports.initEnv = function initEnv() {
   process.env.SOCKET_PATH = generateGatewayPath();
   fs.mkdirpSync(dirname(process.env.SOCKET_PATH), { force: true, recursive: true });
   fs.mkdirpSync(process.env.PM2_HOME, { force: true, recursive: true });
+  const pkgs = [
+    '@nocobase/plugin-multi-app-manager',
+    '@nocobase/plugin-departments',
+    '@nocobase/plugin-field-attachment-url',
+    '@nocobase/plugin-workflow-response-message',
+  ];
+  for (const pkg of pkgs) {
+    const pkgDir = resolve(process.cwd(), 'storage/plugins', pkg);
+    fs.existsSync(pkgDir) && fs.rmdirSync(pkgDir, { recursive: true, force: true });
+  }
 };
 
 exports.generatePlugins = function () {
diff --git a/packages/core/client/package.json b/packages/core/client/package.json
index 79535b243b..38e0b87fe3 100644
--- a/packages/core/client/package.json
+++ b/packages/core/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -27,9 +27,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "1.6.6",
-    "@nocobase/sdk": "1.6.6",
-    "@nocobase/utils": "1.6.6",
+    "@nocobase/evaluators": "1.6.20",
+    "@nocobase/sdk": "1.6.20",
+    "@nocobase/utils": "1.6.20",
     "ahooks": "^3.7.2",
     "antd": "5.12.8",
     "antd-style": "3.7.1",
diff --git a/packages/core/client/src/acl/ACLProvider.tsx b/packages/core/client/src/acl/ACLProvider.tsx
index 6dfa112361..09eaf964ad 100644
--- a/packages/core/client/src/acl/ACLProvider.tsx
+++ b/packages/core/client/src/acl/ACLProvider.tsx
@@ -74,6 +74,7 @@ export const ACLRolesCheckProvider = (props) => {
       url: 'roles:check',
     },
     {
+      manual: !api.auth.token,
       onSuccess(data) {
         if (!data?.data?.snippets.includes('ui.*')) {
           setDesignable(false);
diff --git a/packages/core/client/src/api-client/APIClient.ts b/packages/core/client/src/api-client/APIClient.ts
index 1cbbcdacdd..f85c766e10 100644
--- a/packages/core/client/src/api-client/APIClient.ts
+++ b/packages/core/client/src/api-client/APIClient.ts
@@ -139,7 +139,19 @@ export class APIClient extends APIClientSDK {
     if (typeof error?.response?.data === 'string') {
       const tempElement = document.createElement('div');
       tempElement.innerHTML = error?.response?.data;
-      return [{ message: tempElement.textContent || tempElement.innerText }];
+      let message = tempElement.textContent || tempElement.innerText;
+      if (message.includes('Error occurred while trying')) {
+        message = 'The application may be starting up. Please try again later.';
+        return [{ code: 'APP_WARNING', message }];
+      }
+      if (message.includes('502 Bad Gateway')) {
+        message = 'The application may be starting up. Please try again later.';
+        return [{ code: 'APP_WARNING', message }];
+      }
+      return [{ message }];
+    }
+    if (error?.response?.data?.error) {
+      return [error?.response?.data?.error];
     }
     return (
       error?.response?.data?.errors ||
diff --git a/packages/core/client/src/application/Application.tsx b/packages/core/client/src/application/Application.tsx
index c441f1ae92..efe709fa21 100644
--- a/packages/core/client/src/application/Application.tsx
+++ b/packages/core/client/src/application/Application.tsx
@@ -350,23 +350,9 @@ export class Application {
           setTimeout(() => resolve(null), 1000);
         });
       }
-      const toError = (error) => {
-        if (typeof error?.response?.data === 'string') {
-          const tempElement = document.createElement('div');
-          tempElement.innerHTML = error?.response?.data;
-          return { message: tempElement.textContent || tempElement.innerText };
-        }
-        if (error?.response?.data?.error) {
-          return error?.response?.data?.error;
-        }
-        if (error?.response?.data?.errors?.[0]) {
-          return error?.response?.data?.errors?.[0];
-        }
-        return { message: error?.message };
-      };
       this.error = {
         code: 'LOAD_ERROR',
-        ...toError(error),
+        ...this.apiClient.toErrMessages(error)?.[0],
       };
       console.error(error, this.error);
     }
diff --git a/packages/core/client/src/application/components/defaultComponents.tsx b/packages/core/client/src/application/components/defaultComponents.tsx
index aeb2c475b9..31801e97ed 100644
--- a/packages/core/client/src/application/components/defaultComponents.tsx
+++ b/packages/core/client/src/application/components/defaultComponents.tsx
@@ -11,10 +11,11 @@ import React, { FC } from 'react';
 import { MainComponent } from './MainComponent';
 
 const Loading: FC = () => <div>Loading...</div>;
-const AppError: FC<{ error: Error }> = ({ error }) => {
+const AppError: FC<{ error: Error & { title?: string } }> = ({ error }) => {
+  const title = error?.title || 'App Error';
   return (
     <div>
-      <div>App Error</div>
+      <div>{title}</div>
       {error?.message}
       {process.env.__TEST__ && error?.stack}
     </div>
diff --git a/packages/core/client/src/application/schema-initializer/components/SchemaInitializerItem.tsx b/packages/core/client/src/application/schema-initializer/components/SchemaInitializerItem.tsx
index 436fc54f37..dfdedad636 100644
--- a/packages/core/client/src/application/schema-initializer/components/SchemaInitializerItem.tsx
+++ b/packages/core/client/src/application/schema-initializer/components/SchemaInitializerItem.tsx
@@ -63,7 +63,7 @@ export const SchemaInitializerItem = memo(
           className: className,
           label: children || compile(title),
           onClick: (info) => {
-            if (info.key !== name) return;
+            if (disabled || info.key !== name) return;
             if (closeInitializerMenuWhenClick) {
               setVisible?.(false);
             }
@@ -73,10 +73,10 @@ export const SchemaInitializerItem = memo(
           children: childrenItems,
         },
       ];
-    }, [name, style, className, children, title, onClick, icon, childrenItems]);
+    }, [name, disabled, style, className, children, title, onClick, icon, childrenItems]);
 
     if (items && items.length > 0) {
-      return <SchemaInitializerMenu items={menuItems}></SchemaInitializerMenu>;
+      return <SchemaInitializerMenu disabled={disabled} items={menuItems}></SchemaInitializerMenu>;
     }
     return (
       <div
diff --git a/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx b/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx
index f6eacc4ede..1a46420a4b 100644
--- a/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx
+++ b/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx
@@ -10,11 +10,11 @@
 import { useFieldSchema } from '@formily/react';
 import React from 'react';
 import { withDynamicSchemaProps } from '../hoc/withDynamicSchemaProps';
-import { DatePickerProvider, ActionBarProvider, SchemaComponentOptions } from '../schema-component';
+import { FilterCollectionField } from '../modules/blocks/filter-blocks/FilterCollectionField';
+import { ActionBarProvider, DatePickerProvider, SchemaComponentOptions } from '../schema-component';
 import { DefaultValueProvider } from '../schema-settings';
 import { CollectOperators } from './CollectOperators';
 import { FormBlockProvider } from './FormBlockProvider';
-import { FilterCollectionField } from '../modules/blocks/filter-blocks/FilterCollectionField';
 
 export const FilterFormBlockProvider = withDynamicSchemaProps((props) => {
   const filedSchema = useFieldSchema();
@@ -35,7 +35,7 @@ export const FilterFormBlockProvider = withDynamicSchemaProps((props) => {
             }}
           >
             <DefaultValueProvider isAllowToSetDefaultValue={() => false}>
-              <FormBlockProvider name="filter-form" {...props}></FormBlockProvider>
+              <FormBlockProvider name="filter-form" {...props} confirmBeforeClose={false}></FormBlockProvider>
             </DefaultValueProvider>
           </ActionBarProvider>
         </DatePickerProvider>
diff --git a/packages/core/client/src/block-provider/hooks/index.ts b/packages/core/client/src/block-provider/hooks/index.ts
index e304a5ddaf..1b82601e71 100644
--- a/packages/core/client/src/block-provider/hooks/index.ts
+++ b/packages/core/client/src/block-provider/hooks/index.ts
@@ -167,7 +167,7 @@ export function useCollectValuesToSubmit() {
         if (parsedValue !== null && parsedValue !== undefined) {
           assignedValues[key] = transformVariableValue(parsedValue, { targetCollectionField: collectionField });
         }
-      } else if (value != null && value !== '') {
+      } else if (value !== '') {
         assignedValues[key] = value;
       }
     });
@@ -338,7 +338,7 @@ export const useAssociationCreateActionProps = () => {
           if (parsedValue) {
             assignedValues[key] = transformVariableValue(parsedValue, { targetCollectionField: collectionField });
           }
-        } else if (value != null && value !== '') {
+        } else if (value !== '') {
           assignedValues[key] = value;
         }
       });
@@ -522,9 +522,11 @@ export const useFilterBlockActionProps = () => {
   const { doFilter } = useDoFilter();
   const actionField = useField();
   actionField.data = actionField.data || {};
+  const form = useForm();
 
   return {
     async onClick() {
+      await form.submit();
       actionField.data.loading = true;
       await doFilter();
       actionField.data.loading = false;
@@ -605,7 +607,7 @@ export const useCustomizeUpdateActionProps = () => {
           if (parsedValue) {
             assignedValues[key] = transformVariableValue(parsedValue, { targetCollectionField: collectionField });
           }
-        } else if (value != null && value !== '') {
+        } else if (value !== '') {
           assignedValues[key] = value;
         }
       });
@@ -708,7 +710,7 @@ export const useCustomizeBulkUpdateActionProps = () => {
           if (parsedValue) {
             assignedValues[key] = transformVariableValue(parsedValue, { targetCollectionField: collectionField });
           }
-        } else if (value != null && value !== '') {
+        } else if (value !== '') {
           assignedValues[key] = value;
         }
       });
@@ -930,7 +932,7 @@ export const useUpdateActionProps = () => {
           if (parsedValue) {
             assignedValues[key] = transformVariableValue(parsedValue, { targetCollectionField: collectionField });
           }
-        } else if (value != null && value !== '') {
+        } else if (value !== '') {
           assignedValues[key] = value;
         }
       });
diff --git a/packages/core/client/src/collection-manager/interfaces/input.ts b/packages/core/client/src/collection-manager/interfaces/input.ts
index ac5897adb7..40d131e5be 100644
--- a/packages/core/client/src/collection-manager/interfaces/input.ts
+++ b/packages/core/client/src/collection-manager/interfaces/input.ts
@@ -62,6 +62,12 @@ export class InputFieldInterface extends CollectionFieldInterface {
   hasDefaultValue = true;
   properties = {
     ...defaultProps,
+    trim: {
+      type: 'boolean',
+      'x-content': '{{t("Automatically remove heading and tailing spaces")}}',
+      'x-decorator': 'FormItem',
+      'x-component': 'Checkbox',
+    },
     layout: {
       type: 'void',
       title: '{{t("Index")}}',
diff --git a/packages/core/client/src/collection-manager/interfaces/properties/operators.ts b/packages/core/client/src/collection-manager/interfaces/properties/operators.ts
index ce0b6d411f..80b4e31527 100644
--- a/packages/core/client/src/collection-manager/interfaces/properties/operators.ts
+++ b/packages/core/client/src/collection-manager/interfaces/properties/operators.ts
@@ -129,12 +129,12 @@ export const enumType = [
     label: '{{t("is")}}',
     value: '$eq',
     selected: true,
-    schema: { 'x-component': 'Select' },
+    schema: { 'x-component': 'Select', 'x-component-props': { mode: null } },
   },
   {
     label: '{{t("is not")}}',
     value: '$ne',
-    schema: { 'x-component': 'Select' },
+    schema: { 'x-component': 'Select', 'x-component-props': { mode: null } },
   },
   {
     label: '{{t("is any of")}}',
diff --git a/packages/core/client/src/collection-manager/interfaces/textarea.ts b/packages/core/client/src/collection-manager/interfaces/textarea.ts
index 2ccebbdeb6..19f48bc4c1 100644
--- a/packages/core/client/src/collection-manager/interfaces/textarea.ts
+++ b/packages/core/client/src/collection-manager/interfaces/textarea.ts
@@ -31,6 +31,12 @@ export class TextareaFieldInterface extends CollectionFieldInterface {
   titleUsable = true;
   properties = {
     ...defaultProps,
+    trim: {
+      type: 'boolean',
+      'x-content': '{{t("Automatically remove heading and tailing spaces")}}',
+      'x-decorator': 'FormItem',
+      'x-component': 'Checkbox',
+    },
   };
   schemaInitialize(schema: ISchema, { block }) {
     if (['Table', 'Kanban'].includes(block)) {
diff --git a/packages/core/client/src/common/SelectWithTitle.tsx b/packages/core/client/src/common/SelectWithTitle.tsx
index 4bd43648a3..b3e0be59a8 100644
--- a/packages/core/client/src/common/SelectWithTitle.tsx
+++ b/packages/core/client/src/common/SelectWithTitle.tsx
@@ -18,7 +18,14 @@ export interface SelectWithTitleProps {
   onChange?: (...args: any[]) => void;
 }
 
-export function SelectWithTitle({ title, defaultValue, onChange, options, fieldNames }: SelectWithTitleProps) {
+export function SelectWithTitle({
+  title,
+  defaultValue,
+  onChange,
+  options,
+  fieldNames,
+  ...others
+}: SelectWithTitleProps) {
   const [open, setOpen] = useState(false);
   const timerRef = useRef<any>(null);
   return (
@@ -36,6 +43,7 @@ export function SelectWithTitle({ title, defaultValue, onChange, options, fieldN
     >
       {title}
       <Select
+        {...others}
         open={open}
         data-testid={`select-${title}`}
         popupMatchSelectWidth={false}
diff --git a/packages/core/client/src/data-source/collection-field/CollectionField.tsx b/packages/core/client/src/data-source/collection-field/CollectionField.tsx
index 4bb5f6df4f..e7cfaa4e04 100644
--- a/packages/core/client/src/data-source/collection-field/CollectionField.tsx
+++ b/packages/core/client/src/data-source/collection-field/CollectionField.tsx
@@ -18,6 +18,7 @@ import { useCollectionFieldUISchema, useIsInNocoBaseRecursionFieldContext } from
 import { useDynamicComponentProps } from '../../hoc/withDynamicSchemaProps';
 import { useCompile, useComponent } from '../../schema-component';
 import { useIsAllowToSetDefaultValue } from '../../schema-settings/hooks/useIsAllowToSetDefaultValue';
+import { isVariable } from '../../variables/utils/isVariable';
 import { CollectionFieldProvider, useCollectionField } from './CollectionFieldProvider';
 
 type Props = {
@@ -102,17 +103,43 @@ const CollectionFieldInternalField = (props) => {
   const dynamicProps = useDynamicComponentProps(uiSchema?.['x-use-component-props'], props);
 
   useEffect(() => {
-    // There seems to be a bug in formily where after setting a field to readPretty, switching to editable,
-    // then back to readPretty, and refreshing the page, the field remains in editable state. The expected state is readPretty.
-    // This code is meant to fix this issue.
+    /**
+     * There seems to be a bug in formily where after setting a field to readPretty, switching to editable,
+     * then back to readPretty, and refreshing the page, the field remains in editable state. The expected state is readPretty.
+     * This code is meant to fix this issue.
+     */
     if (fieldSchema['x-read-pretty'] === true && !field.readPretty) {
       field.readPretty = true;
     }
+
+    /**
+     * This solves the issue: After creating a form and setting a field to "read-only", the field remains editable when refreshing the page and reopening the dialog.
+     *
+     * Note: This might be a bug in Formily
+     * When both x-disabled and x-read-pretty exist in the Schema:
+     * - If x-disabled appears before x-read-pretty in the Schema JSON, the disabled state becomes ineffective
+     * - The reason is that during field instance initialization, field.disabled is set before field.readPretty, which causes the pattern value to be changed to 'editable'
+     * - This issue is related to the order of JSON fields, which might return different orders in different environments (databases), thus making the issue inconsistent to reproduce
+     *
+     * Reference to Formily source code:
+     * 1. Setting readPretty may cause pattern to be changed to 'editable': https://github.com/alibaba/formily/blob/d4bb96c40e7918210b1bd7d57b8fadee0cfe4b26/packages/core/src/models/BaseField.ts#L208-L224
+     * 2. The execution order of the each method depends on the order of JSON fields: https://github.com/alibaba/formily/blob/123d536b6076196e00b4e02ee160d72480359f54/packages/json-schema/src/schema.ts#L486-L519
+     */
+    if (fieldSchema['x-disabled'] === true) {
+      field.disabled = true;
+    }
   }, [field, fieldSchema]);
 
   if (!uiSchema) return null;
 
-  return <Component {...props} {...dynamicProps} />;
+  const mergedProps = { ...props, ...dynamicProps };
+
+  // Prevent displaying the variable string first, then the variable value
+  if (isVariable(mergedProps.value) && mergedProps.value === fieldSchema.default) {
+    mergedProps.value = undefined;
+  }
+
+  return <Component {...mergedProps} />;
 };
 
 export const CollectionField = connect((props) => {
diff --git a/packages/core/client/src/formily/NocoBaseRecursionField.tsx b/packages/core/client/src/formily/NocoBaseRecursionField.tsx
index c2c75af9bb..cf0d00c880 100644
--- a/packages/core/client/src/formily/NocoBaseRecursionField.tsx
+++ b/packages/core/client/src/formily/NocoBaseRecursionField.tsx
@@ -48,6 +48,7 @@ interface INocoBaseRecursionFieldProps extends IRecursionFieldProps {
    * Whether to use Formily Field class - performance will be reduced but provides better compatibility with Formily
    */
   isUseFormilyField?: boolean;
+  parentSchema?: Schema;
 }
 
 const CollectionFieldUISchemaContext = React.createContext<CollectionFieldOptions>({});
@@ -266,6 +267,7 @@ export const NocoBaseRecursionField: ReactFC<INocoBaseRecursionFieldProps> = Rea
     values,
     isUseFormilyField = true,
     uiSchema,
+    parentSchema,
   } = props;
   const basePath = useBasePath(props);
   const newFieldSchemaRef = useRef(null);
@@ -279,6 +281,14 @@ export const NocoBaseRecursionField: ReactFC<INocoBaseRecursionFieldProps> = Rea
 
   const fieldSchema: Schema = newFieldSchemaRef.current || oldFieldSchema;
 
+  // Establish connection with the Schema tree
+  if (!fieldSchema.parent && parentSchema) {
+    fieldSchema.parent = parentSchema;
+    if (!fieldSchema.parent?.properties?.[fieldSchema.name] && fieldSchema.name) {
+      _.set(fieldSchema.parent, `properties.${fieldSchema.name}`, fieldSchema);
+    }
+  }
+
   const refresh = useCallback(() => {
     const parent = fieldSchema.parent;
     newFieldSchemaRef.current = new Schema(fieldSchema.toJSON(), parent);
diff --git a/packages/core/client/src/locale/de-DE.json b/packages/core/client/src/locale/de-DE.json
index 1f0df5805f..6ba834ee1b 100644
--- a/packages/core/client/src/locale/de-DE.json
+++ b/packages/core/client/src/locale/de-DE.json
@@ -884,5 +884,7 @@
   "If selected, the page will display Tab pages.": "Wenn ausgewählt, zeigt die Seite Tab-Seiten an.",
   "If selected, the route will be displayed in the menu.": "Wenn ausgewählt, wird die Route im Menü angezeigt.",
   "Are you sure you want to hide this tab?": "Sind Sie sicher, dass Sie diesen Tab ausblenden möchten?",
-  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Nach dem Ausblenden wird dieser Tab nicht mehr in der Tableiste angezeigt. Um ihn wieder anzuzeigen, müssen Sie zur Routenverwaltungsseite gehen, um ihn einzustellen."
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Nach dem Ausblenden wird dieser Tab nicht mehr in der Tableiste angezeigt. Um ihn wieder anzuzeigen, müssen Sie zur Routenverwaltungsseite gehen, um ihn einzustellen.",
+  "No pages yet, please configure first": "Noch keine Seiten, bitte zuerst konfigurieren",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Klicken Sie auf das \"UI-Editor\"-Symbol in der oberen rechten Ecke, um den UI-Editor-Modus zu betreten"
 }
diff --git a/packages/core/client/src/locale/en-US.json b/packages/core/client/src/locale/en-US.json
index f80a244aa7..d0867f786e 100644
--- a/packages/core/client/src/locale/en-US.json
+++ b/packages/core/client/src/locale/en-US.json
@@ -884,5 +884,7 @@
   "If selected, the page will display Tab pages.": "If selected, the page will display Tab pages.",
   "If selected, the route will be displayed in the menu.": "If selected, the route will be displayed in the menu.",
   "Are you sure you want to hide this tab?": "Are you sure you want to hide this tab?",
-  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it."
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.",
+  "No pages yet, please configure first": "No pages yet, please configure first",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode"
 }
diff --git a/packages/core/client/src/locale/es-ES.json b/packages/core/client/src/locale/es-ES.json
index 3a3a45d646..ffc6ef06aa 100644
--- a/packages/core/client/src/locale/es-ES.json
+++ b/packages/core/client/src/locale/es-ES.json
@@ -801,5 +801,7 @@
   "If selected, the page will display Tab pages.": "Si se selecciona, la página mostrará páginas de pestañas.",
   "If selected, the route will be displayed in the menu.": "Si se selecciona, la ruta se mostrará en el menú.",
   "Are you sure you want to hide this tab?": "¿Estás seguro de que quieres ocultar esta pestaña?",
-  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Después de ocultar, esta pestaña ya no aparecerá en la barra de pestañas. Para mostrarla de nuevo, deberás ir a la página de gestión de rutas para configurarla."
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Después de ocultar, esta pestaña ya no aparecerá en la barra de pestañas. Para mostrarla de nuevo, deberás ir a la página de gestión de rutas para configurarla.",
+  "No pages yet, please configure first": "Aún no hay páginas, por favor configura primero",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Haga clic en el icono \"Editor de UI\" en la esquina superior derecha para entrar en el modo de Editor de UI."
 }
diff --git a/packages/core/client/src/locale/fr-FR.json b/packages/core/client/src/locale/fr-FR.json
index c5d0ee72d0..ed716f81fe 100644
--- a/packages/core/client/src/locale/fr-FR.json
+++ b/packages/core/client/src/locale/fr-FR.json
@@ -821,5 +821,7 @@
   "If selected, the page will display Tab pages.": "Si sélectionné, la page affichera des onglets.",
   "If selected, the route will be displayed in the menu.": "Si sélectionné, la route sera affichée dans le menu.",
   "Are you sure you want to hide this tab?": "Êtes-vous sûr de vouloir masquer cet onglet ?",
-  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Après avoir masqué, cette tab ne sera plus affichée dans la barre de tab. Pour la montrer à nouveau, vous devez vous rendre sur la page de gestion des routes pour la configurer."
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Après avoir masqué, cette tab ne sera plus affichée dans la barre de tab. Pour la montrer à nouveau, vous devez vous rendre sur la page de gestion des routes pour la configurer.",
+  "No pages yet, please configure first": "Pas encore de pages, veuillez configurer d'abord",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Cliquez sur l'icône \"Éditeur d'interface utilisateur\" dans le coin supérieur droit pour entrer en mode Éditeur d'interface utilisateur"
 }
diff --git a/packages/core/client/src/locale/it-IT.json b/packages/core/client/src/locale/it-IT.json
index a9818450e7..74b1d739f8 100644
--- a/packages/core/client/src/locale/it-IT.json
+++ b/packages/core/client/src/locale/it-IT.json
@@ -1,861 +1,1086 @@
-{
-    "Display <1><0>10</0><1>20</1><2>50</2><3>100</3></1> items per page": "Visualizza <1><0>10</0><1>20</1><2>50</2><3>100</3></1> articoli per pagina",
-    "Meet <1><0>All</0><1>Any</1></1> conditions in the group": "Soddisfa<1><0>Tutte</0><1>Qualsiasi</1></1>condizioni nel gruppo",
-    "Open in<1><0>Modal</0><1>Drawer</1><2>Window</2></1>": "Apri in<1><0>Modale</0><1>Cassetto</1><2>Finestra</2></1>",
-    "{{count}} filter items": "{{Count}} filtri elementi",
-    "{{count}} more items": "{{Count}} altri elementi",
-    "Total {{count}} items": "{{count}} elementi totali",
-    "Today": "Oggi",
-    "Yesterday": "Ieri",
-    "Tomorrow": "Domani",
-    "Month": "Mese",
-    "Week": "Settimana",
-    "This week": "Questa settimana",
-    "This month": "Questo mese",
-    "This year": "Quest'anno",
-    "Next year": "Anno prossimo",
-    "Last week": "Settimana scorsa",
-    "Next week": "Prossima settimana",
-    "Last month": "Mese scorso",
-    "Next month": "Mese prossimo",
-    "Last quarter": "Ultimo trimestre",
-    "This quarter": "Questo trimestre",
-    "Next quarter": "Prossimo trimestre",
-    "Last year": "Anno scorso",
-    "Last 7 days": "Ultimi 7 giorni",
-    "Last 30 days": "Ultimi 30 giorni",
-    "Last 90 days": "Ultimi 90 giorni",
-    "Next 7 days": "Prossimi 7 giorni",
-    "Next 30 days": "Prossimi 30 giorni",
-    "Next 90 days": "Prossimi 90 giorni",
-    "Work week": "Settimana lavorativa",
-    "Day": "Giorno",
-    "Agenda": "Agenda",
-    "Date": "Data",
-    "Time": "Tempo",
-    "Event": "Evento",
-    "None": "Nessuno",
-    "Unconnected": "Non collegato",
-    "System settings": "Impostazioni di sistema",
-    "System title": "Titolo del sistema",
-    "Settings": "Impostazioni",
-    "Logo": "Logo",
-    "Add menu item": "Aggiungi voce di menu",
-    "Page": "Pagina",
-    "Name": "Nome",
-    "Icon": "Icona",
-    "Group": "Gruppo",
-    "Link": "Collegamento",
-    "Save conditions": "Salva condizioni",
-    "Edit menu item": "Modifica voce di menu",
-    "Move to": "Passa a",
-    "Insert left": "Inserisci a sinistra",
-    "Insert right": "Inserire a destra",
-    "Insert inner": "Inserire dentro",
-    "Delete": "Eliminare",
-    "Disassociate": "Dissociare",
-    "Disassociate record": "Dissociare il record",
-    "Are you sure you want to disassociate it?": "Sei sicuro di voler dissociare?",
-    "UI editor": "Editor UI",
-    "Collection": "Raccolta",
-    "Collection selector": "Selettore di raccolta",
-    "Providing certain collections as options for users, typically used in polymorphic or inheritance scenarios": "Fornire alcune raccolte come opzioni per gli utenti, in genere utilizzati negli scenari polimorfici o ereditari",
-    "Collections & Fields": "Raccolte e campi",
-    "All collections": "Tutte le raccolte",
-    "Add category": "Aggiungi categoria",
-    "Enable child collections": "Abilita raccolte figlie",
-    "Allow adding records to the current collection": "Consenti l'aggiunta di record alla raccolta corrente",
-    "Delete category": "Elimina categoria",
-    "Edit category": "Modifica categoria",
-    "Collection category": "Categoria raccolta",
-    "Collection template": "Modello raccolta",
-    "Sort": "Ordina",
-    "Categories": "Categorie",
-    "Visible": "Visibile",
-    "Read only": "Solo lettura",
-    "Easy reading": "Lettura facile",
-    "Hidden": "Nascosto",
-    "Hidden(reserved value)": "Nascosto (valore riservato)",
-    "Not required": "Non richiesto",
-    "Value": "Valore",
-    "Disabled": "Disabilitato",
-    "Enabled": "Abilitato",
-    "Problematic": "Problematico",
-    "Setting": "Impostazioni",
-    "On": "Acceso",
-    "Off": "Spento",
-    "Empty": "Vuoto",
-    "Linkage rule": "Regola di collegamento",
-    "Linkage rules": "Regole di collegamento",
-    "Condition": "Condizione",
-    "Properties": "Proprietà",
-    "Add linkage rule": "Aggiungi regola di collegamento",
-    "Add property": "Aggiungi proprietà",
-    "Category name": "Nome della categoria",
-    "Roles & Permissions": "Ruoli e autorizzazioni",
-    "Edit profile": "Modifica profilo",
-    "Change password": "Cambia password",
-    "Old password": "Vecchia password",
-    "New password": "Nuova password",
-    "Switch role": "Cambia ruolo",
-    "Super admin": "Super Admin",
-    "Language": "Lingua",
-    "Allow sign up": "Consenti iscrizione",
-    "Enable SMS authentication": "Abilita autenticazione SMS",
-    "Sign out": "Disconnessione",
-    "Cancel": "Annulla",
-    "Submit": "Invia",
-    "Close": "Chiudi",
-    "Set the data scope": "Imposta l'ambito dei dati",
-    "Set data loading mode": "Imposta modalità di caricamento dei dati",
-    "Load all data when filter is empty": "Carica tutti i dati quando il filtro è vuoto",
-    "Do not load data when filter is empty": "Non caricare i dati quando il filtro è vuoto",
-    "Data loading mode": "Modalità di caricamento dei dati",
-    "Data blocks": "Blocchi dati",
-    "Filter blocks": "Blocchi filtro",
-    "Table": "Tabella",
-    "Table OID(Inheritance)": "Tabella OID (eredità)",
-    "Form": "Modulo",
-    "List": "Elenco",
-    "Grid Card": "Scheda griglia",
-    "pixels": "pixel",
-    "Screen size": "Dimensione dello schermo",
-    "Display title": "Visualizza titolo",
-    "Set the count of columns displayed in a row": "Imposta il conteggio delle colonne visualizzate in una riga",
-    "Column": "Colonna",
-    "Phone device": "Telefono",
-    "Tablet device": "Tablet",
-    "Desktop device": "Desktop",
-    "Large screen device": "Schermo di grandi dimensioni",
-    "Collapse": "Comprimi",
-    "Select data source": "Seleziona origine dati",
-    "Calendar": "Calendario",
-    "Delete events": "Elimina eventi",
-    "This event": "Questo evento",
-    "This and following events": "Questo e seguenti eventi",
-    "All events": "Tutti gli eventi",
-    "Delete this event?": "Eliminare questo evento?",
-    "Delete Event": "Elimina evento",
-    "Kanban": "Kanban",
-    "Gantt": "Gantt",
-    "Create gantt block": "Crea blocco Gantt",
-    "Progress field": "Campo avanzamento",
-    "Time scale": "Scala del tempo",
-    "Hour": "Ora",
-    "Quarter of day": "Quarto del giorno",
-    "Half of day": "Metà del giorno",
-    "Year": "Anno",
-    "QuarterYear": "Quarto dell' anno",
-    "Select grouping field": "Seleziona il campo di raggruppamento",
-    "Media": "Media",
-    "Markdown": "Markdown",
-    "Wysiwyg": "Wysiwyg",
-    "Chart blocks": "Blocchi grafici",
-    "Column chart": "Grafico a colonne",
-    "Bar chart": "Grafico a barre",
-    "Line chart": "Grafico a linee",
-    "Pie chart": "Grafico a torta",
-    "Area chart": "Grafico ad area",
-    "Other chart": "Altro grafico",
-    "Other blocks": "Altri blocchi",
-    "In configuration": "In configurazione",
-    "Chart title": "Titolo grafico",
-    "Chart type": "Tipo grafico",
-    "Chart config": "Configurazione grafico",
-    "Templates": "Modelli",
-    "Select template": "Seleziona modello",
-    "Action logs": "Registri eventi",
-    "Create template": "Crea modello",
-    "Edit markdown": "Modifica Markdown",
-    "Add block": "Aggiungi blocco",
-    "Add new": "Aggiungi nuovo",
-    "Add record": "Aggiungi record",
-    "Add child": "Aggiungi figlio",
-    "Collapse all": "Comprimi tutto",
-    "Expand all": "Espandi tutto",
-    "Expand/Collapse": "Espandi/Comprimi",
-    "Default collapse": "Comprimi di default",
-    "Tree table": "Tabella ad albero",
-    "Custom field display name": "Nome visualizzato campo personalizzato ",
-    "Display fields": "Visualizza campi",
-    "Edit record": "Modifica record",
-    "Delete menu item": "Elimina voce di menu",
-    "Add page": "Aggiungi pagina",
-    "Add group": "Aggiungi gruppo",
-    "Add link": "Aggiungi link",
-    "Insert above": "Inserisci sopra",
-    "Insert below": "Inserisci sotto",
-    "Save": "Salva",
-    "Delete block": "Elimina blocco",
-    "Are you sure you want to delete it?": "Sei sicuro di volerlo eliminare?",
-    "This is a demo text, **supports Markdown syntax**.": "Questo è un testo demo, ** supporta la sintassi di Markdown **.",
-    "Filter": "Filtro",
-    "Connect data blocks": "Collega blocchi di dati",
-    "Action type": "Tipo di operazione",
-    "Actions": "Operazioni",
-    "Insert": "Inserisci",
-    "Insert if not exists": "Inserisci se non esiste",
-    "Insert if not exists, or update": "Inserisci se non esiste o aggiorna",
-    "Determine whether a record exists by the following fields": "Determina se un record esiste dai seguenti campi",
-    "Update": "Aggiorna",
-    "Update record": "Aggiorna record",
-    "View": "Visualizza",
-    "View record": "Visualizza record",
-    "Refresh": "Refresh",
-    "Data changes": "Modifiche ai dati",
-    "Field name": "Nome campo",
-    "Before change": "Prima delle modifiche",
-    "After change": "Dopo le modifiche",
-    "Delete record": "Elimina record",
-    "Delete collection": "Elimina raccolta",
-    "Create collection": "Crea raccolta",
-    "Collection display name": "Nome visualizzato raccolta",
-    "Collection name": "Nome raccolta",
-    "Inherits": "Eredita",
-    "Primary key, unique identifier, self growth": "Chiave primaria, identificatore univoco, auto-incremento",
-    "Store the creation user of each record": "Memorizza l'utente della creazione di ogni record",
-    "Store the last update user of each record": "Memorizza l'ultimo utente di aggiornamento di ogni record",
-    "Store the creation time of each record": "Memorizza l'orario di creazione di ogni record",
-    "Store the last update time of each record": "Memorizza l'ultimo orario di aggiornamento di ogni record",
-    "More options": "Più opzioni",
-    "Records can be sorted": "I record possono essere ordinati",
-    "Calendar collection": "Raccolta calendario",
-    "General collection": "Raccolta generale",
-    "Connect to database view": "Connetti alla vista del database",
-    "Sync from database": "Sincronizza dal database",
-    "Source collections": "Sorgente raccolte",
-    "Field source": "Sorgente campo",
-    "Preview": "Anteprima",
-    "Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.": "Generato casualmente e può essere modificato. Supporta lettere, numeri e underscore, deve iniziare con una lettera.",
-    "Edit": "Modifica",
-    "Edit collection": "Modifica raccolta",
-    "Configure fields": "Configura campi",
-    "Configure columns": "Configura colonne",
-    "Edit field": "Modifica campo",
-    "Override": "Forza",
-    "Override field": "Forza campo",
-    "Configure fields of {{title}}": "Configura campi di {{title}}",
-    "Association fields filter": "Filtro associazione campi",
-    "PK & FK fields": "Campi PK e FK",
-    "Association fields": "Campi associazione",
-    "Choices fields": "Campi scelte",
-    "System fields": "Campi di sistema",
-    "General fields": "Campi generali",
-    "Inherited fields": "Campi ereditati",
-    "Parent collection fields": "Campi raccolta padre",
-    "Basic": "Di base",
-    "Single line text": "Testo a riga singola",
-    "Long text": "Testo lungo",
-    "Phone": "Telefono",
-    "Email": "E-mail",
-    "Number": "Numero",
-    "Integer": "Intero",
-    "Percent": "Percentuale",
-    "Password": "Password",
-    "Advanced type": "Avanzato",
-    "Formula": "Formula",
-    "Formula description": "Calcola un valore in ciascun record in base ad altri campi nello stesso record.",
-    "Choices": "Scelte",
-    "Checkbox": "Casella di controllo",
-    "Single select": "Selezione singola",
-    "Multiple select": "Selezione multipla",
-    "Radio group": "Gruppo radio",
-    "Checkbox group": "Gruppo cassella di controllo",
-    "China region": "Regione cinese",
-    "Date & Time": "Data e ora",
-    "Datetime": "DateTime",
-    "Relation": "Relazione",
-    "Link to": "Collegamento a",
-    "Link to description": "Utilizzato per creare relazioni tra raccolte in modo rapido e compatibile con gli scenari più comuni. Adatto per un uso da non sviluppatore. Se presente come campo, è una selezione a discesa utilizzata per selezionare i record dalla raccolta di destinazione. Una volta creato, genererà contemporaneamente i campi associati dell'attuale raccolta nella raccolta di destinazione.",
-    "Sub-table": "Sotto-tabella",
-    "Sub-details": "Sotto-dettagli",
-    "Sub-form(Popover)": "Sotto-modulo (Popover)",
-    "System info": "Informazioni di sistema",
-    "Created at": "Creato il",
-    "Last updated at": "Ultimo aggiornamento il",
-    "Created by": "Creato da",
-    "Last updated by": "Ultimo aggiornamento da",
-    "Add field": "Aggiungi campo",
-    "Field display name": "Nome visualizzato campo",
-    "Field type": "Tipo campo",
-    "Field interface": "Interfaccia campo",
-    "Date format": "Formato data",
-    "Year/Month/Day": "Anno/Mese/Giorno",
-    "Year-Month-Day": "Anno-Mese-Giorno",
-    "Day/Month/Year": "Giorno/Mese/Anno",
-    "Show time": "Mostra orario",
-    "Time format": "Formato tempo",
-    "12 hour": "12 ore",
-    "24 hour": "24 ore",
-    "Relationship type": "Tipo di relazione",
-    "Inverse relationship type": "Tipo di relazione inversa",
-    "Source collection": "Raccolta sorgente",
-    "Source key": "Chiave sorgente",
-    "Target collection": "Raccolta di destinazione",
-    "Through collection": "Attraverso la raccolta",
-    "Target key": "Chiave di destinazione",
-    "Foreign key": "Chiave esterna",
-    "One to one": "Uno a uno",
-    "One to many": "Uno a molti",
-    "Many to one": "Molti a uno",
-    "Many to many": "Molti a molti",
-    "Foreign key 1": "Chiave esterna 1",
-    "Foreign key 2": "Chiave esterna 2",
-    "One to one description": "Usato per creare relazioni one-to-one. Ad esempio, un utente ha un profilo.",
-    "One to many description": "Utilizzato per creare una relazione da uno a molti. Ad esempio, un paese avrà molte città e una città può essere solo in un paese. Se presente come campo, è una sotto-tabella che mostra i record della raccolta associata. Se creato, un campo molti-a-uno viene generato automaticamente nella raccolta associata.",
-    "Many to one description": "Utilizzato per creare relazioni molti-a-uno. Ad esempio, una città può appartenere a un solo paese e un paese può avere molte città. Se presente come campo, è una selezione a discesa utilizzata per selezionare il record dalla raccolta associata. Una volta creato, un campo da uno a molti viene generato automaticamente nella raccolta associata.",
-    "Many to many description": "Utilizzato per creare relazioni molti-a-molti. Ad esempio, uno studente avrà molti insegnanti e un insegnante avrà molti studenti. Se presente come campo, è una selezione a discesa utilizzata per selezionare i record dalla raccolta associata.",
-    "Generated automatically if left blank": "Generato automaticamente se lasciato vuoto",
-    "Display association fields": "Visualizza campi di associazione",
-    "Display field title": "Visualizza titolo campo",
-    "Field component": "Componente campo",
-    "Allow multiple": "Consenti multipli",
-    "Quick upload": "Caricamento rapido",
-    "Select file": "Seleziona file",
-    "Subtable": "Sotto-tabella",
-    "Sub-form": "Sotto-modulo",
-    "Field mode": "Modalità campo",
-    "Allow add new data": "Consenti aggiunta nuovi dati",
-    "Record picker": "Record Picker",
-    "Toggles the subfield mode": "Attiva la modalità Subfield",
-    "Selector mode": "Modalità selettore",
-    "Subtable mode": "Modalità sotto-tabella",
-    "Subform mode": "Modalità sotto-modulo",
-    "Edit block title": "Modifica titolo blocco",
-    "Block title": "Titolo blocco",
-    "Pattern": "Modello",
-    "Operator": "Operatore",
-    "Editable": "Modificabile",
-    "Readonly": "Solo lettura",
-    "Easy-reading": "Lettura facile",
-    "Add filter": "Aggiungi filtro",
-    "Add filter group": "Aggiungi gruppo di filtri",
-    "Comparision": "Confronto",
-    "is": "è",
-    "is not": "non lo è",
-    "contains": "contiene",
-    "does not contain": "non contiene",
-    "starts with": "inizia con",
-    "not starts with": "non inizia con",
-    "ends with": "termina con",
-    "not ends with": "non termina con",
-    "is empty": "è vuoto",
-    "is not empty": "non è vuoto",
-    "Edit chart": "Modifica grafico",
-    "Add text": "Aggiungi testo",
-    "Filterable fields": "Campi filtrabili",
-    "Edit button": "Modifica pulsante",
-    "Hide": "Nascondi",
-    "Enable actions": "Abilita operazioni",
-    "Import": "Importa",
-    "Export": "Esporta",
-    "Customize": "Personalizza",
-    "Custom": "Personalizzato",
-    "Function": "Funzione",
-    "Popup form": "Modulo Popup",
-    "Flexible popup": "Popup flessibile",
-    "Configure actions": "Configura operazioni",
-    "Display order number": "Visualizza numero ordinamento",
-    "Enable drag and drop sorting": "Abilita l'ordinamento con drag and drop",
-    "Triggered when the row is clicked": "Attivato quando si fa clic sulla riga",
-    "Add tab": "Aggiungi scheda",
-    "Disable tabs": "Disabilita le schede",
-    "Details": "Dettagli",
-    "Edit form": "Modifica modulo",
-    "Create form": "Crea modulo",
-    "Form (Edit)": "Modulo (modifica)",
-    "Form (Add new)": "Modulo (aggiungi nuovo)",
-    "Edit tab": "Modifica scheda",
-    "Relationship blocks": "Blocchi di relazione",
-    "Select record": "Seleziona Record",
-    "Display name": "Visualizza nome",
-    "Select icon": "Seleziona icona",
-    "Custom column name": "Nome colonna personalizzato",
-    "Edit description": "Modifica descrizione",
-    "Required": "Richiesto",
-    "Unique": "Unico",
-    "Primary": "Primario",
-    "Auto increment": "Incremento automatico",
-    "Label field": "Campo etichetta",
-    "Default is the ID field": "L'impostazione predefinita è il campo ID",
-    "Set default sorting rules": "Imposta le regole di ordinamento predefinite",
-    "Set validation rules": "Imposta le regole di convalida",
-    "Max length": "Lunghezza massima",
-    "Min length": "Lunghezza minima",
-    "Maximum": "Massimo",
-    "Minimum": "Minimo",
-    "Max length must greater than min length": "La lunghezza massima deve essere maggiore della lunghezza minima",
-    "Min length must less than max length": "La lunghezza minima deve essere inferiore della lunghezza massima",
-    "Maximum must greater than minimum": "Il massimo deve essere maggiore del minimo",
-    "Minimum must less than maximum": "Il minimo deve essere minore del massimo",
-    "Validation rule": "Regola di convalida",
-    "Add validation rule": "Aggiungi regola di convalida",
-    "Format": "Formato",
-    "Regular expression": "Espressione regolare",
-    "Error message": "Messaggio di errore",
-    "Length": "Lunghezza",
-    "The field value cannot be greater than ": "Il valore del campo non può essere maggiore di",
-    "The field value cannot be less than ": "Il valore del campo non può essere inferiore a",
-    "The field value is not an integer number": "Il valore del campo non è un numero intero",
-    "Set default value": "Imposta valore predefinito",
-    "Default value": "Valore predefinito",
-    "is before": "è prima",
-    "is after": "è dopo",
-    "is on or after": "a partire dal",
-    "is on or before": "entro il",
-    "is between": "è tra",
-    "Upload": "Upload",
-    "Select level": "Seleziona livello",
-    "Province": "Provincia",
-    "City": "Città",
-    "Area": "Zona",
-    "Street": "Strada",
-    "Village": "Villaggio",
-    "Must select to the last level": "Deve selezionare all'ultimo livello",
-    "Move {{title}} to": "Sposta {{title}} a",
-    "Target position": "Posizione di destinazione",
-    "After": "Dopo",
-    "Before": "Prima",
-    "Add {{type}} before \"{{title}}\"": "Aggiungi {{type}} prima di \"{{title}}\"",
-    "Add {{type}} after \"{{title}}\"": "Aggiungi {{type}} dopo \"{{title}}\"",
-    "Add {{type}} in \"{{title}}\"": "Aggiungi {{type}} in \"{{title}}\"",
-    "Original name": "Nome originale",
-    "Custom name": "Nome personalizzato",
-    "Custom Title": "Titolo personalizzato",
-    "Options": "Opzioni",
-    "Option value": "Valore opzione",
-    "Option label": "Etichetta opzione",
-    "Color": "Colore",
-    "Background Color": "Colore sfondo",
-    "Text Align": "Allineamento testo",
-    "Add option": "Aggiungi opzione",
-    "Related collection": "Raccolta correlata",
-    "Allow linking to multiple records": "Consenti il ​collegamento a più record",
-    "Allow uploading multiple files": "Consenti il caricamento di più file",
-    "Configure calendar": "Configura calendario",
-    "Title field": "Campo titolo",
-    "Custom title": "Titolo personalizzato",
-    "Daily": "Quotidiano",
-    "Weekly": "Settimanale",
-    "Monthly": "Mensile",
-    "Yearly": "Annuale",
-    "Repeats": "Ripeti",
-    "Show lunar": "Mostra lunare",
-    "Start date field": "Campo data di inizio",
-    "End date field": "Campo data di fine",
-    "Navigate": "Naviga",
-    "Title": "Titolo",
-    "Description": "Descrizione",
-    "Select view": "Seleziona vista",
-    "Reset": "Reset",
-    "Importable fields": "Campi importabili",
-    "Exportable fields": "Campi esportabili",
-    "Saved successfully": "Salvataggio riuscito",
-    "Nickname": "Soprannome",
-    "Sign in": "Registrazione",
-    "Sign in via account": "Accedi tramite account",
-    "Sign in via phone": "Accedi via telefono",
-    "Create an account": "Crea un account",
-    "Sign up": "Iscrizione",
-    "Confirm password": "Conferma password",
-    "Log in with an existing account": "Accedi con account esistente",
-    "Signed up successfully. It will jump to the login page.": "Registrazione riuscita. Reindirizzamento alla pagina di accesso.",
-    "Password mismatch": "Password non corretta",
-    "Users": "Utenti",
-    "Verification code": "Codice di verifica",
-    "Send code": "Invia codice",
-    "Retry after {{count}} seconds": "Riprova dopo {{count}} secondi",
-    "Roles": "Ruoli",
-    "Add role": "Aggiungi ruolo",
-    "Role name": "Nome ruolo",
-    "Configure": "Configura",
-    "Configure permissions": "Configura permessi",
-    "Edit role": "Modifica ruolo",
-    "Action permissions": "Permessi su operazioni",
-    "Menu permissions": "Permessi su menu",
-    "Menu item name": "Nome voce di menu",
-    "Allow access": "Consenti accesso",
-    "Action name": "Nome operazione",
-    "Allow action": "Consenti operazione",
-    "Action scope": "Ambito operazione",
-    "Operate on new data": "Operare su nuovi dati",
-    "Operate on existing data": "Operare su dati esistenti",
-    "Yes": "Si",
-    "No": "No",
-    "Red": "Rosso",
-    "Magenta": "Magenta",
-    "Volcano": "Vulcano",
-    "Orange": "Arancione",
-    "Gold": "Oro",
-    "Lime": "Lime",
-    "Green": "Verde",
-    "Cyan": "Ciano",
-    "Blue": "Blu",
-    "Geek blue": "Geek Blue",
-    "Purple": "Viola",
-    "Default": "Predefinito",
-    "Add card": "Aggiungi scheda",
-    "edit title": "modifica titolo",
-    "Turn pages": "Volta pagine",
-    "Others": "Altri",
-    "Other records": "Altri record",
-    "Save as template": "Salva come modello",
-    "Save as block template": "Salva come modello blocco",
-    "Block templates": "Modelli blocco",
-    "Block template": "Modello blocco",
-    "Convert reference to duplicate": "Converti il ​​riferimento a duplicato",
-    "Template name": "Nome modello",
-    "Block type": "Tipo blocco",
-    "No blocks to connect": "Nessun blocco per connettersi",
-    "Action column": "Colonna operazioni",
-    "Records per page": "Record per pagina",
-    "(Fields only)": "(Solo campi)",
-    "Button title": "Titolo pulsante",
-    "Button icon": "Icona pulsante",
-    "Submitted successfully": "Invio riuscito",
-    "Operation succeeded": "L'operazione è riuscita",
-    "Operation failed": "Operazione non riuscita",
-    "Open mode": "Modalità aperta",
-    "Popup size": "Dimensione popup",
-    "Small": "Piccolo",
-    "Middle": "Medio",
-    "Large": "Grande",
-    "Size": "Misura",
-    "Oversized": "Oversize",
-    "Auto": "Auto",
-    "Object Fit": "Adattato all'oggetto",
-    "Cover": "Cover",
-    "Fill": "Riempi",
-    "Contain": "Contiene",
-    "Scale Down": "Ridimensiona",
-    "Menu item title": "Titolo voce di menu",
-    "Menu item icon": "Icona voce di menu",
-    "Target": "Destinazione",
-    "Position": "Posizione",
-    "Insert before": "Inserire prima",
-    "Insert after": "Inserire dopo",
-    "UI Editor": "Editor UI",
-    "ASC": "Asc",
-    "DESC": "Desc",
-    "Add sort field": "Aggiungi campo di ordinamento",
-    "ID": "ID",
-    "Identifier for program usage. Support letters, numbers and underscores, must start with an letter.": "Identificatore per l'utilizzo del programma. Supporta lettere, numeri e underscore, deve iniziare con una lettera.",
-    "Drawer": "Cassetto",
-    "Dialog": "Dialogo",
-    "Delete action": "Elimina operazione",
-    "Custom column title": "Titolo colonna personalizzata",
-    "Column title": "Titolo colonna",
-    "Original title: ": "Titolo originale: ",
-    "Delete table column": "Elimina colonna della tabella",
-    "Skip required validation": "Salta convalida richiesta",
-    "Form values": "Valori modulo",
-    "Fields values": "Valori campi",
-    "The field has been deleted": "Il campo è stato eliminato",
-    "When submitting the following fields, the saved values are": "Quando si inviano i seguenti campi, i valori salvati sono",
-    "After successful submission": "Dopo un invio riuscito",
-    "Then": "Poi",
-    "Stay on current page": "Resta sulla pagina corrente",
-    "Redirect to": "Reindirizza a",
-    "Save action": "Salva operazione",
-    "Exists": "Esiste",
-    "Add condition": "Aggiungi condizione",
-    "Add condition group": "Aggiungi gruppo di condizioni",
-    "exists": "esiste",
-    "not exists": "non esiste",
-    "Style": "Stile",
-    "=": "=",
-    "≠": "≠",
-    ">": ">",
-    "≥": "≥",
-    "<": "<",
-    "≤": "≤",
-    "Role UID": "Ruolo UID",
-    "Precision": "Precisione",
-    "Formula mode": "Modalità formula",
-    "Expression": "Espressione",
-    "Input +, -, *, /, ( ) to calculate, input @ to open field variables.": "Input +, -, *, /, () per calcolare, input @ per aprire le variabili campo.",
-    "Formula error.": "Errore formula.",
-    "Rich Text": "Testo ricco",
-    "Junction collection": "Raccolta giunzione",
-    "Leave it blank, unless you need a custom intermediate table": "Lascialo vuoto, a meno che tu non abbia bisogno di una tabella intermedia personalizzata",
-    "Fields": "Campi",
-    "Edit field title": "Modifica titolo campo",
-    "Field title": "Titolo campo",
-    "Original field title: ": "Titolo campo originale:",
-    "Edit tooltip": "Modifica suggerimento",
-    "Delete field": "Elimina campo",
-    "Select collection": "Seleziona raccolta",
-    "Blank block": "Blocco vuoto",
-    "Duplicate template": "Modello duplicato",
-    "Reference template": "Modello di riferimento",
-    "Create calendar block": "Crea blocco calendario",
-    "Create kanban block": "Crea blocco kanban",
-    "Grouping field": "Campo di raggruppamento",
-    "Single select and radio fields can be used as the grouping field": "I campi di selezione singoli e radio possono essere utilizzati come campo di raggruppamento",
-    "Tab name": "Nome della scheda",
-    "Current record blocks": "Blocchi record attuale",
-    "Popup message": "Messaggio popup",
-    "Delete role": "Elimina il ruolo",
-    "Role display name": "Nome visualizzato ruolo",
-    "Default role": "Ruolo predefinito",
-    "All collections use general action permissions by default; permission configured individually will override the default one.": "Tutte le raccolte utilizzano i permessi di operazioni generali per impostazione predefinita; I permessi configurati individualmente sovrascriveranno quelli predefiniti.",
-    "Allows configuration of the whole system, including UI, collections, permissions, etc.": "Consente la configurazione dell'intero sistema, tra cui interfaccia utente, raccolte, permessi, ecc.",
-    "New menu items are allowed to be accessed by default.": "È possibile accedere a nuove voci di menu per impostazione predefinita.",
-    "Global permissions": "Permessi globali",
-    "General permissions": "Permessi generali",
-    "Global action permissions": "Permessi operazioni globali",
-    "General action permissions": "Permessi operazioni generali",
-    "Plugin settings permissions": "Permessi impostazioni plugin",
-    "Allow to desgin pages": "Consenti progettazione pagine",
-    "Allow to manage plugins": "Consenti gestione plugin",
-    "Allow to configure plugins": "Consenti configurazione plugin",
-    "Allows to configure interface": "Consente di configurare l'interfaccia",
-    "Allows to install, activate, disable plugins": "Consente di installare, attivare, disabilitare i plugin",
-    "Allows to configure plugins": "Consente di configurare i plugin",
-    "Action display name": "Nome visualizzato operazione",
-    "Allow": "Permetti",
-    "Data scope": "Ambito dei dati",
-    "Action on new records": "Operazione su nuovi record",
-    "Action on existing records": "Operazione su record esistenti",
-    "All records": "Tutti i record",
-    "Own records": "Record propri",
-    "Permission policy": "Policy di autorizzazione",
-    "Individual": "Individuale",
-    "General": "Generale",
-    "Accessible": "Accessibile",
-    "Configure permission": "Configura permesso",
-    "Action permission": "Permesso operazione",
-    "Field permission": "Permesso campo",
-    "Scope name": "Nome ambito",
-    "Unsaved changes": "Modifiche non salvate",
-    "Are you sure you don't want to save?": "Sei sicuro di non voler salvare?",
-    "Dragging": "Trascina",
-    "Popup": "Popup",
-    "Trigger workflow": "Trigger flusso di lavoro",
-    "Request API": "Richiesta API",
-    "Assign field values": "Assegna valori del campo",
-    "Constant value": "Valore costante",
-    "Dynamic value": "Valore dinamico",
-    "Current user": "Utente attuale",
-    "Current role": "Ruolo attuale",
-    "Current record": "Record attuale",
-    "Current collection": "Raccolta attuale",
-    "Other collections": "Altre raccolte",
-    "Current popup record": "Record popup attuale",
-    "Parent popup record": "Record popup padre",
-    "Associated records": "Record associati",
-    "Parent record": "Record padre",
-    "Current time": "Ora attuale",
-    "System variables": "Variabili di sistema",
-    "Date variables": "Variabili della data",
-    "Message popup close method": "Metodo di chiusura popup di messaggio",
-    "Automatic close": "Chiudi automaticamente",
-    "Manually close": "Chiudi manualmente",
-    "After successful update": "Dopo un aggiornamento riuscito",
-    "Save record": "Salva record",
-    "Updated successfully": "Aggiornamento riuscito",
-    "After successful save": "Dopo un salvataggio riuscito",
-    "After clicking the custom button, the following field values will be assigned according to the following form.": "Dopo aver fatto clic sul pulsante personalizza, i seguenti valori verranno assegnati in base al seguente modulo.",
-    "After clicking the custom button, the following fields of the current record will be saved according to the following form.": "Dopo aver fatto clic sul pulsante personalizza, i seguenti campi del record corrente verranno salvati in base al seguente modulo.",
-    "Button background color": "Colore sfondo del pulsante",
-    "Highlight": "Evidenziato",
-    "Danger red": "Rosso pericolo",
-    "Custom request": "Richiesta personalizzata",
-    "Request settings": "Impostazioni richiesta",
-    "Request URL": "URL richiesta",
-    "Request method": "Metodo richiesta",
-    "Request query parameters": "Parametri richiesta query",
-    "Request headers": "Intestazioni richiesta",
-    "Request body": "Corpo richiesta",
-    "Request success": "Successo richiesta",
-    "Invalid JSON format": "Formato JSON non valido",
-    "After successful request": "Dopo una richiesta riuscita",
-    "Add exportable field": "Aggiungi campo esportabile",
-    "Audit logs": "Registri audit",
-    "Record ID": "ID record",
-    "User": "Utente",
-    "Field": "Campo",
-    "Select": "Seleziona",
-    "Select field": "Seleziona campo",
-    "Field value changes": "Modifiche valore del campo",
-    "One to one (has one)": "Uno a uno (ne ha uno)",
-    "One to one (belongs to)": "Uno a uno (appartiene a)",
-    "Use the same time zone (GMT) for all users": "Usa lo stesso fuso orario (GMT) per tutti gli utenti",
-    "Province/city/area name": "Nome provincia/città/area",
-    "Enabled languages": "Lingue abilitate",
-    "View all plugins": "Visualizza tutti i plugin",
-    "Print": "Stampa",
-    "Done": "Fatto",
-    "Sign up successfully, and automatically jump to the sign in page": "Iscriviti correttamente e reindirizza automaticamente alla pagina di accesso",
-    "File manager": "File Manager",
-    "ACL": "ACL",
-    "Collection manager": "Responsabile della raccolta",
-    "Plugin manager": "Plugin Manager",
-    "Local": "Locale",
-    "Built-in": "Incorporato",
-    "Marketplace": "Marketplace",
-    "Add plugin": "Aggiungi plugin",
-    "Plugin source": "Sorgente plugin",
-    "Upgrade": "Aggiornamento",
-    "Plugin dependencies check failed": "Controllo delle dipendenze del plugin non riuscito",
-    "More details": "Maggiori dettagli",
-    "Upload new version": "Carica nuova versione",
-    "Version": "Versione",
-    "Npm package": "Pacchetto Npm",
-    "Npm package name": "Nome pacchetto Npm",
-    "Upload plugin": "Carica plugin",
-    "Official plugin": "Plugin ufficiale",
-    "Add type": "Aggiungi tipo",
-    "Changelog": "Changelog",
-    "Dependencies check": "Controllo delle dipendenze",
-    "Update plugin": "Aggiorna plugin",
-    "Installing": "Installazione",
-    "The deletion was successful.": "Cancellazione riuscita.",
-    "Plugin Zip File": "File zip plugin",
-    "Compressed file url": "URL file compresso",
-    "Last updated": "Ultimo aggiornamento",
-    "PackageName": "Nome pacchetto",
-    "DisplayName": "Nome da visualizzare",
-    "Readme": "Readme",
-    "Dependencies compatibility check": "Controllo compatibilità delle dipendenze",
-    "Plugin dependencies check failed, you should change the dependent version to meet the version requirements.": "Controllo delle dipendenze del plugin non riuscito, è necessario modificare la versione dipendente per soddisfare i requisiti della versione.",
-    "Version range": "Range versione",
-    "Plugin's version": "Versione plugin",
-    "Result": "Risultato",
-    "No CHANGELOG.md file": "Nessun file Changelog.md",
-    "No README.md file": "Nessun file readme.md",
-    "Homepage": "Homepage",
-    "Drag and drop the file here or click to upload, file size should not exceed 30M": "Trascina e rilascia il file qui o fai clic per caricare, la dimensione del file non deve superare i 30M",
-    "Dependencies check failed, can't enable.": "Il controllo delle dipendenze non è riuscito, impossibile abilitare.",
-    "Plugin starting...": "Avvio plugin...",
-    "Plugin stopping...": "Interruzione plugin ...",
-    "Are you sure to delete this plugin?": "Sei sicuro di eliminare questo plugin?",
-    "Are you sure to disable this plugin?": "Sei sicuro di disabilitare questo plugin?",
-    "re-download file": "ri-scarica file",
-    "Not enabled": "Non abilitato",
-    "Search plugin": "Ricerca plugin",
-    "Author": "Autore",
-    "Plugin loading failed. Please check the server logs.": "Il caricamento del plugin non è riuscito. Si prega di controllare i registri del server.",
-    "Coming soon...": "Prossimamente...",
-    "All plugin settings": "Tutte le impostazioni del plugin",
-    "Bookmark": "Segnalibro",
-    "Manage all settings": "Gestisci tutte le impostazioni",
-    "Create inverse field in the target collection": "Crea campo inverso nella raccolta di destinazione",
-    "Inverse field name": "Nome campo inverso",
-    "Inverse field display name": "Nome visualizzato campo inverso",
-    "Bulk update": "Aggiornamento di massa",
-    "After successful bulk update": "Dopo un aggiornamento di massa riuscito",
-    "Bulk edit": "Modifica di massa",
-    "Data will be updated": "I dati verranno aggiornati",
-    "Selected": "Selezionato",
-    "All": "Tutto",
-    "Update selected data?": "Aggiornare i dati selezionati?",
-    "Update all data?": "Aggiornare tutti i dati?",
-    "Remains the same": "Rimane lo stesso",
-    "Changed to": "Cambiato in",
-    "Clear": "Cancella",
-    "Add attach": "Aggiungi allegato",
-    "Please select the records to be updated": "Si prega di selezionare i record da aggiornare",
-    "Selector": "Selettore",
-    "Inner": "Interno",
-    "Search and select collection": "Cerca e seleziona la raccolta",
-    "Please fill in the iframe URL": "Si prega di compilare l'URL iFrame",
-    "Fix block": "Fissa blocco",
-    "Plugin name": "Nome plugin",
-    "Plugin tab name": "Nome scheda plugin",
-    "AutoGenId": "Campo ID generato automaticamente",
-    "CreatedBy": "Creato da",
-    "UpdatedBy": "Aggiornato da",
-    "CreatedAt": "Creato il",
-    "UpdatedAt": "Aggiornato il",
-    "Column width": "Larghezza colonna",
-    "Sortable": "Ordinabile",
-    "Enable link": "Abilita link",
-    "This is likely a NocoBase internals bug. Please open an issue at <1>here</1>": "Questo sembra un bug interno di NocoBase. Si prega di aprire un ticket <1>qui</1>",
-    "Render Failed": "Rendering non riuscito",
-    "App error": "Errore app",
-    "Feedback": "Feedback",
-    "Try again": "Riprova",
-    "Download logs": "Download registri",
-    "Data template": "Modello dati",
-    "Duplicate": "Duplica",
-    "Duplicating": "Duplicazione",
-    "Duplicate mode": "Modalità duplicazione",
-    "Quick duplicate": "Duplicazione veloce",
-    "Duplicate and continue": "Duplica e continua",
-    "Please configure the duplicate fields": "Si prega di configurare i campi duplicati",
-    "Add": "Aggiungi",
-    "Add new mode": "Modalità aggiungi nuovo",
-    "Quick add": "Aggiunta rapida",
-    "Modal add": "Aggiunta modale",
-    "Save mode": "Modalità salvataggio",
-    "First or create": "Prima o crea",
-    "Update or create": "Aggiorna o crea",
-    "Find by the following fields": "Trova dai seguenti campi",
-    "Create": "Crea",
-    "Current form": "Modulo corrente",
-    "Current object": "Oggetto corrente",
-    "Linkage with form fields": "Collegamento con i campi del modulo",
-    "Allow add new, update and delete actions": "Consenti operazioni aggiungi nuovo, aggiorna ed elimina",
-    "Date display format": "Formato di visualizzazione della data",
-    "Assign  data scope for the template": "Assegna l'ambito dei dati per il modello",
-    "Table selected records": "Tabella record selezionati",
-    "Tag": "Etichetta",
-    "Tag color field": "Campo colore etichetta",
-    "Sync successfully": "Sincronizzazione riuscita",
-    "Sync from form fields": "Sincronizzazione dai campi del modulo",
-    "Select all": "Seleziona tutto",
-    "Restart": "Ricomincia",
-    "Restart application": "Riavvia applicazione",
-    "Cascade Select": "Seleziona in cascata",
-    "Execute": "Esegui",
-    "Please use a valid SELECT or WITH AS statement": "Si prega di utilizzare un' istruzione SELECT o WITH AS valida",
-    "Please confirm the SQL statement first": "Si prega di confermare prima l'istruzione SQL",
-    "Automatically drop objects that depend on the collection (such as views), and in turn all objects that depend on those objects": "Elimina automaticamente gli oggetti che dipendono dalla raccolta (come le viste) e, a loro volta, tutti gli oggetti che dipendono da tali oggetti",
-    "Sign in with another account": "Accedi con un altro account",
-    "Return to the main application": "Torna alla applicazione principale",
-    "Permission deined": "Permesso negato",
-    "loading": "caricamento",
-    "name is required": "nome richiesto",
-    "data source": "sorgente dati",
-    "Data source": "Sorgente dati",
-    "DataSource": "Sorgente Dati",
-    "The {{type}} \"{{name}}\" may have been deleted. Please remove this {{blockType}}.": "Il {{type}} \"{{name}}\" potrebbe essere stato eliminato. Si prega di rimuovere {{blockType}}.",
-    "Preset fields": "Campi preimpostati",
-    "Home page": "Home page",
-    "Handbook": "Manuale",
-    "License": "Licenza",
-    "Generic properties": "Proprietà generiche",
-    "Specific properties": "Proprietà specifiche",
-    "Used for drag and drop sorting scenarios, supporting grouping sorting": "Utilizzato per scenari con drag and drop, supporta ordinamento raggruppato",
-    "Grouped sorting": "Ordinamento raggruppato",
-    "When a field is selected for grouping, it will be grouped first before sorting.": "Quando viene selezionato un campo per il raggruppamento, verrà raggruppato prima dell'ordinamento.",
-    "Departments": "Dipartimenti",
-    "Main department": "Dipartimento principale",
-    "Department name": "Nome del dipartimento",
-    "Superior department": "Dipartimento superiore",
-    "Owners": "Proprietari",
-    "Plugin settings": "Impostazioni plugin",
-    "Menu": "Menu",
-    "Drag and drop sorting field": "Campi ordinamento drag and drop",
-    "This variable has been deprecated and can be replaced with \"Current form\"": "Questa variabile è stata deprecata e può essere sostituita con \"Current form\"",
-    "The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "Il valore di questa variabile deriva dalla stringa di ricerca nell'URL della pagina. Questa variabile può essere utilizzata normalmente solo quando la pagina ha una stringa di ricerca.",
-    "URL search params": "Parametri di ricerca URL",
-    "Expand All": "Espandi tutto",
-    "Search": "Ricerca",
-    "Clear default value": "Cancella il valore predefinito",
-    "Open in new window": "Apri in una nuova finestra",
-    "Sorry, the page you visited does not exist.": "Spiacente, la pagina che hai visitato non esiste.",
-    "is none of": "non è nessuno di",
-    "is any of": "è uno di",
-    "Plugin dependency version mismatch": "Mancata corrispondenza della versione della dipendenza del plugin",
-    "The current dependency version of the plugin does not match the version of the application and may not work properly. Are you sure you want to continue enabling the plugin?": "L'attuale versione della dipendenza del plugin non corrisponde alla versione dell'applicazione e potrebbe non funzionare correttamente. Sei sicuro di voler continuare a abilitare il plugin?",
-    "Allow multiple selection": "Consenti selezione multipla",
-    "Parent object": "Oggetto padre",
-    "Skip getting the total number of table records during paging to speed up loading. It is recommended to enable this option for data tables with a large amount of data": "Ometti calcolo del numero totale di record della tabella durante l'impaginazione per accelerare il caricamento. Si consiglia di abilitare questa opzione per tabelle con grandi quantità di dati",
-    "Enable secondary confirmation": "Abilita conferma secondaria",
-    "Notification": "Notifica",
-    "Ellipsis overflow content": "Contenuto Ellipsis overflow",
-    "Hide column": "Nascondi colonna",
-    "In configuration mode, the entire column becomes transparent. In non-configuration mode, the entire column will be hidden. Even if the entire column is hidden, its configured default values and other settings will still take effect.": "In modalità di configurazione, l'intera colonna diventa trasparente. In modalità non di configurazione, l'intera colonna verrà nascosta. Anche se l'intera colonna è nascosta, i suoi valori predefiniti configurati e le altre impostazioni avranno comunque effetto."
-}
+{
+  "Display <1><0>10</0><1>20</1><2>50</2><3>100</3></1> items per page": "Visualizza <1><0>10</0><1>20</1><2>50</2><3>100</3></1> articoli per pagina",
+  "Meet <1><0>All</0><1>Any</1></1> conditions in the group": "Soddisfa<1><0>Tutte</0><1>Qualsiasi</1></1>condizioni nel gruppo",
+  "Open in<1><0>Modal</0><1>Drawer</1><2>Window</2></1>": "Apri in<1><0>Modale</0><1>Cassetto</1><2>Finestra</2></1>",
+  "{{count}} filter items": "{{Count}} filtri elementi",
+  "{{count}} more items": "{{Count}} altri elementi",
+  "Total {{count}} items": "{{count}} elementi totali",
+  "Today": "Oggi",
+  "Yesterday": "Ieri",
+  "Tomorrow": "Domani",
+  "Month": "Mese",
+  "Week": "Settimana",
+  "This week": "Questa settimana",
+  "This month": "Questo mese",
+  "This year": "Quest'anno",
+  "Next year": "Anno prossimo",
+  "Last week": "Settimana scorsa",
+  "Next week": "Prossima settimana",
+  "Last month": "Mese scorso",
+  "Next month": "Mese prossimo",
+  "Last quarter": "Ultimo trimestre",
+  "This quarter": "Questo trimestre",
+  "Next quarter": "Prossimo trimestre",
+  "Last year": "Anno scorso",
+  "Last 7 days": "Ultimi 7 giorni",
+  "Last 30 days": "Ultimi 30 giorni",
+  "Last 90 days": "Ultimi 90 giorni",
+  "Next 7 days": "Prossimi 7 giorni",
+  "Next 30 days": "Prossimi 30 giorni",
+  "Next 90 days": "Prossimi 90 giorni",
+  "Work week": "Settimana lavorativa",
+  "Day": "Giorno",
+  "Agenda": "Agenda",
+  "Date": "Data",
+  "Time": "Tempo",
+  "Event": "Evento",
+  "None": "Nessuno",
+  "Unconnected": "Non collegato",
+  "System settings": "Impostazioni di sistema",
+  "System title": "Titolo del sistema",
+  "Settings": "Impostazioni",
+  "Logo": "Logo",
+  "Add menu item": "Aggiungi voce di menu",
+  "Page": "Pagina",
+  "Name": "Nome",
+  "Icon": "Icona",
+  "Group": "Gruppo",
+  "Link": "Collegamento",
+  "Save conditions": "Salva condizioni",
+  "Edit menu item": "Modifica voce di menu",
+  "Move to": "Passa a",
+  "Insert left": "Inserisci a sinistra",
+  "Insert right": "Inserire a destra",
+  "Insert inner": "Inserire dentro",
+  "Delete": "Eliminare",
+  "Disassociate": "Dissociare",
+  "Disassociate record": "Dissociare record",
+  "Are you sure you want to disassociate it?": "Sei sicuro di voler dissociare?",
+  "UI editor": "Editor UI",
+  "Collection": "Raccolta",
+  "Collection selector": "Selettore di raccolta",
+  "Providing certain collections as options for users, typically used in polymorphic or inheritance scenarios": "Fornire alcune raccolte come opzioni per gli utenti, in genere utilizzati negli scenari polimorfici o ereditari",
+  "Collections & Fields": "Raccolte e campi",
+  "All collections": "Tutte le raccolte",
+  "Add category": "Aggiungi categoria",
+  "Enable child collections": "Abilita raccolte figlie",
+  "Allow adding records to the current collection": "Consenti l'aggiunta di record alla raccolta corrente",
+  "Delete category": "Elimina categoria",
+  "Edit category": "Modifica categoria",
+  "Collection category": "Categoria raccolta",
+  "Collection template": "Modello raccolta",
+  "Sort": "Ordina",
+  "Categories": "Categorie",
+  "Visible": "Visibile",
+  "Read only": "Solo lettura",
+  "Easy reading": "Lettura facile",
+  "Hidden": "Nascosto",
+  "Hidden(reserved value)": "Nascosto (valore riservato)",
+  "Not required": "Non richiesto",
+  "Value": "Valore",
+  "Disabled": "Disabilitato",
+  "Enabled": "Abilitato",
+  "Problematic": "Con problemi",
+  "Setting": "Impostazioni",
+  "On": "Acceso",
+  "Off": "Spento",
+  "Empty": "Vuoto",
+  "Linkage rule": "Regola di collegamento",
+  "Linkage rules": "Regole di collegamento",
+  "Condition": "Condizione",
+  "Properties": "Proprietà",
+  "Add linkage rule": "Aggiungi regola di collegamento",
+  "Add property": "Aggiungi proprietà",
+  "Category name": "Nome della categoria",
+  "Roles & Permissions": "Ruoli e autorizzazioni",
+  "Edit profile": "Modifica profilo",
+  "Change password": "Cambia password",
+  "Old password": "Vecchia password",
+  "New password": "Nuova password",
+  "Switch role": "Cambia ruolo",
+  "Super admin": "Super Admin",
+  "Language": "Lingua",
+  "Allow sign up": "Consenti iscrizione",
+  "Enable SMS authentication": "Abilita autenticazione SMS",
+  "Sign out": "Disconnessione",
+  "Cancel": "Annulla",
+  "Submit": "Invia",
+  "Close": "Chiudi",
+  "Set the data scope": "Imposta l'ambito dei dati",
+  "Set data loading mode": "Imposta modalità di caricamento dei dati",
+  "Load all data when filter is empty": "Carica tutti i dati quando il filtro è vuoto",
+  "Do not load data when filter is empty": "Non caricare i dati quando il filtro è vuoto",
+  "Data loading mode": "Modalità di caricamento dei dati",
+  "Data blocks": "Blocchi dati",
+  "Filter blocks": "Blocchi filtro",
+  "Table": "Tabella",
+  "Table OID(Inheritance)": "Tabella OID (eredità)",
+  "Form": "Modulo",
+  "List": "Elenco",
+  "Grid Card": "Scheda griglia",
+  "pixels": "pixel",
+  "Screen size": "Dimensione dello schermo",
+  "Display title": "Visualizza titolo",
+  "Set the count of columns displayed in a row": "Imposta conteggio delle colonne visualizzate in una riga",
+  "Column": "Colonna",
+  "Phone device": "Telefono",
+  "Tablet device": "Tablet",
+  "Desktop device": "Desktop",
+  "Large screen device": "Schermo di grandi dimensioni",
+  "Collapse": "Comprimi",
+  "Select data source": "Seleziona origine dati",
+  "Calendar": "Calendario",
+  "Delete events": "Elimina eventi",
+  "This event": "Questo evento",
+  "This and following events": "Questo e seguenti eventi",
+  "All events": "Tutti gli eventi",
+  "Delete this event?": "Eliminare questo evento?",
+  "Delete Event": "Elimina evento",
+  "Kanban": "Kanban",
+  "Gantt": "Gantt",
+  "Create gantt block": "Crea blocco Gantt",
+  "Progress field": "Campo avanzamento",
+  "Time scale": "Scala del tempo",
+  "Hour": "Ora",
+  "Quarter of day": "Quarto del giorno",
+  "Half of day": "Metà del giorno",
+  "Year": "Anno",
+  "QuarterYear": "Quarto dell' anno",
+  "Select grouping field": "Seleziona campo di raggruppamento",
+  "Media": "Media",
+  "Markdown": "Markdown",
+  "Wysiwyg": "Wysiwyg",
+  "Chart blocks": "Blocchi grafici",
+  "Column chart": "Grafico a colonne",
+  "Bar chart": "Grafico a barre",
+  "Line chart": "Grafico a linee",
+  "Pie chart": "Grafico a torta",
+  "Area chart": "Grafico ad area",
+  "Other chart": "Altro grafico",
+  "Other blocks": "Altri blocchi",
+  "In configuration": "In configurazione",
+  "Chart title": "Titolo grafico",
+  "Chart type": "Tipo grafico",
+  "Chart config": "Configurazione grafico",
+  "Templates": "Modelli",
+  "Select template": "Seleziona modello",
+  "Action logs": "Registri eventi",
+  "Create template": "Crea modello",
+  "Edit markdown": "Modifica Markdown",
+  "Add block": "Aggiungi blocco",
+  "Add new": "Aggiungi nuovo",
+  "Add record": "Aggiungi record",
+  "Add child": "Aggiungi figlio",
+  "Collapse all": "Comprimi tutto",
+  "Expand all": "Espandi tutto",
+  "Expand/Collapse": "Espandi/Comprimi",
+  "Default collapse": "Comprimi di default",
+  "Tree table": "Tabella struttura ad albero",
+  "Custom field display name": "Nome visualizzato campo personalizzato ",
+  "Display fields": "Visualizza campi",
+  "Edit record": "Modifica record",
+  "Delete menu item": "Elimina voce di menu",
+  "Add page": "Aggiungi pagina",
+  "Add group": "Aggiungi gruppo",
+  "Add link": "Aggiungi link",
+  "Insert above": "Inserisci sopra",
+  "Insert below": "Inserisci sotto",
+  "Save": "Salva",
+  "Delete block": "Elimina blocco",
+  "Are you sure you want to delete it?": "Sei sicuro di volerlo eliminare?",
+  "This is a demo text, **supports Markdown syntax**.": "Questo è un testo demo, ** supporta la sintassi di Markdown **.",
+  "Filter": "Filtro",
+  "Connect data blocks": "Collega blocchi di dati",
+  "Action type": "Tipo di azione",
+  "Actions": "Azioni",
+  "Insert": "Inserisci",
+  "Insert if not exists": "Inserisci se non esiste",
+  "Insert if not exists, or update": "Inserisci se non esiste o aggiorna",
+  "Determine whether a record exists by the following fields": "Determina se un record esiste dai seguenti campi",
+  "Update": "Aggiorna",
+  "Update record": "Aggiorna record",
+  "View": "Visualizza",
+  "View record": "Visualizza record",
+  "Refresh": "Refresh",
+  "Data changes": "Modifiche ai dati",
+  "Field name": "Nome campo",
+  "Before change": "Prima delle modifiche",
+  "After change": "Dopo le modifiche",
+  "Delete record": "Elimina record",
+  "Delete collection": "Elimina raccolta",
+  "Create collection": "Crea raccolta",
+  "Collection display name": "Nome visualizzato raccolta",
+  "Collection name": "Nome raccolta",
+  "Inherits": "Eredita",
+  "Primary key, unique identifier, self growth": "Chiave primaria, identificatore univoco, auto-incremento",
+  "Store the creation user of each record": "Memorizza l'utente della creazione di ogni record",
+  "Store the last update user of each record": "Memorizza l'ultimo utente di aggiornamento di ogni record",
+  "Store the creation time of each record": "Memorizza l'orario di creazione di ogni record",
+  "Store the last update time of each record": "Memorizza l'ultimo orario di aggiornamento di ogni record",
+  "More options": "Più opzioni",
+  "Records can be sorted": "I record possono essere ordinati",
+  "Calendar collection": "Raccolta calendario",
+  "General collection": "Raccolta generale",
+  "Connect to database view": "Connetti alla vista del database",
+  "Sync from database": "Sincronizza dal database",
+  "Source collections": "Sorgente raccolte",
+  "Field source": "Sorgente campo",
+  "Preview": "Anteprima",
+  "Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.": "Generato casualmente e può essere modificato. Supporta lettere, numeri e underscore, deve iniziare con una lettera.",
+  "Edit": "Modifica",
+  "Edit collection": "Modifica raccolta",
+  "Configure fields": "Configura campi",
+  "Configure columns": "Configura colonne",
+  "Edit field": "Modifica campo",
+  "Override": "Forza",
+  "Override field": "Forza campo",
+  "Configure fields of {{title}}": "Configura campi di {{title}}",
+  "Association fields filter": "Filtro associazione campi",
+  "PK & FK fields": "Campi PK e FK",
+  "Association fields": "Campi associazione",
+  "Choices fields": "Campi scelte",
+  "System fields": "Campi di sistema",
+  "General fields": "Campi generali",
+  "Inherited fields": "Campi ereditati",
+  "Parent collection fields": "Campi raccolta padre",
+  "Basic": "Di base",
+  "Single line text": "Testo a riga singola",
+  "Long text": "Testo lungo",
+  "Phone": "Telefono",
+  "Email": "E-mail",
+  "Number": "Numero",
+  "Integer": "Intero",
+  "Percent": "Percentuale",
+  "Password": "Password",
+  "Advanced type": "Avanzato",
+  "Choices": "Scelte",
+  "Checkbox": "Casella di controllo",
+  "Single select": "Selezione singola",
+  "Multiple select": "Selezione multipla",
+  "Radio group": "Gruppo radio",
+  "Checkbox group": "Gruppo cassella di controllo",
+  "China region": "Regione cinese",
+  "Date & Time": "Data e ora",
+  "Datetime": "DateTime",
+  "Relation": "Relazione",
+  "Link to": "Collegamento a",
+  "Link to description": "Utilizzato per creare relazioni tra raccolte in modo rapido e compatibile con gli scenari più comuni. Adatto per un uso da non sviluppatore. Se presente come campo, è una selezione a discesa utilizzata per selezionare i record dalla raccolta di destinazione. Una volta creato, genererà contemporaneamente i campi associati dell'attuale raccolta nella raccolta di destinazione.",
+  "Sub-table": "Sotto-tabella",
+  "Sub-details": "Sotto-dettagli",
+  "Sub-form(Popover)": "Sotto-modulo (Popover)",
+  "System info": "Informazioni di sistema",
+  "Created at": "Creato il",
+  "Last updated at": "Ultimo aggiornamento il",
+  "Created by": "Creato da",
+  "Last updated by": "Ultimo aggiornamento da",
+  "Add field": "Aggiungi campo",
+  "Field display name": "Nome visualizzato campo",
+  "Field type": "Tipo campo",
+  "Field interface": "Interfaccia campo",
+  "Date format": "Formato data",
+  "Year/Month/Day": "Anno/Mese/Giorno",
+  "Year-Month-Day": "Anno-Mese-Giorno",
+  "Day/Month/Year": "Giorno/Mese/Anno",
+  "Show time": "Mostra orario",
+  "Time format": "Formato tempo",
+  "12 hour": "12 ore",
+  "24 hour": "24 ore",
+  "Relationship type": "Tipo di relazione",
+  "Inverse relationship type": "Tipo di relazione inversa",
+  "Source collection": "Raccolta sorgente",
+  "Source key": "Chiave sorgente",
+  "Target collection": "Raccolta di destinazione",
+  "Through collection": "Attraverso la raccolta",
+  "Target key": "Chiave di destinazione",
+  "Foreign key": "Chiave esterna",
+  "One to one": "Uno a uno",
+  "One to many": "Uno a molti",
+  "Many to one": "Molti a uno",
+  "Many to many": "Molti a molti",
+  "Foreign key 1": "Chiave esterna 1",
+  "Foreign key 2": "Chiave esterna 2",
+  "One to one description": "Usato per creare relazioni one-to-one. Ad esempio, un utente ha un profilo.",
+  "One to many description": "Utilizzato per creare una relazione da uno a molti. Ad esempio, un paese avrà molte città e una città può essere solo in un paese. Se presente come campo, è una sotto-tabella che mostra i record della raccolta associata. Se creato, un campo molti-a-uno viene generato automaticamente nella raccolta associata.",
+  "Many to one description": "Utilizzato per creare relazioni molti-a-uno. Ad esempio, una città può appartenere a un solo paese e un paese può avere molte città. Se presente come campo, è una selezione a discesa utilizzata per selezionare il record dalla raccolta associata. Una volta creato, un campo da uno a molti viene generato automaticamente nella raccolta associata.",
+  "Many to many description": "Utilizzato per creare relazioni molti-a-molti. Ad esempio, uno studente avrà molti insegnanti e un insegnante avrà molti studenti. Se presente come campo, è una selezione a discesa utilizzata per selezionare i record dalla raccolta associata.",
+  "Generated automatically if left blank": "Generato automaticamente se lasciato vuoto",
+  "Display association fields": "Visualizza campi di associazione",
+  "Display field title": "Visualizza titolo campo",
+  "Field component": "Componente campo",
+  "Allow multiple": "Consenti multipli",
+  "Quick upload": "Caricamento rapido",
+  "Select file": "Seleziona file",
+  "Subtable": "Sotto-tabella",
+  "Sub-form": "Sotto-modulo",
+  "Field mode": "Modalità campo",
+  "Allow add new data": "Consenti aggiunta nuovi dati",
+  "Record picker": "Record Picker",
+  "Toggles the subfield mode": "Attiva la modalità Subfield",
+  "Selector mode": "Modalità selettore",
+  "Subtable mode": "Modalità sotto-tabella",
+  "Subform mode": "Modalità sotto-modulo",
+  "Block title": "Titolo blocco",
+  "Pattern": "Modello",
+  "Operator": "Operatore",
+  "Editable": "Modificabile",
+  "Readonly": "Solo lettura",
+  "Easy-reading": "Lettura facile",
+  "Add filter": "Aggiungi filtro",
+  "Add filter group": "Aggiungi gruppo di filtri",
+  "Comparision": "Confronto",
+  "is": "è",
+  "is not": "non lo è",
+  "contains": "contiene",
+  "does not contain": "non contiene",
+  "starts with": "inizia con",
+  "not starts with": "non inizia con",
+  "ends with": "termina con",
+  "not ends with": "non termina con",
+  "is empty": "è vuoto",
+  "is not empty": "non è vuoto",
+  "Edit chart": "Modifica grafico",
+  "Filterable fields": "Campi filtrabili",
+  "Edit button": "Modifica pulsante",
+  "Hide": "Nascondi",
+  "Enable actions": "Abilita azioni",
+  "Import": "Importa",
+  "Export": "Esporta",
+  "Customize": "Personalizza",
+  "Custom": "Personalizzato",
+  "Function": "Funzione",
+  "Popup form": "Modulo Popup",
+  "Flexible popup": "Popup flessibile",
+  "Configure actions": "Configura azioni",
+  "Display order number": "Visualizza numero ordinamento",
+  "Enable drag and drop sorting": "Abilita l'ordinamento con drag and drop",
+  "Triggered when the row is clicked": "Attivato quando si fa clic sulla riga",
+  "Add tab": "Aggiungi scheda",
+  "Disable tabs": "Disabilita schede",
+  "Details": "Dettagli",
+  "Edit form": "Modifica modulo",
+  "Create form": "Crea modulo",
+  "Form (Edit)": "Modulo (modifica)",
+  "Form (Add new)": "Modulo (aggiungi nuovo)",
+  "Edit tab": "Modifica scheda",
+  "Relationship blocks": "Blocchi di relazione",
+  "Select record": "Seleziona Record",
+  "Display name": "Visualizza nome",
+  "Select icon": "Seleziona icona",
+  "Custom column name": "Nome colonna personalizzato",
+  "Edit description": "Modifica descrizione",
+  "Required": "Richiesto",
+  "Unique": "Univoco",
+  "Primary": "Primario",
+  "Auto increment": "Incremento automatico",
+  "Label field": "Campo etichetta",
+  "Default is the ID field": "L'impostazione predefinita è il campo ID",
+  "Set default sorting rules": "Imposta regole di ordinamento predefinite",
+  "Set validation rules": "Imposta regole di convalida",
+  "Max length": "Lunghezza massima",
+  "Min length": "Lunghezza minima",
+  "Maximum": "Massimo",
+  "Minimum": "Minimo",
+  "Max length must greater than min length": "La lunghezza massima deve essere maggiore della lunghezza minima",
+  "Min length must less than max length": "La lunghezza minima deve essere inferiore della lunghezza massima",
+  "Maximum must greater than minimum": "Il massimo deve essere maggiore del minimo",
+  "Minimum must less than maximum": "Il minimo deve essere minore del massimo",
+  "Validation rule": "Regola di convalida",
+  "Add validation rule": "Aggiungi regola di convalida",
+  "Format": "Formato",
+  "Regular expression": "Espressione regolare",
+  "Error message": "Messaggio di errore",
+  "Length": "Lunghezza",
+  "The field value cannot be greater than ": "Il valore del campo non può essere maggiore di",
+  "The field value cannot be less than ": "Il valore del campo non può essere inferiore a",
+  "The field value is not an integer number": "Il valore del campo non è un numero intero",
+  "Set default value": "Imposta valore predefinito",
+  "Default value": "Valore predefinito",
+  "is before": "è prima",
+  "is after": "è dopo",
+  "is on or after": "a partire dal",
+  "is on or before": "entro il",
+  "is between": "è tra",
+  "Upload": "Upload",
+  "Select level": "Seleziona livello",
+  "Province": "Provincia",
+  "City": "Città",
+  "Area": "Zona",
+  "Street": "Strada",
+  "Village": "Villaggio",
+  "Must select to the last level": "Deve selezionare all'ultimo livello",
+  "Move {{title}} to": "Sposta {{title}} a",
+  "Target position": "Posizione di destinazione",
+  "After": "Dopo",
+  "Before": "Prima",
+  "Add {{type}} before \"{{title}}\"": "Aggiungi {{type}} prima di \"{{title}}\"",
+  "Add {{type}} after \"{{title}}\"": "Aggiungi {{type}} dopo \"{{title}}\"",
+  "Add {{type}} in \"{{title}}\"": "Aggiungi {{type}} in \"{{title}}\"",
+  "Original name": "Nome originale",
+  "Custom name": "Nome personalizzato",
+  "Custom Title": "Titolo personalizzato",
+  "Options": "Opzioni",
+  "Option value": "Valore opzione",
+  "Option label": "Etichetta opzione",
+  "Color": "Colore",
+  "Background Color": "Colore sfondo",
+  "Text Align": "Allineamento testo",
+  "Add option": "Aggiungi opzione",
+  "Related collection": "Raccolta correlata",
+  "Allow linking to multiple records": "Consenti ​collegamento a più record",
+  "Configure calendar": "Configura calendario",
+  "Title field": "Campo titolo",
+  "Custom title": "Titolo personalizzato",
+  "Daily": "Quotidiano",
+  "Weekly": "Settimanale",
+  "Monthly": "Mensile",
+  "Yearly": "Annuale",
+  "Repeats": "Ripeti",
+  "Show lunar": "Mostra lunare",
+  "Start date field": "Campo data di inizio",
+  "End date field": "Campo data di fine",
+  "Navigate": "Naviga",
+  "Title": "Titolo",
+  "Description": "Descrizione",
+  "Select view": "Seleziona vista",
+  "Reset": "Reset",
+  "Importable fields": "Campi importabili",
+  "Exportable fields": "Campi esportabili",
+  "Saved successfully": "Salvataggio riuscito",
+  "Nickname": "Soprannome",
+  "Sign in": "Registrazione",
+  "Sign in via account": "Accedi tramite account",
+  "Sign in via phone": "Accedi via telefono",
+  "Create an account": "Crea un account",
+  "Sign up": "Iscrizione",
+  "Confirm password": "Conferma password",
+  "Log in with an existing account": "Accedi con account esistente",
+  "Signed up successfully. It will jump to the login page.": "Registrazione riuscita. Reindirizzamento alla pagina di accesso.",
+  "Password mismatch": "Password non corretta",
+  "Users": "Utenti",
+  "Verification code": "Codice di verifica",
+  "Send code": "Invia codice",
+  "Retry after {{count}} seconds": "Riprova dopo {{count}} secondi",
+  "Roles": "Ruoli",
+  "Add role": "Aggiungi ruolo",
+  "Role name": "Nome ruolo",
+  "Configure": "Configura",
+  "Configure permissions": "Configura permessi",
+  "Edit role": "Modifica ruolo",
+  "Action permissions": "Permessi su azioni",
+  "Menu permissions": "Permessi su menu",
+  "Menu item name": "Nome voce di menu",
+  "Allow access": "Consenti accesso",
+  "Action name": "Nome azione",
+  "Allow action": "Consenti azione",
+  "Action scope": "Ambito azione",
+  "Operate on new data": "Operare su nuovi dati",
+  "Operate on existing data": "Operare su dati esistenti",
+  "Yes": "Si",
+  "No": "No",
+  "Red": "Rosso",
+  "Magenta": "Magenta",
+  "Volcano": "Vulcano",
+  "Orange": "Arancione",
+  "Gold": "Oro",
+  "Lime": "Lime",
+  "Green": "Verde",
+  "Cyan": "Ciano",
+  "Blue": "Blu",
+  "Geek blue": "Geek Blue",
+  "Purple": "Viola",
+  "Default": "Predefinito",
+  "Add card": "Aggiungi scheda",
+  "edit title": "modifica titolo",
+  "Turn pages": "Volta pagine",
+  "Others": "Altri",
+  "Other records": "Altri record",
+  "Save as template": "Salva come modello",
+  "Save as block template": "Salva come modello blocco",
+  "Block templates": "Modelli blocco",
+  "Block template": "Modello blocco",
+  "Convert reference to duplicate": "Converti ​​riferimento a duplicato",
+  "Template name": "Nome modello",
+  "Block type": "Tipo blocco",
+  "No blocks to connect": "Nessun blocco per connettersi",
+  "Action column": "Colonna azioni",
+  "Records per page": "Record per pagina",
+  "(Fields only)": "(Solo campi)",
+  "Button title": "Titolo pulsante",
+  "Button icon": "Icona pulsante",
+  "Submitted successfully": "Invio riuscito",
+  "Operation succeeded": "L'operazione è riuscita",
+  "Operation failed": "Operazione non riuscita",
+  "Open mode": "Modalità aperta",
+  "Popup size": "Dimensione popup",
+  "Small": "Piccolo",
+  "Middle": "Medio",
+  "Large": "Grande",
+  "Size": "Misura",
+  "Oversized": "Oversize",
+  "Auto": "Auto",
+  "Object Fit": "Adattato all'oggetto",
+  "Cover": "Cover",
+  "Fill": "Riempi",
+  "Contain": "Contiene",
+  "Scale Down": "Ridimensiona",
+  "Menu item title": "Titolo voce di menu",
+  "Menu item icon": "Icona voce di menu",
+  "Target": "Destinazione",
+  "Position": "Posizione",
+  "Insert before": "Inserire prima",
+  "Insert after": "Inserire dopo",
+  "UI Editor": "Editor UI",
+  "ASC": "Asc",
+  "DESC": "Desc",
+  "Add sort field": "Aggiungi campo di ordinamento",
+  "ID": "ID",
+  "Identifier for program usage. Support letters, numbers and underscores, must start with an letter.": "Identificatore per l'utilizzo del programma. Supporta lettere, numeri e underscore, deve iniziare con una lettera.",
+  "Drawer": "Cassetto",
+  "Dialog": "Dialogo",
+  "Delete action": "Elimina azione",
+  "Custom column title": "Titolo colonna personalizzata",
+  "Column title": "Titolo colonna",
+  "Original title: ": "Titolo originale: ",
+  "Delete table column": "Elimina colonna della tabella",
+  "Skip required validation": "Salta convalida richiesta",
+  "Form values": "Valori modulo",
+  "Fields values": "Valori campi",
+  "The field has been deleted": "Il campo è stato eliminato",
+  "When submitting the following fields, the saved values are": "Quando si inviano i seguenti campi, i valori salvati sono",
+  "After successful submission": "Dopo un invio riuscito",
+  "Then": "Poi",
+  "Stay on current page": "Resta sulla pagina corrente",
+  "Redirect to": "Reindirizza a",
+  "Save action": "Salva azione",
+  "Exists": "Esiste",
+  "Add condition": "Aggiungi condizione",
+  "Add condition group": "Aggiungi gruppo di condizioni",
+  "exists": "esiste",
+  "not exists": "non esiste",
+  "Style": "Stile",
+  "=": "=",
+  "≠": "≠",
+  ">": ">",
+  "≥": "≥",
+  "<": "<",
+  "≤": "≤",
+  "Role UID": "Ruolo UID",
+  "Precision": "Precisione",
+  "Expression": "Espressione",
+  "Rich Text": "Testo ricco",
+  "Junction collection": "Raccolta giunzione",
+  "Leave it blank, unless you need a custom intermediate table": "Lascialo vuoto, a meno che tu non abbia bisogno di una tabella intermedia personalizzata",
+  "Fields": "Campi",
+  "Edit field title": "Modifica titolo campo",
+  "Field title": "Titolo campo",
+  "Original field title: ": "Titolo campo originale:",
+  "Edit tooltip": "Modifica suggerimento",
+  "Delete field": "Elimina campo",
+  "Select collection": "Seleziona raccolta",
+  "Blank block": "Blocco vuoto",
+  "Duplicate template": "Modello duplicato",
+  "Reference template": "Modello di riferimento",
+  "Create calendar block": "Crea blocco calendario",
+  "Create kanban block": "Crea blocco kanban",
+  "Grouping field": "Campo di raggruppamento",
+  "Single select and radio fields can be used as the grouping field": "I campi di selezione singoli e radio possono essere utilizzati come campo di raggruppamento",
+  "Tab name": "Nome della scheda",
+  "Current record blocks": "Blocchi record attuale",
+  "Popup message": "Messaggio popup",
+  "Delete role": "Elimina ruolo",
+  "Role display name": "Nome visualizzato ruolo",
+  "Default role": "Ruolo predefinito",
+  "All collections use general action permissions by default; permission configured individually will override the default one.": "Tutte le raccolte utilizzano i permessi di operazioni generali per impostazione predefinita; I permessi configurati individualmente sovrascriveranno quelli predefiniti.",
+  "Allows configuration of the whole system, including UI, collections, permissions, etc.": "Consente la configurazione dell'intero sistema, tra cui interfaccia utente, raccolte, permessi, ecc.",
+  "New menu items are allowed to be accessed by default.": "È possibile accedere a nuove voci di menu per impostazione predefinita.",
+  "Global permissions": "Permessi globali",
+  "General permissions": "Permessi generali",
+  "Global action permissions": "Permessi operazioni globali",
+  "General action permissions": "Permessi operazioni generali",
+  "Plugin settings permissions": "Permessi impostazioni plugin",
+  "Allow to desgin pages": "Consenti progettazione pagine",
+  "Allow to manage plugins": "Consenti gestione plugin",
+  "Allow to configure plugins": "Consenti configurazione plugin",
+  "Allows to configure interface": "Consente di configurare l'interfaccia",
+  "Allows to install, activate, disable plugins": "Consente di installare, attivare, disabilitare i plugin",
+  "Allows to configure plugins": "Consente di configurare i plugin",
+  "Action display name": "Nome visualizzato azione",
+  "Allow": "Permetti",
+  "Data scope": "Ambito dei dati",
+  "Action on new records": "Azione su nuovi record",
+  "Action on existing records": "Azione su record esistenti",
+  "All records": "Tutti i record",
+  "Own records": "Record propri",
+  "Permission policy": "Policy di autorizzazione",
+  "Individual": "Individuale",
+  "General": "Generale",
+  "Accessible": "Accessibile",
+  "Configure permission": "Configura permesso",
+  "Action permission": "Permesso azione",
+  "Field permission": "Permesso campo",
+  "Scope name": "Nome ambito",
+  "Unsaved changes": "Modifiche non salvate",
+  "Are you sure you don't want to save?": "Sei sicuro di non voler salvare?",
+  "Dragging": "Trascina",
+  "Popup": "Popup",
+  "Trigger workflow": "Trigger workflow",
+  "Request API": "Richiesta API",
+  "Assign field values": "Assegna valori del campo",
+  "Constant value": "Valore costante",
+  "Dynamic value": "Valore dinamico",
+  "Current user": "Utente attuale",
+  "Current role": "Ruolo attuale",
+  "Current record": "Record attuale",
+  "Current collection": "Raccolta attuale",
+  "Other collections": "Altre raccolte",
+  "Current popup record": "Record popup attuale",
+  "Parent popup record": "Record popup padre",
+  "Associated records": "Record associati",
+  "Parent record": "Record padre",
+  "Current time": "Ora attuale",
+  "System variables": "Variabili di sistema",
+  "Date variables": "Variabili della data",
+  "Message popup close method": "Metodo di chiusura popup di messaggio",
+  "Automatic close": "Chiudi automaticamente",
+  "Manually close": "Chiudi manualmente",
+  "After successful update": "Dopo un aggiornamento riuscito",
+  "Save record": "Salva record",
+  "Updated successfully": "Aggiornamento riuscito",
+  "After successful save": "Dopo un salvataggio riuscito",
+  "After clicking the custom button, the following field values will be assigned according to the following form.": "Dopo aver fatto clic sul pulsante personalizza, i seguenti valori verranno assegnati in base al seguente modulo.",
+  "After clicking the custom button, the following fields of the current record will be saved according to the following form.": "Dopo aver fatto clic sul pulsante personalizza, i seguenti campi del record corrente verranno salvati in base al seguente modulo.",
+  "Button background color": "Colore sfondo del pulsante",
+  "Highlight": "Evidenziato",
+  "Danger red": "Rosso pericolo",
+  "Custom request": "Richiesta personalizzata",
+  "Request settings": "Impostazioni richiesta",
+  "Request URL": "URL richiesta",
+  "Request method": "Metodo richiesta",
+  "Request query parameters": "Parametri richiesta query",
+  "Request headers": "Intestazioni richiesta",
+  "Request body": "Corpo richiesta",
+  "Request success": "Successo richiesta",
+  "Invalid JSON format": "Formato JSON non valido",
+  "After successful request": "Dopo una richiesta riuscita",
+  "Add exportable field": "Aggiungi campo esportabile",
+  "Audit logs": "Registri audit",
+  "Record ID": "ID record",
+  "User": "Utente",
+  "Field": "Campo",
+  "Select": "Seleziona",
+  "Select field": "Seleziona campo",
+  "Field value changes": "Modifiche valore del campo",
+  "One to one (has one)": "Uno a uno (ne ha uno)",
+  "One to one (belongs to)": "Uno a uno (appartiene a)",
+  "Use the same time zone (GMT) for all users": "Usa lo stesso fuso orario (GMT) per tutti gli utenti",
+  "Province/city/area name": "Nome provincia/città/area",
+  "Enabled languages": "Lingue abilitate",
+  "View all plugins": "Visualizza tutti i plugin",
+  "Print": "Stampa",
+  "Done": "Fatto",
+  "Sign up successfully, and automatically jump to the sign in page": "Iscriviti correttamente e reindirizza automaticamente alla pagina di accesso",
+  "File manager": "File Manager",
+  "ACL": "ACL",
+  "Collection manager": "Responsabile della raccolta",
+  "Plugin manager": "Plugin Manager",
+  "Local": "Locale",
+  "Built-in": "Incorporato",
+  "Marketplace": "Marketplace",
+  "Add plugin": "Aggiungi plugin",
+  "Plugin source": "Sorgente plugin",
+  "Upgrade": "Aggiornamento",
+  "Plugin dependencies check failed": "Controllo delle dipendenze del plugin non riuscito",
+  "More details": "Maggiori dettagli",
+  "Upload new version": "Carica nuova versione",
+  "Version": "Versione",
+  "Npm package": "Pacchetto Npm",
+  "Npm package name": "Nome pacchetto Npm",
+  "Upload plugin": "Carica plugin",
+  "Official plugin": "Plugin ufficiale",
+  "Add type": "Aggiungi tipo",
+  "Changelog": "Changelog",
+  "Dependencies check": "Controllo delle dipendenze",
+  "Update plugin": "Aggiorna plugin",
+  "Installing": "Installazione",
+  "The deletion was successful.": "Cancellazione riuscita.",
+  "Plugin Zip File": "File zip plugin",
+  "Compressed file url": "URL file compresso",
+  "Last updated": "Ultimo aggiornamento",
+  "PackageName": "Nome pacchetto",
+  "DisplayName": "Nome da visualizzare",
+  "Readme": "Readme",
+  "Dependencies compatibility check": "Controllo compatibilità delle dipendenze",
+  "Plugin dependencies check failed, you should change the dependent version to meet the version requirements.": "Controllo delle dipendenze del plugin non riuscito, è necessario modificare la versione dipendente per soddisfare i requisiti della versione.",
+  "Version range": "Range versione",
+  "Plugin's version": "Versione plugin",
+  "Result": "Risultato",
+  "No CHANGELOG.md file": "Nessun file Changelog.md",
+  "No README.md file": "Nessun file readme.md",
+  "Homepage": "Homepage",
+  "Drag and drop the file here or click to upload, file size should not exceed 30M": "Trascina e rilascia il file qui o fai clic per caricare, la dimensione del file non deve superare i 30M",
+  "Dependencies check failed, can't enable.": "Il controllo delle dipendenze non è riuscito, impossibile abilitare.",
+  "Plugin starting...": "Avvio plugin...",
+  "Plugin stopping...": "Interruzione plugin ...",
+  "Are you sure to delete this plugin?": "Sei sicuro di eliminare questo plugin?",
+  "Are you sure to disable this plugin?": "Sei sicuro di disabilitare questo plugin?",
+  "re-download file": "ri-scarica file",
+  "Not enabled": "Non abilitato",
+  "Search plugin": "Ricerca plugin",
+  "Author": "Autore",
+  "Plugin loading failed. Please check the server logs.": "Il caricamento del plugin non è riuscito. Si prega di controllare i registri del server.",
+  "Coming soon...": "Prossimamente...",
+  "All plugin settings": "Tutte le impostazioni del plugin",
+  "Bookmark": "Segnalibro",
+  "Manage all settings": "Gestisci tutte le impostazioni",
+  "Create inverse field in the target collection": "Crea campo inverso nella raccolta di destinazione",
+  "Inverse field name": "Nome campo inverso",
+  "Inverse field display name": "Nome visualizzato campo inverso",
+  "Bulk update": "Aggiornamento di massa",
+  "After successful bulk update": "Dopo un aggiornamento di massa riuscito",
+  "Bulk edit": "Modifica di massa",
+  "Data will be updated": "I dati verranno aggiornati",
+  "Selected": "Selezionato",
+  "All": "Tutto",
+  "Update selected data?": "Aggiornare i dati selezionati?",
+  "Update all data?": "Aggiornare tutti i dati?",
+  "Remains the same": "Rimane lo stesso",
+  "Changed to": "Cambiato in",
+  "Clear": "Cancella",
+  "Add attach": "Aggiungi allegato",
+  "Please select the records to be updated": "Si prega di selezionare i record da aggiornare",
+  "Selector": "Selettore",
+  "Inner": "Interno",
+  "Search and select collection": "Cerca e seleziona la raccolta",
+  "Please fill in the iframe URL": "Si prega di compilare l'URL iFrame",
+  "Fix block": "Fissa blocco",
+  "Plugin name": "Nome plugin",
+  "Plugin tab name": "Nome scheda plugin",
+  "Column width": "Larghezza colonna",
+  "Sortable": "Ordinabile",
+  "Enable link": "Abilita link",
+  "This is likely a NocoBase internals bug. Please open an issue at <1>here</1>": "Questo sembra un bug interno di NocoBase. Si prega di aprire un ticket <1>qui</1>",
+  "Render Failed": "Rendering non riuscito",
+  "App error": "Errore app",
+  "Feedback": "Feedback",
+  "Try again": "Riprova",
+  "Download logs": "Download registri",
+  "Data template": "Modello dati",
+  "Duplicate": "Duplica",
+  "Duplicating": "Duplicazione",
+  "Duplicate mode": "Modalità duplicazione",
+  "Quick duplicate": "Duplicazione veloce",
+  "Duplicate and continue": "Duplica e continua",
+  "Please configure the duplicate fields": "Si prega di configurare i campi duplicati",
+  "Add": "Aggiungi",
+  "Add new mode": "Modalità aggiungi nuovo",
+  "Quick add": "Aggiunta rapida",
+  "Modal add": "Aggiunta modale",
+  "Save mode": "Modalità salvataggio",
+  "First or create": "Prima o crea",
+  "Update or create": "Aggiorna o crea",
+  "Find by the following fields": "Trova dai seguenti campi",
+  "Create": "Crea",
+  "Current form": "Modulo corrente",
+  "Current object": "Oggetto corrente",
+  "Linkage with form fields": "Collegamento con i campi del modulo",
+  "Allow add new, update and delete actions": "Consenti azioni aggiungi nuovo, aggiorna ed elimina",
+  "Date display format": "Formato di visualizzazione della data",
+  "Table selected records": "Tabella record selezionati",
+  "Tag": "Etichetta",
+  "Tag color field": "Campo colore etichetta",
+  "Sync successfully": "Sincronizzazione riuscita",
+  "Sync from form fields": "Sincronizzazione dai campi del modulo",
+  "Select all": "Seleziona tutto",
+  "Restart": "Ricomincia",
+  "Restart application": "Riavvia applicazione",
+  "Cascade Select": "Seleziona in cascata",
+  "Execute": "Esegui",
+  "Please use a valid SELECT or WITH AS statement": "Si prega di utilizzare un' istruzione SELECT o WITH AS valida",
+  "Please confirm the SQL statement first": "Si prega di confermare prima l'istruzione SQL",
+  "Automatically drop objects that depend on the collection (such as views), and in turn all objects that depend on those objects": "Elimina automaticamente gli oggetti che dipendono dalla raccolta (come le viste) e, a loro volta, tutti gli oggetti che dipendono da tali oggetti",
+  "Sign in with another account": "Accedi con un altro account",
+  "Return to the main application": "Torna alla applicazione principale",
+  "loading": "caricamento",
+  "name is required": "nome richiesto",
+  "data source": "sorgente dati",
+  "Data source": "Sorgente dati",
+  "DataSource": "Sorgente Dati",
+  "The {{type}} \"{{name}}\" may have been deleted. Please remove this {{blockType}}.": "Il {{type}} \"{{name}}\" potrebbe essere stato eliminato. Si prega di rimuovere {{blockType}}.",
+  "Preset fields": "Campi preimpostati",
+  "Home page": "Home page",
+  "Handbook": "Manuale",
+  "License": "Licenza",
+  "Generic properties": "Proprietà generiche",
+  "Specific properties": "Proprietà specifiche",
+  "Used for drag and drop sorting scenarios, supporting grouping sorting": "Utilizzato per scenari con drag and drop, supporta ordinamento raggruppato",
+  "Grouped sorting": "Ordinamento raggruppato",
+  "When a field is selected for grouping, it will be grouped first before sorting.": "Quando viene selezionato un campo per il raggruppamento, verrà raggruppato prima dell'ordinamento.",
+  "Departments": "Dipartimenti",
+  "Main department": "Dipartimento principale",
+  "Department name": "Nome del dipartimento",
+  "Superior department": "Dipartimento superiore",
+  "Owners": "Proprietari",
+  "Plugin settings": "Impostazioni plugin",
+  "Menu": "Menu",
+  "Drag and drop sorting field": "Campi ordinamento drag and drop",
+  "This variable has been deprecated and can be replaced with \"Current form\"": "Questa variabile è stata deprecata e può essere sostituita con \"Current form\"",
+  "The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "Il valore di questa variabile deriva dalla stringa di ricerca nell'URL della pagina. Questa variabile può essere utilizzata normalmente solo quando la pagina ha una stringa di ricerca.",
+  "URL search params": "Parametri di ricerca URL",
+  "Expand All": "Espandi tutto",
+  "Search": "Ricerca",
+  "Clear default value": "Cancella valore predefinito",
+  "Open in new window": "Apri in una nuova finestra",
+  "Sorry, the page you visited does not exist.": "Spiacente, la pagina che hai visitato non esiste.",
+  "is none of": "non è nessuno di",
+  "is any of": "è uno di",
+  "Plugin dependency version mismatch": "Mancata corrispondenza della versione della dipendenza del plugin",
+  "The current dependency version of the plugin does not match the version of the application and may not work properly. Are you sure you want to continue enabling the plugin?": "L'attuale versione della dipendenza del plugin non corrisponde alla versione dell'applicazione e potrebbe non funzionare correttamente. Sei sicuro di voler continuare a abilitare il plugin?",
+    "Allow multiple selection": "Consenti selezione multipla",
+  "Parent object": "Oggetto padre",
+  "Skip getting the total number of table records during paging to speed up loading. It is recommended to enable this option for data tables with a large amount of data": "Ometti calcolo del numero totale di record della tabella durante l'impaginazione per accelerare il caricamento. Si consiglia di abilitare questa opzione per tabelle con grandi quantità di dati",
+  "Enable secondary confirmation": "Abilita conferma secondaria",
+  "Notification": "Notifica",
+  "Ellipsis overflow content": "Contenuto Ellipsis overflow",
+  "Hide column": "Nascondi colonna",
+  "In configuration mode, the entire column becomes transparent. In non-configuration mode, the entire column will be hidden. Even if the entire column is hidden, its configured default values and other settings will still take effect.": "In modalità di configurazione, l'intera colonna diventa trasparente. In modalità non di configurazione, l'intera colonna verrà nascosta. Anche se l'intera colonna è nascosta, i suoi valori predefiniti configurati e le altre impostazioni avranno comunque effetto.",
+  "Page number": "Numero di pagina",
+  "Page size": "Numero di voci per pagina",
+  "Enable": "Abilita",
+  "Disable": "Disabilita",
+  "Tab": "Scheda",
+  "Calculation engine": "Motore di calcolo",
+  "Expression collection": "Raccolta espressioni",
+  "Tree collection": "Raccolta struttura ad albero",
+  "Parent ID": "ID record padre",
+  "Parent": "Record padre",
+  "Children": "Record figlio",
+  "Confirm": "Conferma",
+  "Block": "Blocco",
+  "Unnamed": "Senza nome",
+  "SQL collection": "Raccolta dati SQL",
+  "Configure field": "Configura campo",
+  "Username": "Nome utente",
+  "Null": "Null",
+  "Boolean": "Booleano",
+  "String": "Stringa",
+  "Syntax references": "Riferimenti sintassi",
+  "Math.js comes with a large set of built-in functions and constants, and offers an integrated solution to work with different data types.": "Math.js include un ampio set di funzioni e costanti integrate e offre una soluzione integrata per lavorare con diversi tipi di dati.",
+  "Formula.js supports most Microsoft Excel formula functions.": "Formula.js supporta la maggior parte delle funzioni delle formule di Microsoft Excel.",
+  "String template": "Modello stringa",
+  "Simple string replacement, can be used to interpolate variables in a string.": "Sostituzione semplice di stringhe, può essere utilizzata per interpolare variabili in una stringa.",
+  "https://docs.nocobase.com/handbook/calculation-engines/formula": "https://docs-cn.nocobase.com/handbook/calculation-engines/formula",
+  "https://docs.nocobase.com/handbook/calculation-engines/mathjs": "https://docs-cn.nocobase.com/handbook/calculation-engines/mathjs",
+  "Display <icon></icon> when unchecked": "Visualizza <icon></icon> quando deselezionato",
+  "Allow dissociate": "Consenti dissociazione",
+  "Edit block title & description": "Modifica titolo e descrizione blocco",
+  "Add Markdown": "Aggiungi Markdown",
+  "Must be 1-50 characters in length (excluding @.<>\"'/)": "Deve essere lungo 1-50 caratteri (esclusi @.<>\"'/)",
+  "Data source permissions": "Permessi origine dati",
+  "Now": "Adesso",
+  "Access control": "Controllo accessi",
+  "Remove": "Rimuovi",
+  "Docs": "Documenti",
+  "Enable page header": "Abilita intestazione pagina",
+  "Display page title": "Visualizza titolo pagina",
+  "Edit page title": "Modifica titolo pagina",
+  "Enable page tabs": "Abilita schede pagina",
+  "Constant": "Costante",
+  "Select a variable": "Seleziona una variabile",
+  "Double click to choose entire object": "Doppio clic per scegliere l'intero oggetto",
+  "True": "Vero",
+  "False": "Falso",
+  "Prettify": "Formatta",
+  "Theme": "Tema",
+  "Default theme": "Tema predefinito",
+  "Compact theme": "Tema compatto",
+  "Download": "Scarica",
+  "File type is not supported for previewing, please download it to preview.": "Il tipo di file non è supportato per l'anteprima, scaricalo per visualizzarlo.",
+  "Click or drag file to this area to upload": "Clicca o trascina il file in quest'area per caricarlo",
+  "Support for a single or bulk upload.": "Supporta il caricamento singolo o in blocco.",
+  "File size should not exceed {{size}}.": "La dimensione del file non deve superare {{size}}.",
+  "File size exceeds the limit": "La dimensione del file supera il limite",
+  "File type is not allowed": "Il tipo di file non è consentito",
+  "Incomplete uploading files need to be resolved": "I caricamenti incompleti dei file devono essere completati",
+  "Default title for each record": "Titolo predefinito per ogni record",
+  "If collection inherits, choose inherited collections as templates": "Se la raccolta eredita, scegli le raccolte ereditate come modelli",
+  "Select an existing piece of data as the initialization data for the form": "Seleziona un dato esistente come dati di inizializzazione per il modulo",
+  "Only the selected fields will be used as the initialization data for the form": "Solo i campi selezionati verranno utilizzati come dati di inizializzazione per il modulo",
+  "Template Data": "Dati modello",
+  "Data fields": "Campi dati",
+  "Add template": "Aggiungi modello",
+  "Enable form data template": "Abilita modello dati modulo",
+  "Form data templates": "Modelli dati modulo",
+  "No configuration available.": "Nessuna configurazione disponibile.",
+  "Reload application": "Ricarica applicazione",
+  "The application is reloading, please do not close the page.": "L'applicazione si sta ricaricando, non chiudere la pagina.",
+  "Application reloading": "Ricaricamento applicazione",
+  "Allows to clear cache, reboot application": "Consente di cancellare la cache, riavviare l'applicazione",
+  "The will interrupt service, it may take a few seconds to restart. Are you sure to continue?": "Il riavvio interromperà il servizio, potrebbero essere necessari alcuni secondi. Sei sicuro di continuare?",
+  "Clear cache": "Cancella cache",
+  "Quick create": "Creazione rapida",
+  "Dropdown": "Menu a discesa",
+  "Pop-up": "Popup",
+  "Direct duplicate": "Duplicazione diretta",
+  "Copy into the form and continue to fill in": "Copia nel modulo e continua a compilare",
+  "Failed to load plugin": "Caricamento plugin fallito",
+  "Date range limit": "Limite intervallo date",
+  "MinDate": "Data minima",
+  "MaxDate": "Data massima",
+  "Please select time or variable": "Seleziona ora o variabile",
+  "Filter out a single piece or a group of records as a template": "Filtra un singolo dato o un gruppo di record come modello",
+  "The title field is used to identify the template record": "Il campo titolo è utilizzato per identificare il record modello",
+  "Template fields": "Campi modello",
+  "The selected fields will automatically populate the form": "I campi selezionati popoleranno automaticamente il modulo",
+  "UnSelect all": "Deseleziona tutto",
+  "Secondary confirmation": "Conferma secondaria",
+  "Perform the {{title}}": "Esegui {{title}}",
+  "Are you sure you want to perform the {{title}} action?": "Sei sicuro di voler eseguire l'azione {{title}}?",
+  "Permission denied": "Permesso negato",
+  "Allow add new": "Consenti aggiunta",
+  "Data model": "Modello dati",
+  "Security": "Sicurezza",
+  "Action": "Azione",
+  "System": "Sistema",
+  "Other": "Altro",
+  "Allow selection of existing records": "Consenti selezione di record esistenti",
+  "Data Model": "Modello dati",
+  "Blocks": "Blocchi",
+  "Users & permissions": "Utenti e permessi",
+  "System management": "Gestione sistema",
+  "System & security": "Sistema e sicurezza",
+  "Workflow": "Workflow",
+  "Third party services": "Servizi di terze parti",
+  "Data model tools": "Strumenti modello dati",
+  "Data sources": "Origini dati",
+  "Collections": "Raccolte",
+  "Collection fields": "Campi raccolta",
+  "Authentication": "Autenticazione",
+  "Logging and monitoring": "Registrazione e monitoraggio",
+  "Main": "Principale",
+  "Index": "Indice",
+  "Field values must be unique.": "I valori dei campi devono essere univoci.",
+  "Alphabet": "Alfabeto",
+  "Accuracy": "Precisione",
+  "Millisecond": "Millisecondo",
+  "Second": "Secondo",
+  "Unix Timestamp": "Timestamp Unix",
+  "Field value do not meet the requirements": "Il valore del campo non soddisfa i requisiti",
+  "Field value size is": "La dimensione del valore del campo è",
+  "Unit conversion": "Conversione unità",
+  "Separator": "Separatore",
+  "Prefix": "Prefisso",
+  "Suffix": "Suffisso",
+  "Record unique key": "Chiave univoca record",
+  "Filter target key": "Chiave target filtro",
+  "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.": "Se una raccolta non ha una chiave primaria, devi configurare un record come chiave univoca per individuare i record di ogni riga all'interno di un blocco, la mancata configurazione impedirà la creazione di blocchi di dati per la raccolta.",
+  "Filter data based on the specific field, with the requirement that the field value must be unique.": "Filtra i dati in base a un campo specifico, con il requisito che il valore del campo deve essere univoco.",
+  "Multiply by": "Moltiplica per",
+  "Divide by": "Dividi per",
+  "Scientifix notation": "Notazione scientifica",
+  "Normal": "Normale",
+  "Automatically generate default values": "Genera automaticamente valori predefiniti",
+  "Refresh data on close": "Refresh dei dati alla chiusura",
+  "Refresh data on action": "Refresh dei dati su azione",
+  "Unknown field type": "Tipo di campo sconosciuto",
+  "The following field types are not compatible and do not support output and display": "I seguenti tipi di campo non sono compatibili e non supportano l'output e la visualizzazione",
+  "Not fixed": "Non fissato",
+  "Left fixed": "Fissato a sinistra",
+  "Right fixed": "Fissato a destra",
+  "Fixed": "Colonna fissa",
+  "Set block height": "Imposta altezza del blocco",
+  "Specify height": "Specifica altezza",
+  "Full height": "Altezza completa",
+  "Please configure the URL": "Configura l'URL",
+  "URL": "URL",
+  "Search parameters": "Parametri di ricerca URL",
+  "Do not concatenate search params in the URL": "Non concatenare i parametri di ricerca nell'URL",
+  "Edit link": "Modifica link",
+  "Add parameter": "Aggiungi parametro",
+  "Use simple pagination mode": "Usa modalità di paginazione semplice",
+  "Set Template Engine": "Imposta motore template",
+  "Template engine": "Motore template",
+  "The current user only has the UI configuration permission, but don't have view permission for collection \"{{name}}\"": "L'utente corrente ha solo il permesso di configurazione dell'interfaccia utente, ma non ha il permesso di visualizzazione per la raccolta \"{{name}}\"",
+  "Default value to current time": "Imposta il valore predefinito del campo all'ora corrente",
+  "Automatically update timestamp on update": "Aggiorna automaticamente il timestamp all'aggiornamento",
+  "Default value to current server time": "Imposta il valore predefinito del campo all'ora corrente del server",
+  "Automatically update timestamp to the current server time on update": "Aggiorna automaticamente il timestamp all'ora corrente del server all'aggiornamento",
+  "Datetime (with time zone)": "Data e ora (con fuso orario)",
+  "Datetime (without time zone)": "Data e ora (senza fuso orario)",
+  "DateOnly": "Solo data",
+  "Content": "Contenuto",
+  "Perform the Update record": "Esegui aggiornamento record",
+  "Are you sure you want to perform the Update record action?": "Sei sicuro di voler eseguire l'azione di aggiornamento record?",
+  "Perform the Custom request": "Esegui richiesta personalizzata",
+  "Are you sure you want to perform the Custom request action": "Sei sicuro di voler eseguire l'azione di richiesta personalizzata?",
+  "Perform the Refresh": "Esegui refresh",
+  "Are you sure you want to perform the Refresh action?": "Sei sicuro di voler eseguire l'azione di refresh?",
+  "Perform the Submit": "Esegui l'invio",
+  "Are you sure you want to perform the Submit action?": "Sei sicuro di voler eseguire l'azione di invio?",
+  "Perform the Trigger workflow": "Esegui il trigger del workflow",
+  "Are you sure you want to perform the Trigger workflow action?": "Sei sicuro di voler eseguire l'azione di trigger del workflow?",
+  "Picker": "Selettore",
+  "Quarter": "Trimestre",
+  "Switching the picker, the value and default value will be cleared": "Cambiando il selettore, il valore e il valore predefinito verranno cancellati",
+  "Stay on the current popup or page": "Rimani nel popup o nella pagina corrente",
+  "Return to the previous popup or page": "Torna al popup o alla pagina precedente",
+  "Action after successful submission": "Azione dopo l'invio riuscito",
+  "Allow disassociation": "Consenti la dissociazione",
+  "Layout": "Layout",
+  "Vertical": "Verticale",
+  "Horizontal": "Orizzontale",
+  "Edit group title": "Modifica titolo del gruppo",
+  "Title position": "Posizione titolo",
+  "Dashed": "Tratteggiato",
+  "Left": "Sinistra",
+  "Center": "Centro",
+  "Right": "Destra",
+  "Divider line color": "Colore linea di divisione",
+  "Label align": "Allineamento etichetta",
+  "Label width": "Larghezza etichetta",
+  "When the Label exceeds the width": "Quando l'etichetta supera la larghezza",
+  "Line break": "A capo",
+  "Ellipsis": "Ellipsis",
+  "Set block layout": "Imposta layout del blocco",
+  "Add & Update": "Aggiungi e aggiorna",
+  "Table size": "Dimensione della tabella",
+  "Plugin": "Plugin",
+  "Bulk enable": "Abilitazione in blocco",
+  "Search plugin...": "Cerca plugin...",
+  "Package name": "Nome pacchetto",
+  "Associate": "Associa",
+  "Please add or select record": "Aggiungi o seleziona record",
+  "No data": "Nessun dato",
+  "Fields can only be used correctly if they are defined with an interface.": "I campi possono essere utilizzati correttamente solo se sono definiti con un'interfaccia.",
+  "Unauthenticated. Please sign in to continue.": "Non autenticato. Accedi per continuare.",
+  "User not found. Please sign in again to continue.": "Impossibile trovare l'utente. Accedi nuovamente per continuare.",
+  "Your session has expired. Please sign in again.": "La tua sessione è scaduta. Accedi nuovamente.",
+  "User password changed, please signin again.": "La password dell'utente è stata modificata, accedi di nuovo.",
+  "Show file name": "Mostra nome del file",
+  "Outlined": "Contornato",
+  "Filled": "Riempito",
+  "Two tone": "Due toni",
+  "Desktop routes": "Percorsi desktop",
+  "Route permissions": "Permessi percorso",
+  "New routes are allowed to be accessed by default": "I nuovi percorsi sono accessibili per impostazione predefinita",
+  "Route name": "Nome percorso",
+  "Mobile routes": "Percorsi mobile",
+  "Show in menu": "Mostra nel menu",
+  "Hide in menu": "Nascondi nel menu",
+  "Path": "Percorso",
+  "Type": "Tipo",
+  "Access": "Accesso",
+  "Routes": "Percorsi",
+  "Add child route": "Aggiungi percorso figlio",
+  "Delete routes": "Elimina percorsi",
+  "Delete route": "Elimina percorso",
+  "Are you sure you want to hide these routes in menu?": "Sei sicuro di voler nascondere questi percorsi nel menu?",
+  "Are you sure you want to show these routes in menu?": "Sei sicuro di voler mostrare questi percorsi nel menu?",
+  "Are you sure you want to hide this menu?": "Sei sicuro di voler nascondere questo menu?",
+  "After hiding, this menu will no longer appear in the menu bar. To show it again, you need to go to the route management page to configure it.": "Dopo averlo nascosto, questo menu non apparirà più nella barra dei menu. Per mostrarlo di nuovo, devi andare alla pagina di gestione dei percorsi per configurarlo.",
+  "If selected, the page will display Tab pages.": "Se selezionato, la pagina visualizzerà le pagine schede.",
+  "If selected, the route will be displayed in the menu.": "Se selezionato, il percorso verrà visualizzato nel menu.",
+  "Are you sure you want to hide this tab?": "Sei sicuro di voler nascondere questa scheda?",
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Dopo averla nascosta, questa scheda non apparirà più nella barra delle schede. Per mostrarla di nuovo, devi andare alla pagina di gestione dei percorsi per configurarlo.",
+  "No pages yet, please configure first": "Nessuna pagina ancora, si prega di configurare prima",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Cliquez sur l'icône \"Éditeur d'interface utilisateur\" dans le coin supérieur droit pour entrer en mode Éditeur d'interface utilisateur"
+}
diff --git a/packages/core/client/src/locale/ja-JP.json b/packages/core/client/src/locale/ja-JP.json
index 7013d30af2..a90eba9463 100644
--- a/packages/core/client/src/locale/ja-JP.json
+++ b/packages/core/client/src/locale/ja-JP.json
@@ -1039,5 +1039,7 @@
   "If selected, the page will display Tab pages.": "選択されている場合、ページはタブページを表示します。",
   "If selected, the route will be displayed in the menu.": "選択されている場合、ルートはメニューに表示されます。",
   "Are you sure you want to hide this tab?": "このタブを非表示にしますか？",
-  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "非表示にすると、このタブはタブバーに表示されなくなります。再表示するには、ルート管理ページで設定する必要があります。"
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "非表示にすると、このタブはタブバーに表示されなくなります。再表示するには、ルート管理ページで設定する必要があります。",
+  "No pages yet, please configure first": "まだページがありません。最初に設定してください",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "ユーザーインターフェースエディターモードに入るには、右上隅の「UIエディタ」アイコンをクリックしてください"
 }
diff --git a/packages/core/client/src/locale/ko-KR.json b/packages/core/client/src/locale/ko-KR.json
index 9e17f29876..8294df8e6b 100644
--- a/packages/core/client/src/locale/ko-KR.json
+++ b/packages/core/client/src/locale/ko-KR.json
@@ -912,5 +912,7 @@
   "If selected, the page will display Tab pages.": "선택되면 페이지는 탭 페이지를 표시합니다.",
   "If selected, the route will be displayed in the menu.": "선택되면 라우트는 메뉴에 표시됩니다.",
   "Are you sure you want to hide this tab?": "이 탭을 숨기시겠습니까?",
-  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "숨기면 이 탭은 탭 바에 더 이상 표시되지 않습니다. 다시 표시하려면 라우트 관리 페이지에서 설정해야 합니다."
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "숨기면 이 탭은 탭 바에 더 이상 표시되지 않습니다. 다시 표시하려면 라우트 관리 페이지에서 설정해야 합니다.",
+  "No pages yet, please configure first": "아직 페이지가 없습니다. 먼저 설정하십시오",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "사용자 인터페이스 편집기 모드에 들어가려면 오른쪽 상단의 \"UI 편집기\" 아이콘을 클릭하십시오"
 }
diff --git a/packages/core/client/src/locale/pt-BR.json b/packages/core/client/src/locale/pt-BR.json
index 1bacded113..96025c52d5 100644
--- a/packages/core/client/src/locale/pt-BR.json
+++ b/packages/core/client/src/locale/pt-BR.json
@@ -778,5 +778,7 @@
   "If selected, the page will display Tab pages.": "Se selecionado, a página exibirá páginas de abas.",
   "If selected, the route will be displayed in the menu.": "Se selecionado, a rota será exibida no menu.",
   "Are you sure you want to hide this tab?": "Tem certeza de que deseja ocultar esta guia?",
-  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Depois de ocultar, esta guia não aparecerá mais na barra de guias. Para mostrá-la novamente, você precisa ir à página de gerenciamento de rotas para configurá-la."
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Depois de ocultar, esta guia não aparecerá mais na barra de guias. Para mostrá-la novamente, você precisa ir à página de gerenciamento de rotas para configurá-la.",
+  "No pages yet, please configure first": "Ainda não há páginas, por favor configure primeiro",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Cliquez sur l'icône \"Éditeur d'interface utilisateur\" dans le coin supérieur droit pour entrer en mode Éditeur d'interface utilisateur"
 }
diff --git a/packages/core/client/src/locale/ru-RU.json b/packages/core/client/src/locale/ru-RU.json
index c85a74cdd1..af31e21e6a 100644
--- a/packages/core/client/src/locale/ru-RU.json
+++ b/packages/core/client/src/locale/ru-RU.json
@@ -607,5 +607,7 @@
   "If selected, the page will display Tab pages.": "Если выбран, страница будет отображать страницы с вкладками.",
   "If selected, the route will be displayed in the menu.": "Если выбран, маршрут будет отображаться в меню.",
   "Are you sure you want to hide this tab?": "Вы уверены, что хотите скрыть эту вкладку?",
-  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "После скрытия этой вкладки она больше не будет отображаться во вкладке. Чтобы снова отобразить ее, вам нужно будет перейти на страницу управления маршрутами, чтобы установить ее."
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "После скрытия этой вкладки она больше не будет отображаться во вкладке. Чтобы снова отобразить ее, вам нужно будет перейти на страницу управления маршрутами, чтобы установить ее.",
+  "No pages yet, please configure first": "Пока нет страниц, пожалуйста, настройте сначала",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Нажмите на значок \"Редактор пользовательского интерфейса\" в правом верхнем углу, чтобы войти в режим редактора пользовательского интерфейса"
 }
diff --git a/packages/core/client/src/locale/tr-TR.json b/packages/core/client/src/locale/tr-TR.json
index 3845bc75a0..a5572c47fc 100644
--- a/packages/core/client/src/locale/tr-TR.json
+++ b/packages/core/client/src/locale/tr-TR.json
@@ -605,5 +605,7 @@
   "If selected, the page will display Tab pages.": "Seçildiğinde, sayfa Tab sayfalarını görüntüleyecektir.",
   "If selected, the route will be displayed in the menu.": "Seçildiğinde, yol menüde görüntülenecektir.",
   "Are you sure you want to hide this tab?": "Bu sekmeyi gizlemek istediğinizden emin misiniz?",
-  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Gizlendikten sonra, bu sekme artık sekme çubuğunda görünmeyecek. Onu tekrar göstermek için, rotayı yönetim sayfasına gidip ayarlamanız gerekiyor."
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Gizlendikten sonra, bu sekme artık sekme çubuğunda görünmeyecek. Onu tekrar göstermek için, rotayı yönetim sayfasına gidip ayarlamanız gerekiyor.",
+  "No pages yet, please configure first": "Henüz sayfa yok, lütfen önce yapılandırın",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Kullanıcı arayüzü düzenleyici moduna girmek için sağ üst köşedeki \"Kullanıcı Arayüzü Düzenleyici\" simgesine tıklayın"
 }
diff --git a/packages/core/client/src/locale/uk-UA.json b/packages/core/client/src/locale/uk-UA.json
index c381200d65..19f6c8dcd9 100644
--- a/packages/core/client/src/locale/uk-UA.json
+++ b/packages/core/client/src/locale/uk-UA.json
@@ -821,5 +821,7 @@
   "If selected, the page will display Tab pages.": "Якщо вибрано, сторінка відобразить сторінки з вкладками.",
   "If selected, the route will be displayed in the menu.": "Якщо вибрано, маршрут буде відображений в меню.",
   "Are you sure you want to hide this tab?": "Ви впевнені, що хочете приховати цю вкладку?",
-  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Після приховування цієї вкладки вона більше не з'явиться в панелі вкладок. Щоб знову показати її, вам потрібно перейти на сторінку керування маршрутами, щоб налаштувати її."
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Після приховування цієї вкладки вона більше не з'явиться в панелі вкладок. Щоб знову показати її, вам потрібно перейти на сторінку керування маршрутами, щоб налаштувати її.",
+  "No pages yet, please configure first": "Ще немає сторінок, будь ласка, спочатку налаштуйте",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Натисніть на значок \"Редактор користувацького інтерфейсу\" в правому верхньому куті, щоб увійти в режим редактора користувацького інтерфейсу."
 }
diff --git a/packages/core/client/src/locale/zh-CN.json b/packages/core/client/src/locale/zh-CN.json
index ee7937d066..f0fb2ebbe9 100644
--- a/packages/core/client/src/locale/zh-CN.json
+++ b/packages/core/client/src/locale/zh-CN.json
@@ -258,6 +258,7 @@
   "Parent collection fields": "父表字段",
   "Basic": "基本类型",
   "Single line text": "单行文本",
+  "Automatically remove heading and tailing spaces": "自动去除首尾空白字符",
   "Long text": "多行文本",
   "Phone": "手机号码",
   "Email": "电子邮箱",
@@ -1080,5 +1081,7 @@
   "If selected, the page will display Tab pages.": "如果选中，该页面将显示标签页。",
   "If selected, the route will be displayed in the menu.": "如果选中，该路由将显示在菜单中。",
   "Are you sure you want to hide this tab?": "你确定要隐藏该标签页吗？",
-  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "隐藏后，该标签将不再显示在标签栏中。要想再次显示它，你需要到路由管理页面进行设置。"
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "隐藏后，该标签将不再显示在标签栏中。要想再次显示它，你需要到路由管理页面进行设置。",
+  "No pages yet, please configure first": "暂无页面，请先配置",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "点击右上角的“界面配置”图标，进入界面配置模式"
 }
diff --git a/packages/core/client/src/locale/zh-TW.json b/packages/core/client/src/locale/zh-TW.json
index fd825c88cf..1d5fec8a40 100644
--- a/packages/core/client/src/locale/zh-TW.json
+++ b/packages/core/client/src/locale/zh-TW.json
@@ -912,6 +912,7 @@
   "If selected, the page will display Tab pages.": "如果選中，該頁面將顯示標籤頁。",
   "If selected, the route will be displayed in the menu.": "如果選中，該路由將顯示在菜單中。",
   "Are you sure you want to hide this tab?": "你確定要隱藏這個標籤嗎？",
-  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "隱藏後，這個標籤將不再出現在標籤欄中。要再次顯示它，你需要到路由管理頁面進行設置。"
+  "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "隱藏後，這個標籤將不再出現在標籤欄中。要再次顯示它，你需要到路由管理頁面進行設置。",
+  "No pages yet, please configure first": "尚未配置頁面，請先配置",
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "點擊右上角的 \"介面設定\" 圖示進入介面設定模式"
 }
-
diff --git a/packages/core/client/src/modules/blocks/data-blocks/list/__e2e__/schemaInitializer.test.ts b/packages/core/client/src/modules/blocks/data-blocks/list/__e2e__/schemaInitializer.test.ts
index 3c7db0668b..ab2db6a9c0 100644
--- a/packages/core/client/src/modules/blocks/data-blocks/list/__e2e__/schemaInitializer.test.ts
+++ b/packages/core/client/src/modules/blocks/data-blocks/list/__e2e__/schemaInitializer.test.ts
@@ -40,6 +40,7 @@ test.describe('where list block can be added', () => {
     await page.getByLabel('schema-initializer-Grid-').nth(1).hover();
     await page.getByRole('menuitem', { name: 'Role name' }).click();
     await page.mouse.move(300, 0);
+    await page.reload();
     await expect(page.getByLabel('block-item-CollectionField-').getByText('Root')).toBeVisible();
     await expect(page.getByLabel('block-item-CollectionField-').getByText('Admin')).toBeVisible();
     await expect(page.getByLabel('block-item-CollectionField-').getByText('Member')).toBeVisible();
diff --git a/packages/core/client/src/modules/blocks/filter-blocks/FilterCollectionField.tsx b/packages/core/client/src/modules/blocks/filter-blocks/FilterCollectionField.tsx
index 2f075ecaf3..3a8d26d7ef 100644
--- a/packages/core/client/src/modules/blocks/filter-blocks/FilterCollectionField.tsx
+++ b/packages/core/client/src/modules/blocks/filter-blocks/FilterCollectionField.tsx
@@ -94,9 +94,13 @@ export const FilterCollectionFieldInternalField: React.FC = (props: Props) => {
     // @ts-ignore
     field.dataSource = uiSchema.enum;
     const originalProps =
-      compile({ ...(operator?.schema?.['x-component-props'] || {}), ...(uiSchema['x-component-props'] || {}) }) || {};
+      compile({
+        ...(operator?.schema?.['x-component-props'] || {}),
+        ...(uiSchema['x-component-props'] || {}),
+        ...(fieldSchema?.['x-component-props'] || {}),
+      }) || {};
 
-    field.componentProps = merge(originalProps, field.componentProps || {}, dynamicProps || {});
+    field.componentProps = merge(field.componentProps || {}, originalProps, dynamicProps || {});
   }, [uiSchemaOrigin]);
 
   if (!uiSchemaOrigin) return null;
diff --git a/packages/core/client/src/modules/fields/component/Input/inputComponentSettings.tsx b/packages/core/client/src/modules/fields/component/Input/inputComponentSettings.tsx
index 8f53455a71..d86283a3f2 100644
--- a/packages/core/client/src/modules/fields/component/Input/inputComponentSettings.tsx
+++ b/packages/core/client/src/modules/fields/component/Input/inputComponentSettings.tsx
@@ -8,6 +8,7 @@
  */
 
 import { useField, useFieldSchema } from '@formily/react';
+import _ from 'lodash';
 import { useTranslation } from 'react-i18next';
 import { useBlockContext, useOpenModeContext } from '../../../../';
 import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings';
@@ -45,11 +46,12 @@ export const ellipsisSettingsItem: SchemaSettingsItemType = {
           tableFieldInstanceList.forEach((fieldInstance) => {
             fieldInstance.componentProps.ellipsis = checked;
           });
-          schema['x-component-props']['ellipsis'] = checked;
         } else {
           formField.componentProps.ellipsis = checked;
         }
 
+        _.set(schema, 'x-component-props.ellipsis', checked);
+
         await dn.emit('patch', {
           schema: {
             'x-uid': schema['x-uid'],
diff --git a/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx
index dc3ff40a10..8daaabe25d 100644
--- a/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx
+++ b/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx
@@ -126,6 +126,10 @@ export const getAllowMultiple = (params?: { title: string }) => {
   return {
     name: 'allowMultiple',
     type: 'switch',
+    useVisible() {
+      const isAssociationField = useIsAssociationField();
+      return isAssociationField;
+    },
     useComponentProps() {
       const { t } = useTranslation();
       const field = useField<Field>();
diff --git a/packages/core/client/src/modules/menu/LinkMenuItem.tsx b/packages/core/client/src/modules/menu/LinkMenuItem.tsx
index 8217f7de14..aace433ec4 100644
--- a/packages/core/client/src/modules/menu/LinkMenuItem.tsx
+++ b/packages/core/client/src/modules/menu/LinkMenuItem.tsx
@@ -14,6 +14,14 @@ import React, { useCallback, useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Router } from 'react-router-dom';
 import { SchemaInitializerItem } from '../../application';
+import {
+  CollectionManagerProvider,
+  useCollectionManager,
+} from '../../data-source/collection/CollectionManagerProvider';
+import {
+  DataSourceManagerProvider,
+  useDataSourceManager,
+} from '../../data-source/data-source/DataSourceManagerProvider';
 import { useGlobalTheme } from '../../global-theme';
 import { NocoBaseDesktopRouteType } from '../../route-switch/antd/admin-layout/convertRoutesToSchema';
 import {
@@ -34,6 +42,8 @@ export const LinkMenuItem = () => {
   const { urlSchema, paramsSchema } = useURLAndHTMLSchema();
   const parentRoute = useParentRoute();
   const { createRoute } = useNocoBaseRoutes();
+  const dm = useDataSourceManager();
+  const cm = useCollectionManager();
 
   const handleClick = useCallback(async () => {
     const values = await FormDialog(
@@ -41,31 +51,35 @@ export const LinkMenuItem = () => {
       () => {
         const history = createMemoryHistory();
         return (
-          <Router location={history.location} navigator={history}>
-            <SchemaComponentOptions scope={options.scope} components={{ ...options.components }}>
-              <FormLayout layout={'vertical'}>
-                <SchemaComponent
-                  schema={{
-                    properties: {
-                      title: {
-                        title: t('Menu item title'),
-                        required: true,
-                        'x-component': 'Input',
-                        'x-decorator': 'FormItem',
-                      },
-                      icon: {
-                        title: t('Icon'),
-                        'x-component': 'IconPicker',
-                        'x-decorator': 'FormItem',
-                      },
-                      href: urlSchema,
-                      params: paramsSchema,
-                    },
-                  }}
-                />
-              </FormLayout>
-            </SchemaComponentOptions>
-          </Router>
+          <DataSourceManagerProvider dataSourceManager={dm}>
+            <CollectionManagerProvider instance={cm} dataSource={cm?.dataSource?.key}>
+              <Router location={history.location} navigator={history}>
+                <SchemaComponentOptions scope={options.scope} components={{ ...options.components }}>
+                  <FormLayout layout={'vertical'}>
+                    <SchemaComponent
+                      schema={{
+                        properties: {
+                          title: {
+                            title: t('Menu item title'),
+                            required: true,
+                            'x-component': 'Input',
+                            'x-decorator': 'FormItem',
+                          },
+                          icon: {
+                            title: t('Icon'),
+                            'x-component': 'IconPicker',
+                            'x-decorator': 'FormItem',
+                          },
+                          href: urlSchema,
+                          params: paramsSchema,
+                        },
+                      }}
+                    />
+                  </FormLayout>
+                </SchemaComponentOptions>
+              </Router>
+            </CollectionManagerProvider>
+          </DataSourceManagerProvider>
         );
       },
       theme,
diff --git a/packages/core/client/src/nocobase-buildin-plugin/index.tsx b/packages/core/client/src/nocobase-buildin-plugin/index.tsx
index b9d61e9123..c53173b30a 100644
--- a/packages/core/client/src/nocobase-buildin-plugin/index.tsx
+++ b/packages/core/client/src/nocobase-buildin-plugin/index.tsx
@@ -74,9 +74,9 @@ const useErrorProps = (app: Application, error: any) => {
   }
 };
 
-const AppError: FC<{ error: Error; app: Application }> = observer(
+const AppError: FC<{ error: Error & { title?: string }; app: Application }> = observer(
   ({ app, error }) => {
-    const props = useErrorProps(app, error);
+    const props = getProps(app);
     return (
       <div>
         <Result
@@ -87,8 +87,9 @@ const AppError: FC<{ error: Error; app: Application }> = observer(
             transform: translate(0, -50%);
           `}
           status="error"
-          title={app.i18n.t('App error')}
+          title={error?.title || app.i18n.t('App error', { ns: 'client' })}
           subTitle={app.i18n.t(error?.message)}
+          {...props}
           extra={[
             <Button type="primary" key="try" onClick={() => window.location.reload()}>
               {app.i18n.t('Try again')}
@@ -124,6 +125,14 @@ const getProps = (app: Application) => {
     };
   }
 
+  if (app.error.code === 'APP_WARNING') {
+    return {
+      status: 'warning',
+      title: 'App warning',
+      subTitle: app.error?.message,
+    };
+  }
+
   if (app.error.code === 'APP_INITIALIZING') {
     return {
       status: 'info',
diff --git a/packages/core/client/src/route-switch/antd/admin-layout/__tests__/findFirstPageRoute.test.tsx b/packages/core/client/src/route-switch/antd/admin-layout/__tests__/findFirstPageRoute.test.tsx
new file mode 100644
index 0000000000..5bfd4554d1
--- /dev/null
+++ b/packages/core/client/src/route-switch/antd/admin-layout/__tests__/findFirstPageRoute.test.tsx
@@ -0,0 +1,212 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { findFirstPageRoute, NocoBaseDesktopRouteType } from '..';
+import { NocoBaseDesktopRoute } from '../convertRoutesToSchema';
+
+describe('findFirstPageRoute', () => {
+  // 基本测试：空路由数组
+  it('should return undefined for empty routes array', () => {
+    const result = findFirstPageRoute([]);
+    expect(result).toBeUndefined();
+  });
+
+  // 基本测试：undefined 路由数组
+  it('should return undefined for undefined routes', () => {
+    const result = findFirstPageRoute(undefined);
+    expect(result).toBeUndefined();
+  });
+
+  // 测试：只有一个页面路由
+  it('should find the first page route when there is only one page', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        schemaUid: 'page1',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 1',
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[0]);
+  });
+
+  // 测试：多个页面路由
+  it('should find the first page route when there are multiple pages', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        schemaUid: 'page1',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 1',
+      },
+      {
+        id: 2,
+        schemaUid: 'page2',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 2',
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[0]);
+  });
+
+  // 测试：不同类型的路由混合
+  it('should find the first page route among mixed route types', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        schemaUid: 'link1',
+        type: NocoBaseDesktopRouteType.link,
+        title: 'Link 1',
+      },
+      {
+        id: 2,
+        schemaUid: 'page1',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 1',
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[1]);
+  });
+
+  // 测试：隐藏的菜单项
+  it('should ignore hidden menu items', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        schemaUid: 'page1',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 1',
+        hideInMenu: true,
+      },
+      {
+        id: 2,
+        schemaUid: 'page2',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 2',
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[1]);
+  });
+
+  // 测试：嵌套路由
+  it('should find page route in nested group', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        type: NocoBaseDesktopRouteType.group,
+        title: 'Group 1',
+        children: [
+          {
+            id: 11,
+            schemaUid: 'page1',
+            type: NocoBaseDesktopRouteType.page,
+            title: 'Page 1',
+          },
+        ],
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[0].children[0]);
+  });
+
+  // 测试：多层嵌套路由
+  it('should find page route in deeply nested groups', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        type: NocoBaseDesktopRouteType.group,
+        title: 'Group 1',
+        children: [
+          {
+            id: 11,
+            type: NocoBaseDesktopRouteType.group,
+            title: 'Group 1-1',
+            children: [
+              {
+                id: 111,
+                schemaUid: 'page1',
+                type: NocoBaseDesktopRouteType.page,
+                title: 'Page 1',
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[0].children[0].children[0]);
+  });
+
+  // 测试：复杂路由结构
+  it('should find the first visible page in a complex route structure', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        type: NocoBaseDesktopRouteType.group,
+        title: 'Group 1',
+        hideInMenu: true,
+        children: [
+          {
+            id: 11,
+            schemaUid: 'page1',
+            type: NocoBaseDesktopRouteType.page,
+            title: 'Page 1',
+          },
+        ],
+      },
+      {
+        id: 2,
+        type: NocoBaseDesktopRouteType.group,
+        title: 'Group 2',
+        children: [
+          {
+            id: 21,
+            schemaUid: 'page2',
+            type: NocoBaseDesktopRouteType.page,
+            title: 'Page 2',
+          },
+        ],
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[1].children[0]);
+  });
+
+  // 测试：空组
+  it('should skip empty groups and find page in next group', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        type: NocoBaseDesktopRouteType.group,
+        title: 'Empty Group',
+        children: [],
+      },
+      {
+        id: 2,
+        schemaUid: 'page1',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 1',
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[1]);
+  });
+});
diff --git a/packages/core/client/src/route-switch/antd/admin-layout/index.tsx b/packages/core/client/src/route-switch/antd/admin-layout/index.tsx
index 1cd340913f..bc3fe20fb4 100644
--- a/packages/core/client/src/route-switch/antd/admin-layout/index.tsx
+++ b/packages/core/client/src/route-switch/antd/admin-layout/index.tsx
@@ -7,13 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { EllipsisOutlined } from '@ant-design/icons';
+import { EllipsisOutlined, HighlightOutlined } from '@ant-design/icons';
 import ProLayout, { RouteContext, RouteContextType } from '@ant-design/pro-layout';
 import { HeaderViewProps } from '@ant-design/pro-layout/es/components/Header';
 import { css } from '@emotion/css';
-import { Popover, Tooltip } from 'antd';
+import { Popover, Result, Tooltip } from 'antd';
 import React, { createContext, FC, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import ReactDOM from 'react-dom';
+import { useTranslation } from 'react-i18next';
 import { Link, Navigate, Outlet, useLocation, useNavigate } from 'react-router-dom';
 import {
   ACLRolesCheckProvider,
@@ -197,12 +198,34 @@ const pageContentStyle: React.CSSProperties = {
   overflowY: 'auto',
 };
 
+const ShowTipWhenNoPages = () => {
+  const { allAccessRoutes } = useAllAccessDesktopRoutes();
+  const { designable } = useDesignable();
+  const { token } = useToken();
+  const { t } = useTranslation();
+  const location = useLocation();
+
+  // Check if there are any pages
+  if (allAccessRoutes.length === 0 && !designable && ['/admin', '/admin/'].includes(location.pathname)) {
+    return (
+      <Result
+        icon={<HighlightOutlined style={{ fontSize: '8em', color: token.colorText }} />}
+        title={t('No pages yet, please configure first')}
+        subTitle={t(`Click the "UI Editor" icon in the upper right corner to enter the UI Editor mode`)}
+      />
+    );
+  }
+
+  return null;
+};
+
 export const LayoutContent = () => {
   /* Use the "nb-subpages-slot-without-header-and-side" class name to locate the position of the subpages */
   return (
     <div className={`${layoutContentClass} nb-subpages-slot-without-header-and-side`}>
       <div style={pageContentStyle}>
         <Outlet />
+        <ShowTipWhenNoPages />
       </div>
     </div>
   );
@@ -588,27 +611,11 @@ export const InternalAdminLayout = () => {
   );
 };
 
-function getDefaultPageUid(routes: NocoBaseDesktopRoute[]) {
-  // Find the first route of type "page"
-  for (const route of routes) {
-    if (route.type === NocoBaseDesktopRouteType.page) {
-      return route.schemaUid;
-    }
-
-    if (route.children?.length) {
-      const result = getDefaultPageUid(route.children);
-      if (result) {
-        return result;
-      }
-    }
-  }
-}
-
 const NavigateToDefaultPage: FC = (props) => {
   const { allAccessRoutes } = useAllAccessDesktopRoutes();
   const location = useLocationNoUpdate();
 
-  const defaultPageUid = getDefaultPageUid(allAccessRoutes);
+  const defaultPageUid = findFirstPageRoute(allAccessRoutes)?.schemaUid;
 
   return (
     <>
@@ -718,36 +725,6 @@ export function findRouteBySchemaUid(schemaUid: string, treeArray: any[]) {
   return null;
 }
 
-const MenuItemIcon: FC<{ icon: string; title: string }> = (props) => {
-  const { inHeader } = useContext(headerContext);
-
-  return (
-    <RouteContext.Consumer>
-      {(value: RouteContextType) => {
-        const { collapsed } = value;
-
-        if (collapsed && !inHeader) {
-          return props.icon ? (
-            <Icon type={props.icon} />
-          ) : (
-            <span
-              style={{
-                display: 'inline-block',
-                width: '100%',
-                textAlign: 'center',
-              }}
-            >
-              {props.title.charAt(0)}
-            </span>
-          );
-        }
-
-        return props.icon ? <Icon type={props.icon} /> : null;
-      }}
-    </RouteContext.Consumer>
-  );
-};
-
 const MenuDesignerButton: FC<{ testId: string }> = (props) => {
   const { render: renderInitializer } = useSchemaInitializerRender(menuItemInitializer);
 
@@ -869,16 +846,17 @@ function findRouteById(id: string, treeArray: any[]) {
   return null;
 }
 
-function findFirstPageRoute(routes: NocoBaseDesktopRoute[]) {
+export function findFirstPageRoute(routes: NocoBaseDesktopRoute[]) {
   if (!routes) return;
 
-  for (const route of routes) {
+  for (const route of routes.filter((item) => !item.hideInMenu)) {
     if (route.type === NocoBaseDesktopRouteType.page) {
       return route;
     }
 
-    if (route.children?.length) {
-      return findFirstPageRoute(route.children);
+    if (route.type === NocoBaseDesktopRouteType.group && route.children?.length) {
+      const result = findFirstPageRoute(route.children);
+      if (result) return result;
     }
   }
 }
diff --git a/packages/core/client/src/schema-component/antd/action/Action.Link.tsx b/packages/core/client/src/schema-component/antd/action/Action.Link.tsx
index 6c67782876..6656bca46d 100644
--- a/packages/core/client/src/schema-component/antd/action/Action.Link.tsx
+++ b/packages/core/client/src/schema-component/antd/action/Action.Link.tsx
@@ -17,7 +17,12 @@ import { ComposedAction } from './types';
 export const ActionLink: ComposedAction = withDynamicSchemaProps(
   observer((props: any) => {
     return (
-      <Action {...props} component={props.component || 'a'} className={classnames('nb-action-link', props.className)} />
+      <Action
+        {...props}
+        component={props.component || 'a'}
+        className={classnames('nb-action-link', props.className)}
+        isLink
+      />
     );
   }),
   { displayName: 'ActionLink' },
diff --git a/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx b/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx
index 09562cb54d..2411b32ed9 100644
--- a/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx
+++ b/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx
@@ -9,7 +9,7 @@
 
 import { css } from '@emotion/css';
 import { observer, useField, useFieldSchema } from '@formily/react';
-import { Modal, ModalProps } from 'antd';
+import { Modal, ModalProps, Skeleton } from 'antd';
 import classNames from 'classnames';
 import React, { FC, startTransition, useEffect, useState } from 'react';
 import { ErrorBoundary, FallbackProps } from 'react-error-boundary';
@@ -53,7 +53,6 @@ const ActionModalContent: FC<{ footerNodeName: string; field: any; schema: any }
     if (!deferredVisible) {
       return null;
     }
-
     return (
       <NocoBaseRecursionField
         basePath={field.address}
@@ -67,6 +66,19 @@ const ActionModalContent: FC<{ footerNodeName: string; field: any; schema: any }
   },
 );
 
+export function useDelayedVisible(visible: boolean, delay = 200) {
+  const [ready, setReady] = useState(false);
+  useEffect(() => {
+    if (visible) {
+      const timer = setTimeout(() => setReady(true), delay);
+      return () => clearTimeout(timer);
+    } else {
+      setReady(false);
+    }
+  }, [visible]);
+  return ready;
+}
+
 export const InternalActionModal: React.FC<ActionDrawerProps<ModalProps>> = observer(
   (props) => {
     const { footerNodeName = 'Action.Modal.Footer', width, zIndex: _zIndex, ...others } = props;
@@ -90,6 +102,7 @@ export const InternalActionModal: React.FC<ActionDrawerProps<ModalProps>> = obse
     }
 
     const zIndex = getZIndex('modal', _zIndex || parentZIndex, props.level || 0);
+    const ready = useDelayedVisible(visible, 200); // 200ms 与 Modal 动画时间一致
 
     return (
       <ActionContextNoRerender>
@@ -154,7 +167,11 @@ export const InternalActionModal: React.FC<ActionDrawerProps<ModalProps>> = obse
                 )
               }
             >
-              <ActionModalContent footerNodeName={footerNodeName} field={field} schema={schema} />
+              {ready ? (
+                <ActionModalContent footerNodeName={footerNodeName} field={field} schema={schema} />
+              ) : (
+                <Skeleton active paragraph={{ rows: 6 }} />
+              )}
             </Modal>
           </TabsContextProvider>
         </zIndexContext.Provider>
diff --git a/packages/core/client/src/schema-component/antd/action/Action.tsx b/packages/core/client/src/schema-component/antd/action/Action.tsx
index cb7657877a..968cb2ad16 100644
--- a/packages/core/client/src/schema-component/antd/action/Action.tsx
+++ b/packages/core/client/src/schema-component/antd/action/Action.tsx
@@ -247,7 +247,6 @@ const InternalAction: React.FC<InternalActionProps> = observer(function Com(prop
   const aclCtx = useACLActionParamsContext();
   const { run, element, disabled: disableAction } = useAction?.(actionCallback) || ({} as any);
   const disabled = form.disabled || field.disabled || field.data?.disabled || propsDisabled || disableAction;
-
   const buttonStyle = useMemo(() => {
     return {
       ...style,
@@ -538,6 +537,7 @@ const RenderButtonInner = observer(
     Designer: React.ElementType;
     designerProps: any;
     title: string;
+    isLink?: boolean;
   }) => {
     const {
       designable,
@@ -558,6 +558,7 @@ const RenderButtonInner = observer(
       Designer,
       designerProps,
       title,
+      isLink,
       ...others
     } = props;
     const debouncedClick = useCallback(
@@ -582,7 +583,8 @@ const RenderButtonInner = observer(
     }
 
     const actionTitle = title || field?.title;
-
+    const { opacity, ...restButtonStyle } = buttonStyle;
+    const linkStyle = isLink && opacity ? { opacity } : undefined;
     return (
       <SortableItem
         role="button"
@@ -591,15 +593,19 @@ const RenderButtonInner = observer(
         onMouseEnter={handleMouseEnter}
         // @ts-ignore
         loading={field?.data?.loading || loading}
-        icon={typeof icon === 'string' ? <Icon type={icon} /> : icon}
+        icon={typeof icon === 'string' ? <Icon type={icon} style={linkStyle} /> : icon}
         disabled={disabled}
-        style={buttonStyle}
+        style={isLink ? restButtonStyle : buttonStyle}
         onClick={process.env.__E2E__ ? handleButtonClick : debouncedClick} // E2E 中的点击操作都是很快的，如果加上 debounce 会导致 E2E 测试失败
         component={tarComponent || Button}
         className={classnames(componentCls, hashId, className, 'nb-action')}
         type={type === 'danger' ? undefined : type}
       >
-        {actionTitle && <span className={icon ? 'nb-action-title' : null}>{actionTitle}</span>}
+        {actionTitle && (
+          <span className={icon ? 'nb-action-title' : null} style={linkStyle}>
+            {actionTitle}
+          </span>
+        )}
         <Designer {...designerProps} />
       </SortableItem>
     );
diff --git a/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx b/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx
index 190a5e6f23..740d66fd5f 100644
--- a/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx
@@ -14,6 +14,7 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { useAPIClient, useRequest } from '../../../api-client';
 import { useCollectionManager } from '../../../data-source/collection';
 import { markRecordAsNew } from '../../../data-source/collection-record/isNewRecord';
+import { getDataSourceHeaders } from '../../../data-source/utils';
 import { useKeepAlive } from '../../../route-switch/antd/admin-layout/KeepAlive';
 import { useSchemaComponentContext } from '../../hooks';
 import { AssociationFieldContext } from './context';
@@ -67,9 +68,11 @@ export const AssociationFieldProvider = observer(
         if (_.isUndefined(ids) || _.isNil(ids) || _.isNaN(ids)) {
           return Promise.reject(null);
         }
+
         return api.request({
           resource: collectionField.target,
           action: Array.isArray(ids) ? 'list' : 'get',
+          headers: getDataSourceHeaders(cm?.dataSource?.key),
           params: {
             filter: {
               [targetKey]: ids,
diff --git a/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx b/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx
index 57debf2402..ed9969a523 100644
--- a/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx
@@ -14,22 +14,28 @@ import { uid } from '@formily/shared';
 import { Space, message } from 'antd';
 import { isEqual } from 'lodash';
 import { isFunction } from 'mathjs';
-import React, { useEffect, useState, useContext } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   ClearCollectionFieldContext,
   NocoBaseRecursionField,
   RecordProvider,
+  SchemaComponentContext,
   useAPIClient,
   useCollectionRecordData,
-  SchemaComponentContext,
+  useCollectionManager_deprecated,
 } from '../../../';
-import { Action } from '../action';
+import { VariablePopupRecordProvider } from '../../../modules/variable/variablesProvider/VariablePopupRecordProvider';
 import { isVariable } from '../../../variables/utils/isVariable';
 import { getInnermostKeyAndValue } from '../../common/utils/uitls';
+import { Action } from '../action';
 import { RemoteSelect, RemoteSelectProps } from '../remote-select';
 import useServiceOptions, { useAssociationFieldContext } from './hooks';
-import { VariablePopupRecordProvider } from '../../../modules/variable/variablesProvider/VariablePopupRecordProvider';
+
+const removeIfKeyEmpty = (obj, filterTargetKey) => {
+  if (!obj || typeof obj !== 'object' || !filterTargetKey || Array.isArray(obj)) return obj;
+  return !obj[filterTargetKey] ? null : obj;
+};
 
 export const AssociationFieldAddNewer = (props) => {
   const schemaComponentCtxValue = useContext(SchemaComponentContext);
@@ -69,6 +75,11 @@ export const filterAnalyses = (filters): any[] => {
   return results;
 };
 
+function getFieldPath(str) {
+  const lastIndex = str.lastIndexOf('.');
+  return lastIndex === -1 ? str : str.slice(0, lastIndex);
+}
+
 const InternalAssociationSelect = observer(
   (props: AssociationSelectProps) => {
     const { objectValue = true, addMode: propsAddMode, ...rest } = props;
@@ -88,6 +99,9 @@ const InternalAssociationSelect = observer(
     const resource = api.resource(collectionField.target);
     const recordData = useCollectionRecordData();
     const schemaComponentCtxValue = useContext(SchemaComponentContext);
+    const { getCollection } = useCollectionManager_deprecated();
+    const associationCollection = getCollection(collectionField.target);
+    const { filterTargetKey } = associationCollection;
 
     useEffect(() => {
       const initValue = isVariable(field.value) ? undefined : field.value;
@@ -100,11 +114,14 @@ const InternalAssociationSelect = observer(
         //支持深层次子表单
         onFieldInputValueChange('*', (fieldPath: any) => {
           const linkageFields = filterAnalyses(field.componentProps?.service?.params?.filter) || [];
+          const linageFieldEntire = getFieldPath(fieldPath.address.entire);
+          const targetFieldEntire = getFieldPath(field.address.entire);
           if (
             linkageFields.includes(fieldPath?.props?.name) &&
             field.value &&
             isEqual(fieldPath?.indexes, field?.indexes) &&
-            fieldPath?.props?.name !== field.props.name
+            fieldPath?.props?.name !== field.props.name &&
+            (!field?.indexes?.length || isEqual(linageFieldEntire, targetFieldEntire))
           ) {
             field.setValue(null);
             setInnerValue(null);
@@ -151,7 +168,6 @@ const InternalAssociationSelect = observer(
         </div>
       );
     };
-    console.log(fieldSchema);
     return (
       <div key={fieldSchema.name}>
         <Space.Compact style={{ display: 'flex' }}>
@@ -160,7 +176,7 @@ const InternalAssociationSelect = observer(
             {...rest}
             size={'middle'}
             objectValue={objectValue}
-            value={value || innerValue}
+            value={removeIfKeyEmpty(value || innerValue, filterTargetKey)}
             service={service}
             onChange={(value) => {
               const val = value?.length !== 0 ? value : null;
diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx
index 1d1be90a8c..b59dec00ad 100644
--- a/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx
@@ -13,6 +13,8 @@ import { FormProvider, connect, createSchemaField, observer, useField, useFieldS
 import { uid } from '@formily/shared';
 import { Select as AntdSelect, Input, Space, Spin, Tag } from 'antd';
 import dayjs from 'dayjs';
+import { css } from '@emotion/css';
+import { debounce } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAPIClient, useCollectionManager_deprecated } from '../../../';
@@ -152,7 +154,11 @@ const CascadeSelect = connect((props) => {
     } else {
       associationField.value = option;
     }
-    onChange?.(options);
+    if (options.length === 1 && !options[0].value) {
+      onChange?.(null);
+    } else {
+      onChange?.(options);
+    }
   };
 
   const onDropdownVisibleChange = async (visible, selectedValue, index) => {
@@ -238,28 +244,38 @@ export const InternalCascadeSelect = observer(
     const fieldSchema = useFieldSchema();
     const { loading, data: formData } = useDataBlockRequest() || {};
     const initialValue = formData?.data?.[fieldSchema.name];
+
+    const handleFormValuesChange = debounce((form) => {
+      if (collectionField.interface === 'm2o') {
+        // 对 m2o 类型字段，提取最后一个非 null 值
+        const value = extractLastNonNullValueObjects(form.values?.[fieldSchema.name]);
+        setTimeout(() => {
+          form.setValuesIn(fieldSchema.name, value);
+          field.value = value;
+        });
+      } else {
+        // 对 select_array 类型字段，过滤掉空对象
+        const value = extractLastNonNullValueObjects(form.values?.select_array).filter(
+          (v) => v && Object.keys(v).length > 0,
+        );
+        setTimeout(() => {
+          field.value = value;
+        });
+      }
+    }, 300);
+
     useEffect(() => {
       const id = uid();
       selectForm.addEffects(id, () => {
         onFormValuesChange((form) => {
-          if (collectionField.interface === 'm2o') {
-            const value = extractLastNonNullValueObjects(form.values?.[fieldSchema.name]);
-            setTimeout(() => {
-              form.setValuesIn(fieldSchema.name, value);
-              field.value = value;
-            });
-          } else {
-            const value = extractLastNonNullValueObjects(form.values?.select_array).filter(
-              (v) => v && Object.keys(v).length > 0,
-            );
-            setTimeout(() => {
-              field.value = value;
-            });
-          }
+          handleFormValuesChange(form);
         });
       });
+
       return () => {
         selectForm.removeEffects(id);
+        // 清除防抖定时器
+        handleFormValuesChange.cancel();
       };
     }, []);
 
@@ -282,6 +298,24 @@ export const InternalCascadeSelect = observer(
           items: {
             type: 'void',
             'x-component': 'Space',
+            'x-component-props': {
+              style: {
+                width: '100%',
+                display: 'flex',
+              },
+              className: css`
+                .ant-formily-item-control {
+                  max-width: 100% !important;
+                }
+                .ant-space-item:nth-child(1) {
+                  flex: 0.1;
+                }
+
+                .ant-space-item:nth-child(2) {
+                  flex: 3;
+                }
+              `,
+            },
             properties: {
               sort: {
                 type: 'void',
diff --git a/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx b/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx
index 38209fca61..53225b028c 100644
--- a/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx
@@ -256,8 +256,7 @@ export const SubTable: any = observer(
                 {field.editable && (
                   <Space
                     style={{
-                      marginTop: '10px',
-                      position: field.value?.length ? 'absolute' : 'relative',
+                      position: 'relative',
                       bottom: '0',
                       gap: 15,
                     }}
diff --git a/packages/core/client/src/schema-component/antd/association-field/Table.tsx b/packages/core/client/src/schema-component/antd/association-field/Table.tsx
index 851e223b8d..bf3607976a 100644
--- a/packages/core/client/src/schema-component/antd/association-field/Table.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/Table.tsx
@@ -602,12 +602,6 @@ const InternalNocoBaseTable = React.memo(
                   height: 100%;
                   display: flex;
                   flex-direction: column;
-                  .ant-table-expanded-row-fixed {
-                    min-height: ${tableHeight}px;
-                  }
-                  .ant-table-body {
-                    min-height: ${tableHeight}px;
-                  }
                   .ant-table-cell {
                     padding: 16px 8px;
                   }
diff --git a/packages/core/client/src/schema-component/antd/association-field/hooks.tsx b/packages/core/client/src/schema-component/antd/association-field/hooks.tsx
index f44f67906f..2c1b2e4183 100644
--- a/packages/core/client/src/schema-component/antd/association-field/hooks.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/hooks.tsx
@@ -53,6 +53,7 @@ export function useAssociationFieldContext<F extends GeneralField>() {
   };
 }
 
+// 用于获取关系字段请求数据时所需的一些参数
 export default function useServiceOptions(props) {
   const { action = 'list', service, useOriginalFilter } = props;
   const fieldSchema = useFieldSchema();
diff --git a/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx b/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx
index 3a69dc4335..54f4849a7f 100644
--- a/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx
+++ b/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx
@@ -54,7 +54,7 @@ describe('CollectionSelect', () => {
             role="button"
           >
             <div
-              class="css-1yh5po ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o"
+              class="css-a7w9kk ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o"
             >
               <div
                 class="ant-formily-item-label"
@@ -191,7 +191,7 @@ describe('CollectionSelect', () => {
             role="button"
           >
             <div
-              class="css-1yh5po ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o"
+              class="css-a7w9kk ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o"
             >
               <div
                 class="ant-formily-item-label"
diff --git a/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx
index 7e9125b46b..cc1099775a 100644
--- a/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx
+++ b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx
@@ -289,7 +289,7 @@ DatePicker.FilterWithPicker = function FilterWithPicker(props: any) {
   const [stateProps, setStateProps] = useState(newProps);
   useEffect(() => {
     newProps.picker = targetPicker;
-    const dateTimeFormat = getDateTimeFormat(targetPicker, format, showTime, timeFormat);
+    const dateTimeFormat = getDateTimeFormat(targetPicker, targetDateFormat, showTime, timeFormat);
     newProps.format = dateTimeFormat;
     setStateProps(newProps);
   }, [targetPicker]);
diff --git a/packages/core/client/src/schema-component/antd/filter/DynamicComponent.tsx b/packages/core/client/src/schema-component/antd/filter/DynamicComponent.tsx
index 79025dabd2..2c5062344e 100644
--- a/packages/core/client/src/schema-component/antd/filter/DynamicComponent.tsx
+++ b/packages/core/client/src/schema-component/antd/filter/DynamicComponent.tsx
@@ -65,7 +65,6 @@ export const DynamicComponent = (props: Props) => {
                 ...props.style,
               },
               utc: false,
-              underFilter: true,
             }),
             name: 'value',
             'x-read-pretty': false,
diff --git a/packages/core/client/src/schema-component/antd/filter/FilterItem.tsx b/packages/core/client/src/schema-component/antd/filter/FilterItem.tsx
index 556644fe72..88fbe23505 100644
--- a/packages/core/client/src/schema-component/antd/filter/FilterItem.tsx
+++ b/packages/core/client/src/schema-component/antd/filter/FilterItem.tsx
@@ -70,6 +70,7 @@ export const FilterItem = observer(
             className={css`
               width: 160px;
             `}
+            showSearch
             fieldNames={fieldNames}
             changeOnSelect={false}
             value={dataIndex}
diff --git a/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts b/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts
index 1f20ba46e4..8db32dec4f 100644
--- a/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts
+++ b/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts
@@ -92,7 +92,7 @@ export const useGetFilterFieldOptions = () => {
 
   const getOptions = (fields, depth, usedInVariable?: boolean) => {
     const options = [];
-    fields.forEach((field) => {
+    fields?.forEach((field) => {
       const option = field2option(field, depth, usedInVariable);
       if (option) {
         options.push(option);
diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.Settings.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.Settings.tsx
index 788741a5c2..aefda32ebe 100644
--- a/packages/core/client/src/schema-component/antd/form-item/FormItem.Settings.tsx
+++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.Settings.tsx
@@ -985,12 +985,11 @@ function useFormItemCollectionField() {
 
 export function useIsAssociationField() {
   const collectionField = useFormItemCollectionField();
-  const isAssociationField = ['obo', 'oho', 'o2o', 'o2m', 'm2m', 'm2o', 'updatedBy', 'createdBy', 'mbm'].includes(
-    collectionField?.interface,
-  );
+  const isAssociationField =
+    collectionField &&
+    ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany', 'belongsToArray'].includes(collectionField.type);
   return isAssociationField;
 }
-
 export function useIsFileField() {
   const cm = useCollectionManager();
   const collectionField = useFormItemCollectionField();
diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
index 325bc90a66..7af69ad89b 100644
--- a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
+++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
@@ -37,6 +37,17 @@ const formItemWrapCss = css`
   .ant-description-textarea img {
     max-width: 100%;
   }
+  &.ant-formily-item-layout-horizontal.ant-formily-item-label-wrap {
+    .ant-formily-item-label {
+      display: inline;
+      padding-right: 5px;
+
+      .ant-formily-item-label-tooltip-icon,
+      .ant-formily-item-label-content {
+        display: inline;
+      }
+    }
+  }
 `;
 
 const formItemLabelCss = css`
@@ -44,7 +55,7 @@ const formItemLabelCss = css`
     padding: 0px !important;
   }
   > .ant-formily-item-label {
-    display: none;
+    display: none !important;
   }
 `;
 
@@ -83,7 +94,6 @@ export const FormItem: any = withDynamicSchemaProps(
         [formItemLabelCss]: showTitle === false,
       });
     }, [showTitle]);
-
     // 联动规则中的“隐藏保留值”的效果
     if (field.data?.hidden) {
       return null;
diff --git a/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts b/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts
index cda06cd3c0..f663975902 100644
--- a/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts
+++ b/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts
@@ -86,11 +86,6 @@ const useParseDefaultValue = () => {
         field &&
         ((isVariable(fieldSchema.default) && field.value == null) || field.value === fieldSchema.default || forceUpdate)
       ) {
-        // 一个变量字符串如果显示出来会比较奇怪
-        if (isVariable(field.value)) {
-          await field.reset({ forceClear: true });
-        }
-
         field.loading = true;
         const collectionField = !fieldSchema.name.toString().includes('.') && collection?.getField(fieldSchema.name);
 
diff --git a/packages/core/client/src/schema-component/antd/form-v2/Form.tsx b/packages/core/client/src/schema-component/antd/form-v2/Form.tsx
index f099766a90..4721db9aae 100644
--- a/packages/core/client/src/schema-component/antd/form-v2/Form.tsx
+++ b/packages/core/client/src/schema-component/antd/form-v2/Form.tsx
@@ -16,8 +16,10 @@ import { ConfigProvider, theme } from 'antd';
 import React, { useEffect, useMemo } from 'react';
 import { useActionContext } from '..';
 import { useAttach, useComponent } from '../..';
+import { useApp } from '../../../application';
 import { getCardItemSchema } from '../../../block-provider';
 import { useTemplateBlockContext } from '../../../block-provider/TemplateBlockProvider';
+import { useDataBlockProps } from '../../../data-source';
 import { useDataBlockRequest } from '../../../data-source/data-block/DataBlockRequestProvider';
 import { NocoBaseRecursionField } from '../../../formily/NocoBaseRecursionField';
 import { withDynamicSchemaProps } from '../../../hoc/withDynamicSchemaProps';
@@ -27,7 +29,6 @@ import { useToken } from '../../../style';
 import { useLocalVariables, useVariables } from '../../../variables';
 import { useProps } from '../../hooks/useProps';
 import { useFormBlockHeight } from './hook';
-import { useApp } from '../../../application';
 
 export interface FormProps extends IFormLayoutProps {
   form?: FormilyForm;
@@ -141,12 +142,15 @@ const WithForm = (props: WithFormProps) => {
   const linkageRules: any[] =
     (getLinkageRules(fieldSchema) || fieldSchema.parent?.['x-linkage-rules'])?.filter((k) => !k.disabled) || [];
 
+  // 关闭弹窗之前，如果有未保存的数据，是否要二次确认
+  const { confirmBeforeClose = true } = useDataBlockProps() || ({} as any);
+
   useEffect(() => {
     const id = uid();
 
     form.addEffects(id, () => {
       onFormInputChange(() => {
-        setFormValueChanged?.(true);
+        setFormValueChanged?.(confirmBeforeClose);
       });
     });
 
@@ -157,7 +161,7 @@ const WithForm = (props: WithFormProps) => {
     return () => {
       form.removeEffects(id);
     };
-  }, [form, props.disabled, setFormValueChanged]);
+  }, [form, props.disabled, setFormValueChanged, confirmBeforeClose]);
 
   useEffect(() => {
     if (loading) {
@@ -210,17 +214,19 @@ const WithForm = (props: WithFormProps) => {
 const WithoutForm = (props) => {
   const fieldSchema = useFieldSchema();
   const { setFormValueChanged } = useActionContext();
+  // 关闭弹窗之前，如果有未保存的数据，是否要二次确认
+  const { confirmBeforeClose = true } = useDataBlockProps() || ({} as any);
   const form = useMemo(
     () =>
       createForm({
         disabled: props.disabled,
         effects() {
           onFormInputChange((form) => {
-            setFormValueChanged?.(true);
+            setFormValueChanged?.(confirmBeforeClose);
           });
         },
       }),
-    [],
+    [confirmBeforeClose],
   );
   return fieldSchema['x-decorator'] === 'FormV2' ? (
     <FormDecorator form={form} {...props} />
diff --git a/packages/core/client/src/schema-component/antd/grid/Grid.tsx b/packages/core/client/src/schema-component/antd/grid/Grid.tsx
index 734aa9e34f..082943cb7f 100644
--- a/packages/core/client/src/schema-component/antd/grid/Grid.tsx
+++ b/packages/core/client/src/schema-component/antd/grid/Grid.tsx
@@ -20,7 +20,6 @@ import { FilterBlockProvider } from '../../../filter-provider/FilterProvider';
 import {
   NocoBaseRecursionField,
   RefreshComponentProvider,
-  useRefreshComponent,
   useRefreshFieldSchema,
 } from '../../../formily/NocoBaseRecursionField';
 import { DndContext, DndContextProps } from '../../common/dnd-context';
@@ -379,11 +378,9 @@ export const Grid: any = observer(
     }, [fieldSchema, render, InitializerComponent, showDivider]);
 
     const refreshFieldSchema = useRefreshFieldSchema();
-    const refreshComponent = useRefreshComponent();
     const refresh = useCallback(() => {
       refreshFieldSchema?.();
-      refreshComponent?.();
-    }, [refreshComponent, refreshFieldSchema]);
+    }, [refreshFieldSchema]);
 
     return (
       <RefreshComponentProvider refresh={refresh}>
diff --git a/packages/core/client/src/schema-component/antd/input/Input.tsx b/packages/core/client/src/schema-component/antd/input/Input.tsx
index 1a7a072ca2..2870f7abf9 100644
--- a/packages/core/client/src/schema-component/antd/input/Input.tsx
+++ b/packages/core/client/src/schema-component/antd/input/Input.tsx
@@ -11,22 +11,40 @@ import { LoadingOutlined } from '@ant-design/icons';
 import { connect, mapProps, mapReadPretty } from '@formily/react';
 import { Input as AntdInput } from 'antd';
 import { InputProps, TextAreaProps } from 'antd/es/input';
-import React from 'react';
+import React, { useCallback } from 'react';
 import { JSONTextAreaProps, Json } from './Json';
 import { InputReadPrettyComposed, ReadPretty } from './ReadPretty';
 
 export { ReadPretty as InputReadPretty } from './ReadPretty';
 
-type ComposedInput = React.FC<InputProps> & {
+type ComposedInput = React.FC<NocoBaseInputProps> & {
   ReadPretty: InputReadPrettyComposed['Input'];
   TextArea: React.FC<TextAreaProps> & { ReadPretty: InputReadPrettyComposed['TextArea'] };
   URL: React.FC<InputProps> & { ReadPretty: InputReadPrettyComposed['URL'] };
   JSON: React.FC<JSONTextAreaProps> & { ReadPretty: InputReadPrettyComposed['JSON'] };
 };
 
+export type NocoBaseInputProps = InputProps & {
+  trim?: boolean;
+};
+
+function InputInner(props: NocoBaseInputProps) {
+  const { onChange, trim, ...others } = props;
+  const handleChange = useCallback(
+    (ev: React.ChangeEvent<HTMLInputElement>) => {
+      if (trim) {
+        ev.target.value = ev.target.value.trim();
+      }
+      onChange?.(ev);
+    },
+    [onChange, trim],
+  );
+  return <AntdInput {...others} onChange={handleChange} />;
+}
+
 export const Input: ComposedInput = Object.assign(
   connect(
-    AntdInput,
+    InputInner,
     mapProps((props, field) => {
       return {
         ...props,
diff --git a/packages/core/client/src/schema-component/antd/input/demos/new-demos/input.tsx b/packages/core/client/src/schema-component/antd/input/demos/new-demos/input.tsx
index 053a736c4c..5fba3f3699 100644
--- a/packages/core/client/src/schema-component/antd/input/demos/new-demos/input.tsx
+++ b/packages/core/client/src/schema-component/antd/input/demos/new-demos/input.tsx
@@ -1,4 +1,3 @@
-
 import React from 'react';
 import { mockApp } from '@nocobase/client/demo-utils';
 import { SchemaComponent, Plugin, ISchema } from '@nocobase/client';
@@ -15,15 +14,25 @@ const schema: ISchema = {
       'x-decorator': 'FormItem',
       'x-component': 'Input',
     },
+    trim: {
+      type: 'string',
+      title: `Trim heading and tailing spaces`,
+      'x-decorator': 'FormItem',
+      'x-component': 'Input',
+      'x-component-props': {
+        trim: true,
+      },
+    },
   },
-}
+};
+
 const Demo = () => {
   return <SchemaComponent schema={schema} />;
 };
 
 class DemoPlugin extends Plugin {
   async load() {
-    this.app.router.add('root', { path: '/', Component: Demo })
+    this.app.router.add('root', { path: '/', Component: Demo });
   }
 }
 
diff --git a/packages/core/client/src/schema-component/antd/page/PagePopups.tsx b/packages/core/client/src/schema-component/antd/page/PagePopups.tsx
index faef6cce0c..818cf75460 100644
--- a/packages/core/client/src/schema-component/antd/page/PagePopups.tsx
+++ b/packages/core/client/src/schema-component/antd/page/PagePopups.tsx
@@ -273,31 +273,43 @@ const InternalPagePopups = (props: { paramsList?: PopupParams[] }) => {
         );
       });
       const schemas = await Promise.all(waitList);
-      const clonedSchemas = schemas.map((schema, index) => {
-        if (_.isEmpty(schema)) {
-          return get404Schema();
-        }
-
-        const params = popupParams[index];
-
-        if (params.puid) {
-          const popupSchema = findSchemaByUid(params.puid, fieldSchema?.root);
-          if (popupSchema) {
-            savePopupSchemaToSchema(_.omit(popupSchema, 'parent'), schema);
+      const clonedSchemas = await Promise.all(
+        schemas.map(async (schema, index) => {
+          if (_.isEmpty(schema)) {
+            return get404Schema();
           }
-        }
 
-        // Using toJSON for deep clone, faster than lodash's cloneDeep
-        const result = _.cloneDeepWith(_.omit(schema, 'parent'), (value) => {
-          // If we clone the Tabs component, it will cause the configuration to be lost when reopening the popup after modifying its settings
-          if (value?.['x-component'] === 'Tabs') {
-            return value;
+          const params = popupParams[index];
+
+          if (params.puid) {
+            const popupSchema = findSchemaByUid(params.puid, fieldSchema?.root);
+            if (popupSchema) {
+              savePopupSchemaToSchema(_.omit(popupSchema, 'parent'), schema);
+            } else {
+              // 当本地找不到 popupSchema 时，通过接口请求 puid 对应的 schema
+              try {
+                const remoteSchema = await requestSchema(params.puid);
+                if (remoteSchema) {
+                  savePopupSchemaToSchema(remoteSchema, schema);
+                }
+              } catch (error) {
+                console.error('Failed to fetch schema for puid:', params.puid, error);
+              }
+            }
           }
-        });
-        result['x-read-pretty'] = true;
 
-        return result;
-      });
+          // Using toJSON for deep clone, faster than lodash's cloneDeep
+          const result = _.cloneDeepWith(_.omit(schema, 'parent'), (value) => {
+            // If we clone the Tabs component, it will cause the configuration to be lost when reopening the popup after modifying its settings
+            if (value?.['x-component'] === 'Tabs') {
+              return value;
+            }
+          });
+          result['x-read-pretty'] = true;
+
+          return result;
+        }),
+      );
       popupPropsRef.current = clonedSchemas.map((schema, index, items) => {
         const schemaContext = getPopupContextFromActionOrAssociationFieldSchema(schema);
         let hidden = false;
diff --git a/packages/core/client/src/schema-component/antd/page/index.en-US.md b/packages/core/client/src/schema-component/antd/page/index.en-US.md
deleted file mode 100644
index 1720833bd5..0000000000
--- a/packages/core/client/src/schema-component/antd/page/index.en-US.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Page
-
-Can be used in conjunction with DocumentTitleProvider to display the page title on document.title.
-
-<code src="./demos/demo1.tsx"></code>
diff --git a/packages/core/client/src/schema-component/antd/page/index.md b/packages/core/client/src/schema-component/antd/page/index.md
deleted file mode 100644
index f505078b94..0000000000
--- a/packages/core/client/src/schema-component/antd/page/index.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Page
-
-可以与 DocumentTitleProvider 搭配使用，将 page title 显示在 document.title 上。
-
-<code src="./demos/demo1.tsx"></code>
diff --git a/packages/core/client/src/schema-component/antd/time-picker/TimePicker.tsx b/packages/core/client/src/schema-component/antd/time-picker/TimePicker.tsx
index da9652ba29..f270f9838d 100644
--- a/packages/core/client/src/schema-component/antd/time-picker/TimePicker.tsx
+++ b/packages/core/client/src/schema-component/antd/time-picker/TimePicker.tsx
@@ -27,10 +27,10 @@ export const mapTimeFormat = function () {
       ...props,
       format,
       inputReadOnly: true,
-      value: dayjsable(props.value, format),
+      value: dayjsable(props.value, 'HH:mm:ss'),
       onChange: (value: dayjs.Dayjs | dayjs.Dayjs[]) => {
         if (onChange) {
-          onChange(formatDayjsValue(value, format) || null);
+          onChange(formatDayjsValue(value, 'HH:mm:ss') || null);
         }
       },
     };
diff --git a/packages/core/client/src/schema-component/antd/upload/Upload.tsx b/packages/core/client/src/schema-component/antd/upload/Upload.tsx
index 728e1f70ad..6c42d7bd68 100644
--- a/packages/core/client/src/schema-component/antd/upload/Upload.tsx
+++ b/packages/core/client/src/schema-component/antd/upload/Upload.tsx
@@ -11,6 +11,7 @@ import { DeleteOutlined, DownloadOutlined, InboxOutlined, LoadingOutlined, PlusO
 import { Field } from '@formily/core';
 import { connect, mapProps, mapReadPretty, useField } from '@formily/react';
 import { Alert, Upload as AntdUpload, Button, Modal, Progress, Space, Tooltip } from 'antd';
+import { createGlobalStyle } from 'antd-style';
 import useUploadStyle from 'antd/es/upload/style';
 import cls from 'classnames';
 import { saveAs } from 'file-saver';
@@ -36,6 +37,12 @@ import {
 import { useStyles } from './style';
 import type { ComposedUpload, DraggerProps, DraggerV2Props, UploadProps } from './type';
 
+const LightBoxGlobalStyle = createGlobalStyle`
+  .ReactModal__Overlay.ReactModal__Overlay--after-open {
+    z-index: 3000 !important; // 避免预览图片时被遮挡
+  }
+`;
+
 attachmentFileTypes.add({
   match(file) {
     return matchMimetype(file, 'image/*');
@@ -62,34 +69,37 @@ attachmentFileTypes.add({
       [index, list],
     );
     return (
-      <LightBox
-        // discourageDownloads={true}
-        mainSrc={list[index]?.url}
-        nextSrc={list[(index + 1) % list.length]?.url}
-        prevSrc={list[(index + list.length - 1) % list.length]?.url}
-        onCloseRequest={() => onSwitchIndex(null)}
-        onMovePrevRequest={() => onSwitchIndex((index + list.length - 1) % list.length)}
-        onMoveNextRequest={() => onSwitchIndex((index + 1) % list.length)}
-        imageTitle={list[index]?.title}
-        toolbarButtons={[
-          <button
-            key={'preview-img'}
-            style={{ fontSize: 22, background: 'none', lineHeight: 1 }}
-            type="button"
-            aria-label="Download"
-            title="Download"
-            className="ril-zoom-in ril__toolbarItemChild ril__builtinButton"
-            onClick={onDownload}
-          >
-            <DownloadOutlined />
-          </button>,
-        ]}
-      />
+      <>
+        <LightBoxGlobalStyle />
+        <LightBox
+          // discourageDownloads={true}
+          mainSrc={list[index]?.url}
+          nextSrc={list[(index + 1) % list.length]?.url}
+          prevSrc={list[(index + list.length - 1) % list.length]?.url}
+          onCloseRequest={() => onSwitchIndex(null)}
+          onMovePrevRequest={() => onSwitchIndex((index + list.length - 1) % list.length)}
+          onMoveNextRequest={() => onSwitchIndex((index + 1) % list.length)}
+          imageTitle={list[index]?.title}
+          toolbarButtons={[
+            <button
+              key={'preview-img'}
+              style={{ fontSize: 22, background: 'none', lineHeight: 1 }}
+              type="button"
+              aria-label="Download"
+              title="Download"
+              className="ril-zoom-in ril__toolbarItemChild ril__builtinButton"
+              onClick={onDownload}
+            >
+              <DownloadOutlined />
+            </button>,
+          ]}
+        />
+      </>
     );
   },
 });
 
-const iframePreviewSupportedTypes = ['application/pdf', 'audio/*', 'image/*', 'video/*', 'text/*'];
+const iframePreviewSupportedTypes = ['application/pdf', 'audio/*', 'image/*', 'video/*', 'text/plain'];
 
 function IframePreviewer({ index, list, onSwitchIndex }) {
   const { t } = useTranslation();
diff --git a/packages/core/client/src/schema-component/antd/variable/Input.tsx b/packages/core/client/src/schema-component/antd/variable/Input.tsx
index 75d83ec2aa..459538584a 100644
--- a/packages/core/client/src/schema-component/antd/variable/Input.tsx
+++ b/packages/core/client/src/schema-component/antd/variable/Input.tsx
@@ -26,12 +26,13 @@ import { Json } from '../input';
 const JT_VALUE_RE = /^\s*{{\s*([^{}]+)\s*}}\s*$/;
 
 type ParseOptions = {
+  defaultTypeOnNull?: string;
   stringToDate?: boolean;
 };
 
 function parseValue(value: any, options: ParseOptions = {}): string | string[] {
   if (value == null) {
-    return 'null';
+    return options.defaultTypeOnNull ?? 'null';
   }
   const type = typeof value;
   if (type === 'string') {
diff --git a/packages/core/client/src/schema-component/antd/variable/RawTextArea.tsx b/packages/core/client/src/schema-component/antd/variable/RawTextArea.tsx
index f37165bef8..f75c91e6d5 100644
--- a/packages/core/client/src/schema-component/antd/variable/RawTextArea.tsx
+++ b/packages/core/client/src/schema-component/antd/variable/RawTextArea.tsx
@@ -7,9 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import React, { useRef, useState } from 'react';
 import { css } from '@emotion/css';
 import { Button, Input } from 'antd';
+import React, { useRef, useState } from 'react';
 import { VariableSelect } from './VariableSelect';
 
 // NOTE: https://stackoverflow.com/questions/23892547/what-is-the-best-way-to-trigger-onchange-event-in-react-js/46012210#46012210
@@ -80,6 +80,7 @@ export function RawTextArea(props): JSX.Element {
           setOptions={setOptions}
           onInsert={onInsert}
           changeOnSelect={changeOnSelect}
+          disabled={others.disabled}
         />
       </Button.Group>
     </div>
diff --git a/packages/core/client/src/schema-component/antd/variable/TextArea.tsx b/packages/core/client/src/schema-component/antd/variable/TextArea.tsx
index 53656f75e5..a68a1dd475 100644
--- a/packages/core/client/src/schema-component/antd/variable/TextArea.tsx
+++ b/packages/core/client/src/schema-component/antd/variable/TextArea.tsx
@@ -10,6 +10,7 @@
 import { css, cx } from '@emotion/css';
 import { useForm } from '@formily/react';
 import { Space, theme } from 'antd';
+import type { CascaderProps, DefaultOptionType } from 'antd/lib/cascader';
 import useInputStyle from 'antd/es/input/style';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { renderToString } from 'react-dom/server';
@@ -110,7 +111,7 @@ function renderHTML(exp: string, keyLabelMap, delimiters: [string, string] = ['{
   });
 }
 
-function createOptionsValueLabelMap(options: any[], fieldNames = { value: 'value', label: 'label' }) {
+function createOptionsValueLabelMap(options: any[], fieldNames: CascaderProps['fieldNames'] = defaultFieldNames) {
   const map = new Map<string, string[]>();
   for (const option of options) {
     map.set(option[fieldNames.value], [option[fieldNames.label]]);
@@ -220,10 +221,24 @@ function useVariablesFromValue(value: string, delimiters: [string, string] = ['{
   }, [value, delimitersString]);
 }
 
-export function TextArea(props) {
+export type TextAreaProps = {
+  value?: string;
+  scope?: Partial<DefaultOptionType>[] | (() => Partial<DefaultOptionType>[]);
+  onChange?(value: string): void;
+  disabled?: boolean;
+  changeOnSelect?: CascaderProps['changeOnSelect'];
+  style?: React.CSSProperties;
+  fieldNames?: CascaderProps['fieldNames'];
+  trim?: boolean;
+  delimiters?: [string, string];
+  addonBefore?: React.ReactNode;
+};
+
+export function TextArea(props: TextAreaProps) {
   const { wrapSSR, hashId, componentCls } = useStyles();
-  const { scope, onChange, changeOnSelect, style, fieldNames, delimiters = ['{{', '}}'], addonBefore } = props;
-  const value = typeof props.value === 'string' ? props.value : props.value == null ? '' : props.value.toString();
+  const { scope, changeOnSelect, style, fieldNames, delimiters = ['{{', '}}'], addonBefore, trim = true } = props;
+  const value =
+    typeof props.value === 'string' ? props.value : props.value == null ? '' : (props.value as any).toString();
   const variables = useVariablesFromValue(value, delimiters);
   const inputRef = useRef<HTMLDivElement>(null);
   const [options, setOptions] = useState([]);
@@ -241,6 +256,14 @@ export function TextArea(props) {
   const { token } = theme.useToken();
   const delimitersString = delimiters.join(' ');
 
+  const onChange = useCallback(
+    (target: HTMLDivElement) => {
+      const v = getValue(target, delimiters);
+      props.onChange?.(trim ? v.trim() : v);
+    },
+    [delimitersString, props.onChange, trim],
+  );
+
   useEffect(() => {
     preloadOptions(scope, variables)
       .then((preloaded) => {
@@ -324,9 +347,9 @@ export function TextArea(props) {
 
       setChanged(true);
       setRange(getCurrentRange(current));
-      onChange(getValue(current, delimiters));
+      onChange(current);
     },
-    [keyLabelMap, onChange, range, delimitersString],
+    [keyLabelMap, onChange, range],
   );
 
   const onInput = useCallback(
@@ -336,9 +359,9 @@ export function TextArea(props) {
       }
       setChanged(true);
       setRange(getCurrentRange(currentTarget));
-      onChange(getValue(currentTarget, delimiters));
+      onChange(currentTarget);
     },
-    [ime, onChange, delimitersString],
+    [ime, onChange],
   );
 
   const onBlur = useCallback(function ({ currentTarget }) {
@@ -360,9 +383,9 @@ export function TextArea(props) {
       setIME(false);
       setChanged(true);
       setRange(getCurrentRange(currentTarget));
-      onChange(getValue(currentTarget, delimiters));
+      onChange(currentTarget);
     },
-    [onChange, delimitersString],
+    [onChange],
   );
 
   const onPaste = useCallback(
@@ -393,9 +416,9 @@ export function TextArea(props) {
       setChanged(true);
       pasteHTML(ev.currentTarget, sanitizedHTML);
       setRange(getCurrentRange(ev.currentTarget));
-      onChange(getValue(ev.currentTarget, delimiters));
+      onChange(ev.currentTarget);
     },
-    [onChange, delimitersString],
+    [onChange],
   );
   const disabled = props.disabled || form.disabled;
   return wrapSSR(
diff --git a/packages/core/client/src/schema-component/common/utils/uitls.tsx b/packages/core/client/src/schema-component/common/utils/uitls.tsx
index 198f98cfa5..e2359e5eef 100644
--- a/packages/core/client/src/schema-component/common/utils/uitls.tsx
+++ b/packages/core/client/src/schema-component/common/utils/uitls.tsx
@@ -96,7 +96,6 @@ export const conditionAnalyses = async (
 ) => {
   const type = Object.keys(ruleGroup)[0] || '$and';
   const conditions = ruleGroup[type];
-
   let results = conditions.map(async (condition) => {
     if ('$and' in condition || '$or' in condition) {
       return await conditionAnalyses({ ruleGroup: condition, variables, localVariables }, jsonLogic);
@@ -147,7 +146,10 @@ export const conditionAnalyses = async (
   if (type === '$and') {
     return every(results, (v) => v);
   } else {
-    return some(results, (v) => v);
+    if (results.length) {
+      return some(results, (v) => v);
+    }
+    return true;
   }
 };
 
diff --git a/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx b/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx
index 356705c31b..f220126041 100644
--- a/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx
+++ b/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx
@@ -8,7 +8,7 @@
  */
 
 import { createForm } from '@formily/core';
-import { Schema } from '@formily/react';
+import { Schema, useFieldSchema } from '@formily/react';
 import { Spin } from 'antd';
 import React, { memo, useMemo } from 'react';
 import { useRemoteCollectionManagerLoading } from '../../collection-manager/CollectionManagerProvider';
@@ -62,6 +62,7 @@ const RequestSchemaComponent: React.FC<RemoteSchemaComponentProps> = (props) =>
   });
   const NotFoundComponent = useComponent(NotFoundPage);
   const collectionManagerLoading = useRemoteCollectionManagerLoading();
+  const parentSchema = useFieldSchema();
 
   if (collectionManagerLoading || loading || hidden) {
     return <Spin style={{ width: '100%', marginTop: 20 }} delay={LOADING_DELAY} />;
@@ -73,10 +74,20 @@ const RequestSchemaComponent: React.FC<RemoteSchemaComponentProps> = (props) =>
   }
 
   return noForm ? (
-    <SchemaComponent components={components} scope={scope} schema={schemaTransform(schema || {})} />
+    <SchemaComponent
+      components={components}
+      scope={scope}
+      schema={schemaTransform(schema || {})}
+      parentSchema={parentSchema}
+    />
   ) : (
     <FormProvider form={form}>
-      <SchemaComponent components={components} scope={scope} schema={schemaTransform(schema || {})} />
+      <SchemaComponent
+        components={components}
+        scope={scope}
+        schema={schemaTransform(schema || {})}
+        parentSchema={parentSchema}
+      />
     </FormProvider>
   );
 };
diff --git a/packages/core/client/src/schema-component/core/SchemaComponent.tsx b/packages/core/client/src/schema-component/core/SchemaComponent.tsx
index 5a51340ace..2443eb5c43 100644
--- a/packages/core/client/src/schema-component/core/SchemaComponent.tsx
+++ b/packages/core/client/src/schema-component/core/SchemaComponent.tsx
@@ -28,6 +28,7 @@ function toSchema(schema?: any) {
       properties: {
         [schema.name]: schema,
       },
+      name: `p_${schema.name}`,
     });
   }
   return new Schema(schema);
@@ -52,58 +53,65 @@ interface DistributedProps {
  */
 export const SchemaComponentOnChangeContext = createContext<SchemaComponentOnChange>({ onChange: _.noop });
 
-const RecursionSchemaComponent = memo((props: ISchemaFieldProps & SchemaComponentOnChange & DistributedProps) => {
-  const { components, scope, schema: _schema, distributed, onChange: _onChange, ...others } = props;
-  const ctx = useContext(SchemaComponentContext);
-  const schema = useMemo(() => toSchema(_schema), [_schema]);
-  const value = useMemo(
-    () => ({
-      ...ctx,
-      distributed: ctx.distributed == false ? false : distributed,
-      /**
-       * @deprecated
-       */
-      refresh: ctx.refresh || _.noop,
-    }),
-    [ctx, distributed],
-  );
+const RecursionSchemaComponent = memo(
+  (props: ISchemaFieldProps & SchemaComponentOnChange & DistributedProps & { parentSchema?: Schema }) => {
+    const { components, scope, schema: _schema, distributed, onChange: _onChange, parentSchema, ...others } = props;
+    const ctx = useContext(SchemaComponentContext);
+    const schema = useMemo(() => toSchema(_schema), [_schema]);
+    const value = useMemo(
+      () => ({
+        ...ctx,
+        distributed: ctx.distributed == false ? false : distributed,
+        /**
+         * @deprecated
+         */
+        refresh: ctx.refresh || _.noop,
+      }),
+      [ctx, distributed],
+    );
 
-  const { onChange: onChangeFromContext } = useContext(SchemaComponentOnChangeContext);
+    const { onChange: onChangeFromContext } = useContext(SchemaComponentOnChangeContext);
 
-  const onChangeValue = useMemo(
-    () => ({
-      onChange: () => {
-        _onChange?.(schema);
-        onChangeFromContext?.();
-      },
-    }),
-    [_onChange, onChangeFromContext, schema],
-  );
+    const onChangeValue = useMemo(
+      () => ({
+        onChange: () => {
+          _onChange?.(schema);
+          onChangeFromContext?.();
+        },
+      }),
+      [_onChange, onChangeFromContext, schema],
+    );
 
-  return (
-    <SchemaComponentOnChangeContext.Provider value={onChangeValue}>
-      <SchemaComponentContext.Provider value={value}>
-        <SchemaComponentOptions inherit components={components} scope={scope}>
-          <NocoBaseRecursionField {...others} schema={schema} isUseFormilyField />
-        </SchemaComponentOptions>
-      </SchemaComponentContext.Provider>
-    </SchemaComponentOnChangeContext.Provider>
-  );
-});
+    return (
+      <SchemaComponentOnChangeContext.Provider value={onChangeValue}>
+        <SchemaComponentContext.Provider value={value}>
+          <SchemaComponentOptions inherit components={components} scope={scope}>
+            <NocoBaseRecursionField {...others} schema={schema} isUseFormilyField parentSchema={parentSchema} />
+          </SchemaComponentOptions>
+        </SchemaComponentContext.Provider>
+      </SchemaComponentOnChangeContext.Provider>
+    );
+  },
+);
 
 RecursionSchemaComponent.displayName = 'RecursionSchemaComponent';
 
-const MemoizedSchemaComponent = memo((props: ISchemaFieldProps & SchemaComponentOnChange & DistributedProps) => {
-  const { schema, ...others } = props;
-  const s = useMemoizedSchema(schema);
-  return <RecursionSchemaComponent {...others} schema={s} />;
-});
+const MemoizedSchemaComponent = memo(
+  (props: ISchemaFieldProps & SchemaComponentOnChange & DistributedProps & { parentSchema?: Schema }) => {
+    const { schema, parentSchema, ...others } = props;
+    const s = useMemoizedSchema(schema);
+    return <RecursionSchemaComponent {...others} schema={s} parentSchema={parentSchema} />;
+  },
+);
 
 MemoizedSchemaComponent.displayName = 'MemoizedSchemaComponent';
 
 export const SchemaComponent = memo(
   (
-    props: (ISchemaFieldProps | IRecursionFieldProps) & { memoized?: boolean } & SchemaComponentOnChange &
+    props: (ISchemaFieldProps | IRecursionFieldProps) & {
+      memoized?: boolean;
+      parentSchema?: Schema;
+    } & SchemaComponentOnChange &
       DistributedProps,
   ) => {
     const { memoized, ...others } = props;
diff --git a/packages/core/client/src/schema-component/hooks/useBlockSize.ts b/packages/core/client/src/schema-component/hooks/useBlockSize.ts
index 8272e448d2..826b891400 100644
--- a/packages/core/client/src/schema-component/hooks/useBlockSize.ts
+++ b/packages/core/client/src/schema-component/hooks/useBlockSize.ts
@@ -37,7 +37,9 @@ const getPageHeaderHeight = (disablePageHeader, enablePageTabs, hidePageTitle, t
           token.paddingContentHorizontalLG
         );
       }
-      return token.controlHeight + token.marginXS + (token.paddingXXS + 2) * 2 + token.paddingContentHorizontalLG;
+      return (
+        token.controlHeight + token.marginXS + (token.paddingContentVertical + 2) * 2 + token.paddingContentHorizontalLG
+      );
     } else {
       if (enablePageTabs) {
         return (
@@ -140,12 +142,12 @@ export const useDataBlockHeight = (options?: UseDataBlockHeightOptions) => {
   const { heightMode, height, title, titleHeight } = heightProps || {};
 
   const blockHeaderHeight = title ? titleHeight : 0;
+
   if (!heightProps?.heightMode || heightMode === HeightMode.DEFAULT) {
     return;
   }
   if (heightMode === HeightMode.FULL_HEIGHT) {
     let res = window.innerHeight - pageFullScreenHeight;
-    console.log(res);
     if (options?.removeBlockHeaderHeight) {
       res = res - blockHeaderHeight;
     }
diff --git a/packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx b/packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx
index a940d82085..be3cfca201 100644
--- a/packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx
+++ b/packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx
@@ -268,10 +268,12 @@ function FinallyButton({
   const { getCollection } = useCollectionManager_deprecated();
   const aclCtx = useACLActionParamsContext();
   const buttonStyle = useMemo(() => {
+    const shouldApplyOpacity = designable && (field?.data?.hidden || !aclCtx);
+    const opacityValue = componentType !== 'link' ? (shouldApplyOpacity ? 0.1 : 1) : 1;
     return {
-      opacity: designable && (field?.data?.hidden || !aclCtx) && 0.1,
+      opacity: opacityValue,
     };
-  }, [designable, field?.data?.hidden]);
+  }, [designable, field?.data?.hidden, aclCtx, componentType]);
 
   if (inheritsCollections?.length > 0) {
     if (!linkageFromForm) {
diff --git a/packages/core/client/src/schema-initializer/utils.ts b/packages/core/client/src/schema-initializer/utils.ts
index a279fcd751..0860e64464 100644
--- a/packages/core/client/src/schema-initializer/utils.ts
+++ b/packages/core/client/src/schema-initializer/utils.ts
@@ -470,7 +470,6 @@ export const useFilterFormItemInitializerFields = (options?: any) => {
         'x-collection-field': `${name}.${field.name}`,
         'x-component-props': {
           utc: false,
-          underFilter: true,
         },
       };
       if (isAssocField(field)) {
@@ -485,7 +484,7 @@ export const useFilterFormItemInitializerFields = (options?: any) => {
           'x-decorator': 'FormItem',
           'x-use-decorator-props': 'useFormItemProps',
           'x-collection-field': `${name}.${field.name}`,
-          'x-component-props': { ...field.uiSchema?.['x-component-props'], utc: false, underFilter: true },
+          'x-component-props': { ...field.uiSchema?.['x-component-props'], utc: false },
         };
       }
       const resultItem = {
@@ -580,7 +579,7 @@ const associationFieldToMenu = (
       interface: field.interface,
     },
     'x-component': 'CollectionField',
-    'x-component-props': { utc: false, underFilter: true },
+    'x-component-props': { utc: false },
     'x-read-pretty': false,
     'x-decorator': 'FormItem',
     'x-collection-field': `${collectionName}.${schemaName}`,
@@ -697,7 +696,7 @@ export const useFilterInheritsFormItemInitializerFields = (options?) => {
             'x-component': 'CollectionField',
             'x-decorator': 'FormItem',
             'x-collection-field': `${name}.${field.name}`,
-            'x-component-props': { utc: false, underFilter: true },
+            'x-component-props': { utc: false },
             'x-read-pretty': field?.uiSchema?.['x-read-pretty'],
           };
           return {
@@ -728,7 +727,7 @@ export const useCustomFormItemInitializerFields = (options?: any) => {
   const remove = useRemoveGridFormItem();
   return currentFields
     ?.filter((field) => {
-      return field?.interface && field.interface !== 'snapshot' && field.type !== 'sequence';
+      return !field.inherit && field?.interface && field.interface !== 'snapshot' && field.type !== 'sequence';
     })
     ?.map((field) => {
       const interfaceConfig = getInterface(field.interface);
diff --git a/packages/core/client/src/schema-settings/SchemaSettings.tsx b/packages/core/client/src/schema-settings/SchemaSettings.tsx
index e7542c2d97..d438cb55d9 100644
--- a/packages/core/client/src/schema-settings/SchemaSettings.tsx
+++ b/packages/core/client/src/schema-settings/SchemaSettings.tsx
@@ -568,13 +568,14 @@ export interface SchemaSettingsSelectItemProps
   extends Omit<SchemaSettingsItemProps, 'onChange' | 'onClick'>,
     Omit<SelectWithTitleProps, 'title' | 'defaultValue'> {
   value?: SelectWithTitleProps['defaultValue'];
+  optionRender?: (option: any, info: { index: number }) => React.ReactNode;
 }
 export const SchemaSettingsSelectItem: FC<SchemaSettingsSelectItemProps> = (props) => {
-  const { title, options, value, onChange, ...others } = props;
+  const { title, options, value, onChange, optionRender, ...others } = props;
 
   return (
     <SchemaSettingsItem title={title} {...others}>
-      <SelectWithTitle {...{ title, defaultValue: value, onChange, options }} />
+      <SelectWithTitle {...{ title, defaultValue: value, onChange, options, optionRender }} />
     </SchemaSettingsItem>
   );
 };
diff --git a/packages/core/client/src/user/CurrentUserProvider.tsx b/packages/core/client/src/user/CurrentUserProvider.tsx
index 4b1dcab21b..29c9d012c3 100644
--- a/packages/core/client/src/user/CurrentUserProvider.tsx
+++ b/packages/core/client/src/user/CurrentUserProvider.tsx
@@ -20,6 +20,11 @@ export const useCurrentUserContext = () => {
   return useContext(CurrentUserContext);
 };
 
+export const useIsLoggedIn = () => {
+  const ctx = useContext(CurrentUserContext);
+  return !!ctx?.data?.data;
+};
+
 export const useCurrentRoles = () => {
   const { allowAnonymous } = useACLRoleContext();
   const { data } = useCurrentUserContext();
@@ -39,14 +44,18 @@ export const useCurrentRoles = () => {
 
 export const CurrentUserProvider = (props) => {
   const api = useAPIClient();
-  const result = useRequest<any>(() =>
-    api
-      .request({
-        url: '/auth:check',
-        skipNotify: true,
-        skipAuth: true,
-      })
-      .then((res) => res?.data),
+  const result = useRequest<any>(
+    () =>
+      api
+        .request({
+          url: '/auth:check',
+          skipNotify: true,
+          skipAuth: true,
+        })
+        .then((res) => res?.data),
+    {
+      manual: !api.auth.token,
+    },
   );
   const { render } = useAppSpin();
 
diff --git a/packages/core/client/src/variables/VariablesProvider.tsx b/packages/core/client/src/variables/VariablesProvider.tsx
index 85c14a4a18..c7ffc83da5 100644
--- a/packages/core/client/src/variables/VariablesProvider.tsx
+++ b/packages/core/client/src/variables/VariablesProvider.tsx
@@ -18,7 +18,6 @@ import { getDataSourceHeaders } from '../data-source/utils';
 import { useCompile } from '../schema-component';
 import useBuiltInVariables from './hooks/useBuiltinVariables';
 import { VariableOption, VariablesContextType } from './types';
-import { cacheLazyLoadedValues, getCachedLazyLoadedValues } from './utils/cacheLazyLoadedValues';
 import { filterEmptyValues } from './utils/filterEmptyValues';
 import { getAction } from './utils/getAction';
 import { getPath } from './utils/getPath';
@@ -144,14 +143,13 @@ const VariablesProvider = ({ children, filterVariables }: any) => {
                   .then((data) => {
                     clearRequested(url);
                     const value = data.data.data;
-                    cacheLazyLoadedValues(item, currentVariablePath, value);
                     return value;
                   });
                 stashRequested(url, result);
                 return result;
               }
             }
-            return getCachedLazyLoadedValues(item, currentVariablePath) || item?.[key];
+            return item?.[key];
           });
           current = removeThroughCollectionFields(_.flatten(await Promise.all(result)), associationField);
         } else if (
@@ -180,17 +178,9 @@ const VariablesProvider = ({ children, filterVariables }: any) => {
           }
 
           const value = data.data.data;
-          if (!getCachedLazyLoadedValues(current, currentVariablePath)) {
-            // Cache the API response data to avoid repeated requests
-            cacheLazyLoadedValues(current, currentVariablePath, value);
-          }
-
           current = removeThroughCollectionFields(value, associationField);
         } else {
-          current = removeThroughCollectionFields(
-            getCachedLazyLoadedValues(current, currentVariablePath) || getValuesByPath(current, key),
-            associationField,
-          );
+          current = removeThroughCollectionFields(getValuesByPath(current, key), associationField);
         }
 
         if (associationField?.target) {
@@ -359,13 +349,8 @@ export default VariablesProvider;
 function shouldToRequest(value, variableCtx: Record<string, any>, variablePath: string) {
   let result = false;
 
-  if (getCachedLazyLoadedValues(variableCtx, variablePath)) {
-    return false;
-  }
-
   // value may be a reactive object, using untracked to avoid unexpected autorun
   untracked(() => {
-    // fix https://nocobase.height.app/T-2502
     // Compatible with `xxx to many` and `xxx to one` subform fields and subtable fields
     if (JSON.stringify(value) === '[{}]' || JSON.stringify(value) === '{}') {
       result = true;
diff --git a/packages/core/client/src/variables/utils/cacheLazyLoadedValues.ts b/packages/core/client/src/variables/utils/cacheLazyLoadedValues.ts
deleted file mode 100644
index 9d07c2959d..0000000000
--- a/packages/core/client/src/variables/utils/cacheLazyLoadedValues.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-const cache = new Map<Record<string, any>, any>();
-
-export const cacheLazyLoadedValues = (variableCtx: Record<string, any>, variablePath: string, value: any) => {
-  const cachedValue = cache.get(variableCtx);
-
-  if (cachedValue) {
-    cachedValue[variablePath] = value;
-  } else {
-    cache.set(variableCtx, { [variablePath]: value });
-  }
-};
-
-export const getCachedLazyLoadedValues = (variableCtx: Record<string, any>, variablePath: string) => {
-  const cachedValue = cache.get(variableCtx);
-  return cachedValue?.[variablePath];
-};
diff --git a/packages/core/client/src/variables/utils/isVariable.tsx b/packages/core/client/src/variables/utils/isVariable.tsx
index 7e97d9e077..57a125c71f 100644
--- a/packages/core/client/src/variables/utils/isVariable.tsx
+++ b/packages/core/client/src/variables/utils/isVariable.tsx
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-export const REGEX_OF_VARIABLE = /^\s*\{\{\s*([a-zA-Z0-9_$-.]+?)\s*\}\}\s*$/g;
+export const REGEX_OF_VARIABLE = /^\s*\{\{\s*([\p{L}0-9_$-.]+?)\s*\}\}\s*$/u;
 export const REGEX_OF_VARIABLE_IN_EXPRESSION = /\{\{\s*([a-zA-Z0-9_$-.]+?)\s*\}\}/g;
 
 export const isVariable = (str: unknown) => {
diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json
index 9c8ecf5b20..db383a5c3c 100755
--- a/packages/core/create-nocobase-app/package.json
+++ b/packages/core/create-nocobase-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-nocobase-app",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "src/index.js",
   "license": "AGPL-3.0",
   "dependencies": {
diff --git a/packages/core/data-source-manager/package.json b/packages/core/data-source-manager/package.json
index c9f93887dc..08efdca833 100644
--- a/packages/core/data-source-manager/package.json
+++ b/packages/core/data-source-manager/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.6.6",
-    "@nocobase/cache": "1.6.6",
-    "@nocobase/database": "1.6.6",
-    "@nocobase/resourcer": "1.6.6",
-    "@nocobase/utils": "1.6.6",
+    "@nocobase/actions": "1.6.20",
+    "@nocobase/cache": "1.6.20",
+    "@nocobase/database": "1.6.20",
+    "@nocobase/resourcer": "1.6.20",
+    "@nocobase/utils": "1.6.20",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
diff --git a/packages/core/data-source-manager/src/__tests__/data-source-manager.test.ts b/packages/core/data-source-manager/src/__tests__/data-source-manager.test.ts
index 701bd7e191..6e43a750ab 100644
--- a/packages/core/data-source-manager/src/__tests__/data-source-manager.test.ts
+++ b/packages/core/data-source-manager/src/__tests__/data-source-manager.test.ts
@@ -7,10 +7,10 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { createMockServer, mockDatabase, supertest } from '@nocobase/test';
-import { SequelizeDataSource } from '../sequelize-data-source';
-import { vi } from 'vitest';
 import { DataSourceManager } from '@nocobase/data-source-manager';
+import { createMockDatabase, createMockServer, mockDatabase, supertest } from '@nocobase/test';
+import { vi } from 'vitest';
+import { SequelizeDataSource } from '../sequelize-data-source';
 
 describe('example', () => {
   test.skip('case1', async () => {
@@ -41,7 +41,7 @@ describe('example', () => {
       name: 'test2',
     });
 
-    const database = mockDatabase({
+    const database = await createMockDatabase({
       tablePrefix: 'ds1_',
     });
     await database.clean({ drop: true });
@@ -82,7 +82,7 @@ describe('example', () => {
       name: 'update-filter',
     });
 
-    const database = mockDatabase({
+    const database = await createMockDatabase({
       tablePrefix: 'ds1_',
     });
 
@@ -128,7 +128,7 @@ describe('example', () => {
       name: 'update-filter',
     });
 
-    const database = mockDatabase({
+    const database = await createMockDatabase({
       tablePrefix: 'ds1_',
     });
 
@@ -198,7 +198,7 @@ describe('example', () => {
     // it should be called on main datasource
     expect(hook).toBeCalledTimes(1);
 
-    const database = mockDatabase({
+    const database = await createMockDatabase({
       tablePrefix: 'ds1_',
     });
 
diff --git a/packages/core/data-source-manager/src/__tests__/koa.test.ts b/packages/core/data-source-manager/src/__tests__/koa.test.ts
index 3c42dd8aed..587b549543 100644
--- a/packages/core/data-source-manager/src/__tests__/koa.test.ts
+++ b/packages/core/data-source-manager/src/__tests__/koa.test.ts
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '@nocobase/test';
+import { createMockDatabase, mockDatabase } from '@nocobase/test';
 import Koa from 'koa';
 import bodyParser from 'koa-bodyparser';
 import supertest from 'supertest';
@@ -24,7 +24,7 @@ describe('example', () => {
       await next();
     });
     app.use(dsm.middleware());
-    const database = mockDatabase({
+    const database = await createMockDatabase({
       tablePrefix: 'ds1_',
     });
     await database.clean({ drop: true });
diff --git a/packages/core/database/package.json b/packages/core/database/package.json
index 4b48c4c0c1..5b23198f5f 100644
--- a/packages/core/database/package.json
+++ b/packages/core/database/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.6.6",
-    "@nocobase/utils": "1.6.6",
+    "@nocobase/logger": "1.6.20",
+    "@nocobase/utils": "1.6.20",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
diff --git a/packages/core/database/src/__tests__/associations/references.test.ts b/packages/core/database/src/__tests__/associations/references.test.ts
index 0cd351b47e..475c2b751e 100644
--- a/packages/core/database/src/__tests__/associations/references.test.ts
+++ b/packages/core/database/src/__tests__/associations/references.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database } from '../../database';
-import { mockDatabase } from '../index';
+import { Database, createMockDatabase } from '@nocobase/database';
+
 describe('association references', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
 
     await db.clean({ drop: true });
   });
diff --git a/packages/core/database/src/__tests__/associations/target-key.test.ts b/packages/core/database/src/__tests__/associations/target-key.test.ts
index fd0c5d0bc3..2c203c68ef 100644
--- a/packages/core/database/src/__tests__/associations/target-key.test.ts
+++ b/packages/core/database/src/__tests__/associations/target-key.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe('association target key', async () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
 
     await db.clean({ drop: true });
   });
diff --git a/packages/core/database/src/__tests__/bigint.test.ts b/packages/core/database/src/__tests__/bigint.test.ts
index 621c8700b7..31453334fb 100644
--- a/packages/core/database/src/__tests__/bigint.test.ts
+++ b/packages/core/database/src/__tests__/bigint.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database } from '../database';
-import { mockDatabase } from './index';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe.skipIf(process.env['DB_DIALECT'] === 'sqlite')('collection', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       logging: console.log,
     });
 
diff --git a/packages/core/database/src/__tests__/collection-factory.test.ts b/packages/core/database/src/__tests__/collection-factory.test.ts
index fb6b2cb6b4..0a48ebfbf4 100644
--- a/packages/core/database/src/__tests__/collection-factory.test.ts
+++ b/packages/core/database/src/__tests__/collection-factory.test.ts
@@ -7,16 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+import { Collection, Database, createMockDatabase } from '@nocobase/database';
 import { vi } from 'vitest';
-import Database from '../database';
-import { mockDatabase } from './index';
-import { Collection } from '../collection';
 
 describe('collection factory', function () {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
 
     await db.clean({ drop: true });
   });
diff --git a/packages/core/database/src/__tests__/collection.test.ts b/packages/core/database/src/__tests__/collection.test.ts
index dbe8dd1ceb..d94a87ba04 100644
--- a/packages/core/database/src/__tests__/collection.test.ts
+++ b/packages/core/database/src/__tests__/collection.test.ts
@@ -7,9 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Collection } from '../collection';
-import { Database } from '../database';
-import { mockDatabase } from './index';
+import { Collection, Database, createMockDatabase } from '@nocobase/database';
 import { IdentifierError } from '../errors/identifier-error';
 
 const pgOnly = () => (process.env.DB_DIALECT == 'postgres' ? it : it.skip);
@@ -17,7 +15,7 @@ describe('collection', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
 
     await db.clean({ drop: true });
   });
@@ -265,7 +263,7 @@ describe('collection sync', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/database.import.test.ts b/packages/core/database/src/__tests__/database.import.test.ts
index c008e46710..a5facdb6e7 100644
--- a/packages/core/database/src/__tests__/database.import.test.ts
+++ b/packages/core/database/src/__tests__/database.import.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from './index';
+import { Database, createMockDatabase } from '@nocobase/database';
 import path from 'path';
-import Database from '../database';
 
 describe('database', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/database.test.ts b/packages/core/database/src/__tests__/database.test.ts
index 1d04ee4dc6..9f1ce51154 100644
--- a/packages/core/database/src/__tests__/database.test.ts
+++ b/packages/core/database/src/__tests__/database.test.ts
@@ -7,17 +7,15 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { vi } from 'vitest';
+import { ArrayFieldRepository, createMockDatabase, Database, Model } from '@nocobase/database';
 import path from 'path';
-import { Database, Model } from '..';
-import { ArrayFieldRepository } from '../field-repository/array-field-repository';
-import { mockDatabase } from './index';
+import { vi } from 'vitest';
 
 describe('database', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/dialect-extend/dialect-extend.test.ts b/packages/core/database/src/__tests__/dialect-extend/dialect-extend.test.ts
index e4e95b75d4..b8ddf9b8ca 100644
--- a/packages/core/database/src/__tests__/dialect-extend/dialect-extend.test.ts
+++ b/packages/core/database/src/__tests__/dialect-extend/dialect-extend.test.ts
@@ -7,15 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../';
-import { Database } from '../../database';
-import { BaseDialect } from '../../dialects/base-dialect';
+import { BaseDialect, Database, createMockDatabase } from '@nocobase/database';
 
 describe('dialect extend', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/eager-loading/eager-loading-tree.test.ts b/packages/core/database/src/__tests__/eager-loading/eager-loading-tree.test.ts
index 6f5ff48d58..8d29b8e51a 100644
--- a/packages/core/database/src/__tests__/eager-loading/eager-loading-tree.test.ts
+++ b/packages/core/database/src/__tests__/eager-loading/eager-loading-tree.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database, { mockDatabase } from '@nocobase/database';
+import Database, { createMockDatabase } from '@nocobase/database';
 import { EagerLoadingTree } from '../../eager-loading/eager-loading-tree';
 
 describe('Eager loading tree', () => {
   let db: Database;
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       tablePrefix: '',
     });
 
diff --git a/packages/core/database/src/__tests__/field-options/hidden.test.ts b/packages/core/database/src/__tests__/field-options/hidden.test.ts
index 1be54af80b..1a9687c812 100644
--- a/packages/core/database/src/__tests__/field-options/hidden.test.ts
+++ b/packages/core/database/src/__tests__/field-options/hidden.test.ts
@@ -7,15 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../';
-import { Database } from '../../database';
-import { Model } from '../../model';
+import { Database, Model, createMockDatabase } from '@nocobase/database';
 
 describe('hidden field options', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/field-options/inddex.test.ts b/packages/core/database/src/__tests__/field-options/inddex.test.ts
index 4793f1699c..83d2e77d81 100644
--- a/packages/core/database/src/__tests__/field-options/inddex.test.ts
+++ b/packages/core/database/src/__tests__/field-options/inddex.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 import { md5 } from '../../utils';
 
 describe('index field options', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/field-options/sort-by.test.ts b/packages/core/database/src/__tests__/field-options/sort-by.test.ts
index 7cbd92b0b4..c6774363a9 100644
--- a/packages/core/database/src/__tests__/field-options/sort-by.test.ts
+++ b/packages/core/database/src/__tests__/field-options/sort-by.test.ts
@@ -7,8 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '@nocobase/test';
-import { BelongsToManyRepository, Database } from '../../index';
+import { BelongsToManyRepository, Database, createMockDatabase } from '@nocobase/database';
 
 describe('associated field order', () => {
   let db: Database;
@@ -18,7 +17,7 @@ describe('associated field order', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
 
     db.collection({
diff --git a/packages/core/database/src/__tests__/field-repository/array-field-repository.test.ts b/packages/core/database/src/__tests__/field-repository/array-field-repository.test.ts
index 678f3289d4..605f9972bc 100644
--- a/packages/core/database/src/__tests__/field-repository/array-field-repository.test.ts
+++ b/packages/core/database/src/__tests__/field-repository/array-field-repository.test.ts
@@ -7,9 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../index';
-import Database from '../../database';
-import { ArrayFieldRepository } from '../../field-repository/array-field-repository';
+import { ArrayFieldRepository, Database, createMockDatabase } from '@nocobase/database';
 
 describe('Array field repository', () => {
   let db: Database;
@@ -17,7 +15,7 @@ describe('Array field repository', () => {
   let TestCollection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     TestCollection = db.collection({
       name: 'test',
diff --git a/packages/core/database/src/__tests__/fields/array.test.ts b/packages/core/database/src/__tests__/fields/array.test.ts
index 88ac7bf3bd..4ebd5db15d 100644
--- a/packages/core/database/src/__tests__/fields/array.test.ts
+++ b/packages/core/database/src/__tests__/fields/array.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('array field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/fields/belongs-to-field.test.ts b/packages/core/database/src/__tests__/fields/belongs-to-field.test.ts
index 3a29ec68a3..7c3f9882dc 100644
--- a/packages/core/database/src/__tests__/fields/belongs-to-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/belongs-to-field.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database } from '../../database';
-import { mockDatabase } from '../';
+import { Database, createMockDatabase } from '@nocobase/database';
 import { IdentifierError } from '../../errors/identifier-error';
 
 describe('belongs to field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/fields/belongs-to-many-field.test.ts b/packages/core/database/src/__tests__/fields/belongs-to-many-field.test.ts
index d21e923b3b..2c57ade86c 100644
--- a/packages/core/database/src/__tests__/fields/belongs-to-many-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/belongs-to-many-field.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 import { IdentifierError } from '../../errors/identifier-error';
 
 describe('belongs to many field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/fields/context-field.test.ts b/packages/core/database/src/__tests__/fields/context-field.test.ts
index 392dc9ec0b..b58f3dae4f 100644
--- a/packages/core/database/src/__tests__/fields/context-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/context-field.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+import { createMockDatabase, Database } from '@nocobase/database';
 import { DataTypes } from 'sequelize';
-import { mockDatabase } from '../';
-import { Database } from '../../';
 
 describe('context field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/fields/date-only.test.ts b/packages/core/database/src/__tests__/fields/date-only.test.ts
index 1b6d9a60f7..d6f93c7ae8 100644
--- a/packages/core/database/src/__tests__/fields/date-only.test.ts
+++ b/packages/core/database/src/__tests__/fields/date-only.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe('date only', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       timezone: '+08:00',
     });
     await db.clean({ drop: true });
diff --git a/packages/core/database/src/__tests__/fields/datetime-no-tz.test.ts b/packages/core/database/src/__tests__/fields/datetime-no-tz.test.ts
index e78ada5678..a6c61b28b8 100644
--- a/packages/core/database/src/__tests__/fields/datetime-no-tz.test.ts
+++ b/packages/core/database/src/__tests__/fields/datetime-no-tz.test.ts
@@ -7,14 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 import { sleep } from '@nocobase/test';
 
 describe('datetime no tz field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       timezone: '+01:00',
     });
     await db.clean({ drop: true });
diff --git a/packages/core/database/src/__tests__/fields/datetime-tz.test.ts b/packages/core/database/src/__tests__/fields/datetime-tz.test.ts
index 789063dae5..cf2fb1cc9b 100644
--- a/packages/core/database/src/__tests__/fields/datetime-tz.test.ts
+++ b/packages/core/database/src/__tests__/fields/datetime-tz.test.ts
@@ -7,15 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../';
-import { Database } from '../../database';
-import { Repository } from '../../repository';
+import { Database, Repository, createMockDatabase } from '@nocobase/database';
 
 describe('timezone', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       timezone: '+08:00',
     });
     await db.clean({ drop: true });
@@ -119,7 +117,7 @@ describe('date-field', () => {
   let repository: Repository;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     db.collection({
       name: 'tests',
diff --git a/packages/core/database/src/__tests__/fields/encryption-field.test.ts b/packages/core/database/src/__tests__/fields/encryption-field.test.ts
index e368ceb04d..606580f182 100644
--- a/packages/core/database/src/__tests__/fields/encryption-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/encryption-field.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { EncryptionField } from '../../fields/encryption-field';
-import { mockDatabase, MockDatabase } from '../../mock-database';
+import { createMockDatabase, EncryptionField, MockDatabase } from '@nocobase/database';
 
 describe('encryption field', () => {
   let db: MockDatabase;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     db.registerFieldTypes({
       encryption: EncryptionField,
diff --git a/packages/core/database/src/__tests__/fields/has-many-field.test.ts b/packages/core/database/src/__tests__/fields/has-many-field.test.ts
index 51b3d25ba2..6efbbe8a6b 100644
--- a/packages/core/database/src/__tests__/fields/has-many-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/has-many-field.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database } from '../../database';
-import { mockDatabase } from '../';
+import { Database, createMockDatabase } from '@nocobase/database';
 import { IdentifierError } from '../../errors/identifier-error';
 
 describe('has many field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/fields/has-one-field.test.ts b/packages/core/database/src/__tests__/fields/has-one-field.test.ts
index 94b92dd246..8a6f66a919 100644
--- a/packages/core/database/src/__tests__/fields/has-one-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/has-one-field.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database } from '../../database';
-import { mockDatabase } from '../';
+import { Database, createMockDatabase } from '@nocobase/database';
 import { IdentifierError } from '../../errors/identifier-error';
 
 describe('has many field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/fields/nanoid-field.test.ts b/packages/core/database/src/__tests__/fields/nanoid-field.test.ts
index ee1f1b9859..9c658c9461 100644
--- a/packages/core/database/src/__tests__/fields/nanoid-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/nanoid-field.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('nanoid field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/fields/password-field.test.ts b/packages/core/database/src/__tests__/fields/password-field.test.ts
index 9b25339793..175e5620fa 100644
--- a/packages/core/database/src/__tests__/fields/password-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/password-field.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../';
-import { Database, PasswordField } from '../../';
+import { createMockDatabase, Database, PasswordField } from '@nocobase/database';
 
 describe('password field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/fields/set.test.ts b/packages/core/database/src/__tests__/fields/set.test.ts
index 2ef56022ce..d71c0a1272 100644
--- a/packages/core/database/src/__tests__/fields/set.test.ts
+++ b/packages/core/database/src/__tests__/fields/set.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('set field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/fields/string-field.test.ts b/packages/core/database/src/__tests__/fields/string-field.test.ts
index 0d5acc25d9..ff095bc862 100644
--- a/packages/core/database/src/__tests__/fields/string-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/string-field.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database } from '../../database';
-import { mockDatabase } from '../';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('string field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
@@ -106,4 +105,18 @@ describe('string field', () => {
       name2: 'n2111',
     });
   });
+
+  it('trim', async () => {
+    const collection = db.collection({
+      name: 'tests',
+      fields: [{ type: 'string', name: 'name', trim: true }],
+    });
+    await db.sync();
+    const model = await collection.model.create({
+      name: '  n1\n ',
+    });
+    expect(model.toJSON()).toMatchObject({
+      name: 'n1',
+    });
+  });
 });
diff --git a/packages/core/database/src/__tests__/fields/text-field.test.ts b/packages/core/database/src/__tests__/fields/text-field.test.ts
index 1708a1bfc1..762269cb7f 100644
--- a/packages/core/database/src/__tests__/fields/text-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/text-field.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('text field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
@@ -53,4 +52,18 @@ describe('text field', () => {
     });
     await Test.sync();
   });
+
+  it('trim', async () => {
+    const collection = db.collection({
+      name: 'tests',
+      fields: [{ type: 'text', name: 'name', trim: true }],
+    });
+    await db.sync();
+    const model = await collection.model.create({
+      name: '  n1\n ',
+    });
+    expect(model.toJSON()).toMatchObject({
+      name: 'n1',
+    });
+  });
 });
diff --git a/packages/core/database/src/__tests__/fields/unix-timestamp-field.test.ts b/packages/core/database/src/__tests__/fields/unix-timestamp-field.test.ts
index 65b9068728..9b7bcab424 100644
--- a/packages/core/database/src/__tests__/fields/unix-timestamp-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/unix-timestamp-field.test.ts
@@ -7,14 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { Database, createMockDatabase } from '@nocobase/database';
 import moment from 'moment';
 
 describe('unix timestamp field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/fields/uuid-field.test.ts b/packages/core/database/src/__tests__/fields/uuid-field.test.ts
index aa7f2b278f..c1f66aad81 100644
--- a/packages/core/database/src/__tests__/fields/uuid-field.test.ts
+++ b/packages/core/database/src/__tests__/fields/uuid-field.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('uuid field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/filter-match.test.ts b/packages/core/database/src/__tests__/filter-match.test.ts
index f2f4b58362..dae3a85697 100644
--- a/packages/core/database/src/__tests__/filter-match.test.ts
+++ b/packages/core/database/src/__tests__/filter-match.test.ts
@@ -7,15 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database } from '..';
-import { filterMatch } from '../filter-match';
-import { mockDatabase } from './index';
+import { createMockDatabase, Database, filterMatch } from '@nocobase/database';
 
 describe('filterMatch', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/filter-parser.test.ts b/packages/core/database/src/__tests__/filter-parser.test.ts
index 3600e42610..eb111d0f07 100644
--- a/packages/core/database/src/__tests__/filter-parser.test.ts
+++ b/packages/core/database/src/__tests__/filter-parser.test.ts
@@ -7,16 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+import { Database, FilterParser, createMockDatabase } from '@nocobase/database';
 import { Op } from 'sequelize';
-import { Database } from '../database';
-import FilterParser from '../filter-parser';
-import { mockDatabase } from './index';
 
 describe('filter by related', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     db.collection({
       name: 'users',
diff --git a/packages/core/database/src/__tests__/filter-target-key/multi-filter-target-key.test.ts b/packages/core/database/src/__tests__/filter-target-key/multi-filter-target-key.test.ts
index aead5d20f5..ca526e802f 100644
--- a/packages/core/database/src/__tests__/filter-target-key/multi-filter-target-key.test.ts
+++ b/packages/core/database/src/__tests__/filter-target-key/multi-filter-target-key.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database, { mockDatabase } from '../../index';
+import Database, { createMockDatabase } from '@nocobase/database';
 
 describe('multi filter target key', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/filter-target-key/single-filter-target-key.test.ts b/packages/core/database/src/__tests__/filter-target-key/single-filter-target-key.test.ts
index e03e5f88c0..daf4b7d502 100644
--- a/packages/core/database/src/__tests__/filter-target-key/single-filter-target-key.test.ts
+++ b/packages/core/database/src/__tests__/filter-target-key/single-filter-target-key.test.ts
@@ -1,10 +1,19 @@
-import Database, { mockDatabase } from '@nocobase/database';
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import Database, { createMockDatabase } from '@nocobase/database';
 
 describe('single filter target key', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/filter.test.ts b/packages/core/database/src/__tests__/filter.test.ts
index cc81a33d20..aa91199c2e 100644
--- a/packages/core/database/src/__tests__/filter.test.ts
+++ b/packages/core/database/src/__tests__/filter.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database from '../database';
-import { mockDatabase } from '../mock-database';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('filter', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
 
     await db.clean({ drop: true });
   });
diff --git a/packages/core/database/src/__tests__/group.test.ts b/packages/core/database/src/__tests__/group.test.ts
index 0ef30e22ca..411000bd0d 100644
--- a/packages/core/database/src/__tests__/group.test.ts
+++ b/packages/core/database/src/__tests__/group.test.ts
@@ -7,14 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 import sequelize from 'sequelize';
 
 describe('migrator', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       tablePrefix: 'test_',
     });
 
diff --git a/packages/core/database/src/__tests__/hooks/afterCreateWithAssociations.test.ts b/packages/core/database/src/__tests__/hooks/afterCreateWithAssociations.test.ts
index d5fa6f0c44..eaa700055a 100644
--- a/packages/core/database/src/__tests__/hooks/afterCreateWithAssociations.test.ts
+++ b/packages/core/database/src/__tests__/hooks/afterCreateWithAssociations.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('afterCreateWithAssociations', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/hooks/hook.test.ts b/packages/core/database/src/__tests__/hooks/hook.test.ts
index e43f77a9ff..47296d76b3 100644
--- a/packages/core/database/src/__tests__/hooks/hook.test.ts
+++ b/packages/core/database/src/__tests__/hooks/hook.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database } from '../../database';
-import { mockDatabase } from '../';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('hook', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/inhertits/collection-inherits-sync.test.ts b/packages/core/database/src/__tests__/inhertits/collection-inherits-sync.test.ts
index 85f40d3889..dea0b10391 100644
--- a/packages/core/database/src/__tests__/inhertits/collection-inherits-sync.test.ts
+++ b/packages/core/database/src/__tests__/inhertits/collection-inherits-sync.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database from '../../database';
-import { mockDatabase } from '../index';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe.runIf(process.env['DB_DIALECT'] === 'postgres')('sync inherits', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/inhertits/collection-inherits.test.ts b/packages/core/database/src/__tests__/inhertits/collection-inherits.test.ts
index 2a98ef844f..de6e88010e 100644
--- a/packages/core/database/src/__tests__/inhertits/collection-inherits.test.ts
+++ b/packages/core/database/src/__tests__/inhertits/collection-inherits.test.ts
@@ -7,17 +7,15 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { BelongsToManyRepository } from '@nocobase/database';
-import Database from '../../database';
-import { InheritedCollection } from '../../inherited-collection';
-import { mockDatabase } from '../index';
+import { BelongsToManyRepository, createMockDatabase, Database } from '@nocobase/database';
 import { isPg } from '@nocobase/test';
+import { InheritedCollection } from '../../inherited-collection';
 
 describe.runIf(isPg())('collection inherits', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/interfaces/datetime-interface.test.ts b/packages/core/database/src/__tests__/interfaces/datetime-interface.test.ts
index adcb237d4b..9b91fe4c84 100644
--- a/packages/core/database/src/__tests__/interfaces/datetime-interface.test.ts
+++ b/packages/core/database/src/__tests__/interfaces/datetime-interface.test.ts
@@ -7,18 +7,16 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '..';
-import { Database } from '../../database';
-import { Collection } from '../../collection';
-import { DatetimeInterface } from '../../interfaces/datetime-interface';
+import { Collection, Database, createMockDatabase } from '@nocobase/database';
 import dayjs from 'dayjs';
+import { DatetimeInterface } from '../../interfaces/datetime-interface';
 
 describe('Date time interface', () => {
   let db: Database;
   let testCollection: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     testCollection = db.collection({
       name: 'tests',
diff --git a/packages/core/database/src/__tests__/interfaces/interface-manager.test.ts b/packages/core/database/src/__tests__/interfaces/interface-manager.test.ts
index efdbd192df..39e4eb0075 100644
--- a/packages/core/database/src/__tests__/interfaces/interface-manager.test.ts
+++ b/packages/core/database/src/__tests__/interfaces/interface-manager.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '..';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 import { BaseInterface } from '../../interfaces/base-interface';
 
 describe('interface manager', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/interfaces/multiple-select-interface.test.ts b/packages/core/database/src/__tests__/interfaces/multiple-select-interface.test.ts
index 4dde27ef52..a739a79552 100644
--- a/packages/core/database/src/__tests__/interfaces/multiple-select-interface.test.ts
+++ b/packages/core/database/src/__tests__/interfaces/multiple-select-interface.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '..';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 import { MultipleSelectInterface } from '../../interfaces/multiple-select-interface';
 
 describe('MultipleSelectInterface', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/interfaces/number-interface.test.ts b/packages/core/database/src/__tests__/interfaces/number-interface.test.ts
index 340652952c..f86bbd7b61 100644
--- a/packages/core/database/src/__tests__/interfaces/number-interface.test.ts
+++ b/packages/core/database/src/__tests__/interfaces/number-interface.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '..';
-import { Database } from '../../database';
+import { createMockDatabase, Database } from '@nocobase/database';
 import { NumberInterface } from '../../interfaces/number-interface';
 
 describe('number interface', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/interfaces/percent-interface.test.ts b/packages/core/database/src/__tests__/interfaces/percent-interface.test.ts
index fcf057f00e..fcb4d61b0b 100644
--- a/packages/core/database/src/__tests__/interfaces/percent-interface.test.ts
+++ b/packages/core/database/src/__tests__/interfaces/percent-interface.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '..';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 import { PercentInterface } from '../../interfaces/percent-interface';
 
 describe('percent interface', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/interfaces/select-interface.test.ts b/packages/core/database/src/__tests__/interfaces/select-interface.test.ts
index afe50abe47..56d130e1a7 100644
--- a/packages/core/database/src/__tests__/interfaces/select-interface.test.ts
+++ b/packages/core/database/src/__tests__/interfaces/select-interface.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '..';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 import { SelectInterface } from '../../interfaces/select-interface';
 
 describe('SelectInterface', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/magic-attribute-model.test.ts b/packages/core/database/src/__tests__/magic-attribute-model.test.ts
index 696c595f0e..c6a7d9a5dc 100644
--- a/packages/core/database/src/__tests__/magic-attribute-model.test.ts
+++ b/packages/core/database/src/__tests__/magic-attribute-model.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '.';
-import { Database, MagicAttributeModel } from '..';
+import { createMockDatabase, Database, MagicAttributeModel } from '@nocobase/database';
 
 describe('magic-attribute-model', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/migrator.test.ts b/packages/core/database/src/__tests__/migrator.test.ts
index 8deb9069b7..938f676169 100644
--- a/packages/core/database/src/__tests__/migrator.test.ts
+++ b/packages/core/database/src/__tests__/migrator.test.ts
@@ -7,9 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { vi } from 'vitest';
-import { Database, Migration, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database, Migration } from '@nocobase/database';
 import { resolve } from 'path';
+import { vi } from 'vitest';
 
 const names = (migrations: Array<{ name: string }>) => migrations.map((m) => m.name);
 
@@ -17,7 +17,7 @@ describe('migrator', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       tablePrefix: 'test_',
     });
 
diff --git a/packages/core/database/src/__tests__/model-hook.test.ts b/packages/core/database/src/__tests__/model-hook.test.ts
index 4706064f69..203e74def6 100644
--- a/packages/core/database/src/__tests__/model-hook.test.ts
+++ b/packages/core/database/src/__tests__/model-hook.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database } from '..';
-import { mockDatabase } from '.';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe('model hook', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/model.changedWithAssociations.test.ts b/packages/core/database/src/__tests__/model.changedWithAssociations.test.ts
index fc2fb1ce97..97f7932e3a 100644
--- a/packages/core/database/src/__tests__/model.changedWithAssociations.test.ts
+++ b/packages/core/database/src/__tests__/model.changedWithAssociations.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database from '../database';
-import { mockDatabase } from '../mock-database';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('changedWithAssociations', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/model.test.ts b/packages/core/database/src/__tests__/model.test.ts
index 9cd4531ec8..b141d80ddb 100644
--- a/packages/core/database/src/__tests__/model.test.ts
+++ b/packages/core/database/src/__tests__/model.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe('model', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/non-id-primary-key.test.ts b/packages/core/database/src/__tests__/non-id-primary-key.test.ts
index db25afc777..76b62834c8 100644
--- a/packages/core/database/src/__tests__/non-id-primary-key.test.ts
+++ b/packages/core/database/src/__tests__/non-id-primary-key.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database, mockDatabase } from '@nocobase/database';
 
 describe('non-id primary key', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
 
     await db.clean({ drop: true });
   });
diff --git a/packages/core/database/src/__tests__/operator/array-operator.test.ts b/packages/core/database/src/__tests__/operator/array-operator.test.ts
index 08f988be93..455673124c 100644
--- a/packages/core/database/src/__tests__/operator/array-operator.test.ts
+++ b/packages/core/database/src/__tests__/operator/array-operator.test.ts
@@ -7,8 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database from '../../database';
-import { mockDatabase } from '../index';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe('array field operator', function () {
   let db: Database;
@@ -22,7 +21,7 @@ describe('array field operator', function () {
   });
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
     await db.clean({ drop: true });
 
     Test = db.collection({
diff --git a/packages/core/database/src/__tests__/operator/association-operator.test.ts b/packages/core/database/src/__tests__/operator/association-operator.test.ts
index 4b44b597e8..e1c41e69e7 100644
--- a/packages/core/database/src/__tests__/operator/association-operator.test.ts
+++ b/packages/core/database/src/__tests__/operator/association-operator.test.ts
@@ -7,10 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database from '../../database';
-import { Collection } from '../../collection';
-
-import { mockDatabase } from '../index';
+import { Collection, Database, createMockDatabase } from '@nocobase/database';
 
 describe('association operator', () => {
   let db: Database;
@@ -27,7 +24,7 @@ describe('association operator', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     Group = db.collection({
       name: 'groups',
diff --git a/packages/core/database/src/__tests__/operator/boolean-operator.test.ts b/packages/core/database/src/__tests__/operator/boolean-operator.test.ts
index 07352eb80b..72f25f8f9f 100644
--- a/packages/core/database/src/__tests__/operator/boolean-operator.test.ts
+++ b/packages/core/database/src/__tests__/operator/boolean-operator.test.ts
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database, { Collection, mockDatabase } from '@nocobase/database';
+import Database, { Collection, createMockDatabase } from '@nocobase/database';
 
 describe('boolean operator', () => {
   let db: Database;
@@ -19,7 +19,7 @@ describe('boolean operator', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
 
     await db.clean({ drop: true });
 
diff --git a/packages/core/database/src/__tests__/operator/date/date-only.test.ts b/packages/core/database/src/__tests__/operator/date/date-only.test.ts
index aa1690b148..8e127f374f 100644
--- a/packages/core/database/src/__tests__/operator/date/date-only.test.ts
+++ b/packages/core/database/src/__tests__/operator/date/date-only.test.ts
@@ -1,4 +1,13 @@
-import Database, { mockDatabase, Repository } from '../../../index';
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { createMockDatabase, Database, Repository } from '@nocobase/database';
 
 describe('dateOnly operator', () => {
   let db: Database;
@@ -10,7 +19,7 @@ describe('dateOnly operator', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       timezone: '+08:00',
     });
 
diff --git a/packages/core/database/src/__tests__/operator/date/datetime-no-tz.test.ts b/packages/core/database/src/__tests__/operator/date/datetime-no-tz.test.ts
index 24a1d6005c..6f6d833751 100644
--- a/packages/core/database/src/__tests__/operator/date/datetime-no-tz.test.ts
+++ b/packages/core/database/src/__tests__/operator/date/datetime-no-tz.test.ts
@@ -1,4 +1,13 @@
-import Database, { mockDatabase, Repository } from '../../../index';
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { createMockDatabase, Database, Repository } from '@nocobase/database';
 
 describe('datetimeNoTz date operator test', () => {
   let db: Database;
@@ -10,7 +19,7 @@ describe('datetimeNoTz date operator test', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       timezone: '+00:00',
     });
 
diff --git a/packages/core/database/src/__tests__/operator/date/datetime-tz.test.ts b/packages/core/database/src/__tests__/operator/date/datetime-tz.test.ts
index b722f2437e..d819dde14f 100644
--- a/packages/core/database/src/__tests__/operator/date/datetime-tz.test.ts
+++ b/packages/core/database/src/__tests__/operator/date/datetime-tz.test.ts
@@ -7,9 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database from '../../../database';
-import { Repository } from '../../../repository';
-import { mockDatabase } from '../../index';
+import { Database, Repository, createMockDatabase } from '@nocobase/database';
 
 describe('date operator test', () => {
   let db: Database;
@@ -21,7 +19,7 @@ describe('date operator test', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       timezone: '+00:00',
     });
     await db.clean({ drop: true });
diff --git a/packages/core/database/src/__tests__/operator/date/unix-timestamp.test.ts b/packages/core/database/src/__tests__/operator/date/unix-timestamp.test.ts
index 16bcde85ea..4906fbf791 100644
--- a/packages/core/database/src/__tests__/operator/date/unix-timestamp.test.ts
+++ b/packages/core/database/src/__tests__/operator/date/unix-timestamp.test.ts
@@ -1,4 +1,13 @@
-import Database, { mockDatabase, Repository } from '../../../index';
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { createMockDatabase, Database, Repository } from '@nocobase/database';
 
 describe('unix timestamp date operator test', () => {
   let db: Database;
@@ -10,7 +19,7 @@ describe('unix timestamp date operator test', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       timezone: '+00:00',
     });
 
diff --git a/packages/core/database/src/__tests__/operator/empty-operator.test.ts b/packages/core/database/src/__tests__/operator/empty-operator.test.ts
index 101f885e42..8134b0d05b 100644
--- a/packages/core/database/src/__tests__/operator/empty-operator.test.ts
+++ b/packages/core/database/src/__tests__/operator/empty-operator.test.ts
@@ -7,10 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database from '../../database';
-import { Collection } from '../../collection';
-
-import { mockDatabase } from '../index';
+import { Collection, createMockDatabase, Database } from '@nocobase/database';
 
 describe('empty operator', () => {
   let db: Database;
@@ -22,7 +19,7 @@ describe('empty operator', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
     User = db.collection({
       name: 'users',
       fields: [
diff --git a/packages/core/database/src/__tests__/operator/eq.test.ts b/packages/core/database/src/__tests__/operator/eq.test.ts
index d4435ec82c..a265ebfc59 100644
--- a/packages/core/database/src/__tests__/operator/eq.test.ts
+++ b/packages/core/database/src/__tests__/operator/eq.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database from '../../database';
-import { mockDatabase } from '../index';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe('eq operator', () => {
   let db: Database;
   let Test;
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
     await db.clean({ drop: true });
 
     Test = db.collection({
diff --git a/packages/core/database/src/__tests__/operator/ne.test.ts b/packages/core/database/src/__tests__/operator/ne.test.ts
index 0b9114d519..9ad276ed35 100644
--- a/packages/core/database/src/__tests__/operator/ne.test.ts
+++ b/packages/core/database/src/__tests__/operator/ne.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database from '../../database';
-import { mockDatabase } from '../index';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('ne operator', () => {
   let db: Database;
   let Test;
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
 
     await db.clean({ drop: true });
     Test = db.collection({
diff --git a/packages/core/database/src/__tests__/operator/notIn.test.ts b/packages/core/database/src/__tests__/operator/notIn.test.ts
index 65ba6f28fc..758b964d9b 100644
--- a/packages/core/database/src/__tests__/operator/notIn.test.ts
+++ b/packages/core/database/src/__tests__/operator/notIn.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../index';
-import Database from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('ne operator', () => {
   let db: Database;
   let Test;
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
     await db.clean({ drop: true });
 
     Test = db.collection({
diff --git a/packages/core/database/src/__tests__/operator/string-operator.test.ts b/packages/core/database/src/__tests__/operator/string-operator.test.ts
index 69d57bbea3..f9eef50523 100644
--- a/packages/core/database/src/__tests__/operator/string-operator.test.ts
+++ b/packages/core/database/src/__tests__/operator/string-operator.test.ts
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database, { Collection, mockDatabase } from '@nocobase/database';
+import Database, { Collection, createMockDatabase } from '@nocobase/database';
 
 describe('string operator', () => {
   let db: Database;
@@ -19,7 +19,7 @@ describe('string operator', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
 
     await db.clean({ drop: true });
 
diff --git a/packages/core/database/src/__tests__/option-parser.test.ts b/packages/core/database/src/__tests__/option-parser.test.ts
index 165415580a..0f233de8b2 100644
--- a/packages/core/database/src/__tests__/option-parser.test.ts
+++ b/packages/core/database/src/__tests__/option-parser.test.ts
@@ -7,10 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Collection } from '../collection';
-import { Database } from '../database';
+import { Collection, createMockDatabase, Database } from '@nocobase/database';
 import { OptionsParser } from '../options-parser';
-import { mockDatabase } from './index';
 
 describe('option parser', () => {
   let db: Database;
@@ -20,7 +18,7 @@ describe('option parser', () => {
   let Tag: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     User = db.collection<{ id: number; name: string }, { name: string }>({
       name: 'users',
diff --git a/packages/core/database/src/__tests__/postgres/schema.test.ts b/packages/core/database/src/__tests__/postgres/schema.test.ts
index a2838ae35d..08e550f302 100644
--- a/packages/core/database/src/__tests__/postgres/schema.test.ts
+++ b/packages/core/database/src/__tests__/postgres/schema.test.ts
@@ -7,8 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../index';
-import { Database } from '../../database';
+import { Database, createMockDatabase } from '@nocobase/database';
 import { randomStr } from '@nocobase/test';
 
 describe('auth', () => {
@@ -22,7 +21,7 @@ describe('auth', () => {
   it('should auto create schema on prepare when schema missing', async () => {
     const schemaName = randomStr();
 
-    db = mockDatabase({
+    db = await createMockDatabase({
       schema: schemaName,
     });
 
@@ -45,7 +44,7 @@ describe('postgres schema', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       schema: 'test_schema',
     });
 
diff --git a/packages/core/database/src/__tests__/query-interface/query-interface.test.ts b/packages/core/database/src/__tests__/query-interface/query-interface.test.ts
index 887cf447a9..4aea44e856 100644
--- a/packages/core/database/src/__tests__/query-interface/query-interface.test.ts
+++ b/packages/core/database/src/__tests__/query-interface/query-interface.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe.runIf(process.env.DB_DIALECT === 'mysql')('mysql', async () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       logging: console.log,
     });
 
@@ -50,7 +50,7 @@ describe('query interface', async () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       logging: console.log,
     });
 
diff --git a/packages/core/database/src/__tests__/relation-repository/appends.test.ts b/packages/core/database/src/__tests__/relation-repository/appends.test.ts
index 48a0858125..2ffbde33e8 100644
--- a/packages/core/database/src/__tests__/relation-repository/appends.test.ts
+++ b/packages/core/database/src/__tests__/relation-repository/appends.test.ts
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database, { BelongsToRepository, Collection, mockDatabase } from '@nocobase/database';
+import { BelongsToRepository, Collection, createMockDatabase, Database } from '@nocobase/database';
 
 describe('appends', () => {
   let db: Database;
@@ -23,7 +23,7 @@ describe('appends', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
 
     User = db.collection({
diff --git a/packages/core/database/src/__tests__/relation-repository/belongs-to-many-repository.test.ts b/packages/core/database/src/__tests__/relation-repository/belongs-to-many-repository.test.ts
index 0e568824f0..6ef9c240c6 100644
--- a/packages/core/database/src/__tests__/relation-repository/belongs-to-many-repository.test.ts
+++ b/packages/core/database/src/__tests__/relation-repository/belongs-to-many-repository.test.ts
@@ -7,10 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Collection } from '@nocobase/database';
-import Database from '../../database';
-import { BelongsToManyRepository } from '../../relation-repository/belongs-to-many-repository';
-import { mockDatabase } from '../index';
+import { BelongsToManyRepository, Collection, createMockDatabase, Database } from '@nocobase/database';
 import { pgOnly } from '@nocobase/test';
 
 pgOnly()('belongs to many with targetCollection', () => {
@@ -23,7 +20,7 @@ pgOnly()('belongs to many with targetCollection', () => {
   let OrgUser: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
 
     await db.clean({ drop: true });
 
@@ -98,7 +95,7 @@ pgOnly()('belongs to many with targetCollection', () => {
 describe('belongs to many with collection that has no id key', () => {
   let db: Database;
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
 
     await db.clean({ drop: true });
   });
@@ -184,7 +181,7 @@ describe('belongs to many with target key', function () {
   let Color: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
 
     await db.clean({ drop: true });
     Post = db.collection({
@@ -320,7 +317,7 @@ describe('belongs to many', () => {
   let Color;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     PostTag = db.collection({
       name: 'posts_tags',
diff --git a/packages/core/database/src/__tests__/relation-repository/belongs-to-repository.test.ts b/packages/core/database/src/__tests__/relation-repository/belongs-to-repository.test.ts
index 332967733a..539e48fb7f 100644
--- a/packages/core/database/src/__tests__/relation-repository/belongs-to-repository.test.ts
+++ b/packages/core/database/src/__tests__/relation-repository/belongs-to-repository.test.ts
@@ -1,7 +1,13 @@
-import { Collection } from '@nocobase/database';
-import Database from '../../database';
-import { BelongsToRepository } from '../../relation-repository/belongs-to-repository';
-import { mockDatabase } from '../index';
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { BelongsToRepository, Collection, createMockDatabase, Database } from '@nocobase/database';
 
 describe('belongs to repository', () => {
   let db: Database;
@@ -9,7 +15,7 @@ describe('belongs to repository', () => {
   let Post: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
 
     User = db.collection({
diff --git a/packages/core/database/src/__tests__/relation-repository/has-many-repository.test.ts b/packages/core/database/src/__tests__/relation-repository/has-many-repository.test.ts
index c7b5cff062..2cd0dd6bb7 100644
--- a/packages/core/database/src/__tests__/relation-repository/has-many-repository.test.ts
+++ b/packages/core/database/src/__tests__/relation-repository/has-many-repository.test.ts
@@ -7,10 +7,12 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../index';
-import { HasManyRepository } from '../../relation-repository/hasmany-repository';
-import { BelongsToManyRepository } from '../../relation-repository/belongs-to-many-repository';
-import Database, { Collection } from '@nocobase/database';
+import Database, {
+  BelongsToManyRepository,
+  Collection,
+  createMockDatabase,
+  HasManyRepository,
+} from '@nocobase/database';
 
 describe('has many with target key', function () {
   let db: Database;
@@ -19,7 +21,7 @@ describe('has many with target key', function () {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
@@ -142,7 +144,7 @@ describe('has many repository', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     User = db.collection({
       name: 'users',
@@ -157,6 +159,7 @@ describe('has many repository', () => {
       name: 'posts',
       fields: [
         { type: 'string', name: 'title' },
+        { type: 'belongsTo', name: 'user' },
         { type: 'belongsToMany', name: 'tags', through: 'posts_tags' },
         { type: 'hasMany', name: 'comments' },
         { type: 'string', name: 'status' },
@@ -478,6 +481,51 @@ describe('has many repository', () => {
     ).not.toBeNull();
   });
 
+  test('destroy by pk and filter with association', async () => {
+    const u1 = await User.repository.create({
+      values: { name: 'u1' },
+    });
+
+    const UserPostRepository = new HasManyRepository(User, 'posts', u1.id);
+
+    const p1 = await UserPostRepository.create({
+      values: {
+        title: 't1',
+        status: 'published',
+        user: u1,
+      },
+    });
+
+    const p2 = await UserPostRepository.create({
+      values: {
+        title: 't2',
+        status: 'draft',
+        user: u1,
+      },
+    });
+
+    await UserPostRepository.destroy({
+      filterByTk: p1.id,
+      filter: {
+        user: {
+          id: u1.id,
+        },
+      },
+    });
+
+    expect(
+      await UserPostRepository.findOne({
+        filterByTk: p1.id,
+      }),
+    ).toBeNull();
+
+    expect(
+      await UserPostRepository.findOne({
+        filterByTk: p2.id,
+      }),
+    ).not.toBeNull();
+  });
+
   test('destroy by pk', async () => {
     const u1 = await User.repository.create({
       values: { name: 'u1' },
diff --git a/packages/core/database/src/__tests__/relation-repository/has-one-repository.test.ts b/packages/core/database/src/__tests__/relation-repository/has-one-repository.test.ts
index 0b913f696f..c4258746b2 100644
--- a/packages/core/database/src/__tests__/relation-repository/has-one-repository.test.ts
+++ b/packages/core/database/src/__tests__/relation-repository/has-one-repository.test.ts
@@ -1,7 +1,13 @@
-import { Collection } from '@nocobase/database';
-import Database from '../../database';
-import { HasOneRepository } from '../../relation-repository/hasone-repository';
-import { mockDatabase } from '../index';
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Collection, createMockDatabase, Database, HasOneRepository } from '@nocobase/database';
 
 describe('has one repository', () => {
   let db: Database;
@@ -9,7 +15,7 @@ describe('has one repository', () => {
   let Profile: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
 
     User = db.collection({
diff --git a/packages/core/database/src/__tests__/relation-repository/hasone-repository.test.ts b/packages/core/database/src/__tests__/relation-repository/hasone-repository.test.ts
index 389bb22ad7..ddd15f8d5a 100644
--- a/packages/core/database/src/__tests__/relation-repository/hasone-repository.test.ts
+++ b/packages/core/database/src/__tests__/relation-repository/hasone-repository.test.ts
@@ -7,10 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Collection } from '../../collection';
-import Database from '../../database';
-import { HasOneRepository } from '../../relation-repository/hasone-repository';
-import { mockDatabase } from '../index';
+import { Collection, Database, HasOneRepository, createMockDatabase } from '@nocobase/database';
 
 describe('has one repository', () => {
   let db: Database;
@@ -26,7 +23,7 @@ describe('has one repository', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     User = db.collection({
       name: 'users',
       fields: [
diff --git a/packages/core/database/src/__tests__/relation-repository/multi-filter-target-key.test.ts b/packages/core/database/src/__tests__/relation-repository/multi-filter-target-key.test.ts
index 0b6790c452..4cd46d1b0b 100644
--- a/packages/core/database/src/__tests__/relation-repository/multi-filter-target-key.test.ts
+++ b/packages/core/database/src/__tests__/relation-repository/multi-filter-target-key.test.ts
@@ -7,12 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database, { HasManyRepository, mockDatabase } from '../../index';
+import { Database, HasManyRepository, createMockDatabase } from '@nocobase/database';
+
 describe('multi target key in association repository', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/relation-repository/relation-repository.test.ts b/packages/core/database/src/__tests__/relation-repository/relation-repository.test.ts
index 29d0b51a53..92486eaa8c 100644
--- a/packages/core/database/src/__tests__/relation-repository/relation-repository.test.ts
+++ b/packages/core/database/src/__tests__/relation-repository/relation-repository.test.ts
@@ -7,12 +7,12 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { MockDatabase, mockDatabase } from '../../mock-database';
+import { createMockDatabase, MockDatabase } from '@nocobase/database';
 
 describe('relation repository', () => {
   let db: MockDatabase;
-  beforeEach(() => {
-    db = mockDatabase();
+  beforeEach(async () => {
+    db = await createMockDatabase();
   });
 
   afterEach(async () => {
diff --git a/packages/core/database/src/__tests__/repository.test.ts b/packages/core/database/src/__tests__/repository.test.ts
index 4229ea5095..d878829014 100644
--- a/packages/core/database/src/__tests__/repository.test.ts
+++ b/packages/core/database/src/__tests__/repository.test.ts
@@ -7,11 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Repository } from '@nocobase/database';
+import { Collection, createMockDatabase, Database, Repository } from '@nocobase/database';
 import { vi } from 'vitest';
-import { Collection } from '../collection';
-import { Database } from '../database';
-import { mockDatabase } from './';
 
 describe('repository', () => {
   test('value to filter', async () => {
@@ -39,7 +36,7 @@ describe('find by targetKey', function () {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
@@ -91,7 +88,7 @@ describe('repository.find', () => {
   let Tag: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     User = db.collection({
       name: 'users',
@@ -284,7 +281,7 @@ describe('repository create with belongs to many', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       tablePrefix: '',
     });
     await db.clean({ drop: true });
@@ -363,7 +360,7 @@ describe('repository.create', () => {
   let Comment: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     User = db.collection({
       name: 'users',
@@ -434,7 +431,7 @@ describe('repository.update', () => {
   let Comment: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
 
     User = db.collection({
@@ -687,7 +684,7 @@ describe('repository.destroy', () => {
   let Comment: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     User = db.collection({
       name: 'users',
@@ -755,7 +752,7 @@ describe('repository.relatedQuery', () => {
   let Comment: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     User = db.collection({
       name: 'users',
diff --git a/packages/core/database/src/__tests__/repository/aggregation.test.ts b/packages/core/database/src/__tests__/repository/aggregation.test.ts
index bea0273b92..774c5e135c 100644
--- a/packages/core/database/src/__tests__/repository/aggregation.test.ts
+++ b/packages/core/database/src/__tests__/repository/aggregation.test.ts
@@ -7,9 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { BelongsToManyRepository, HasManyRepository, mockDatabase } from '../../index';
-import Database from '../../database';
-import { Collection } from '../../collection';
+import {
+  BelongsToManyRepository,
+  Collection,
+  Database,
+  HasManyRepository,
+  createMockDatabase,
+} from '@nocobase/database';
 
 describe('association aggregation', () => {
   let db: Database;
@@ -23,7 +27,7 @@ describe('association aggregation', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
 
     User = db.collection({
@@ -240,7 +244,7 @@ describe('Aggregation', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
 
     User = db.collection({
diff --git a/packages/core/database/src/__tests__/repository/chunk.test.ts b/packages/core/database/src/__tests__/repository/chunk.test.ts
index e04d358353..9f6bb0b93b 100644
--- a/packages/core/database/src/__tests__/repository/chunk.test.ts
+++ b/packages/core/database/src/__tests__/repository/chunk.test.ts
@@ -7,9 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../index';
-import Database from '../../database';
-import { Collection } from '../../collection';
+import { Collection, createMockDatabase, Database } from '@nocobase/database';
 import { vi } from 'vitest';
 
 describe('repository chunk', () => {
@@ -22,7 +20,7 @@ describe('repository chunk', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
 
     await db.clean({ drop: true });
 
diff --git a/packages/core/database/src/__tests__/repository/count.test.ts b/packages/core/database/src/__tests__/repository/count.test.ts
index ac92ea3bce..6d23f9d91a 100644
--- a/packages/core/database/src/__tests__/repository/count.test.ts
+++ b/packages/core/database/src/__tests__/repository/count.test.ts
@@ -7,9 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../index';
-import { HasManyRepository } from '../../relation-repository/hasmany-repository';
-import { Collection } from '../../collection';
+import { Collection, HasManyRepository, createMockDatabase } from '@nocobase/database';
 
 describe('count', () => {
   let db;
@@ -22,7 +20,7 @@ describe('count', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
 
     User = db.collection({
diff --git a/packages/core/database/src/__tests__/repository/create.test.ts b/packages/core/database/src/__tests__/repository/create.test.ts
index bc63f6bdf9..1dcc3918b6 100644
--- a/packages/core/database/src/__tests__/repository/create.test.ts
+++ b/packages/core/database/src/__tests__/repository/create.test.ts
@@ -7,9 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../index';
-import Database from '../../database';
-import { Collection } from '../../collection';
+import { Collection, createMockDatabase, Database } from '@nocobase/database';
 
 describe('create with hasMany', () => {
   let db: Database;
@@ -21,7 +19,7 @@ describe('create with hasMany', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
 
     await db.clean({ drop: true });
     User = db.collection({
@@ -79,7 +77,7 @@ describe('create with belongsToMany', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     Post = db.collection({
       name: 'posts',
@@ -139,7 +137,7 @@ describe('create', () => {
   let Role: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
 
     Group = db.collection({
diff --git a/packages/core/database/src/__tests__/repository/destroy.test.ts b/packages/core/database/src/__tests__/repository/destroy.test.ts
index ef4cfca4a0..38e5834345 100644
--- a/packages/core/database/src/__tests__/repository/destroy.test.ts
+++ b/packages/core/database/src/__tests__/repository/destroy.test.ts
@@ -7,9 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../index';
-import { Collection } from '../../collection';
-import { Database } from '@nocobase/database';
+import { Collection, createMockDatabase, Database } from '@nocobase/database';
 
 describe('destroy with targetKey', function () {
   let db: Database;
@@ -21,7 +19,7 @@ describe('destroy with targetKey', function () {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     User = db.collection({
       name: 'users',
@@ -95,7 +93,7 @@ describe('destroy', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({
       drop: true,
     });
diff --git a/packages/core/database/src/__tests__/repository/find-with-collection-without-pk.test.ts b/packages/core/database/src/__tests__/repository/find-with-collection-without-pk.test.ts
index 36d4a91f51..093377e0ae 100644
--- a/packages/core/database/src/__tests__/repository/find-with-collection-without-pk.test.ts
+++ b/packages/core/database/src/__tests__/repository/find-with-collection-without-pk.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database from '../../database';
-import { mockDatabase } from '../index';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('find collection that without primary key', () => {
   let db: Database;
 
   beforeAll(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       tablePrefix: '',
     });
 
diff --git a/packages/core/database/src/__tests__/repository/find.test.ts b/packages/core/database/src/__tests__/repository/find.test.ts
index 824271b34c..b91c35de33 100644
--- a/packages/core/database/src/__tests__/repository/find.test.ts
+++ b/packages/core/database/src/__tests__/repository/find.test.ts
@@ -7,15 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { mockDatabase } from '../index';
-import Database from '@nocobase/database';
-import { Collection } from '../../collection';
+import { Collection, createMockDatabase, Database } from '@nocobase/database';
 import qs from 'qs';
 
 describe('find with associations', () => {
   let db: Database;
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
 
     await db.clean({ drop: true });
   });
@@ -573,7 +571,7 @@ describe('repository find', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     User = db.collection<{ id: number; name: string }, { name: string }>({
       name: 'users',
diff --git a/packages/core/database/src/__tests__/repository/update-many.test.ts b/packages/core/database/src/__tests__/repository/update-many.test.ts
index 9c24b4b235..60091326fa 100644
--- a/packages/core/database/src/__tests__/repository/update-many.test.ts
+++ b/packages/core/database/src/__tests__/repository/update-many.test.ts
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('update many', () => {
   let db: Database;
@@ -16,7 +16,7 @@ describe('update many', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
 
     db.collection({
diff --git a/packages/core/database/src/__tests__/repository/update.test.ts b/packages/core/database/src/__tests__/repository/update.test.ts
index e9e03c59e6..61e554fbf1 100644
--- a/packages/core/database/src/__tests__/repository/update.test.ts
+++ b/packages/core/database/src/__tests__/repository/update.test.ts
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Collection, Database, mockDatabase } from '@nocobase/database';
+import { Collection, Database, createMockDatabase } from '@nocobase/database';
 
 describe('update', () => {
   let db: Database;
@@ -20,7 +20,7 @@ describe('update', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
 
     await db.clean({ drop: true });
     PostTag = db.collection({
diff --git a/packages/core/database/src/__tests__/sequelize-hooks.test.ts b/packages/core/database/src/__tests__/sequelize-hooks.test.ts
index b6846f520c..1d103caf1a 100644
--- a/packages/core/database/src/__tests__/sequelize-hooks.test.ts
+++ b/packages/core/database/src/__tests__/sequelize-hooks.test.ts
@@ -7,16 +7,15 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+import { Database, createMockDatabase } from '@nocobase/database';
 import { vi } from 'vitest';
-import { Database } from '../database';
-import { mockDatabase } from './index';
 
 // TODO
 describe('sequelize-hooks', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     await db.sync();
   });
diff --git a/packages/core/database/src/__tests__/sort.test.ts b/packages/core/database/src/__tests__/sort.test.ts
index e69f8b79f7..4fec649c63 100644
--- a/packages/core/database/src/__tests__/sort.test.ts
+++ b/packages/core/database/src/__tests__/sort.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database } from '../database';
-import { mockDatabase } from './';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe('sort', function () {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/sync.test.ts b/packages/core/database/src/__tests__/sync.test.ts
index c6991f45eb..b785480ab8 100644
--- a/packages/core/database/src/__tests__/sync.test.ts
+++ b/packages/core/database/src/__tests__/sync.test.ts
@@ -7,14 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+import { createMockDatabase, Database } from '@nocobase/database';
 import { vi } from 'vitest';
-import { Database, mockDatabase } from '@nocobase/database';
 
 describe('sync', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       logging: console.log,
     });
 
diff --git a/packages/core/database/src/__tests__/sync/default-value.test.ts b/packages/core/database/src/__tests__/sync/default-value.test.ts
index ebf880ef73..6485b3771d 100644
--- a/packages/core/database/src/__tests__/sync/default-value.test.ts
+++ b/packages/core/database/src/__tests__/sync/default-value.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '../../index';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('default value', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
 
     await db.clean({ drop: true });
   });
diff --git a/packages/core/database/src/__tests__/sync/delete-field.test.ts b/packages/core/database/src/__tests__/sync/delete-field.test.ts
index e30f507c0e..fb2e523487 100644
--- a/packages/core/database/src/__tests__/sync/delete-field.test.ts
+++ b/packages/core/database/src/__tests__/sync/delete-field.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '../../index';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe.skip('delete field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
 
     await db.clean({ drop: true });
   });
diff --git a/packages/core/database/src/__tests__/sync/empty-table.test.ts b/packages/core/database/src/__tests__/sync/empty-table.test.ts
index 6a31931fa6..5daf459be5 100644
--- a/packages/core/database/src/__tests__/sync/empty-table.test.ts
+++ b/packages/core/database/src/__tests__/sync/empty-table.test.ts
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 import * as process from 'process';
 
 describe('empty table', () => {
@@ -20,7 +20,7 @@ describe('empty table', () => {
   };
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
 
     await db.clean({ drop: true });
   });
diff --git a/packages/core/database/src/__tests__/sync/foreign-key.test.ts b/packages/core/database/src/__tests__/sync/foreign-key.test.ts
index 730a5d58e7..319ebc176f 100644
--- a/packages/core/database/src/__tests__/sync/foreign-key.test.ts
+++ b/packages/core/database/src/__tests__/sync/foreign-key.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { primaryKey } from '@nocobase/client';
-import { Database, mockDatabase } from '@nocobase/database';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('foreign key', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
 
     await db.clean({ drop: true });
   });
diff --git a/packages/core/database/src/__tests__/sync/primary-key.test.ts b/packages/core/database/src/__tests__/sync/primary-key.test.ts
index 2b30c64df6..a8630e5405 100644
--- a/packages/core/database/src/__tests__/sync/primary-key.test.ts
+++ b/packages/core/database/src/__tests__/sync/primary-key.test.ts
@@ -7,14 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '../../index';
+import { createMockDatabase, Database } from '@nocobase/database';
 import * as process from 'process';
 
 describe('primary key', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
 
     await db.clean({ drop: true });
   });
@@ -89,7 +89,7 @@ describe.skipIf(process.env['DB_DIALECT'] === 'sqlite')('primary key not in sqli
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
 
     await db.clean({ drop: true });
   });
diff --git a/packages/core/database/src/__tests__/sync/unique-index.test.ts b/packages/core/database/src/__tests__/sync/unique-index.test.ts
index 1e717aece2..7c852b55fe 100644
--- a/packages/core/database/src/__tests__/sync/unique-index.test.ts
+++ b/packages/core/database/src/__tests__/sync/unique-index.test.ts
@@ -7,14 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '../../index';
+import { Database, createMockDatabase } from '@nocobase/database';
 import { waitSecond } from '@nocobase/test';
 
 describe('unique index', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
 
     await db.clean({ drop: true });
   });
diff --git a/packages/core/database/src/__tests__/target-key.test.ts b/packages/core/database/src/__tests__/target-key.test.ts
index ff040d2deb..6cb5a917ff 100644
--- a/packages/core/database/src/__tests__/target-key.test.ts
+++ b/packages/core/database/src/__tests__/target-key.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database } from '../database';
-import { mockDatabase } from './index';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe('targetKey', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/underscored-options.test.ts b/packages/core/database/src/__tests__/underscored-options.test.ts
index 78f0ef5668..9b3accbe14 100644
--- a/packages/core/database/src/__tests__/underscored-options.test.ts
+++ b/packages/core/database/src/__tests__/underscored-options.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe('underscored options', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       underscored: true,
     });
 
diff --git a/packages/core/database/src/__tests__/unique.test.ts b/packages/core/database/src/__tests__/unique.test.ts
index 19589105b3..5947400e58 100644
--- a/packages/core/database/src/__tests__/unique.test.ts
+++ b/packages/core/database/src/__tests__/unique.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe('unique field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       logging: console.log,
     });
 
diff --git a/packages/core/database/src/__tests__/update-association-values.test.ts b/packages/core/database/src/__tests__/update-association-values.test.ts
index 0948ece271..536629fcd8 100644
--- a/packages/core/database/src/__tests__/update-association-values.test.ts
+++ b/packages/core/database/src/__tests__/update-association-values.test.ts
@@ -7,13 +7,12 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database } from '../database';
-import { mockDatabase } from './';
+import { Database, createMockDatabase } from '@nocobase/database';
 
 describe('update associations', () => {
   let db: Database;
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/update-associations-source-key.test.ts b/packages/core/database/src/__tests__/update-associations-source-key.test.ts
index 8f584fe0b6..af86808fa7 100644
--- a/packages/core/database/src/__tests__/update-associations-source-key.test.ts
+++ b/packages/core/database/src/__tests__/update-associations-source-key.test.ts
@@ -7,9 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Collection } from '../collection';
-import Database from '../database';
-import { mockDatabase } from '../mock-database';
+import { Collection, Database, createMockDatabase } from '@nocobase/database';
 
 describe('update associations', () => {
   let db: Database;
@@ -17,7 +15,7 @@ describe('update associations', () => {
   let Post: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     User = db.collection({
       name: 'users',
@@ -97,7 +95,7 @@ describe('update associations', () => {
   let Post: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     User = db.collection({
       name: 'users',
@@ -174,7 +172,7 @@ describe('update associations', () => {
   let Field: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     Table = db.collection({
       name: 'table',
diff --git a/packages/core/database/src/__tests__/update-associations-through.test.ts b/packages/core/database/src/__tests__/update-associations-through.test.ts
index 0f05e10b16..ba51b4ff4b 100644
--- a/packages/core/database/src/__tests__/update-associations-through.test.ts
+++ b/packages/core/database/src/__tests__/update-associations-through.test.ts
@@ -7,14 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+import { createMockDatabase, Database } from '@nocobase/database';
 import { vi } from 'vitest';
-import { Database } from '../database';
-import { mockDatabase } from './';
 
 describe('update through', () => {
   let db: Database;
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/update-associations.test.ts b/packages/core/database/src/__tests__/update-associations.test.ts
index cd458586b3..a54f4160f8 100644
--- a/packages/core/database/src/__tests__/update-associations.test.ts
+++ b/packages/core/database/src/__tests__/update-associations.test.ts
@@ -7,16 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Collection } from '../collection';
-import { Database } from '../database';
-import { updateAssociations } from '../update-associations';
-import { mockDatabase } from './';
+import { Collection, createMockDatabase, Database, updateAssociations } from '@nocobase/database';
 
 describe('update associations', () => {
   describe('belongsTo', () => {
     let db: Database;
     beforeEach(async () => {
-      db = mockDatabase({});
+      db = await createMockDatabase({});
       await db.clean({
         drop: true,
       });
@@ -304,7 +301,7 @@ describe('update associations', () => {
     let User: Collection;
     let Post: Collection;
     beforeEach(async () => {
-      db = mockDatabase();
+      db = await createMockDatabase();
       await db.clean({ drop: true });
       User = db.collection({
         name: 'users',
@@ -474,7 +471,7 @@ describe('update associations', () => {
     let Comment: Collection;
 
     beforeEach(async () => {
-      db = mockDatabase();
+      db = await createMockDatabase();
       await db.clean({ drop: true });
       User = db.collection({
         name: 'users',
@@ -592,7 +589,7 @@ describe('update associations', () => {
     let PostTag: Collection;
 
     beforeEach(async () => {
-      db = mockDatabase();
+      db = await createMockDatabase();
       await db.clean({ drop: true });
       PostTag = db.collection({
         name: 'posts_tags',
diff --git a/packages/core/database/src/__tests__/update-guard.test.ts b/packages/core/database/src/__tests__/update-guard.test.ts
index 7ed1a8df00..5f31913071 100644
--- a/packages/core/database/src/__tests__/update-guard.test.ts
+++ b/packages/core/database/src/__tests__/update-guard.test.ts
@@ -7,11 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Collection } from '../collection';
-import { mockDatabase } from './index';
-import { UpdateGuard } from '../update-guard';
+import { Collection, createMockDatabase, Database } from '@nocobase/database';
 import lodash from 'lodash';
-import { Database } from '../database';
+import { UpdateGuard } from '../update-guard';
 
 describe('update-guard', () => {
   let db: Database;
@@ -21,7 +19,7 @@ describe('update-guard', () => {
   let Tag: Collection;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
 
     User = db.collection({
@@ -425,7 +423,7 @@ describe('update-guard', () => {
 
 describe('One2One Association', () => {
   test('associationKeysToBeUpdate hasOne & BelongsTo', async () => {
-    const db = mockDatabase();
+    const db = await createMockDatabase();
     await db.clean({ drop: true });
     const Post = db.collection({
       name: 'posts',
diff --git a/packages/core/database/src/__tests__/utils.test.ts b/packages/core/database/src/__tests__/utils.test.ts
index 1fc5c7f4b4..9666f9fa18 100644
--- a/packages/core/database/src/__tests__/utils.test.ts
+++ b/packages/core/database/src/__tests__/utils.test.ts
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import Database, { mockDatabase } from '@nocobase/database';
+import Database, { createMockDatabase } from '@nocobase/database';
 
 describe('database utils', () => {
   let db: Database;
@@ -17,7 +17,7 @@ describe('database utils', () => {
   });
 
   beforeEach(async () => {
-    db = mockDatabase({});
+    db = await createMockDatabase({});
 
     await db.clean({ drop: true });
   });
diff --git a/packages/core/database/src/__tests__/value-parsers/date.test.ts b/packages/core/database/src/__tests__/value-parsers/date.test.ts
index 43e1262620..048e67b6e0 100644
--- a/packages/core/database/src/__tests__/value-parsers/date.test.ts
+++ b/packages/core/database/src/__tests__/value-parsers/date.test.ts
@@ -7,16 +7,15 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+import { Database, DateValueParser, createMockDatabase } from '@nocobase/database';
 import dayjs from 'dayjs';
-import { Database, mockDatabase } from '../..';
-import { DateValueParser } from '../../value-parsers';
 
 describe('number value parser', () => {
   let parser: DateValueParser;
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     db.collection({
       name: 'tests',
diff --git a/packages/core/database/src/__tests__/value-parsers/to-many.test.ts b/packages/core/database/src/__tests__/value-parsers/to-many.test.ts
index f8f4a0c0db..383b8b279b 100644
--- a/packages/core/database/src/__tests__/value-parsers/to-many.test.ts
+++ b/packages/core/database/src/__tests__/value-parsers/to-many.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '../..';
-import { ToManyValueParser } from '../../value-parsers';
+import { Database, ToManyValueParser, createMockDatabase } from '@nocobase/database';
 
 describe('number value parser', () => {
   let parser: ToManyValueParser;
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     db.collection({
       name: 'posts',
@@ -102,7 +101,7 @@ describe('china region', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     db.collection({
       name: 'users',
diff --git a/packages/core/database/src/__tests__/value-parsers/to-one.test.ts b/packages/core/database/src/__tests__/value-parsers/to-one.test.ts
index 13b98eb871..4990b4b32d 100644
--- a/packages/core/database/src/__tests__/value-parsers/to-one.test.ts
+++ b/packages/core/database/src/__tests__/value-parsers/to-one.test.ts
@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '../..';
-import { ToManyValueParser } from '../../value-parsers';
+import { Database, ToManyValueParser, createMockDatabase } from '@nocobase/database';
 
 describe('number value parser', () => {
   let parser: ToManyValueParser;
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     db.collection({
       name: 'posts',
diff --git a/packages/core/database/src/__tests__/view/list-view.test.ts b/packages/core/database/src/__tests__/view/list-view.test.ts
index bc18e9f7f8..0cc535659b 100644
--- a/packages/core/database/src/__tests__/view/list-view.test.ts
+++ b/packages/core/database/src/__tests__/view/list-view.test.ts
@@ -7,13 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 
 describe('list view', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       tablePrefix: '',
     });
     await db.clean({ drop: true });
diff --git a/packages/core/database/src/__tests__/view/view-collection.test.ts b/packages/core/database/src/__tests__/view/view-collection.test.ts
index f7b0931aaf..b126ba6e7d 100644
--- a/packages/core/database/src/__tests__/view/view-collection.test.ts
+++ b/packages/core/database/src/__tests__/view/view-collection.test.ts
@@ -7,16 +7,15 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { vi } from 'vitest';
+import { Database, ViewCollection, createMockDatabase } from '@nocobase/database';
 import { uid } from '@nocobase/utils';
-import { Database, mockDatabase } from '../../index';
-import { ViewCollection } from '../../view-collection';
+import { vi } from 'vitest';
 
 describe.runIf(process.env['DB_DIALECT'] === 'postgres')('pg only view', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       tablePrefix: '',
     });
 
@@ -272,7 +271,7 @@ describe('create view', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       tablePrefix: '',
     });
 
diff --git a/packages/core/database/src/__tests__/view/view-inference.test.ts b/packages/core/database/src/__tests__/view/view-inference.test.ts
index a78c68d968..f969d21e2d 100644
--- a/packages/core/database/src/__tests__/view/view-inference.test.ts
+++ b/packages/core/database/src/__tests__/view/view-inference.test.ts
@@ -7,14 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 import { ViewFieldInference } from '../../view/view-inference';
 
 describe('view inference', function () {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
   });
 
diff --git a/packages/core/database/src/__tests__/view/view-repository.test.ts b/packages/core/database/src/__tests__/view/view-repository.test.ts
index c3bb8afe15..938dde0952 100644
--- a/packages/core/database/src/__tests__/view/view-repository.test.ts
+++ b/packages/core/database/src/__tests__/view/view-repository.test.ts
@@ -7,14 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 import { uid } from '@nocobase/utils';
 
 describe('view repository', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       tablePrefix: '',
     });
     await db.clean({ drop: true });
diff --git a/packages/core/database/src/__tests__/view/view-with-association.test.ts b/packages/core/database/src/__tests__/view/view-with-association.test.ts
index 6d21695a5c..2f22781910 100644
--- a/packages/core/database/src/__tests__/view/view-with-association.test.ts
+++ b/packages/core/database/src/__tests__/view/view-with-association.test.ts
@@ -7,15 +7,15 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { uid } from '@nocobase/utils';
-import { Database, mockDatabase, ViewFieldInference } from '../../index';
+import { createMockDatabase, Database, ViewFieldInference } from '@nocobase/database';
 import { pgOnly } from '@nocobase/test';
+import { uid } from '@nocobase/utils';
 
 pgOnly()('view with association', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase({
+    db = await createMockDatabase({
       tablePrefix: '',
     });
     await db.clean({ drop: true });
diff --git a/packages/core/database/src/belongs-to-array/belongs-to-array-repository.ts b/packages/core/database/src/belongs-to-array/belongs-to-array-repository.ts
index 375e65829e..254baf3aa0 100644
--- a/packages/core/database/src/belongs-to-array/belongs-to-array-repository.ts
+++ b/packages/core/database/src/belongs-to-array/belongs-to-array-repository.ts
@@ -54,19 +54,18 @@ export class BelongsToArrayAssociation {
     return this.db.getModel(this.targetName);
   }
 
-  generateInclude() {
-    if (this.db.sequelize.getDialect() !== 'postgres') {
-      throw new Error('Filtering by many to many (array) associations is only supported on postgres');
-    }
+  generateInclude(parentAs?: string) {
     const targetCollection = this.db.getCollection(this.targetName);
     const targetField = targetCollection.getField(this.targetKey);
     const sourceCollection = this.db.getCollection(this.source.name);
     const foreignField = sourceCollection.getField(this.foreignKey);
     const queryInterface = this.db.sequelize.getQueryInterface();
-    const left = queryInterface.quoteIdentifiers(`${this.as}.${targetField.columnName()}`);
-    const right = queryInterface.quoteIdentifiers(`${this.source.collection.name}.${foreignField.columnName()}`);
+    const asLeft = parentAs ? `${parentAs}->${this.as}` : this.as;
+    const asRight = parentAs || this.source.collection.name;
+    const left = queryInterface.quoteIdentifiers(`${asLeft}.${targetField.columnName()}`);
+    const right = queryInterface.quoteIdentifiers(`${asRight}.${foreignField.columnName()}`);
     return {
-      on: this.db.sequelize.literal(`${left}=any(${right})`),
+      on: this.db.queryInterface.generateJoinOnForJSONArray(left, right),
     };
   }
 
diff --git a/packages/core/database/src/eager-loading/eager-loading-tree.ts b/packages/core/database/src/eager-loading/eager-loading-tree.ts
index d0d9fb2eeb..c450eb816f 100644
--- a/packages/core/database/src/eager-loading/eager-loading-tree.ts
+++ b/packages/core/database/src/eager-loading/eager-loading-tree.ts
@@ -82,6 +82,31 @@ const queryParentSQL = (options: {
       SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`;
 };
 
+const processIncludes = (includes: any[], model: any, parentAs = '') => {
+  includes.forEach((include: { association: string; include?: any[] }, index: number) => {
+    // Process current level
+    const association = model.associations[include.association];
+    if (association?.generateInclude) {
+      includes[index] = {
+        ...include,
+        ...association.generateInclude(parentAs),
+      };
+    }
+
+    // Recursively process nested includes if they exist
+    if (include.include && Array.isArray(include.include) && include.include.length > 0) {
+      // Get the associated model for the next level
+      const nextModel = association?.target;
+      if (!nextModel) {
+        return;
+      }
+      processIncludes(include.include, nextModel, parentAs ? `${parentAs}->${association.as}` : association.as);
+    }
+  });
+
+  return includes;
+};
+
 export class EagerLoadingTree {
   public root: EagerLoadingNode;
   db: Database;
@@ -252,16 +277,6 @@ export class EagerLoadingTree {
             throw new Error(`Model ${node.model.name} does not have primary key`);
           }
 
-          includeForFilter.forEach((include: { association: string }, index: number) => {
-            const association = node.model.associations[include.association];
-            if (association?.associationType == 'BelongsToArray') {
-              includeForFilter[index] = {
-                ...include,
-                ...association.generateInclude(),
-              };
-            }
-          });
-
           // find all ids
           const ids = (
             await node.model.findAll({
@@ -270,7 +285,7 @@ export class EagerLoadingTree {
               attributes: [primaryKeyField],
               group: `${node.model.name}.${primaryKeyField}`,
               transaction,
-              include: includeForFilter,
+              include: processIncludes(includeForFilter, node.model),
             } as any)
           ).map((row) => {
             return { row, pk: row[primaryKeyField] };
diff --git a/packages/core/database/src/fields/datetime-no-tz-field.ts b/packages/core/database/src/fields/datetime-no-tz-field.ts
index 695ace4813..676ac778a2 100644
--- a/packages/core/database/src/fields/datetime-no-tz-field.ts
+++ b/packages/core/database/src/fields/datetime-no-tz-field.ts
@@ -29,26 +29,24 @@ export class DatetimeNoTzField extends Field {
       return DatetimeNoTzTypeMySQL;
     }
 
-    return DataTypes.STRING;
+    return DataTypes.DATE;
   }
 
-  init() {
+  beforeSave = async (instance, options) => {
     const { name, defaultToCurrentTime, onUpdateToCurrentTime } = this.options;
 
-    this.beforeSave = async (instance, options) => {
-      const value = instance.get(name);
+    const value = instance.get(name);
 
-      if (!value && instance.isNewRecord && defaultToCurrentTime) {
-        instance.set(name, new Date());
-        return;
-      }
+    if (!value && instance.isNewRecord && defaultToCurrentTime) {
+      instance.set(name, new Date());
+      return;
+    }
 
-      if (onUpdateToCurrentTime) {
-        instance.set(name, new Date());
-        return;
-      }
-    };
-  }
+    if (onUpdateToCurrentTime) {
+      instance.set(name, new Date());
+      return;
+    }
+  };
 
   additionalSequelizeOptions(): {} {
     const { name } = this.options;
@@ -57,17 +55,14 @@ export class DatetimeNoTzField extends Field {
     const timezone = this.database.options.rawTimezone || '+00:00';
 
     const isPg = this.database.inDialect('postgres');
+    const isMySQLCompatibleDialect = this.database.isMySQLCompatibleDialect();
 
     return {
       get() {
         const val = this.getDataValue(name);
 
         if (val instanceof Date) {
-          if (isPg) {
-            return moment(val).format('YYYY-MM-DD HH:mm:ss');
-          }
-          // format to YYYY-MM-DD HH:mm:ss
-          const momentVal = moment(val).utcOffset(timezone);
+          const momentVal = moment(val);
           return momentVal.format('YYYY-MM-DD HH:mm:ss');
         }
 
@@ -75,18 +70,24 @@ export class DatetimeNoTzField extends Field {
       },
 
       set(val) {
-        if (typeof val === 'string' && isIso8601(val)) {
-          const momentVal = moment(val).utcOffset(timezone);
-          val = momentVal.format('YYYY-MM-DD HH:mm:ss');
+        if (val == null) {
+          return this.setDataValue(name, null);
         }
 
-        if (val && val instanceof Date) {
-          // format to YYYY-MM-DD HH:mm:ss
-          const momentVal = moment(val).utcOffset(timezone);
-          val = momentVal.format('YYYY-MM-DD HH:mm:ss');
+        const dateOffset = new Date().getTimezoneOffset();
+        const momentVal = moment(val);
+        if ((typeof val === 'string' && isIso8601(val)) || val instanceof Date) {
+          momentVal.utcOffset(timezone);
+          momentVal.utcOffset(-dateOffset, true);
         }
 
-        return this.setDataValue(name, val);
+        if (isMySQLCompatibleDialect) {
+          momentVal.millisecond(0);
+        }
+
+        const date = momentVal.toDate();
+
+        return this.setDataValue(name, date);
       },
     };
   }
diff --git a/packages/core/database/src/fields/string-field.ts b/packages/core/database/src/fields/string-field.ts
index 50431f0565..627768beeb 100644
--- a/packages/core/database/src/fields/string-field.ts
+++ b/packages/core/database/src/fields/string-field.ts
@@ -8,7 +8,7 @@
  */
 
 import { DataTypes } from 'sequelize';
-import { BaseColumnFieldOptions, Field } from './field';
+import { BaseColumnFieldOptions, Field, FieldContext } from './field';
 
 export class StringField extends Field {
   get dataType() {
@@ -18,9 +18,20 @@ export class StringField extends Field {
 
     return DataTypes.STRING;
   }
+
+  additionalSequelizeOptions() {
+    const { name, trim } = this.options;
+
+    return {
+      set(value) {
+        this.setDataValue(name, trim ? value?.trim() : value);
+      },
+    };
+  }
 }
 
 export interface StringFieldOptions extends BaseColumnFieldOptions {
   type: 'string';
   length?: number;
+  trim?: boolean;
 }
diff --git a/packages/core/database/src/fields/text-field.ts b/packages/core/database/src/fields/text-field.ts
index 74ca88da9b..39f1ef4670 100644
--- a/packages/core/database/src/fields/text-field.ts
+++ b/packages/core/database/src/fields/text-field.ts
@@ -23,9 +23,20 @@ export class TextField extends Field {
       this.options.defaultValue = null;
     }
   }
+
+  additionalSequelizeOptions() {
+    const { name, trim } = this.options;
+
+    return {
+      set(value) {
+        this.setDataValue(name, trim ? value?.trim() : value);
+      },
+    };
+  }
 }
 
 export interface TextFieldOptions extends BaseColumnFieldOptions {
   type: 'text';
   length?: 'tiny' | 'medium' | 'long';
+  trim?: boolean;
 }
diff --git a/packages/core/database/src/index.ts b/packages/core/database/src/index.ts
index cbd7adf116..60df55e6e4 100644
--- a/packages/core/database/src/index.ts
+++ b/packages/core/database/src/index.ts
@@ -25,16 +25,20 @@ export {
   ValidationErrorItem,
   where,
 } from 'sequelize';
+export * from './belongs-to-array/belongs-to-array-repository';
 export * from './collection';
 export * from './collection-group-manager';
 export * from './collection-importer';
 export * from './database';
 export { Database as default } from './database';
+export * from './dialects';
 export * from './field-repository/array-field-repository';
 export * from './fields';
 export * from './filter-match';
 export { default as FilterParser } from './filter-parser';
+export * from './helpers';
 export * from './inherited-collection';
+export * from './interfaces';
 export * from './magic-attribute-model';
 export * from './migration';
 export * from './mock-database';
@@ -42,17 +46,15 @@ export * from './model';
 export * from './relation-repository/belongs-to-many-repository';
 export * from './relation-repository/belongs-to-repository';
 export * from './relation-repository/hasmany-repository';
+export * from './relation-repository/hasone-repository';
 export * from './relation-repository/multiple-relation-repository';
 export * from './relation-repository/single-relation-repository';
-export * from './belongs-to-array/belongs-to-array-repository';
 export * from './repository';
+export { default as sqlParser, SQLParserTypes } from './sql-parser';
 export * from './update-associations';
 export { snakeCase } from './utils';
 export * from './value-parsers';
 export * from './view-collection';
-export * from './view/view-inference';
-export * from './helpers';
-export { default as sqlParser, SQLParserTypes } from './sql-parser';
-export * from './interfaces';
 export { default as fieldTypeMap } from './view/field-type-map';
-export * from './dialects';
+
+export * from './view/view-inference';
diff --git a/packages/core/database/src/mock-database.ts b/packages/core/database/src/mock-database.ts
index 7b7a0c1dc3..524c3f9bfd 100644
--- a/packages/core/database/src/mock-database.ts
+++ b/packages/core/database/src/mock-database.ts
@@ -8,11 +8,11 @@
  */
 
 /* istanbul ignore file -- @preserve */
+import { Database, IDatabaseOptions } from '@nocobase/database';
 import { merge } from '@nocobase/utils';
 import { customAlphabet } from 'nanoid';
 import fetch from 'node-fetch';
 import path from 'path';
-import { Database, IDatabaseOptions } from './database';
 
 export class MockDatabase extends Database {
   constructor(options: IDatabaseOptions) {
@@ -58,8 +58,21 @@ function customLogger(queryString, queryObject) {
   }
 }
 
+export async function createMockDatabase(options: IDatabaseOptions = {}) {
+  try {
+    // @ts-ignore
+    const { runPluginStaticImports } = await import('@nocobase/server');
+    await runPluginStaticImports();
+  } catch (error) {
+    // error
+  }
+  return mockDatabase(options);
+}
+
 export function mockDatabase(options: IDatabaseOptions = {}): MockDatabase {
   const dbOptions = merge(getConfigByEnv(), options) as any;
+  // eslint-disable-next-line prefer-const
+  let db: any;
 
   if (process.env['DB_TEST_PREFIX']) {
     let configKey = 'database';
@@ -100,7 +113,7 @@ export function mockDatabase(options: IDatabaseOptions = {}): MockDatabase {
     }
   }
 
-  const db = new MockDatabase(dbOptions);
+  db = new MockDatabase(dbOptions);
 
-  return db;
+  return db as MockDatabase;
 }
diff --git a/packages/core/database/src/query-interface/mysql-query-interface.ts b/packages/core/database/src/query-interface/mysql-query-interface.ts
index fff3afa528..62c2c7febd 100644
--- a/packages/core/database/src/query-interface/mysql-query-interface.ts
+++ b/packages/core/database/src/query-interface/mysql-query-interface.ts
@@ -141,4 +141,8 @@ export default class MysqlQueryInterface extends QueryInterface {
       await this.db.sequelize.query(sql, { transaction });
     }
   }
+
+  public generateJoinOnForJSONArray(left: string, right: string) {
+    return this.db.sequelize.literal(`JSON_CONTAINS(${right}, JSON_ARRAY(${left}))`);
+  }
 }
diff --git a/packages/core/database/src/query-interface/postgres-query-interface.ts b/packages/core/database/src/query-interface/postgres-query-interface.ts
index 2d251ddf51..0b38c7c098 100644
--- a/packages/core/database/src/query-interface/postgres-query-interface.ts
+++ b/packages/core/database/src/query-interface/postgres-query-interface.ts
@@ -232,4 +232,8 @@ $BODY$
 
     return res[0]['show_create_table'];
   }
+
+  public generateJoinOnForJSONArray(left: string, right: string) {
+    return this.db.sequelize.literal(`${left}=any(${right})`);
+  }
 }
diff --git a/packages/core/database/src/query-interface/query-interface.ts b/packages/core/database/src/query-interface/query-interface.ts
index c7d484ccb7..9d8ffe349a 100644
--- a/packages/core/database/src/query-interface/query-interface.ts
+++ b/packages/core/database/src/query-interface/query-interface.ts
@@ -83,4 +83,9 @@ export default abstract class QueryInterface {
     // @ts-ignore
     return this.db.sequelize.getQueryInterface().queryGenerator.quoteIdentifier(identifier);
   }
+
+  public generateJoinOnForJSONArray(left: string, right: string) {
+    const dialect = this.db.sequelize.getDialect();
+    throw new Error(`Filtering by many to many (array) associations is not supported on ${dialect}`);
+  }
 }
diff --git a/packages/core/database/src/query-interface/sqlite-query-interface.ts b/packages/core/database/src/query-interface/sqlite-query-interface.ts
index 2f6b93c877..ec77652c56 100644
--- a/packages/core/database/src/query-interface/sqlite-query-interface.ts
+++ b/packages/core/database/src/query-interface/sqlite-query-interface.ts
@@ -146,4 +146,8 @@ export default class SqliteQueryInterface extends QueryInterface {
                  WHERE name = '${tableName}';`;
     await this.db.sequelize.query(sql, { transaction });
   }
+
+  public generateJoinOnForJSONArray(left: string, right: string) {
+    return this.db.sequelize.literal(`${left} in (SELECT value from json_each(${right}))`);
+  }
 }
diff --git a/packages/core/database/src/relation-repository/hasmany-repository.ts b/packages/core/database/src/relation-repository/hasmany-repository.ts
index f831166d67..4720a6fa59 100644
--- a/packages/core/database/src/relation-repository/hasmany-repository.ts
+++ b/packages/core/database/src/relation-repository/hasmany-repository.ts
@@ -72,7 +72,13 @@ export class HasManyRepository extends MultipleRelationRepository {
       const filterResult = this.parseFilter(options['filter'], options);
 
       if (filterResult.include && filterResult.include.length > 0) {
-        return await this.destroyByFilter(options['filter'], transaction);
+        return await this.destroyByFilter(
+          {
+            filter: options['filter'],
+            filterByTk: options['filterByTk'],
+          },
+          transaction,
+        );
       }
 
       where.push(filterResult.where);
diff --git a/packages/core/database/src/relation-repository/multiple-relation-repository.ts b/packages/core/database/src/relation-repository/multiple-relation-repository.ts
index af3ed91525..9a649fa97c 100644
--- a/packages/core/database/src/relation-repository/multiple-relation-repository.ts
+++ b/packages/core/database/src/relation-repository/multiple-relation-repository.ts
@@ -179,9 +179,15 @@ export abstract class MultipleRelationRepository extends RelationRepository {
     return false;
   }
 
-  protected async destroyByFilter(filter: Filter, transaction?: Transaction) {
+  protected async destroyByFilter(
+    options: {
+      filter?: Filter;
+      filterByTk?: TargetKey | TargetKey[];
+    },
+    transaction?: Transaction,
+  ) {
     const instances = await this.find({
-      filter: filter,
+      ...options,
       transaction,
     });
 
diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json
index a976e0388e..f344afc841 100644
--- a/packages/core/devtools/package.json
+++ b/packages/core/devtools/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/devtools",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "1.6.6",
-    "@nocobase/client": "1.6.6",
-    "@nocobase/test": "1.6.6",
+    "@nocobase/build": "1.6.20",
+    "@nocobase/client": "1.6.20",
+    "@nocobase/test": "1.6.20",
     "@types/koa": "^2.15.0",
     "@types/koa-bodyparser": "^4.3.4",
     "@types/lodash": "^4.14.177",
diff --git a/packages/core/evaluators/package.json b/packages/core/evaluators/package.json
index 55893892a8..8bd894ae3f 100644
--- a/packages/core/evaluators/package.json
+++ b/packages/core/evaluators/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/evaluators",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
     "@formulajs/formulajs": "4.4.9",
-    "@nocobase/utils": "1.6.6",
+    "@nocobase/utils": "1.6.20",
     "mathjs": "^10.6.0"
   },
   "repository": {
diff --git a/packages/core/lock-manager/package.json b/packages/core/lock-manager/package.json
index 9d77cbcd1a..0229199e0b 100644
--- a/packages/core/lock-manager/package.json
+++ b/packages/core/lock-manager/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nocobase/lock-manager",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "lib/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@nocobase/utils": "1.6.6",
+    "@nocobase/utils": "1.6.20",
     "async-mutex": "^0.5.0"
   }
 }
diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json
index 99040bf97d..995c23febd 100644
--- a/packages/core/logger/package.json
+++ b/packages/core/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "nocobase logging library",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
diff --git a/packages/core/logger/src/logger.ts b/packages/core/logger/src/logger.ts
index 0079b759d0..72b3f694c9 100644
--- a/packages/core/logger/src/logger.ts
+++ b/packages/core/logger/src/logger.ts
@@ -10,8 +10,8 @@
 import winston, { LeveledLogMethod, Logger as WinstonLogger } from 'winston';
 import 'winston-daily-rotate-file';
 import { getLoggerLevel } from './config';
-import { getTransports } from './transports';
 import { consoleFormat } from './format';
+import { getTransports } from './transports';
 
 interface Logger extends WinstonLogger {
   trace: LeveledLogMethod;
diff --git a/packages/core/logger/src/system-logger.ts b/packages/core/logger/src/system-logger.ts
index 342a93f7ce..9744f44378 100644
--- a/packages/core/logger/src/system-logger.ts
+++ b/packages/core/logger/src/system-logger.ts
@@ -7,11 +7,12 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import winston, { format } from 'winston';
-import { createLogger, levels, Logger, LoggerOptions } from './logger';
-import Transport from 'winston-transport';
 import { SPLAT } from 'triple-beam';
+import winston, { format } from 'winston';
+import Transport from 'winston-transport';
+import { getLoggerFilePath } from './config';
 import { getFormat } from './format';
+import { createLogger, levels, Logger, LoggerOptions } from './logger';
 
 export interface SystemLoggerOptions extends LoggerOptions {
   seperateError?: boolean; // print error seperately, default true
@@ -138,3 +139,12 @@ export const createSystemLogger = (options: SystemLoggerOptions): SystemLogger =
     },
   });
 };
+
+export const logger = createSystemLogger({
+  dirname: getLoggerFilePath('main'),
+  filename: 'system',
+  defaultMeta: {
+    app: 'main',
+    module: 'cli',
+  },
+});
diff --git a/packages/core/resourcer/package.json b/packages/core/resourcer/package.json
index 3f6c378a33..f8fd4adf1f 100644
--- a/packages/core/resourcer/package.json
+++ b/packages/core/resourcer/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/utils": "1.6.6",
+    "@nocobase/utils": "1.6.20",
     "deepmerge": "^4.2.2",
     "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",
diff --git a/packages/core/sdk/package.json b/packages/core/sdk/package.json
index cdeaeeff48..8642b04e5b 100644
--- a/packages/core/sdk/package.json
+++ b/packages/core/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/sdk",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/core/sdk/src/APIClient.ts b/packages/core/sdk/src/APIClient.ts
index 9cb8bc922e..2d360599d7 100644
--- a/packages/core/sdk/src/APIClient.ts
+++ b/packages/core/sdk/src/APIClient.ts
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, RawAxiosRequestHeaders } from 'axios';
+import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, RawAxiosRequestHeaders } from 'axios';
 import qs from 'qs';
 
 export interface ActionParams {
diff --git a/packages/core/server/package.json b/packages/core/server/package.json
index 704fb4100b..f21bcde0e3 100644
--- a/packages/core/server/package.json
+++ b/packages/core/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,19 +10,19 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.0.2",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "1.6.6",
-    "@nocobase/actions": "1.6.6",
-    "@nocobase/auth": "1.6.6",
-    "@nocobase/cache": "1.6.6",
-    "@nocobase/data-source-manager": "1.6.6",
-    "@nocobase/database": "1.6.6",
-    "@nocobase/evaluators": "1.6.6",
-    "@nocobase/lock-manager": "1.6.6",
-    "@nocobase/logger": "1.6.6",
-    "@nocobase/resourcer": "1.6.6",
-    "@nocobase/sdk": "1.6.6",
-    "@nocobase/telemetry": "1.6.6",
-    "@nocobase/utils": "1.6.6",
+    "@nocobase/acl": "1.6.20",
+    "@nocobase/actions": "1.6.20",
+    "@nocobase/auth": "1.6.20",
+    "@nocobase/cache": "1.6.20",
+    "@nocobase/data-source-manager": "1.6.20",
+    "@nocobase/database": "1.6.20",
+    "@nocobase/evaluators": "1.6.20",
+    "@nocobase/lock-manager": "1.6.20",
+    "@nocobase/logger": "1.6.20",
+    "@nocobase/resourcer": "1.6.20",
+    "@nocobase/sdk": "1.6.20",
+    "@nocobase/telemetry": "1.6.20",
+    "@nocobase/utils": "1.6.20",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
diff --git a/packages/core/server/src/aes-encryptor.tsx b/packages/core/server/src/aes-encryptor.ts
similarity index 100%
rename from packages/core/server/src/aes-encryptor.tsx
rename to packages/core/server/src/aes-encryptor.ts
diff --git a/packages/core/server/src/app-supervisor.ts b/packages/core/server/src/app-supervisor.ts
index 3006bba000..7698ddfcf3 100644
--- a/packages/core/server/src/app-supervisor.ts
+++ b/packages/core/server/src/app-supervisor.ts
@@ -305,7 +305,7 @@ export class AppSupervisor extends EventEmitter implements AsyncEmitter {
       }
     });
 
-    app.on('afterStop', async () => {
+    app.on('__stopped', async () => {
       this.setAppStatus(app.name, 'stopped');
     });
 
diff --git a/packages/core/server/src/application.ts b/packages/core/server/src/application.ts
index 2002472d51..574dd5f4af 100644
--- a/packages/core/server/src/application.ts
+++ b/packages/core/server/src/application.ts
@@ -572,6 +572,10 @@ export class Application<StateT = DefaultState, ContextT = DefaultContext> exten
 
     this.log.info('app reinitializing');
 
+    // trigger the stop events to make sure old instances are cleaned up
+    await this.emitAsync('beforeStop');
+    await this.emitAsync('afterStop');
+
     if (this.cacheManager) {
       await this.cacheManager.close();
     }
@@ -951,6 +955,7 @@ export class Application<StateT = DefaultState, ContextT = DefaultContext> exten
     }
 
     await this.emitAsync('afterStop', this, options);
+    this.emit('__stopped', this, options);
 
     this.stopped = true;
     log.info(`app has stopped`, { method: 'stop' });
diff --git a/packages/core/server/src/run-plugin-static-imports.ts b/packages/core/server/src/run-plugin-static-imports.ts
index 1f3e8c5d9c..d021edbaf9 100644
--- a/packages/core/server/src/run-plugin-static-imports.ts
+++ b/packages/core/server/src/run-plugin-static-imports.ts
@@ -6,18 +6,22 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+import { logger } from '@nocobase/logger';
 import { findAllPlugins, PluginManager } from '@nocobase/server';
+import { importModule } from '@nocobase/utils';
 
 export async function runPluginStaticImports() {
   const packages = await findAllPlugins();
   for (const name of packages) {
     const { packageName } = await PluginManager.parseName(name);
     try {
-      const plugin = require(packageName);
+      const plugin = await importModule(packageName);
       if (plugin && plugin.staticImport) {
+        logger.info('run static import', { packageName });
         await plugin.staticImport();
       }
     } catch (error) {
+      logger.error(error, { packageName });
       continue;
     }
   }
diff --git a/packages/core/telemetry/package.json b/packages/core/telemetry/package.json
index 872295b156..248198d1eb 100644
--- a/packages/core/telemetry/package.json
+++ b/packages/core/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/telemetry",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "nocobase telemetry library",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
@@ -11,7 +11,7 @@
     "directory": "packages/telemetry"
   },
   "dependencies": {
-    "@nocobase/utils": "1.6.6",
+    "@nocobase/utils": "1.6.20",
     "@opentelemetry/api": "^1.7.0",
     "@opentelemetry/instrumentation": "^0.46.0",
     "@opentelemetry/resources": "^1.19.0",
diff --git a/packages/core/test/package.json b/packages/core/test/package.json
index 2d9554a522..4f15252a86 100644
--- a/packages/core/test/package.json
+++ b/packages/core/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "1.6.6",
+    "@nocobase/server": "1.6.20",
     "@playwright/test": "^1.45.3",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.0.0",
diff --git a/packages/core/test/src/server/index.ts b/packages/core/test/src/server/index.ts
index 8dd864d189..cbe223c54b 100644
--- a/packages/core/test/src/server/index.ts
+++ b/packages/core/test/src/server/index.ts
@@ -10,7 +10,7 @@
 import { describe } from 'vitest';
 import ws from 'ws';
 
-export { MockDatabase, mockDatabase } from '@nocobase/database';
+export { createMockDatabase, MockDatabase, mockDatabase } from '@nocobase/database';
 export { default as supertest } from 'supertest';
 export * from './memory-pub-sub-adapter';
 export * from './mock-isolated-cluster';
diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json
index 6694dcfc3d..48d306f7a9 100644
--- a/packages/core/utils/package.json
+++ b/packages/core/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
diff --git a/packages/core/utils/src/dayjs.ts b/packages/core/utils/src/dayjs.ts
index 0a196ed23d..a780681112 100644
--- a/packages/core/utils/src/dayjs.ts
+++ b/packages/core/utils/src/dayjs.ts
@@ -10,6 +10,7 @@
 import dayjs from 'dayjs';
 import advancedFormat from 'dayjs/plugin/advancedFormat';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
+import duration from 'dayjs/plugin/duration';
 import IsBetween from 'dayjs/plugin/isBetween';
 import IsSameOrAfter from 'dayjs/plugin/isSameOrAfter';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
@@ -35,5 +36,6 @@ dayjs.extend(weekOfYear);
 dayjs.extend(weekYear);
 dayjs.extend(customParseFormat);
 dayjs.extend(advancedFormat);
+dayjs.extend(duration);
 
 export { dayjs };
diff --git a/packages/plugins/@nocobase/plugin-acl/package.json b/packages/plugins/@nocobase/plugin-acl/package.json
index 0d76bdd283..090d28c6cd 100644
--- a/packages/plugins/@nocobase/plugin-acl/package.json
+++ b/packages/plugins/@nocobase/plugin-acl/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "权限控制",
   "description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
index 6b750ffc76..f24a27c485 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-bulk-edit",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-bulk-edit",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-bulk-edit",
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/refresh.test.ts b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/refresh.test.ts
new file mode 100644
index 0000000000..8cc2b184c2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/refresh.test.ts
@@ -0,0 +1,34 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { expect, test } from '@nocobase/test/e2e';
+import { afterConfiguringTheModalWhenReopeningItTheContentShouldPersist } from './utils';
+
+test.describe('refresh', () => {
+  test('After configuring the modal, when reopening it, the content should persist', async ({ mockPage, page }) => {
+    await mockPage(afterConfiguringTheModalWhenReopeningItTheContentShouldPersist).goto();
+
+    // 1. 点击 Bulk edit 按钮，打开弹窗
+    await page.getByLabel('action-Action-Bulk edit-').click();
+
+    // 2. 新增一个表单区块
+    await page.getByLabel('schema-initializer-Grid-popup').hover();
+    await page.getByRole('menuitem', { name: 'form Form' }).click();
+
+    // 3. 新增一个名为 Nickname 的字段
+    await page.getByLabel('schema-initializer-Grid-bulkEditForm:configureFields-users').hover();
+    await page.getByRole('menuitem', { name: 'Nickname' }).click();
+
+    // 4. 关闭弹窗，然后再打开，刚才新增的字段应该还在
+    await page.getByLabel('drawer-Action.Container-users-Bulk edit-mask').click();
+    await page.getByLabel('action-Action-Bulk edit-').click();
+    await expect(page.getByLabel('block-item-BulkEditField-').getByText('Nickname')).toBeVisible();
+    await page.getByLabel('block-item-BulkEditField-').click();
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/utils.ts
index 3e67dc3ad2..d2068a7c82 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/utils.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/utils.ts
@@ -1243,3 +1243,388 @@ export const theAddBlockButtonInDrawerShouldBeVisible = {
     'x-index': 1,
   },
 };
+export const afterConfiguringTheModalWhenReopeningItTheContentShouldPersist = {
+  pageSchema: {
+    type: 'void',
+    'x-component': 'Page',
+    name: 'rjzvy4bmawn',
+    'x-uid': '1rs9caegbf2',
+    'x-async': false,
+    properties: {
+      tab: {
+        type: 'void',
+        'x-component': 'Grid',
+        'x-initializer': 'page:addBlock',
+        properties: {
+          bmsmf8futai: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'x84k7qs6jko',
+            'x-async': false,
+            'x-index': 4,
+          },
+          noe2oca30hc: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 't7jxa830ps6',
+            'x-async': false,
+            'x-index': 5,
+          },
+          w2hnq7rau9p: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': '0fjjtg8z7ws',
+            'x-async': false,
+            'x-index': 7,
+          },
+          fcfs4oot86g: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'nklv7lonpgn',
+            'x-async': false,
+            'x-index': 8,
+          },
+          i22fydav355: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'fz4g6cr9jvr',
+            'x-async': false,
+            'x-index': 10,
+          },
+          row_6u7y7uccrvz: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-index': 12,
+            'x-uid': '7tzumo4nec7',
+            'x-async': false,
+          },
+          higfesvgj7g: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': '8hpa6qf3sez',
+            'x-async': false,
+            'x-index': 13,
+          },
+          '37myao9n0wc': {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'uw1dp2qxd3y',
+            'x-async': false,
+            'x-index': 14,
+          },
+          uvfd76q4ye9: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'nc56fu33m42',
+            'x-async': false,
+            'x-index': 15,
+          },
+          miidizeqgot: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'jf4qarrcs0z',
+            'x-async': false,
+            'x-index': 16,
+          },
+          hxmr87i5imu: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'l3kdiqd9a7k',
+            'x-async': false,
+            'x-index': 17,
+          },
+          pa8dwdi4h5a: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'uz5wcet83qn',
+            'x-async': false,
+            'x-index': 18,
+          },
+          pno0a05tbnp: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'b4bakhhasp3',
+            'x-async': false,
+            'x-index': 19,
+          },
+          uj09g5xgnr1: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'qks035fnfl6',
+            'x-async': false,
+            'x-index': 20,
+          },
+          giobcwj316k: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'awwsb89nyso',
+            'x-async': false,
+            'x-index': 22,
+          },
+          oznewtbvuyw: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            properties: {
+              bwtax0bnnp3: {
+                _isJSONSchemaObject: true,
+                version: '2.0',
+                type: 'void',
+                'x-component': 'Grid.Col',
+                'x-app-version': '1.6.11',
+                properties: {
+                  c0bypj7wg5q: {
+                    _isJSONSchemaObject: true,
+                    version: '2.0',
+                    type: 'void',
+                    'x-decorator': 'TableBlockProvider',
+                    'x-acl-action': 'users:list',
+                    'x-use-decorator-props': 'useTableBlockDecoratorProps',
+                    'x-decorator-props': {
+                      collection: 'users',
+                      dataSource: 'main',
+                      action: 'list',
+                      params: {
+                        pageSize: 20,
+                      },
+                      rowKey: 'id',
+                      showIndex: true,
+                      dragSort: false,
+                    },
+                    'x-toolbar': 'BlockSchemaToolbar',
+                    'x-settings': 'blockSettings:table',
+                    'x-component': 'CardItem',
+                    'x-filter-targets': [],
+                    'x-app-version': '1.6.11',
+                    properties: {
+                      actions: {
+                        _isJSONSchemaObject: true,
+                        version: '2.0',
+                        type: 'void',
+                        'x-initializer': 'table:configureActions',
+                        'x-component': 'ActionBar',
+                        'x-component-props': {
+                          style: {
+                            marginBottom: 'var(--nb-spacing)',
+                          },
+                        },
+                        'x-app-version': '1.6.11',
+                        properties: {
+                          '1dlvhzr308c': {
+                            _isJSONSchemaObject: true,
+                            version: '2.0',
+                            type: 'void',
+                            title: '{{t("Bulk edit")}}',
+                            'x-component': 'Action',
+                            'x-action': 'customize:bulkEdit',
+                            'x-action-settings': {
+                              updateMode: 'selected',
+                            },
+                            'x-component-props': {
+                              openMode: 'drawer',
+                              icon: 'EditOutlined',
+                            },
+                            'x-align': 'right',
+                            'x-decorator': 'BulkEditActionDecorator',
+                            'x-toolbar': 'ActionSchemaToolbar',
+                            'x-settings': 'actionSettings:bulkEdit',
+                            'x-acl-action': 'update',
+                            'x-acl-action-props': {
+                              skipScopeCheck: true,
+                            },
+                            'x-app-version': '1.6.11',
+                            properties: {
+                              drawer: {
+                                _isJSONSchemaObject: true,
+                                version: '2.0',
+                                type: 'void',
+                                title: '{{t("Bulk edit")}}',
+                                'x-component': 'Action.Container',
+                                'x-component-props': {
+                                  className: 'nb-action-popup',
+                                },
+                                'x-app-version': '1.6.11',
+                                properties: {
+                                  tabs: {
+                                    _isJSONSchemaObject: true,
+                                    version: '2.0',
+                                    type: 'void',
+                                    'x-component': 'Tabs',
+                                    'x-component-props': {},
+                                    'x-initializer': 'popup:addTab',
+                                    'x-initializer-props': {
+                                      gridInitializer: 'popup:bulkEdit:addBlock',
+                                    },
+                                    'x-app-version': '1.6.11',
+                                    properties: {
+                                      tab1: {
+                                        _isJSONSchemaObject: true,
+                                        version: '2.0',
+                                        type: 'void',
+                                        title: '{{t("Bulk edit")}}',
+                                        'x-component': 'Tabs.TabPane',
+                                        'x-designer': 'Tabs.Designer',
+                                        'x-component-props': {},
+                                        'x-app-version': '1.6.11',
+                                        properties: {
+                                          grid: {
+                                            _isJSONSchemaObject: true,
+                                            version: '2.0',
+                                            type: 'void',
+                                            'x-component': 'Grid',
+                                            'x-initializer': 'popup:bulkEdit:addBlock',
+                                            'x-app-version': '1.6.11',
+                                            'x-uid': '5ejbu8v5ol8',
+                                            'x-async': false,
+                                            'x-index': 1,
+                                          },
+                                        },
+                                        'x-uid': 'gfheiqtl7f7',
+                                        'x-async': false,
+                                        'x-index': 1,
+                                      },
+                                    },
+                                    'x-uid': 'if2rcx1dy2n',
+                                    'x-async': false,
+                                    'x-index': 1,
+                                  },
+                                },
+                                'x-uid': 'cxyi8q6lm3n',
+                                'x-async': false,
+                                'x-index': 1,
+                              },
+                            },
+                            'x-uid': 'vbvf13xq15t',
+                            'x-async': false,
+                            'x-index': 1,
+                          },
+                        },
+                        'x-uid': 'amlzm32jhwg',
+                        'x-async': false,
+                        'x-index': 1,
+                      },
+                      f232o2ds23n: {
+                        _isJSONSchemaObject: true,
+                        version: '2.0',
+                        type: 'array',
+                        'x-initializer': 'table:configureColumns',
+                        'x-component': 'TableV2',
+                        'x-use-component-props': 'useTableBlockProps',
+                        'x-component-props': {
+                          rowKey: 'id',
+                          rowSelection: {
+                            type: 'checkbox',
+                          },
+                        },
+                        'x-app-version': '1.6.11',
+                        properties: {
+                          actions: {
+                            _isJSONSchemaObject: true,
+                            version: '2.0',
+                            type: 'void',
+                            title: '{{ t("Actions") }}',
+                            'x-action-column': 'actions',
+                            'x-decorator': 'TableV2.Column.ActionBar',
+                            'x-component': 'TableV2.Column',
+                            'x-toolbar': 'TableColumnSchemaToolbar',
+                            'x-initializer': 'table:configureItemActions',
+                            'x-settings': 'fieldSettings:TableColumn',
+                            'x-toolbar-props': {
+                              initializer: 'table:configureItemActions',
+                            },
+                            'x-app-version': '1.6.11',
+                            properties: {
+                              '153lpq30p5f': {
+                                _isJSONSchemaObject: true,
+                                version: '2.0',
+                                type: 'void',
+                                'x-decorator': 'DndContext',
+                                'x-component': 'Space',
+                                'x-component-props': {
+                                  split: '|',
+                                },
+                                'x-app-version': '1.6.11',
+                                'x-uid': '4mha1dmmyz9',
+                                'x-async': false,
+                                'x-index': 1,
+                              },
+                            },
+                            'x-uid': 'afmceivuaf0',
+                            'x-async': false,
+                            'x-index': 1,
+                          },
+                        },
+                        'x-uid': 'iu0xkmeuc5z',
+                        'x-async': false,
+                        'x-index': 2,
+                      },
+                    },
+                    'x-uid': 'ylor106s9ok',
+                    'x-async': false,
+                    'x-index': 1,
+                  },
+                },
+                'x-uid': 'rl50hidu14n',
+                'x-async': false,
+                'x-index': 1,
+              },
+            },
+            'x-uid': 'xxhug2yumqf',
+            'x-async': false,
+            'x-index': 23,
+          },
+        },
+        name: 'h63eibc46on',
+        'x-uid': 'u9g23o0ohgk',
+        'x-async': true,
+        'x-index': 1,
+      },
+    },
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
index 4f85583852..ce800c1766 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-bulk-update",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-bulk-update",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-bulk-update",
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx
index 181ef1d2b3..ac7253f2d0 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx
@@ -68,7 +68,7 @@ export const useCustomizeBulkUpdateActionProps = () => {
           if (result) {
             assignedValues[key] = transformVariableValue(result, { targetCollectionField: collectionField });
           }
-        } else if (value != null && value !== '') {
+        } else if (value !== '') {
           assignedValues[key] = value;
         }
       });
diff --git a/packages/plugins/@nocobase/plugin-action-custom-request/package.json b/packages/plugins/@nocobase/plugin-action-custom-request/package.json
index a6207b5a09..829d392979 100644
--- a/packages/plugins/@nocobase/plugin-action-custom-request/package.json
+++ b/packages/plugins/@nocobase/plugin-action-custom-request/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-custom-request",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-custom-request",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-custom-request",
diff --git a/packages/plugins/@nocobase/plugin-action-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts b/packages/plugins/@nocobase/plugin-action-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts
index 4e8754e313..e64d9e41d7 100644
--- a/packages/plugins/@nocobase/plugin-action-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts
+++ b/packages/plugins/@nocobase/plugin-action-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts
@@ -67,10 +67,13 @@ export const useCustomizeRequestActionProps = () => {
           responseType: fieldSchema['x-response-type'] === 'stream' ? 'blob' : 'json',
         });
         if (res.headers['content-disposition']) {
-          const regex = /attachment;\s*filename="([^"]+)"/;
-          const match = res.headers['content-disposition'].match(regex);
-          if (match?.[1]) {
-            saveAs(res.data, match[1]);
+          const contentDisposition = res.headers['content-disposition'];
+          const utf8Match = contentDisposition.match(/filename\*=utf-8''([^;]+)/i);
+          const asciiMatch = contentDisposition.match(/filename="([^"]+)"/i);
+          if (utf8Match) {
+            saveAs(res.data, decodeURIComponent(utf8Match[1]));
+          } else if (asciiMatch) {
+            saveAs(res.data, asciiMatch[1]);
           }
         }
         actionField.data.loading = false;
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/package.json b/packages/plugins/@nocobase/plugin-action-duplicate/package.json
index 7a13b9060a..d56e8afddd 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/package.json
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-duplicate",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-duplicate",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-duplicate",
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx
index 39ef111c8f..7c02222437 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx
@@ -112,11 +112,7 @@ export const DuplicateAction = observer(
           }),
         )
       : record[collection.filterTargetKey] || id;
-    const buttonStyle = useMemo(() => {
-      return {
-        opacity: designable && (field?.data?.hidden || !aclCtx) && 0.1,
-      };
-    }, [designable, field?.data?.hidden]);
+
     const template = {
       key: 'duplicate',
       dataId,
@@ -198,7 +194,6 @@ export const DuplicateAction = observer(
                   opacity: designable && field?.data?.hidden && 0.1,
                   cursor: loading ? 'not-allowed' : 'pointer',
                   position: 'relative',
-                  ...buttonStyle,
                 }}
                 onClick={handelDuplicate}
               >
diff --git a/packages/plugins/@nocobase/plugin-action-export/package.json b/packages/plugins/@nocobase/plugin-action-export/package.json
index 3060eba26c..0e93dd33fc 100644
--- a/packages/plugins/@nocobase/plugin-action-export/package.json
+++ b/packages/plugins/@nocobase/plugin-action-export/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "操作：导出记录",
   "description": "Export filtered records to excel, you can configure which fields to export.",
   "description.zh-CN": "导出筛选后的记录到 Excel 中，可以配置导出哪些字段。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-export",
diff --git a/packages/plugins/@nocobase/plugin-action-export/src/client/useExportAction.tsx b/packages/plugins/@nocobase/plugin-action-export/src/client/useExportAction.tsx
index c7c7ec8139..4bca136a76 100644
--- a/packages/plugins/@nocobase/plugin-action-export/src/client/useExportAction.tsx
+++ b/packages/plugins/@nocobase/plugin-action-export/src/client/useExportAction.tsx
@@ -37,7 +37,7 @@ export const useExportAction = () => {
   const { name, title } = useCollection_deprecated();
   const { t } = useExportTranslation();
   const { modal } = App.useApp();
-  const filters = service.params?.[1]?.filters || {};
+  const filters = service.params[0]?.filter || {};
   const field = useField();
   const exportLimit = useMemo(() => {
     if (appInfo?.data?.exportLimit) {
@@ -81,7 +81,7 @@ export const useExportAction = () => {
         {
           title: compile(title),
           appends: service.params[0]?.appends?.join(),
-          filter: mergeFilter([...Object.values(filters), defaultFilter]),
+          filter: mergeFilter([filters, defaultFilter]),
           sort: params?.sort,
           values: {
             columns: compile(exportSettings),
diff --git a/packages/plugins/@nocobase/plugin-action-import/package.json b/packages/plugins/@nocobase/plugin-action-import/package.json
index 5c20d58364..017aa0b828 100644
--- a/packages/plugins/@nocobase/plugin-action-import/package.json
+++ b/packages/plugins/@nocobase/plugin-action-import/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "操作：导入记录",
   "description": "Import records using excel templates. You can configure which fields to import and templates will be generated automatically.",
   "description.zh-CN": "使用 Excel 模板导入数据，可以配置导入哪些字段，自动生成模板。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-import",
diff --git a/packages/plugins/@nocobase/plugin-action-print/package.json b/packages/plugins/@nocobase/plugin-action-print/package.json
index aa2fc04e66..7a6a7fe4a0 100644
--- a/packages/plugins/@nocobase/plugin-action-print/package.json
+++ b/packages/plugins/@nocobase/plugin-action-print/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-print",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-print",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-print",
diff --git a/packages/plugins/@nocobase/plugin-ai/package.json b/packages/plugins/@nocobase/plugin-ai/package.json
index 002685cdf9..825c0ebfc7 100644
--- a/packages/plugins/@nocobase/plugin-ai/package.json
+++ b/packages/plugins/@nocobase/plugin-ai/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "AI 集成",
   "description": "Support integration with AI services, providing AI-related workflow nodes to enhance business processing capabilities.",
   "description.zh-CN": "支持接入 AI 服务，提供 AI 相关的工作流节点，增强业务处理能力。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-api-doc/package.json b/packages/plugins/@nocobase/plugin-api-doc/package.json
index c81cede1fc..93ab963c17 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/package.json
+++ b/packages/plugins/@nocobase/plugin-api-doc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-api-doc",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "displayName": "API documentation",
   "displayName.zh-CN": "API 文档",
   "description": "An OpenAPI documentation generator for NocoBase HTTP API.",
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/client/Document.tsx b/packages/plugins/@nocobase/plugin-api-doc/src/client/Document.tsx
index a494b55c0f..c4a349cea0 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/client/Document.tsx
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/client/Document.tsx
@@ -67,6 +67,8 @@ const Documentation = () => {
       direction="vertical"
       style={{
         width: '100%',
+        height: '100%',
+        overflowY: 'auto',
       }}
     >
       <div
diff --git a/packages/plugins/@nocobase/plugin-api-keys/package.json b/packages/plugins/@nocobase/plugin-api-keys/package.json
index 670bc6f954..294272a9a6 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/package.json
+++ b/packages/plugins/@nocobase/plugin-api-keys/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：API 密钥",
   "description": "Allows users to use API key to access application's HTTP API",
   "description.zh-CN": "允许用户使用 API 密钥访问应用的 HTTP API",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/api-keys",
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/package.json b/packages/plugins/@nocobase/plugin-async-task-manager/package.json
index 2d38a33e2a..3817fbaf76 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "异步任务管理器",
   "description": "Manage and monitor asynchronous tasks such as data import/export. Support task progress tracking and notification.",
   "description.zh-CN": "管理和监控数据导入导出等异步任务。支持任务进度跟踪和通知。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/src/client/AsyncTaskManagerProvider.tsx b/packages/plugins/@nocobase/plugin-async-task-manager/src/client/AsyncTaskManagerProvider.tsx
index 26fd598c84..d93ce6806d 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/src/client/AsyncTaskManagerProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/src/client/AsyncTaskManagerProvider.tsx
@@ -1,176 +1,24 @@
-import { PinnedPluginListProvider, SchemaComponentOptions, useApp } from '@nocobase/client';
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { PinnedPluginListProvider, SchemaComponentOptions, useRequest } from '@nocobase/client';
+import React from 'react';
 import { AsyncTasks } from './components/AsyncTasks';
-import React, { useEffect, useState, createContext, useContext, useCallback } from 'react';
-import { message } from 'antd';
-import { useT } from './locale';
-
-export const AsyncTaskContext = createContext<any>(null);
-
-export const useAsyncTask = () => {
-  const context = useContext(AsyncTaskContext);
-  if (!context) {
-    throw new Error('useAsyncTask must be used within AsyncTaskManagerProvider');
-  }
-  return context;
-};
 
 export const AsyncTaskManagerProvider = (props) => {
-  const app = useApp();
-  const t = useT();
-  const [tasks, setTasks] = useState<any[]>([]);
-  const [popoverVisible, setPopoverVisible] = useState(false);
-  const [hasProcessingTasks, setHasProcessingTasks] = useState(false);
-  const [cancellingTasks, setCancellingTasks] = useState<Set<string>>(new Set());
-  const [modalVisible, setModalVisible] = useState(false);
-  const [currentError, setCurrentError] = useState<any>(null);
-  const [resultModalVisible, setResultModalVisible] = useState(false);
-  const [currentTask, setCurrentTask] = useState(null);
-  const [wsAuthorized, setWsAuthorized] = useState(() => app.isWsAuthorized);
-
-  useEffect(() => {
-    setHasProcessingTasks(tasks.some((task) => task.status.type !== 'success' && task.status.type !== 'failed'));
-  }, [tasks]);
-
-  const handleTaskMessage = useCallback((event: CustomEvent) => {
-    const tasks = event.detail;
-    setTasks(tasks ? tasks.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()) : []);
-  }, []);
-
-  const handleTaskCreated = useCallback((event: CustomEvent) => {
-    const taskData = event.detail;
-    setTasks((prev) => {
-      const newTasks = [taskData, ...prev];
-      return newTasks.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
-    });
-    setPopoverVisible(true);
-  }, []);
-
-  const handleTaskProgress = useCallback((event: CustomEvent) => {
-    const { taskId, progress } = event.detail;
-    setTasks((prev) => prev.map((task) => (task.taskId === taskId ? { ...task, progress } : task)));
-  }, []);
-
-  const handleTaskStatus = useCallback((event: CustomEvent) => {
-    const { taskId, status } = event.detail;
-    if (status.type === 'cancelled') {
-      setTasks((prev) => prev.filter((task) => task.taskId !== taskId));
-    } else {
-      setTasks((prev) => {
-        const newTasks = prev.map((task) => {
-          if (task.taskId === taskId) {
-            if (status.type === 'success' && task.status.type !== 'success') {
-              message.success(t('Task completed'));
-            }
-            if (status.type === 'failed' && task.status.type !== 'failed') {
-              message.error(t('Task failed'));
-            }
-            return { ...task, status };
-          }
-          return task;
-        });
-        return newTasks;
-      });
-    }
-  }, []);
-
-  const handleWsAuthorized = useCallback(() => {
-    setWsAuthorized(true);
-  }, []);
-
-  const handleTaskCancelled = useCallback((event: CustomEvent) => {
-    const { taskId } = event.detail;
-    setCancellingTasks((prev) => {
-      const newSet = new Set(prev);
-      newSet.delete(taskId);
-      return newSet;
-    });
-    message.success(t('Task cancelled'));
-  }, []);
-
-  useEffect(() => {
-    app.eventBus.addEventListener('ws:message:async-tasks', handleTaskMessage);
-    app.eventBus.addEventListener('ws:message:async-tasks:created', handleTaskCreated);
-    app.eventBus.addEventListener('ws:message:async-tasks:progress', handleTaskProgress);
-    app.eventBus.addEventListener('ws:message:async-tasks:status', handleTaskStatus);
-    app.eventBus.addEventListener('ws:message:authorized', handleWsAuthorized);
-    app.eventBus.addEventListener('ws:message:async-tasks:cancelled', handleTaskCancelled);
-
-    if (wsAuthorized) {
-      app.ws.send(
-        JSON.stringify({
-          type: 'request:async-tasks:list',
-        }),
-      );
-    }
-
-    return () => {
-      app.eventBus.removeEventListener('ws:message:async-tasks', handleTaskMessage);
-      app.eventBus.removeEventListener('ws:message:async-tasks:created', handleTaskCreated);
-      app.eventBus.removeEventListener('ws:message:async-tasks:progress', handleTaskProgress);
-      app.eventBus.removeEventListener('ws:message:async-tasks:status', handleTaskStatus);
-      app.eventBus.removeEventListener('ws:message:authorized', handleWsAuthorized);
-      app.eventBus.removeEventListener('ws:message:async-tasks:cancelled', handleTaskCancelled);
-    };
-  }, [
-    app,
-    handleTaskMessage,
-    handleTaskCreated,
-    handleTaskProgress,
-    handleTaskStatus,
-    handleWsAuthorized,
-    handleTaskCancelled,
-    wsAuthorized,
-  ]);
-
-  const handleCancelTask = async (taskId: string) => {
-    setCancellingTasks((prev) => new Set(prev).add(taskId));
-    try {
-      app.ws.send(
-        JSON.stringify({
-          type: 'request:async-tasks:cancel',
-          payload: { taskId },
-        }),
-      );
-    } catch (error) {
-      console.error('Failed to cancel task:', error);
-      setCancellingTasks((prev) => {
-        const newSet = new Set(prev);
-        newSet.delete(taskId);
-        return newSet;
-      });
-    }
-  };
-
-  const contextValue = {
-    tasks,
-    popoverVisible,
-    setPopoverVisible,
-    hasProcessingTasks,
-    cancellingTasks,
-    modalVisible,
-    setModalVisible,
-    currentError,
-    setCurrentError,
-    resultModalVisible,
-    setResultModalVisible,
-    currentTask,
-    setCurrentTask,
-    handleCancelTask,
-  };
-
   return (
-    <AsyncTaskContext.Provider value={contextValue}>
-      <PinnedPluginListProvider
-        items={
-          tasks.length > 0
-            ? {
-                asyncTasks: { order: 300, component: 'AsyncTasks', pin: true, snippet: '*' },
-              }
-            : {}
-        }
-      >
-        <SchemaComponentOptions components={{ AsyncTasks }}>{props.children}</SchemaComponentOptions>
-      </PinnedPluginListProvider>
-    </AsyncTaskContext.Provider>
+    <PinnedPluginListProvider
+      items={{
+        asyncTasks: { order: 300, component: 'AsyncTasks', pin: true, snippet: '*' },
+      }}
+    >
+      <SchemaComponentOptions components={{ AsyncTasks }}>{props.children}</SchemaComponentOptions>
+    </PinnedPluginListProvider>
   );
 };
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/src/client/components/AsyncTasks.tsx b/packages/plugins/@nocobase/plugin-async-task-manager/src/client/components/AsyncTasks.tsx
index d53b50f760..af2d5e19be 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/src/client/components/AsyncTasks.tsx
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/src/client/components/AsyncTasks.tsx
@@ -1,13 +1,31 @@
-import React, { useEffect } from 'react';
-import { Button, Popover, Table, Tag, Progress, Space, Tooltip, Popconfirm, Modal, Empty } from 'antd';
-import { createStyles, Icon, useApp, usePlugin } from '@nocobase/client';
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 
+import {
+  createStyles,
+  Icon,
+  useAPIClient,
+  useApp,
+  usePlugin,
+  useRequest,
+  useCollectionManager,
+  useCompile,
+} from '@nocobase/client';
+import { Button, Empty, Modal, Popconfirm, Popover, Progress, Space, Table, Tag, Tooltip } from 'antd';
+import React, { useCallback, useEffect, useState } from 'react';
+
+import { useCurrentAppInfo } from '@nocobase/client';
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 import relativeTime from 'dayjs/plugin/relativeTime';
 import { useT } from '../locale';
-import { useAsyncTask } from '../AsyncTaskManagerProvider';
-import { useCurrentAppInfo } from '@nocobase/client';
+
 const useStyles = createStyles(({ token }) => {
   return {
     button: {
@@ -34,93 +52,27 @@ const renderTaskResult = (status, t) => {
   );
 };
 
-export const AsyncTasks = () => {
-  const {
-    tasks,
-    popoverVisible,
-    setPopoverVisible,
-    hasProcessingTasks,
-    cancellingTasks,
-    modalVisible,
-    setModalVisible,
-    currentError,
-    setCurrentError,
-    resultModalVisible,
-    setResultModalVisible,
-    currentTask,
-    setCurrentTask,
-    handleCancelTask,
-  } = useAsyncTask();
+const useAsyncTask = () => {
+  const { data, refreshAsync, loading } = useRequest<any>({
+    url: 'asyncTasks:list',
+  });
+  return { loading, tasks: data?.data || [], refresh: refreshAsync };
+};
 
-  const plugin = usePlugin<any>('async-task-manager');
+const AsyncTasksButton = (props) => {
+  const { popoverVisible, setPopoverVisible, tasks, refresh, loading, hasProcessingTasks } = props;
   const app = useApp();
+  const api = useAPIClient();
   const appInfo = useCurrentAppInfo();
   const t = useT();
   const { styles } = useStyles();
-
-  useEffect(() => {
-    const handleClickOutside = (event: MouseEvent) => {
-      if (popoverVisible) {
-        const popoverElements = document.querySelectorAll('.ant-popover');
-        const buttonElement = document.querySelector('.sync-task-button');
-        let clickedInside = false;
-
-        popoverElements.forEach((element) => {
-          if (element.contains(event.target as Node)) {
-            clickedInside = true;
-          }
-        });
-
-        if (buttonElement?.contains(event.target as Node)) {
-          clickedInside = true;
-        }
-
-        if (!clickedInside) {
-          setPopoverVisible(false);
-        }
-      }
-    };
-
-    document.addEventListener('click', handleClickOutside);
-    return () => {
-      document.removeEventListener('click', handleClickOutside);
-    };
-  }, [popoverVisible, setPopoverVisible]);
-
+  const plugin = usePlugin<any>('async-task-manager');
+  const cm = useCollectionManager();
+  const compile = useCompile();
   const showTaskResult = (task) => {
-    setCurrentTask(task);
-    setResultModalVisible(true);
     setPopoverVisible(false);
   };
 
-  const renderTaskResultModal = () => {
-    if (!currentTask) {
-      return;
-    }
-
-    const { payload } = currentTask.status;
-    const renderer = plugin.taskResultRendererManager.get(currentTask.title.actionType);
-
-    return (
-      <Modal
-        title={t('Task result')}
-        open={resultModalVisible}
-        footer={[
-          <Button key="close" onClick={() => setResultModalVisible(false)}>
-            {t('Close')}
-          </Button>,
-        ]}
-        onCancel={() => setResultModalVisible(false)}
-      >
-        {renderer ? (
-          React.createElement(renderer, { payload, task: currentTask })
-        ) : (
-          <div>{t(`No renderer available for this task type, payload: ${payload}`)}</div>
-        )}
-      </Modal>
-    );
-  };
-
   const columns = [
     {
       title: t('Created at'),
@@ -140,7 +92,7 @@ export const AsyncTasks = () => {
         if (!title) {
           return '-';
         }
-
+        const collection = cm.getCollection(title.collection);
         const actionTypeMap = {
           export: t('Export'),
           import: t('Import'),
@@ -156,7 +108,7 @@ export const AsyncTasks = () => {
         };
 
         const taskTemplate = taskTypeMap[title.actionType] || `${actionText}`;
-        return taskTemplate.replace('{collection}', title.collection);
+        return taskTemplate.replace('{collection}', compile(collection?.title || title.collection));
       },
     },
     {
@@ -274,7 +226,7 @@ export const AsyncTasks = () => {
       width: 180,
       render: (_, record: any) => {
         const actions = [];
-        const isTaskCancelling = cancellingTasks.has(record.taskId);
+        const isTaskCancelling = false;
 
         if ((record.status.type === 'running' || record.status.type === 'pending') && record.cancelable) {
           actions.push(
@@ -282,7 +234,15 @@ export const AsyncTasks = () => {
               key="cancel"
               title={t('Confirm cancel')}
               description={t('Confirm cancel description')}
-              onConfirm={() => handleCancelTask(record.taskId)}
+              onConfirm={async () => {
+                await api.request({
+                  url: 'asyncTasks:cancel',
+                  params: {
+                    filterByTk: record.taskId,
+                  },
+                });
+                refresh();
+              }}
               okText={t('Confirm')}
               cancelText={t('Cancel')}
               disabled={isTaskCancelling}
@@ -309,8 +269,16 @@ export const AsyncTasks = () => {
                 icon={<Icon type="DownloadOutlined" />}
                 onClick={() => {
                   const token = app.apiClient.auth.token;
+                  const collection = cm.getCollection(record.title.collection);
+                  const compiledTitle = compile(collection?.title);
+                  const suffix = record?.title?.actionType === 'export-attachments' ? '-attachments.zip' : '.xlsx';
+                  const fileText = `${compiledTitle}${suffix}`;
+                  const filename =
+                    record?.title?.actionType !== 'create migration' ? encodeURIComponent(fileText) : null;
                   const url = app.getApiUrl(
-                    `asyncTasks:fetchFile/${record.taskId}?token=${token}&__appName=${appInfo?.data?.name || app.name}`,
+                    `asyncTasks:fetchFile/${record.taskId}?token=${token}&__appName=${encodeURIComponent(
+                      appInfo?.data?.name || app.name,
+                    )}${filename ? `&filename=${filename}` : ''}`,
                   );
                   window.open(url);
                 }}
@@ -325,7 +293,19 @@ export const AsyncTasks = () => {
                 type="link"
                 size="small"
                 icon={<Icon type="EyeOutlined" />}
-                onClick={() => showTaskResult(record)}
+                onClick={() => {
+                  showTaskResult(record);
+                  const { payload } = record.status;
+                  const renderer = plugin.taskResultRendererManager.get(record.title.actionType);
+                  Modal.info({
+                    title: t('Task result'),
+                    content: renderer ? (
+                      React.createElement(renderer, { payload, task: record })
+                    ) : (
+                      <div>{t(`No renderer available for this task type, payload: ${payload}`)}</div>
+                    ),
+                  });
+                }}
               >
                 {t('View result')}
               </Button>,
@@ -341,9 +321,22 @@ export const AsyncTasks = () => {
               size="small"
               icon={<Icon type="ExclamationCircleOutlined" />}
               onClick={() => {
-                setCurrentError(record.status.errors);
-                setModalVisible(true);
                 setPopoverVisible(false);
+                Modal.info({
+                  title: t('Error Details'),
+                  content: record.status.errors?.map((error, index) => (
+                    <div key={index} style={{ marginBottom: 16 }}>
+                      <div style={{ color: '#ff4d4f', marginBottom: 8 }}>{error.message}</div>
+                      {error.code && (
+                        <div style={{ color: '#999', fontSize: 12 }}>
+                          {t('Error code')}: {error.code}
+                        </div>
+                      )}
+                    </div>
+                  )),
+                  closable: true,
+                  width: 400,
+                });
               }}
             >
               {t('Error details')}
@@ -357,9 +350,9 @@ export const AsyncTasks = () => {
   ];
 
   const content = (
-    <div style={{ width: tasks.length > 0 ? 800 : 200 }}>
+    <div style={{ maxHeight: '70vh', overflow: 'auto', width: tasks.length > 0 ? 800 : 200 }}>
       {tasks.length > 0 ? (
-        <Table columns={columns} dataSource={tasks} size="small" pagination={false} rowKey="taskId" />
+        <Table loading={loading} columns={columns} dataSource={tasks} size="small" pagination={false} rowKey="taskId" />
       ) : (
         <div style={{ padding: '24px 0', display: 'flex', justifyContent: 'center' }}>
           <Empty description={t('No tasks')} image={Empty.PRESENTED_IMAGE_SIMPLE} />
@@ -383,30 +376,53 @@ export const AsyncTasks = () => {
           onClick={() => setPopoverVisible(!popoverVisible)}
         />
       </Popover>
-      {renderTaskResultModal()}
-
-      <Modal
-        title={t('Error Details')}
-        open={modalVisible}
-        onCancel={() => setModalVisible(false)}
-        footer={[
-          <Button key="ok" type="primary" onClick={() => setModalVisible(false)}>
-            {t('OK')}
-          </Button>,
-        ]}
-        width={400}
-      >
-        {currentError?.map((error, index) => (
-          <div key={index} style={{ marginBottom: 16 }}>
-            <div style={{ color: '#ff4d4f', marginBottom: 8 }}>{error.message}</div>
-            {error.code && (
-              <div style={{ color: '#999', fontSize: 12 }}>
-                {t('Error code')}: {error.code}
-              </div>
-            )}
-          </div>
-        ))}
-      </Modal>
     </>
   );
 };
+
+export const AsyncTasks = () => {
+  const { tasks, refresh, ...others } = useAsyncTask();
+  const app = useApp();
+  const [popoverVisible, setPopoverVisible] = useState(false);
+  const [hasProcessingTasks, setHasProcessingTasks] = useState(false);
+
+  useEffect(() => {
+    setHasProcessingTasks(tasks.some((task) => task.status.type !== 'success' && task.status.type !== 'failed'));
+  }, [tasks]);
+
+  const handleTaskCreated = useCallback(async () => {
+    setPopoverVisible(true);
+  }, []);
+  const handleTaskProgress = useCallback(() => {
+    refresh();
+    console.log('handleTaskProgress');
+  }, []);
+  const handleTaskStatus = useCallback(() => {
+    refresh();
+    console.log('handleTaskStatus');
+  }, []);
+  const handleTaskCancelled = useCallback(() => {
+    refresh();
+    console.log('handleTaskCancelled');
+  }, []);
+
+  useEffect(() => {
+    app.eventBus.addEventListener('ws:message:async-tasks:created', handleTaskCreated);
+    app.eventBus.addEventListener('ws:message:async-tasks:progress', handleTaskProgress);
+    app.eventBus.addEventListener('ws:message:async-tasks:status', handleTaskStatus);
+    app.eventBus.addEventListener('ws:message:async-tasks:cancelled', handleTaskCancelled);
+
+    return () => {
+      app.eventBus.removeEventListener('ws:message:async-tasks:created', handleTaskCreated);
+      app.eventBus.removeEventListener('ws:message:async-tasks:progress', handleTaskProgress);
+      app.eventBus.removeEventListener('ws:message:async-tasks:status', handleTaskStatus);
+      app.eventBus.removeEventListener('ws:message:async-tasks:cancelled', handleTaskCancelled);
+    };
+  }, [app, handleTaskCancelled, handleTaskCreated, handleTaskProgress, handleTaskStatus]);
+
+  return (
+    tasks?.length > 0 && (
+      <AsyncTasksButton {...{ tasks, refresh, popoverVisible, setPopoverVisible, hasProcessingTasks, ...others }} />
+    )
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-async-task-manager/src/locale/it-IT.json
index 8bb43f77a9..cd1e2c459d 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/src/locale/it-IT.json
@@ -4,7 +4,7 @@
   "Data": "Dati",
   "Task": "Attività",
   "Status": "Stato",
-  "Actions": "Operazioni",
+  "Actions": "Azioni",
   "Created at": "Creato alle",
   "Type": "Tipo",
   "Waiting": "In attesa",
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/src/server/index.ts b/packages/plugins/@nocobase/plugin-async-task-manager/src/server/index.ts
index ce0db665e5..f7f9c12af6 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/src/server/index.ts
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/src/server/index.ts
@@ -1,5 +1,13 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 export * from './interfaces/async-task-manager';
 export * from './task-type';
-export * from './static-import';
 
 export { default } from './plugin';
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-async-task-manager/src/server/plugin.ts
index 494d826848..76fdb0ac1d 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/src/server/plugin.ts
@@ -1,9 +1,18 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 import { Plugin } from '@nocobase/server';
-import { BaseTaskManager } from './base-task-manager';
-import { AsyncTasksManager } from './interfaces/async-task-manager';
-import { CommandTaskType } from './command-task-type';
-import asyncTasksResource from './resourcers/async-tasks';
 import { throttle } from 'lodash';
+import { BaseTaskManager } from './base-task-manager';
+import { CommandTaskType } from './command-task-type';
+import { AsyncTasksManager } from './interfaces/async-task-manager';
+import asyncTasksResource from './resourcers/async-tasks';
 
 export class PluginAsyncExportServer extends Plugin {
   private progressThrottles: Map<string, Function> = new Map();
@@ -20,7 +29,7 @@ export class PluginAsyncExportServer extends Plugin {
     });
 
     this.app.container.get<AsyncTasksManager>('AsyncTaskManager').registerTaskType(CommandTaskType);
-    this.app.acl.allow('asyncTasks', ['get', 'fetchFile'], 'loggedIn');
+    this.app.acl.allow('asyncTasks', ['list', 'get', 'fetchFile', 'cancel'], 'loggedIn');
   }
 
   getThrottledProgressEmitter(taskId: string, userId: string) {
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/src/server/resourcers/async-tasks.ts b/packages/plugins/@nocobase/plugin-async-task-manager/src/server/resourcers/async-tasks.ts
index 1733616ae3..31bece6dfe 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/src/server/resourcers/async-tasks.ts
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/src/server/resourcers/async-tasks.ts
@@ -1,8 +1,26 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 import fs from 'fs';
+import _ from 'lodash';
 import { basename } from 'path';
+
 export default {
   name: 'asyncTasks',
   actions: {
+    async list(ctx, next) {
+      const userId = ctx.auth.user.id;
+      const asyncTaskManager = ctx.app.container.get('AsyncTaskManager');
+      const tasks = await asyncTaskManager.getTasksByTag('userId', userId);
+      ctx.body = _.orderBy(tasks, 'createdAt', 'desc');
+      await next();
+    },
     async get(ctx, next) {
       const { filterByTk } = ctx.action.params;
       const taskManager = ctx.app.container.get('AsyncTaskManager');
@@ -11,8 +29,29 @@ export default {
       ctx.body = taskStatus;
       await next();
     },
-    async fetchFile(ctx, next) {
+    async cancel(ctx, next) {
       const { filterByTk } = ctx.action.params;
+      const userId = ctx.auth.user.id;
+      const asyncTaskManager = ctx.app.container.get('AsyncTaskManager');
+
+      const task = asyncTaskManager.getTask(filterByTk);
+
+      if (!task) {
+        ctx.body = 'ok';
+        await next();
+        return;
+      }
+
+      if (task.tags['userId'] != userId) {
+        ctx.throw(403);
+      }
+
+      const cancelled = await asyncTaskManager.cancelTask(filterByTk);
+      ctx.body = cancelled;
+      await next();
+    },
+    async fetchFile(ctx, next) {
+      const { filterByTk, filename } = ctx.action.params;
       const taskManager = ctx.app.container.get('AsyncTaskManager');
       const taskStatus = await taskManager.getTaskStatus(filterByTk);
       // throw error if task is not success
@@ -28,10 +67,12 @@ export default {
 
       // send file to client
       ctx.body = fs.createReadStream(filePath);
-
+      // 处理文件名
+      let finalFileName = filename ? filename : basename(filePath);
+      finalFileName = encodeURIComponent(finalFileName); // 避免中文或特殊字符问题
       ctx.set({
         'Content-Type': 'application/octet-stream',
-        'Content-Disposition': `attachment; filename=${basename(filePath)}`,
+        'Content-Disposition': `attachment; filename=${finalFileName}`,
       });
 
       await next();
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/src/server/static-import.ts b/packages/plugins/@nocobase/plugin-async-task-manager/src/server/static-import.ts
deleted file mode 100644
index 1329c67ae7..0000000000
--- a/packages/plugins/@nocobase/plugin-async-task-manager/src/server/static-import.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { appendToBuiltInPlugins } from '@nocobase/server';
-
-export async function staticImport() {
-  await appendToBuiltInPlugins('@nocobase/plugin-async-task-manager');
-}
diff --git a/packages/plugins/@nocobase/plugin-audit-logs/package.json b/packages/plugins/@nocobase/plugin-audit-logs/package.json
index ed3a8c628b..2aa074e4a1 100644
--- a/packages/plugins/@nocobase/plugin-audit-logs/package.json
+++ b/packages/plugins/@nocobase/plugin-audit-logs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-audit-logs",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "displayName": "Audit logs (deprecated)",
   "displayName.zh-CN": "审计日志（废弃）",
   "description": "This plugin is deprecated. There will be a new audit log plugin in the future.",
diff --git a/packages/plugins/@nocobase/plugin-auth-sms/package.json b/packages/plugins/@nocobase/plugin-auth-sms/package.json
index 488b5a0c9b..ee7d4fe4e0 100644
--- a/packages/plugins/@nocobase/plugin-auth-sms/package.json
+++ b/packages/plugins/@nocobase/plugin-auth-sms/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：短信",
   "description": "SMS authentication.",
   "description.zh-CN": "通过短信验证码认证身份。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/auth-sms",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/auth-sms",
diff --git a/packages/plugins/@nocobase/plugin-auth/package.json b/packages/plugins/@nocobase/plugin-auth/package.json
index 7f3684bbb5..d9bf447211 100644
--- a/packages/plugins/@nocobase/plugin-auth/package.json
+++ b/packages/plugins/@nocobase/plugin-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-auth",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/auth",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/auth",
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/AuthProvider.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/AuthProvider.tsx
index 9f88e94e0e..85ab4b286c 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/AuthProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/AuthProvider.tsx
@@ -13,15 +13,13 @@ import React, { useEffect } from 'react';
 export const AuthProvider: React.FC = (props) => {
   const searchString = useLocationSearch();
   const app = useApp();
+  const params = new URLSearchParams(searchString);
+  const authenticator = params.get('authenticator');
+  const token = params.get('token');
+  if (token) {
+    app.apiClient.auth.setToken(token);
+    app.apiClient.auth.setAuthenticator(authenticator);
+  }
 
-  useEffect(() => {
-    const params = new URLSearchParams(searchString);
-    const authenticator = params.get('authenticator');
-    const token = params.get('token');
-    if (token) {
-      app.apiClient.auth.setToken(token);
-      app.apiClient.auth.setAuthenticator(authenticator);
-    }
-  });
   return <>{props.children}</>;
 };
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignUpForm.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignUpForm.tsx
index ac01ea81c7..1f1470a9cf 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignUpForm.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignUpForm.tsx
@@ -8,7 +8,7 @@
  */
 
 import { SchemaComponent } from '@nocobase/client';
-import { ISchema } from '@formily/react';
+import { ISchema, Schema } from '@formily/react';
 import React, { useMemo } from 'react';
 import { uid } from '@formily/shared';
 import { useAuthTranslation } from '../locale';
@@ -122,6 +122,7 @@ const getSignupPageSchema = (fieldSchemas: any): ISchema => ({
 
 export const SignUpForm = ({ authenticatorName: name }: { authenticatorName: string }) => {
   const { t } = useAuthTranslation();
+  const { t: fieldT } = useTranslation('lm-collections');
   const useBasicSignUp = () => {
     return useSignUp({ authenticator: name });
   };
@@ -132,8 +133,12 @@ export const SignUpForm = ({ authenticatorName: name }: { authenticatorName: str
     return signupForm
       .filter((field: { show: boolean }) => field.show)
       .reduce((prev: any, item: { field: string; required: boolean; uiSchema: any }) => {
-        prev[item.field] = {
+        const uiSchema = {
           ...item.uiSchema,
+          title: item.uiSchema.title ? fieldT(Schema.compile(item.uiSchema.title, { t })) : '',
+        };
+        prev[item.field] = {
+          ...uiSchema,
           required: item.required,
           'x-decorator': 'FormItem',
         };
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/settings/Authenticator.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/settings/Authenticator.tsx
index d10d8216c3..8d53e82f7d 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/settings/Authenticator.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/settings/Authenticator.tsx
@@ -13,7 +13,10 @@ import {
   useAPIClient,
   useActionContext,
   useAsyncData,
+  useRecord,
   useRequest,
+  useResourceActionContext,
+  useResourceContext,
 } from '@nocobase/client';
 import { Card } from 'antd';
 import React, { useState } from 'react';
@@ -24,7 +27,23 @@ import { AuthTypeContext, AuthTypesContext, useAuthTypes } from './authType';
 import { useValuesFromOptions, Options } from './Options';
 import { useTranslation } from 'react-i18next';
 import { useAuthTranslation } from '../locale';
-import { Schema } from '@formily/react';
+import { Schema, useField, useForm } from '@formily/react';
+
+function recursiveTrim(obj: Record<string, any> | string | any[]) {
+  if (typeof obj === 'string') {
+    return obj.trim();
+  }
+
+  if (Array.isArray(obj)) {
+    return obj.map((item) => recursiveTrim(item));
+  }
+
+  if (typeof obj === 'object' && obj !== null) {
+    return Object.fromEntries(Object.entries(obj).map(([key, value]) => [key, recursiveTrim(value)]));
+  }
+
+  return obj;
+}
 
 const useCloseAction = () => {
   const { setVisible } = useActionContext();
@@ -56,7 +75,7 @@ const AddNew = () => {
             {t('Add new')} <DownOutlined />
           </Button>
         </Dropdown>
-        <SchemaComponent scope={{ useCloseAction, types, setType }} schema={createFormSchema} />
+        <SchemaComponent scope={{ useCloseAction, types, setType, useCreateAction }} schema={createFormSchema} />
       </AuthTypeContext.Provider>
     </ActionContextProvider>
   );
@@ -69,6 +88,71 @@ const useCanNotDelete = () => {
   return false;
 };
 
+export const useCreateAction = () => {
+  const form = useForm();
+  const field = useField();
+  const ctx = useActionContext();
+  const { refresh } = useResourceActionContext();
+  const { resource } = useResourceContext();
+  return {
+    async run() {
+      try {
+        await form.submit();
+        field.data = field.data || {};
+        field.data.loading = true;
+        const options = form.values.options || {};
+        await resource.create({
+          values: {
+            ...form.values,
+            options: recursiveTrim(options),
+          },
+        });
+        ctx.setVisible(false);
+        await form.reset();
+        field.data.loading = false;
+        refresh();
+      } catch (error) {
+        if (field.data) {
+          field.data.loading = false;
+        }
+      }
+    },
+  };
+};
+
+export const useUpdateAction = () => {
+  const field = useField();
+  const form = useForm();
+  const ctx = useActionContext();
+  const { refresh } = useResourceActionContext();
+  const { resource, targetKey } = useResourceContext();
+  const { [targetKey]: filterByTk } = useRecord();
+  return {
+    async run() {
+      await form.submit();
+      field.data = field.data || {};
+      field.data.loading = true;
+      try {
+        const options = form.values.options || {};
+        await resource.update({
+          filterByTk,
+          values: {
+            ...form.values,
+            options: recursiveTrim(options),
+          },
+        });
+        ctx.setVisible(false);
+        await form.reset();
+        refresh();
+      } catch (e) {
+        console.log(e);
+      } finally {
+        field.data.loading = false;
+      }
+    },
+  };
+};
+
 export const Authenticator = () => {
   const { t } = useAuthTranslation();
   const [types, setTypes] = useState([]);
@@ -99,7 +183,7 @@ export const Authenticator = () => {
         <SchemaComponent
           schema={authenticatorsSchema}
           components={{ AddNew, Options }}
-          scope={{ types, useValuesFromOptions, useCanNotDelete, t }}
+          scope={{ types, useValuesFromOptions, useCanNotDelete, t, useUpdateAction }}
         />
       </AuthTypesContext.Provider>
     </Card>
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/settings/schemas/authenticators.ts b/packages/plugins/@nocobase/plugin-auth/src/client/settings/schemas/authenticators.ts
index b021a9384f..ab17b3a218 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/settings/schemas/authenticators.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/settings/schemas/authenticators.ts
@@ -153,7 +153,7 @@ export const createFormSchema: ISchema = {
               'x-component': 'Action',
               'x-component-props': {
                 type: 'primary',
-                useAction: '{{ cm.useCreateAction }}',
+                useAction: '{{ useCreateAction }}',
               },
             },
           },
@@ -389,7 +389,7 @@ export const authenticatorsSchema: ISchema = {
                               'x-component': 'Action',
                               'x-component-props': {
                                 type: 'primary',
-                                useAction: '{{ cm.useUpdateAction }}',
+                                useAction: '{{ useUpdateAction }}',
                               },
                             },
                           },
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-auth/src/server/plugin.ts
index 960427b2d6..e515c6903a 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/plugin.ts
@@ -11,6 +11,7 @@ import { Cache } from '@nocobase/cache';
 import { Model } from '@nocobase/database';
 import { InstallOptions, Plugin } from '@nocobase/server';
 import { tval } from '@nocobase/utils';
+import { tokenPolicyCollectionName, tokenPolicyRecordKey } from '../constants';
 import { namespace, presetAuthType, presetAuthenticator } from '../preset';
 import authActions from './actions/auth';
 import authenticatorsActions from './actions/authenticators';
@@ -19,7 +20,6 @@ import { AuthModel } from './model/authenticator';
 import { Storer } from './storer';
 import { TokenBlacklistService } from './token-blacklist';
 import { TokenController } from './token-controller';
-import { tokenPolicyCollectionName, tokenPolicyRecordKey } from '../constants';
 
 export class PluginAuthServer extends Plugin {
   cache: Cache;
@@ -139,7 +139,7 @@ export class PluginAuthServer extends Plugin {
     });
 
     this.app.on('ws:message:auth:token', async ({ clientId, payload }) => {
-      if (!payload || !payload.token || !payload.authenticator) {
+      if (!payload || !payload.token) {
         this.app.emit(`ws:removeTag`, {
           clientId,
           tagKey: 'userId',
@@ -147,7 +147,7 @@ export class PluginAuthServer extends Plugin {
         return;
       }
 
-      const auth = await this.app.authManager.get(payload.authenticator, {
+      const auth = await this.app.authManager.get(payload.authenticator || 'basic', {
         getBearerToken: () => payload.token,
         app: this.app,
         db: this.app.db,
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/package.json b/packages/plugins/@nocobase/plugin-backup-restore/package.json
index 665915c60f..68017a783f 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/package.json
+++ b/packages/plugins/@nocobase/plugin-backup-restore/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "应用的备份与还原（废弃）",
   "description": "Backup and restore applications for scenarios such as application replication, migration, and upgrades.",
   "description.zh-CN": "备份和还原应用，可用于应用的复制、迁移、升级等场景。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/backup-restore",
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-backup-restore/src/locale/it-IT.json
index 452be0fb9e..70f9feb195 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/locale/it-IT.json
@@ -40,5 +40,11 @@
   "custom.description": "Dati di raccolta personalizzati",
   "skipped.description": "Dati ignorati",
   "unknown.description": "Dati senza regole di dump configurate",
-  "third-party.description": "Informazioni sul servizio di terze parti"
+  "third-party.description": "Informazioni sul servizio di terze parti",
+  "Select Import data": "Seleziona dati da importare",
+  "Select Import Plugins": "Seleziona plugin di importazione",
+  "Select User Collections": "Seleziona raccolte utente",
+  "Basic Data": "Dati di base",
+  "Optional Data": "Dati opzionali",
+  "User Data": "Dati utente"
 }
diff --git a/packages/plugins/@nocobase/plugin-block-iframe/package.json b/packages/plugins/@nocobase/plugin-block-iframe/package.json
index 875ef68fce..49f49e144b 100644
--- a/packages/plugins/@nocobase/plugin-block-iframe/package.json
+++ b/packages/plugins/@nocobase/plugin-block-iframe/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "区块：iframe",
   "description": "Create an iframe block on the page to embed and display external web pages or content.",
   "description.zh-CN": "在页面上创建和管理iframe，用于嵌入和展示外部网页或内容。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/block-iframe",
diff --git a/packages/plugins/@nocobase/plugin-block-workbench/package.json b/packages/plugins/@nocobase/plugin-block-workbench/package.json
index e40c06c239..d283fed3c8 100644
--- a/packages/plugins/@nocobase/plugin-block-workbench/package.json
+++ b/packages/plugins/@nocobase/plugin-block-workbench/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-block-workbench",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "displayName": "Block: Action panel",
   "displayName.zh-CN": "区块：操作面板",
   "description": "Centrally manages and displays various actions, allowing users to efficiently perform tasks. It supports extensibility, with current action types including pop-ups, links, scanning, and custom requests.",
diff --git a/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/index.tsx b/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/index.tsx
index 15c46eb4ec..9365c8ee67 100644
--- a/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/index.tsx
+++ b/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/index.tsx
@@ -9,13 +9,13 @@
 import { FileImageOutlined, LeftOutlined } from '@ant-design/icons';
 import { useActionContext } from '@nocobase/client';
 import { Html5Qrcode } from 'html5-qrcode';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ScanBox } from './ScanBox';
 import { useScanner } from './useScanner';
 
 const qrcodeEleId = 'qrcode';
-export const QRCodeScannerInner = (props) => {
+export const QRCodeScannerInner = ({ setVisible }) => {
   const containerRef = useRef<HTMLDivElement>();
   const imgUploaderRef = useRef<HTMLInputElement>();
   const { t } = useTranslation('block-workbench');
@@ -23,9 +23,17 @@ export const QRCodeScannerInner = (props) => {
   const vw = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0);
   const vh = Math.max(document.documentElement.clientHeight || 0, window.innerHeight || 0);
 
+  const onScanSuccess = useCallback(
+    (text) => {
+      setVisible(false);
+    },
+    [setVisible],
+  );
+
   const { startScanFile } = useScanner({
     onScannerSizeChanged: setOriginVideoSize,
     elementId: qrcodeEleId,
+    onScanSuccess,
   });
 
   const getBoxStyle = (): React.CSSProperties => {
@@ -174,7 +182,7 @@ export const QRCodeScanner = (props) => {
 
   return visible && cameraAvaliable ? (
     <div style={style}>
-      <QRCodeScannerInner />
+      <QRCodeScannerInner setVisible={setVisible} />
       <LeftOutlined style={backIconStyle} onClick={() => setVisible(false)} />
       <div style={titleStyle}>{t('Scan QR code')}</div>
     </div>
diff --git a/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/useScanner.ts b/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/useScanner.ts
index fc64438964..16568498ce 100644
--- a/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/useScanner.ts
+++ b/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/useScanner.ts
@@ -6,14 +6,27 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-
+import { useApp } from '@nocobase/client';
+import MobileManager from '@nocobase/plugin-mobile/client';
 import { Html5Qrcode, Html5QrcodeScannerState } from 'html5-qrcode';
-import { useState, useCallback, useMemo, useEffect } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+
+function removeStringIfStartsWith(text: string, prefix: string): string {
+  if (text.startsWith(prefix)) {
+    return text.slice(prefix.length);
+  }
+  return text;
+}
+
+export function useScanner({ onScannerSizeChanged, elementId, onScanSuccess }) {
+  const app = useApp();
+  const mobileManager = app.pm.get(MobileManager);
+  const basename = mobileManager.mobileRouter.basename.replace(/\/+$/, '');
 
-export function useScanner({ onScannerSizeChanged, elementId }) {
   const [scanner, setScanner] = useState<Html5Qrcode>();
+
   const navigate = useNavigate();
   const { t } = useTranslation('block-workbench');
   const viewPoint = useMemo(() => {
@@ -37,12 +50,17 @@ export function useScanner({ onScannerSizeChanged, elementId }) {
           },
         },
         (text) => {
-          navigate(text);
+          if (text?.startsWith('http')) {
+            window.location.href = text;
+            return;
+          }
+          navigate(removeStringIfStartsWith(text, basename));
+          onScanSuccess && onScanSuccess(text);
         },
         undefined,
       );
     },
-    [navigate, onScannerSizeChanged, viewPoint],
+    [navigate, onScannerSizeChanged, viewPoint, basename, onScanSuccess],
   );
   const stopScanner = useCallback(async (scanner: Html5Qrcode) => {
     const state = scanner.getState();
@@ -56,13 +74,18 @@ export function useScanner({ onScannerSizeChanged, elementId }) {
       await stopScanner(scanner);
       try {
         const { decodedText } = await scanner.scanFileV2(file, false);
-        navigate(decodedText);
+        if (decodedText?.startsWith('http')) {
+          window.location.href = decodedText;
+          return;
+        }
+        navigate(removeStringIfStartsWith(decodedText, basename));
+        onScanSuccess && onScanSuccess(decodedText);
       } catch (error) {
         alert(t('QR code recognition failed, please scan again'));
         startScanCamera(scanner);
       }
     },
-    [scanner, stopScanner, startScanCamera, t, navigate],
+    [stopScanner, scanner, navigate, basename, t, startScanCamera, onScanSuccess],
   );
 
   useEffect(() => {
diff --git a/packages/plugins/@nocobase/plugin-calendar/package.json b/packages/plugins/@nocobase/plugin-calendar/package.json
index f77ca278df..2e7a888f3d 100644
--- a/packages/plugins/@nocobase/plugin-calendar/package.json
+++ b/packages/plugins/@nocobase/plugin-calendar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-calendar",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "displayName": "Calendar",
   "displayName.zh-CN": "日历",
   "description": "Provides callendar collection template and block for managing date data, typically for date/time related information such as events, appointments, tasks, and so on.",
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx
index 49c953bcaf..604b7de19b 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx
@@ -108,7 +108,7 @@ const useEvents = (
     title: string;
   },
   date: Date,
-  view: (typeof Weeks)[number],
+  view: (typeof Weeks)[number] | any = 'month',
 ) => {
   const parseExpression = useLazy<typeof import('cron-parser').parseExpression>(
     () => import('cron-parser'),
@@ -132,8 +132,8 @@ const useEvents = (
       const intervalTime = end.diff(start, 'millisecond', true);
 
       const dateM = dayjs(date);
-      const startDate = dateM.clone().startOf('month');
-      const endDate = startDate.clone().endOf('month');
+      const startDate = dateM.clone().startOf(view);
+      const endDate = startDate.clone().endOf(view);
 
       /**
        * view === month 时，会显示当月日程
@@ -286,7 +286,15 @@ export const Calendar: any = withDynamicSchemaProps(
       }, [reactBigCalendar]);
 
       // 新版 UISchema（1.0 之后）中已经废弃了 useProps，这里之所以继续保留是为了兼容旧版的 UISchema
-      const { dataSource, fieldNames, showLunar, defaultView, getFontColor, getBackgroundColor } = useProps(props);
+      const {
+        dataSource,
+        fieldNames,
+        showLunar,
+        defaultView,
+        getFontColor,
+        getBackgroundColor,
+        enableQuickCreateEvent,
+      } = useProps(props);
       const height = useCalenderHeight();
       const [date, setDate] = useState<Date>(new Date());
       const [view, setView] = useState<View>(props.defaultView || 'month');
@@ -417,7 +425,6 @@ export const Calendar: any = withDynamicSchemaProps(
         };
       };
       const BigCalendar = reactBigCalendar?.BigCalendar;
-
       return wrapSSR(
         <div className={`${hashId} ${containerClassName}`} style={{ height: height || 700 }}>
           <PopupContextProvider visible={visible} setVisible={setVisible}>
@@ -440,7 +447,7 @@ export const Calendar: any = withDynamicSchemaProps(
               onView={setView}
               onSelectSlot={(slotInfo) => {
                 setCurrentSelectDate(slotInfo);
-                if (canCreate) {
+                if (canCreate && enableQuickCreateEvent) {
                   insertAddNewer(addNew);
                   setVisibleAddNewer(true);
                 }
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx
index 2f08b3c11a..191ad1e998 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx
@@ -219,6 +219,30 @@ export const calendarBlockSettings = new SchemaSettings({
         };
       },
     },
+    {
+      name: 'quickCreateEvent',
+      Component: SchemaSettingsSwitchItem,
+      useComponentProps() {
+        const { t } = useTranslation();
+        const fieldSchema = useFieldSchema();
+        const field = useField();
+        const { dn } = useDesignable();
+        return {
+          title: t('Quick create event'),
+          checked: field.decoratorProps?.enableQuickCreateEvent ?? true,
+          onChange: (v) => {
+            field.decoratorProps.enableQuickCreateEvent = v;
+            fieldSchema['x-decorator-props']['enableQuickCreateEvent'] = v;
+            dn.emit('patch', {
+              schema: {
+                ['x-uid']: fieldSchema['x-uid'],
+                'x-decorator-props': field.decoratorProps,
+              },
+            });
+          },
+        };
+      },
+    },
     {
       name: 'showLunar',
       Component: ShowLunarDesignerItem,
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx
index d185dc152c..b22de16d2c 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx
@@ -17,7 +17,7 @@ export const CalendarBlockContext = createContext<any>({});
 CalendarBlockContext.displayName = 'CalendarBlockContext';
 
 const InternalCalendarBlockProvider = (props) => {
-  const { fieldNames, showLunar, defaultView } = props;
+  const { fieldNames, showLunar, defaultView, enableQuickCreateEvent } = props;
   const field = useField();
   const { resource, service } = useBlockRequestContext();
 
@@ -30,6 +30,7 @@ const InternalCalendarBlockProvider = (props) => {
         fieldNames,
         showLunar,
         defaultView,
+        enableQuickCreateEvent: enableQuickCreateEvent ?? true,
         fixedBlock: field?.decoratorProps?.fixedBlock,
       }}
     >
@@ -104,6 +105,7 @@ export const useCalendarBlockProps = () => {
     fieldNames: ctx.fieldNames,
     showLunar: ctx.showLunar,
     defaultView: ctx.defaultView,
+    enableQuickCreateEvent: ctx.enableQuickCreateEvent,
     fixedBlock: ctx.fixedBlock,
     getFontColor,
     getBackgroundColor,
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-calendar/src/locale/it-IT.json
index a55b42ab8f..a8b4d37ec3 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-calendar/src/locale/it-IT.json
@@ -23,8 +23,8 @@
   "Calendar collection": "Raccolta calendario",
   "Create calendar block": "Crea blocco calendario",
   "Filter": "Filtro",
-  "Configure actions": "Configura operazioni",
-  "Enable actions": "Abilita operazioni",
+  "Configure actions": "Configura azioni",
+  "Enable actions": "Abilita azioni",
   "Turn pages": "Cambia pagina",
   "Select view": "Seleziona vista",
   "Add new": "Aggiungi nuovo",
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-calendar/src/locale/zh-CN.json
index d94ebda242..bd8c056a67 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/locale/zh-CN.json
+++ b/packages/plugins/@nocobase/plugin-calendar/src/locale/zh-CN.json
@@ -50,5 +50,6 @@
   "Color field": "颜色字段",
   "Not selected": "未选择",
   "Default view": "默认视图",
-  "Event open mode": "事项打开方式"
+  "Event open mode": "事项打开方式",
+  "Quick create event": "快速创建事项"
 }
diff --git a/packages/plugins/@nocobase/plugin-charts/package.json b/packages/plugins/@nocobase/plugin-charts/package.json
index 78981fdd15..8164265a86 100644
--- a/packages/plugins/@nocobase/plugin-charts/package.json
+++ b/packages/plugins/@nocobase/plugin-charts/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "图表（废弃）",
   "description": "The plugin has been deprecated, please use the data visualization plugin instead.",
   "description.zh-CN": "已废弃插件，请使用数据可视化插件代替。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-charts/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-charts/src/locale/it-IT.json
index 0e4ab1a53a..9e1a427a21 100644
--- a/packages/plugins/@nocobase/plugin-charts/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-charts/src/locale/it-IT.json
@@ -3,7 +3,7 @@
   "Delete": "Elimina",
   "Cancel": "Annulla",
   "Submit": "Invia",
-  "Actions": "Operazioni",
+  "Actions": "Azioni",
   "Title": "Titolo",
   "Enable": "Abilita",
   "Chart": "Grafico",
diff --git a/packages/plugins/@nocobase/plugin-client/package.json b/packages/plugins/@nocobase/plugin-client/package.json
index d8c4bc9f53..72cd2e5fff 100644
--- a/packages/plugins/@nocobase/plugin-client/package.json
+++ b/packages/plugins/@nocobase/plugin-client/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "WEB 客户端",
   "description": "Provides a client interface for the NocoBase server",
   "description.zh-CN": "为 NocoBase 服务端提供客户端界面",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-client/src/client/routesTableSchema.tsx b/packages/plugins/@nocobase/plugin-client/src/client/routesTableSchema.tsx
index 05e7bc6de9..c9e190c2f0 100644
--- a/packages/plugins/@nocobase/plugin-client/src/client/routesTableSchema.tsx
+++ b/packages/plugins/@nocobase/plugin-client/src/client/routesTableSchema.tsx
@@ -398,8 +398,9 @@ export const createRoutesTableSchema = (collectionName: string, basename: string
                                   await form.submit();
                                   field.data = field.data || {};
                                   field.data.loading = true;
-                                  const { pageSchemaUid, tabSchemaUid, menuSchemaUid, tabSchemaName } =
-                                    await createRouteSchema(form.values);
+                                  const { pageSchemaUid, tabSchemaUid, tabSchemaName } = await createRouteSchema(
+                                    form.values,
+                                  );
                                   let options;
 
                                   if (form.values.href || !_.isEmpty(form.values.params)) {
@@ -427,10 +428,7 @@ export const createRoutesTableSchema = (collectionName: string, basename: string
                                   const res = await createRoute({
                                     ..._.omit(form.values, ['href', 'params', 'url']),
                                     schemaUid:
-                                      NocoBaseDesktopRouteType.page === form.values.type
-                                        ? pageSchemaUid
-                                        : menuSchemaUid,
-                                    menuSchemaUid,
+                                      NocoBaseDesktopRouteType.page === form.values.type ? pageSchemaUid : undefined,
                                     options,
                                     ...childrenObj,
                                   });
@@ -578,9 +576,7 @@ export const createRoutesTableSchema = (collectionName: string, basename: string
                   }
 
                   if (recordData.type === NocoBaseDesktopRouteType.page) {
-                    const path = `${basenameOfCurrentRouter.slice(0, -1)}${basename}/${
-                      isMobile ? recordData.schemaUid : recordData.menuSchemaUid
-                    }`;
+                    const path = `${basenameOfCurrentRouter.slice(0, -1)}${basename}/${recordData.schemaUid}`;
                     // 在点击 Access 按钮时，会用到
                     recordData._path = path;
 
@@ -596,7 +592,7 @@ export const createRoutesTableSchema = (collectionName: string, basename: string
                       recordData.parentId,
                       data.data,
                       isMobile,
-                    )}/tabs/${recordData.tabSchemaName || recordData.schemaUid}`;
+                    )}/tabs/${recordData.schemaUid}`;
                     recordData._path = path;
 
                     return (
@@ -877,8 +873,9 @@ export const createRoutesTableSchema = (collectionName: string, basename: string
                                         });
                                       } else {
                                         let options;
-                                        const { pageSchemaUid, tabSchemaUid, menuSchemaUid, tabSchemaName } =
-                                          await createRouteSchema(form.values);
+                                        const { pageSchemaUid, tabSchemaUid, tabSchemaName } = await createRouteSchema(
+                                          form.values,
+                                        );
 
                                         if (form.values.href || !_.isEmpty(form.values.params)) {
                                           options = {
@@ -893,8 +890,7 @@ export const createRoutesTableSchema = (collectionName: string, basename: string
                                           schemaUid:
                                             NocoBaseDesktopRouteType.page === form.values.type
                                               ? pageSchemaUid
-                                              : menuSchemaUid,
-                                          menuSchemaUid,
+                                              : undefined,
                                           options,
                                         });
 
@@ -1253,7 +1249,6 @@ function useCreateRouteSchema(isMobile: boolean) {
 
   const createRouteSchema = useCallback(
     async ({ type }: { type: NocoBaseDesktopRouteType }) => {
-      const menuSchemaUid = isMobile ? undefined : uid();
       const pageSchemaUid = uid();
       const tabSchemaName = uid();
       const tabSchemaUid = type === NocoBaseDesktopRouteType.page ? uid() : undefined;
@@ -1284,7 +1279,7 @@ function useCreateRouteSchema(isMobile: boolean) {
         await insertPageSchema(typeToSchema[type]);
       }
 
-      return { menuSchemaUid, pageSchemaUid, tabSchemaUid, tabSchemaName };
+      return { pageSchemaUid, tabSchemaUid, tabSchemaName };
     },
     [isMobile, resource, insertPageSchema],
   );
diff --git a/packages/plugins/@nocobase/plugin-client/src/client/utils.tsx b/packages/plugins/@nocobase/plugin-client/src/client/utils.tsx
index ff62e76cba..4eec50f835 100644
--- a/packages/plugins/@nocobase/plugin-client/src/client/utils.tsx
+++ b/packages/plugins/@nocobase/plugin-client/src/client/utils.tsx
@@ -13,7 +13,7 @@ export function getSchemaUidByRouteId(routeId: number, treeArray: any[], isMobil
   for (const node of treeArray) {
     if (node.id === routeId) {
       if (node.type === NocoBaseDesktopRouteType.page) {
-        return isMobile ? node.schemaUid : node.menuSchemaUid;
+        return node.schemaUid;
       }
       return node.schemaUid;
     }
diff --git a/packages/plugins/@nocobase/plugin-collection-sql/package.json b/packages/plugins/@nocobase/plugin-collection-sql/package.json
index b211aed039..ad0f7b5a0a 100644
--- a/packages/plugins/@nocobase/plugin-collection-sql/package.json
+++ b/packages/plugins/@nocobase/plugin-collection-sql/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表: SQL",
   "description": "Provides SQL collection template",
   "description.zh-CN": "提供 SQL 数据表模板",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "homepage": "https://docs-cn.nocobase.com/handbook/collection-sql",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/collection-sql",
   "main": "dist/server/index.js",
diff --git a/packages/plugins/@nocobase/plugin-collection-sql/src/server/__tests__/infer-fields.test.ts b/packages/plugins/@nocobase/plugin-collection-sql/src/server/__tests__/infer-fields.test.ts
index 5bb99776d7..3df2d6d979 100644
--- a/packages/plugins/@nocobase/plugin-collection-sql/src/server/__tests__/infer-fields.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-sql/src/server/__tests__/infer-fields.test.ts
@@ -7,14 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 import { SQLModel } from '../sql-collection';
 
 describe('infer fields', () => {
   let db: Database;
 
   beforeAll(async () => {
-    db = mockDatabase({ tablePrefix: '' });
+    db = await createMockDatabase({ tablePrefix: '' });
     await db.clean({ drop: true });
 
     db.collection({
diff --git a/packages/plugins/@nocobase/plugin-collection-sql/src/server/__tests__/sql-collection.test.ts b/packages/plugins/@nocobase/plugin-collection-sql/src/server/__tests__/sql-collection.test.ts
index d3ca5537a8..d931cb7b0f 100644
--- a/packages/plugins/@nocobase/plugin-collection-sql/src/server/__tests__/sql-collection.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-sql/src/server/__tests__/sql-collection.test.ts
@@ -7,11 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Collection, mockDatabase } from '@nocobase/database';
+import { Collection, createMockDatabase } from '@nocobase/database';
 import { SQLCollection } from '../sql-collection';
 
 test('sql-collection', async () => {
-  const db = mockDatabase({ tablePrefix: '' });
+  const db = await createMockDatabase({ tablePrefix: '' });
   await db.clean({ drop: true });
   db.collectionFactory.registerCollectionType(SQLCollection, {
     condition: (options) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-tree/package.json b/packages/plugins/@nocobase/plugin-collection-tree/package.json
index 45eda0c6c0..b608655ce0 100644
--- a/packages/plugins/@nocobase/plugin-collection-tree/package.json
+++ b/packages/plugins/@nocobase/plugin-collection-tree/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "displayName": "Collection: Tree",
   "displayName.zh-CN": "数据表：树",
   "description": "Provides tree collection template",
diff --git a/packages/plugins/@nocobase/plugin-collection-tree/src/server/migrations/20240802141435-collection-tree.ts b/packages/plugins/@nocobase/plugin-collection-tree/src/server/migrations/20240802141435-collection-tree.ts
index 61772f45ab..27def98812 100644
--- a/packages/plugins/@nocobase/plugin-collection-tree/src/server/migrations/20240802141435-collection-tree.ts
+++ b/packages/plugins/@nocobase/plugin-collection-tree/src/server/migrations/20240802141435-collection-tree.ts
@@ -31,6 +31,8 @@ export default class extends Migration {
     await this.db.sequelize.transaction(async (transaction) => {
       const treeCollections = await this.getTreeCollections({ transaction });
       for (const treeCollection of treeCollections) {
+        await treeCollection.load({ transaction });
+
         const name = `main_${treeCollection.name}_path`;
         const collectionOptions = {
           name,
@@ -47,35 +49,16 @@ export default class extends Migration {
             },
           ],
         };
-
         const collectionInstance = this.db.getCollection(treeCollection.name);
         const treeCollectionSchema = collectionInstance.collectionSchema();
-
         if (this.app.db.inDialect('postgres') && treeCollectionSchema != this.app.db.options.schema) {
           collectionOptions['schema'] = treeCollectionSchema;
         }
-
         this.app.db.collection(collectionOptions);
 
         const treeExistsInDb = await this.app.db.getCollection(name).existsInDb({ transaction });
-
         if (!treeExistsInDb) {
           await this.app.db.getCollection(name).sync({ transaction } as SyncOptions);
-          const opts = {
-            name: treeCollection.name,
-            autoGenId: false,
-            timestamps: false,
-            fields: [
-              { type: 'integer', name: 'id' },
-              { type: 'integer', name: 'parentId' },
-            ],
-          };
-
-          if (treeCollectionSchema != this.app.db.options.schema) {
-            opts['schema'] = treeCollectionSchema;
-          }
-
-          this.app.db.collection(opts);
           const chunkSize = 1000;
           await this.app.db.getRepository(treeCollection.name).chunk({
             chunkSize: chunkSize,
diff --git a/packages/plugins/@nocobase/plugin-data-source-main/package.json b/packages/plugins/@nocobase/plugin-data-source-main/package.json
index f7c675609c..98b54c2835 100644
--- a/packages/plugins/@nocobase/plugin-data-source-main/package.json
+++ b/packages/plugins/@nocobase/plugin-data-source-main/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/data-source-main",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/data-source-main",
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/package.json b/packages/plugins/@nocobase/plugin-data-source-manager/package.json
index 843a0d6229..7da697db50 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-source-manager",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "displayName": "Data source manager",
   "displayName.zh-CN": "数据源管理",
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/package.json b/packages/plugins/@nocobase/plugin-data-visualization/package.json
index d186c1b9d9..942c27a653 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/package.json
+++ b/packages/plugins/@nocobase/plugin-data-visualization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "displayName": "Data visualization",
   "displayName.zh-CN": "数据可视化",
   "description": "Provides data visualization feature, including chart block and chart filter block, support line charts, area charts, bar charts and more than a dozen kinds of charts, you can also extend more chart types.",
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-data-visualization/src/locale/it-IT.json
index 668ca91534..60090ca498 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/locale/it-IT.json
@@ -3,7 +3,7 @@
   "Delete": "Elimina",
   "Cancel": "Annulla",
   "Submit": "Invia",
-  "Actions": "Operazioni",
+  "Actions": "Azioni",
   "Title": "Titolo",
   "Enable": "Abilita",
   "Chart": "Grafico",
@@ -76,7 +76,7 @@
   "Expand": "Espandi",
   "Current filter": "Filtro corrente",
   "Add custom field": "Aggiungi campo personalizzato",
-  "To filter with custom fields, use \"Current filter\" variables in the chart configuration.": "Per filtrare con campi personalizzati, utilizza le variabili \"Current filter\" nella configurazione del grafico.",
+  "To filter with custom fields, use \"Current filter\" variables in the chart configuration.": "Per filtrare con campi personalizzati, utilizza le variabili \"Filtro corrente\" nella configurazione del grafico.",
   "Input": "Input",
   "Date range": "Intervallo date",
   "Time range": "Intervallo tempo",
diff --git a/packages/plugins/@nocobase/plugin-departments/.npmignore b/packages/plugins/@nocobase/plugin-departments/.npmignore
new file mode 100644
index 0000000000..65f5e8779f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-departments/README.md b/packages/plugins/@nocobase/plugin-departments/README.md
new file mode 100644
index 0000000000..cb4fb63505
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/README.md
@@ -0,0 +1 @@
+# @nocobase/plugin-department
diff --git a/packages/plugins/@nocobase/plugin-departments/client.d.ts b/packages/plugins/@nocobase/plugin-departments/client.d.ts
new file mode 100644
index 0000000000..6c459cbac4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-departments/client.js b/packages/plugins/@nocobase/plugin-departments/client.js
new file mode 100644
index 0000000000..b6e3be70e6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-departments/package.json b/packages/plugins/@nocobase/plugin-departments/package.json
new file mode 100644
index 0000000000..6b3ebf11fa
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@nocobase/plugin-departments",
+  "displayName": "Departments",
+  "displayName.zh-CN": "部门",
+  "description": "Organize users by departments, set hierarchical relationships, link roles to control permissions, and use departments as variables in workflows and expressions.",
+  "description.zh-CN": "以部门来组织用户，设定上下级关系，绑定角色控制权限，并支持作为变量用于工作流和表达式。",
+  "version": "1.6.20",
+  "main": "dist/server/index.js",
+  "devDependencies": {
+    "@nocobase/plugin-user-data-sync": "1.6.20"
+  },
+  "peerDependencies": {
+    "@nocobase/actions": "1.x",
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x"
+  },
+  "keywords": [
+    "Users & permissions"
+  ],
+  "gitHead": "080fc78c1a744d47e010b3bbe5840446775800e4"
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/server.d.ts b/packages/plugins/@nocobase/plugin-departments/server.d.ts
new file mode 100644
index 0000000000..c41081ddc6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-departments/server.js b/packages/plugins/@nocobase/plugin-departments/server.js
new file mode 100644
index 0000000000..972842039a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/ResourcesProvider.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/ResourcesProvider.tsx
new file mode 100644
index 0000000000..2ad0daac83
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/ResourcesProvider.tsx
@@ -0,0 +1,110 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { CollectionProvider_deprecated, ResourceActionContext, TableBlockContext, useRequest } from '@nocobase/client';
+import React, { useContext, useEffect, useMemo } from 'react';
+import { departmentCollection } from './collections/departments';
+import { userCollection } from './collections/users';
+import { FormContext } from '@formily/react';
+import { createForm } from '@formily/core';
+
+export const ResourcesContext = React.createContext<{
+  user: any;
+  setUser?: (user: any) => void;
+  department: any; // department name
+  setDepartment?: (department: any) => void;
+  departmentsResource?: any;
+  usersResource?: any;
+}>({
+  user: {},
+  department: {},
+});
+
+export const ResourcesProvider: React.FC = (props) => {
+  const [user, setUser] = React.useState(null);
+  const [department, setDepartment] = React.useState(null);
+
+  const userService = useRequest({
+    resource: 'users',
+    action: 'list',
+    params: {
+      appends: ['departments', 'departments.parent(recursively=true)'],
+      filter: department
+        ? {
+            'departments.id': department.id,
+          }
+        : {},
+      pageSize: 20,
+    },
+  });
+
+  useEffect(() => {
+    userService.run();
+  }, [department]);
+
+  const departmentRequest = {
+    resource: 'departments',
+    action: 'list',
+    params: {
+      paginate: false,
+      filter: {
+        parentId: null,
+      },
+    },
+  };
+  const departmentService = useRequest(departmentRequest);
+
+  return (
+    <ResourcesContext.Provider
+      value={{
+        user,
+        setUser,
+        department,
+        setDepartment,
+        usersResource: { service: userService },
+        departmentsResource: { service: departmentService },
+      }}
+    >
+      {props.children}
+    </ResourcesContext.Provider>
+  );
+};
+
+export const DepartmentsListProvider: React.FC = (props) => {
+  const { departmentsResource } = useContext(ResourcesContext);
+  const { service } = departmentsResource || {};
+  return (
+    <ResourceActionContext.Provider value={{ ...service }}>
+      <CollectionProvider_deprecated collection={departmentCollection}>{props.children}</CollectionProvider_deprecated>
+    </ResourceActionContext.Provider>
+  );
+};
+
+export const UsersListProvider: React.FC = (props) => {
+  const { usersResource } = useContext(ResourcesContext);
+  const { service } = usersResource || {};
+  const form = useMemo(() => createForm(), []);
+  const field = form.createField({ name: 'table' });
+  return (
+    <FormContext.Provider value={form}>
+      <TableBlockContext.Provider value={{ service, field }}>
+        <CollectionProvider_deprecated collection={userCollection}>{props.children}</CollectionProvider_deprecated>
+      </TableBlockContext.Provider>
+    </FormContext.Provider>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/collections/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/client/collections/departments.ts
new file mode 100644
index 0000000000..38105c0b2b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/collections/departments.ts
@@ -0,0 +1,115 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export const departmentCollection = {
+  name: 'departments',
+  fields: [
+    {
+      type: 'bigInt',
+      name: 'id',
+      primaryKey: true,
+      autoIncrement: true,
+      interface: 'id',
+      uiSchema: {
+        type: 'id',
+        title: '{{t("ID")}}',
+      },
+    },
+    {
+      name: 'title',
+      type: 'string',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Department name")}}',
+        'x-component': 'Input',
+        required: true,
+      },
+    },
+    {
+      name: 'parent',
+      type: 'belongsTo',
+      interface: 'm2o',
+      collectionName: 'departments',
+      foreignKey: 'parentId',
+      target: 'departments',
+      targetKey: 'id',
+      treeParent: true,
+      uiSchema: {
+        title: '{{t("Superior department")}}',
+        'x-component': 'DepartmentSelect',
+        // 'x-component-props': {
+        //   multiple: false,
+        //   fieldNames: {
+        //     label: 'title',
+        //     value: 'id',
+        //   },
+        // },
+      },
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'roles',
+      target: 'roles',
+      collectionName: 'departments',
+      through: 'departmentsRoles',
+      foreignKey: 'departmentId',
+      otherKey: 'roleName',
+      targetKey: 'name',
+      sourceKey: 'id',
+      uiSchema: {
+        title: '{{t("Roles")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            label: 'title',
+            value: 'name',
+          },
+        },
+      },
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'owners',
+      collectionName: 'departments',
+      target: 'users',
+      through: 'departmentsUsers',
+      foreignKey: 'departmentId',
+      otherKey: 'userId',
+      targetKey: 'id',
+      sourceKey: 'id',
+      scope: {
+        isOwner: true,
+      },
+      uiSchema: {
+        title: '{{t("Owners")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            label: 'nickname',
+            value: 'id',
+          },
+        },
+      },
+    },
+  ],
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/collections/users.ts b/packages/plugins/@nocobase/plugin-departments/src/client/collections/users.ts
new file mode 100644
index 0000000000..ba309455a7
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/collections/users.ts
@@ -0,0 +1,142 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export const userCollection = {
+  name: 'users',
+  fields: [
+    {
+      name: 'id',
+      type: 'bigInt',
+      autoIncrement: true,
+      primaryKey: true,
+      allowNull: false,
+      uiSchema: { type: 'number', title: '{{t("ID")}}', 'x-component': 'InputNumber', 'x-read-pretty': true },
+      interface: 'id',
+    },
+    {
+      interface: 'input',
+      type: 'string',
+      name: 'nickname',
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Nickname")}}',
+        'x-component': 'Input',
+      },
+    },
+    {
+      interface: 'input',
+      type: 'string',
+      name: 'username',
+      unique: true,
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Username")}}',
+        'x-component': 'Input',
+        'x-validator': { username: true },
+        required: true,
+      },
+    },
+    {
+      interface: 'email',
+      type: 'string',
+      name: 'email',
+      unique: true,
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Email")}}',
+        'x-component': 'Input',
+        'x-validator': 'email',
+        required: true,
+      },
+    },
+    {
+      interface: 'phone',
+      type: 'string',
+      name: 'phone',
+      unique: true,
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Phone")}}',
+        'x-component': 'Input',
+        'x-validator': 'phone',
+        required: true,
+      },
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'roles',
+      target: 'roles',
+      foreignKey: 'userId',
+      otherKey: 'roleName',
+      onDelete: 'CASCADE',
+      sourceKey: 'id',
+      targetKey: 'name',
+      through: 'rolesUsers',
+      uiSchema: {
+        type: 'array',
+        title: '{{t("Roles")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            label: 'title',
+            value: 'name',
+          },
+        },
+      },
+    },
+    {
+      name: 'departments',
+      type: 'belongsToMany',
+      interface: 'm2m',
+      target: 'departments',
+      foreignKey: 'userId',
+      otherKey: 'departmentId',
+      onDelete: 'CASCADE',
+      sourceKey: 'id',
+      targetKey: 'id',
+      through: 'departmentsUsers',
+      uiSchema: {
+        type: 'array',
+        title: '{{t("Departments")}}',
+        'x-component': 'DepartmentField',
+      },
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'mainDepartment',
+      target: 'departments',
+      foreignKey: 'userId',
+      otherKey: 'departmentId',
+      onDelete: 'CASCADE',
+      sourceKey: 'id',
+      targetKey: 'id',
+      through: 'departmentsUsers',
+      throughScope: {
+        isMain: true,
+      },
+      uiSchema: {
+        type: 'array',
+        title: '{{t("Main department")}}',
+        'x-component': 'DepartmentField',
+      },
+    },
+  ],
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/DepartmentOwnersField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/components/DepartmentOwnersField.tsx
new file mode 100644
index 0000000000..afcb651250
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/DepartmentOwnersField.tsx
@@ -0,0 +1,35 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { SchemaSettings } from '@nocobase/client';
+import { enableLink, fieldComponent, titleField } from './fieldSettings';
+
+export const DepartmentOwnersFieldSettings = new SchemaSettings({
+  name: 'fieldSettings:component:DepartmentOwnersField',
+  items: [
+    {
+      ...fieldComponent,
+    },
+    {
+      ...titleField,
+    },
+    {
+      ...enableLink,
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/ReadOnlyAssociationField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/components/ReadOnlyAssociationField.tsx
new file mode 100644
index 0000000000..d843d62847
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/ReadOnlyAssociationField.tsx
@@ -0,0 +1,27 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React from 'react';
+import { useDepartmentTranslation } from '../locale';
+import { AssociationField } from '@nocobase/client';
+import { connect, mapReadPretty } from '@formily/react';
+
+export const ReadOnlyAssociationField = connect(() => {
+  const { t } = useDepartmentTranslation();
+  return <div style={{ color: '#ccc' }}>{t('This field is currently not supported for use in form blocks.')} </div>;
+}, mapReadPretty(AssociationField.ReadPretty));
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/UserDepartmentsField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/components/UserDepartmentsField.tsx
new file mode 100644
index 0000000000..e866411db2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/UserDepartmentsField.tsx
@@ -0,0 +1,35 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { SchemaSettings } from '@nocobase/client';
+import { enableLink, fieldComponent, titleField } from './fieldSettings';
+
+export const UserDepartmentsFieldSettings = new SchemaSettings({
+  name: 'fieldSettings:component:UserDepartmentsField',
+  items: [
+    {
+      ...fieldComponent,
+    },
+    {
+      ...titleField,
+    },
+    {
+      ...enableLink,
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/UserMainDepartmentField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/components/UserMainDepartmentField.tsx
new file mode 100644
index 0000000000..0e8355e408
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/UserMainDepartmentField.tsx
@@ -0,0 +1,35 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { SchemaSettings } from '@nocobase/client';
+import { enableLink, fieldComponent, titleField } from './fieldSettings';
+
+export const UserMainDepartmentFieldSettings = new SchemaSettings({
+  name: 'fieldSettings:component:UserMainDepartmentField',
+  items: [
+    {
+      ...fieldComponent,
+    },
+    {
+      ...titleField,
+    },
+    {
+      ...enableLink,
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/fieldSettings.ts b/packages/plugins/@nocobase/plugin-departments/src/client/components/fieldSettings.ts
new file mode 100644
index 0000000000..bc637afa40
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/fieldSettings.ts
@@ -0,0 +1,185 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  useCollectionField,
+  useCollectionManager_deprecated,
+  useCollection_deprecated,
+  useCompile,
+  useDesignable,
+  useFieldComponentName,
+  useFieldModeOptions,
+  useIsAddNewForm,
+  useTitleFieldOptions,
+} from '@nocobase/client';
+import { useDepartmentTranslation } from '../locale';
+import { Field } from '@formily/core';
+import { useField, useFieldSchema, ISchema } from '@formily/react';
+
+export const titleField: any = {
+  name: 'titleField',
+  type: 'select',
+  useComponentProps() {
+    const { t } = useDepartmentTranslation();
+    const field = useField<Field>();
+    const { dn } = useDesignable();
+    const options = useTitleFieldOptions();
+    const { uiSchema, fieldSchema: tableColumnSchema, collectionField: tableColumnField } = useColumnSchema();
+    const schema = useFieldSchema();
+    const fieldSchema = tableColumnSchema || schema;
+    const targetCollectionField = useCollectionField();
+    const collectionField = tableColumnField || targetCollectionField;
+    const fieldNames = {
+      ...collectionField?.uiSchema?.['x-component-props']?.['fieldNames'],
+      ...field?.componentProps?.fieldNames,
+      ...fieldSchema?.['x-component-props']?.['fieldNames'],
+    };
+    return {
+      title: t('Title field'),
+      options,
+      value: fieldNames?.label,
+      onChange(label) {
+        const schema = {
+          ['x-uid']: fieldSchema['x-uid'],
+        };
+        const newFieldNames = {
+          ...collectionField?.uiSchema?.['x-component-props']?.['fieldNames'],
+          ...fieldSchema['x-component-props']?.['fieldNames'],
+          label,
+        };
+        fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+        fieldSchema['x-component-props']['fieldNames'] = newFieldNames;
+        schema['x-component-props'] = fieldSchema['x-component-props'];
+        field.componentProps.fieldNames = fieldSchema['x-component-props']?.fieldNames;
+        const path = field.path?.splice(field.path?.length - 1, 1);
+        field.form.query(`${path.concat(`*.` + fieldSchema.name)}`).forEach((f) => {
+          f.componentProps.fieldNames = fieldNames;
+        });
+        dn.emit('patch', {
+          schema,
+        });
+        dn.refresh();
+      },
+    };
+  },
+};
+
+export const isCollectionFieldComponent = (schema: ISchema) => {
+  return schema['x-component'] === 'CollectionField';
+};
+
+const useColumnSchema = () => {
+  const { getField } = useCollection_deprecated();
+  const compile = useCompile();
+  const columnSchema = useFieldSchema();
+  const { getCollectionJoinField } = useCollectionManager_deprecated();
+  const fieldSchema = columnSchema.reduceProperties((buf, s) => {
+    if (isCollectionFieldComponent(s)) {
+      return s;
+    }
+    return buf;
+  }, null);
+  if (!fieldSchema) {
+    return {};
+  }
+
+  const collectionField = getField(fieldSchema.name) || getCollectionJoinField(fieldSchema?.['x-collection-field']);
+  return { columnSchema, fieldSchema, collectionField, uiSchema: compile(collectionField?.uiSchema) };
+};
+
+export const enableLink = {
+  name: 'enableLink',
+  type: 'switch',
+  useVisible() {
+    const field = useField();
+    return field.readPretty;
+  },
+  useComponentProps() {
+    const { t } = useDepartmentTranslation();
+    const field = useField<Field>();
+    const { fieldSchema: tableColumnSchema } = useColumnSchema();
+    const schema = useFieldSchema();
+    const fieldSchema = tableColumnSchema || schema;
+    const { dn } = useDesignable();
+    return {
+      title: t('Enable link'),
+      checked: fieldSchema['x-component-props']?.enableLink !== false,
+      onChange(flag) {
+        fieldSchema['x-component-props'] = {
+          ...fieldSchema?.['x-component-props'],
+          enableLink: flag,
+        };
+        field.componentProps['enableLink'] = flag;
+        dn.emit('patch', {
+          schema: {
+            'x-uid': fieldSchema['x-uid'],
+            'x-component-props': {
+              ...fieldSchema?.['x-component-props'],
+            },
+          },
+        });
+        dn.refresh();
+      },
+    };
+  },
+};
+
+export const fieldComponent: any = {
+  name: 'fieldComponent',
+  type: 'select',
+  useComponentProps() {
+    const { t } = useDepartmentTranslation();
+    const field = useField<Field>();
+    const { fieldSchema: tableColumnSchema, collectionField } = useColumnSchema();
+    const schema = useFieldSchema();
+    const fieldSchema = tableColumnSchema || schema;
+    const fieldModeOptions = useFieldModeOptions({ fieldSchema: tableColumnSchema, collectionField });
+    // const isAddNewForm = useIsAddNewForm();
+    // const fieldMode = useFieldComponentName();
+    const { dn } = useDesignable();
+    return {
+      title: t('Field component'),
+      options: fieldModeOptions,
+      value: 'Select',
+      onChange(mode) {
+        const schema = {
+          ['x-uid']: fieldSchema['x-uid'],
+        };
+        fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+        fieldSchema['x-component-props']['mode'] = mode;
+        schema['x-component-props'] = fieldSchema['x-component-props'];
+        field.componentProps = field.componentProps || {};
+        field.componentProps.mode = mode;
+
+        // 子表单状态不允许设置默认值
+        // if (isSubMode(fieldSchema) && isAddNewForm) {
+        //   // @ts-ignore
+        //   schema.default = null;
+        //   fieldSchema.default = null;
+        //   field?.setInitialValue?.(null);
+        //   field?.setValue?.(null);
+        // }
+
+        void dn.emit('patch', {
+          schema,
+        });
+        dn.refresh();
+      },
+    };
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/index.ts b/packages/plugins/@nocobase/plugin-departments/src/client/components/index.ts
new file mode 100644
index 0000000000..a9a4c4c641
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/index.ts
@@ -0,0 +1,22 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export * from './ReadOnlyAssociationField';
+export * from './UserDepartmentsField';
+export * from './UserMainDepartmentField';
+export * from './DepartmentOwnersField';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/AggregateSearch.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/AggregateSearch.tsx
new file mode 100644
index 0000000000..fccec99e2b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/AggregateSearch.tsx
@@ -0,0 +1,216 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext } from 'react';
+import { Input, Button, Empty, MenuProps, Dropdown, theme } from 'antd';
+import { useDepartmentTranslation } from '../locale';
+import { createStyles, useAPIClient, useRequest } from '@nocobase/client';
+import { ResourcesContext } from '../ResourcesProvider';
+
+const useStyles = createStyles(({ css }) => {
+  return {
+    searchDropdown: css`
+      .ant-dropdown-menu {
+        max-height: 500px;
+        overflow-y: scroll;
+      }
+    `,
+  };
+});
+
+export const AggregateSearch: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  const { token } = theme.useToken();
+  const { setDepartment, setUser } = useContext(ResourcesContext);
+  const [open, setOpen] = React.useState(false);
+  const [keyword, setKeyword] = React.useState('');
+  const [users, setUsers] = React.useState([]);
+  const [departments, setDepartments] = React.useState([]);
+  const [moreUsers, setMoreUsers] = React.useState(true);
+  const [moreDepartments, setMoreDepartments] = React.useState(true);
+  const { styles } = useStyles();
+  const limit = 10;
+
+  const api = useAPIClient();
+  const service = useRequest(
+    (params) =>
+      api
+        .resource('departments')
+        .aggregateSearch(params)
+        .then((res) => res?.data?.data),
+    {
+      manual: true,
+      onSuccess: (data, params) => {
+        const {
+          values: { type },
+        } = params[0] || {};
+        if (!data) {
+          return;
+        }
+        if ((!type || type === 'user') && data['users'].length < limit) {
+          setMoreUsers(false);
+        }
+        if ((!type || type === 'department') && data['departments'].length < limit) {
+          setMoreDepartments(false);
+        }
+        setUsers((users) => [...users, ...data['users']]);
+        setDepartments((departments) => [...departments, ...data['departments']]);
+      },
+    },
+  );
+  const { run } = service;
+
+  const handleSearch = (keyword: string) => {
+    setKeyword(keyword);
+    setUsers([]);
+    setDepartments([]);
+    setMoreUsers(true);
+    setMoreDepartments(true);
+    if (!keyword) {
+      return;
+    }
+    run({
+      values: { keyword, limit },
+    });
+    setOpen(true);
+  };
+
+  const handleChange = (e) => {
+    if (e.target.value) {
+      return;
+    }
+    setUser(null);
+    setKeyword('');
+    setOpen(false);
+    service.mutate({});
+    setUsers([]);
+    setDepartments([]);
+  };
+
+  const getTitle = (department: any) => {
+    const title = department.title;
+    const parent = department.parent;
+    if (parent) {
+      return getTitle(parent) + ' / ' + title;
+    }
+    return title;
+  };
+
+  const LoadMore: React.FC<{ type: string; last: number }> = (props) => {
+    return (
+      <Button
+        type="link"
+        style={{ padding: '0 8px' }}
+        onClick={(e) => {
+          setOpen(true);
+          run({
+            values: { keyword, limit, ...props },
+          });
+        }}
+      >
+        {t('Load more')}
+      </Button>
+    );
+  };
+
+  const getItems = () => {
+    const items: MenuProps['items'] = [];
+    if (!users.length && !departments.length) {
+      return [
+        {
+          key: '0',
+          label: <Empty description={t('No results')} image={Empty.PRESENTED_IMAGE_SIMPLE} />,
+          disabled: true,
+        },
+      ];
+    }
+    if (users.length) {
+      items.push({
+        key: '0',
+        type: 'group',
+        label: t('Users'),
+        children: users.map((user: { nickname: string; username: string; phone?: string; email?: string }) => ({
+          key: user.username,
+          label: (
+            <div onClick={() => setUser(user)}>
+              <div>{user.nickname || user.username}</div>
+              <div
+                style={{
+                  fontSize: token.fontSizeSM,
+                  color: token.colorTextDescription,
+                }}
+              >
+                {`${user.username}${user.phone ? ' | ' + user.phone : ''}${user.email ? ' | ' + user.email : ''}`}
+              </div>
+            </div>
+          ),
+        })),
+      });
+      if (moreUsers) {
+        items.push({
+          type: 'group',
+          key: '0-loadMore',
+          label: <LoadMore type="user" last={users[users.length - 1].id} />,
+        });
+      }
+    }
+    if (departments.length) {
+      items.push({
+        key: '1',
+        type: 'group',
+        label: t('Departments'),
+        children: departments.map((department: any) => ({
+          key: department.id,
+          label: <div onClick={() => setDepartment(department)}>{getTitle(department)}</div>,
+        })),
+      });
+      if (moreDepartments) {
+        items.push({
+          type: 'group',
+          key: '1-loadMore',
+          label: <LoadMore type="department" last={departments[departments.length - 1].id} />,
+        });
+      }
+    }
+    return items;
+  };
+
+  return (
+    <Dropdown
+      menu={{ items: getItems() }}
+      overlayClassName={styles.searchDropdown}
+      trigger={['click']}
+      open={open}
+      onOpenChange={(open) => setOpen(open)}
+    >
+      <Input.Search
+        allowClear
+        onClick={() => {
+          if (!keyword) {
+            setOpen(false);
+          }
+        }}
+        onFocus={() => setDepartment(null)}
+        onSearch={handleSearch}
+        onChange={handleChange}
+        placeholder={t('Search for departments, users')}
+        style={{ marginBottom: '20px' }}
+      />
+    </Dropdown>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/Department.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/Department.tsx
new file mode 100644
index 0000000000..b8673777ab
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/Department.tsx
@@ -0,0 +1,149 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { createContext, useContext, useState } from 'react';
+import { Row, Button, Divider, theme } from 'antd';
+import { UserOutlined } from '@ant-design/icons';
+import { useDepartmentTranslation } from '../locale';
+import { NewDepartment } from './NewDepartment';
+import { DepartmentTree } from './DepartmentTree';
+import { ResourcesContext } from '../ResourcesProvider';
+import { AggregateSearch } from './AggregateSearch';
+import { useDepartmentManager } from '../hooks';
+import {
+  ActionContextProvider,
+  RecordProvider,
+  SchemaComponent,
+  SchemaComponentOptions,
+  useAPIClient,
+  useActionContext,
+  useRecord,
+  useResourceActionContext,
+} from '@nocobase/client';
+import { useForm, useField } from '@formily/react';
+import { DepartmentOwnersField } from './DepartmentOwnersField';
+
+export const DepartmentTreeContext = createContext({} as ReturnType<typeof useDepartmentManager>);
+
+export const useCreateDepartment = () => {
+  const form = useForm();
+  const field = useField();
+  const ctx = useActionContext();
+  const { refreshAsync } = useResourceActionContext();
+  const api = useAPIClient();
+  const { expandedKeys, setLoadedKeys, setExpandedKeys } = useContext(DepartmentTreeContext);
+  return {
+    async run() {
+      try {
+        await form.submit();
+        field.data = field.data || {};
+        field.data.loading = true;
+        await api.resource('departments').create({ values: form.values });
+        ctx.setVisible(false);
+        await form.reset();
+        field.data.loading = false;
+        const expanded = [...expandedKeys];
+        setLoadedKeys([]);
+        setExpandedKeys([]);
+        await refreshAsync();
+        setExpandedKeys(expanded);
+      } catch (error) {
+        if (field.data) {
+          field.data.loading = false;
+        }
+      }
+    },
+  };
+};
+
+export const useUpdateDepartment = () => {
+  const field = useField();
+  const form = useForm();
+  const ctx = useActionContext();
+  const { refreshAsync } = useResourceActionContext();
+  const api = useAPIClient();
+  const { id: filterByTk } = useRecord() as any;
+  const { expandedKeys, setLoadedKeys, setExpandedKeys } = useContext(DepartmentTreeContext);
+  const { department, setDepartment } = useContext(ResourcesContext);
+  return {
+    async run() {
+      await form.submit();
+      field.data = field.data || {};
+      field.data.loading = true;
+      try {
+        await api.resource('departments').update({ filterByTk, values: form.values });
+        setDepartment({ department, ...form.values });
+        ctx.setVisible(false);
+        await form.reset();
+        const expanded = [...expandedKeys];
+        setLoadedKeys([]);
+        setExpandedKeys([]);
+        await refreshAsync();
+        setExpandedKeys(expanded);
+      } catch (e) {
+        console.log(e);
+      } finally {
+        field.data.loading = false;
+      }
+    },
+  };
+};
+
+export const Department: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  const [visible, setVisible] = useState(false);
+  const [drawer, setDrawer] = useState({} as any);
+  const { department, setDepartment } = useContext(ResourcesContext);
+  const { token } = theme.useToken();
+  const departmentManager = useDepartmentManager({
+    label: ({ node }) => <DepartmentTree.Item node={node} setVisible={setVisible} setDrawer={setDrawer} />,
+  });
+
+  return (
+    <SchemaComponentOptions scope={{ useCreateDepartment, useUpdateDepartment }}>
+      <DepartmentTreeContext.Provider value={departmentManager}>
+        <Row>
+          <AggregateSearch />
+          <Button
+            type="text"
+            icon={<UserOutlined />}
+            style={{
+              textAlign: 'left',
+              marginBottom: '5px',
+              background: department ? '' : token.colorBgTextHover,
+            }}
+            onClick={() => {
+              setDepartment(null);
+            }}
+            block
+          >
+            {t('All users')}
+          </Button>
+          <NewDepartment />
+        </Row>
+        <Divider style={{ margin: '12px 0' }} />
+        <DepartmentTree />
+        <ActionContextProvider value={{ visible, setVisible }}>
+          <RecordProvider record={drawer.node || {}}>
+            <SchemaComponent scope={{ t }} components={{ DepartmentOwnersField }} schema={drawer.schema || {}} />
+          </RecordProvider>
+        </ActionContextProvider>
+      </DepartmentTreeContext.Provider>
+    </SchemaComponentOptions>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentBlock.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentBlock.tsx
new file mode 100644
index 0000000000..01b379d59a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentBlock.tsx
@@ -0,0 +1,40 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React from 'react';
+import { SchemaComponent } from '@nocobase/client';
+import { DepartmentManagement } from './DepartmentManagement';
+import { uid } from '@formily/shared';
+
+export const DepartmentBlock: React.FC = () => {
+  return (
+    <SchemaComponent
+      components={{ DepartmentManagement }}
+      schema={{
+        type: 'void',
+        properties: {
+          [uid()]: {
+            type: 'void',
+            'x-decorator': 'CardItem',
+            'x-component': 'DepartmentManagement',
+          },
+        },
+      }}
+    />
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentField.tsx
new file mode 100644
index 0000000000..76763a15bb
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentField.tsx
@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext } from 'react';
+import { useField } from '@formily/react';
+import { Field } from '@formily/core';
+import { ResourcesContext } from '../ResourcesProvider';
+import { getDepartmentTitle } from '../utils';
+import { EllipsisWithTooltip } from '@nocobase/client';
+
+export const DepartmentField: React.FC = () => {
+  const { setDepartment } = useContext(ResourcesContext);
+  const field = useField<Field>();
+  const values = field.value || [];
+  const deptsMap = values.reduce((mp: { [id: number]: any }, dept: any) => {
+    mp[dept.id] = dept;
+    return mp;
+  }, {});
+  const depts = values.map((dept: { id: number; title: string }, index: number) => (
+    <span key={index}>
+      <a
+        onClick={(e) => {
+          e.preventDefault();
+          setDepartment(deptsMap[dept.id]);
+        }}
+      >
+        {getDepartmentTitle(dept)}
+      </a>
+      {index !== values.length - 1 ? <span style={{ marginRight: 4, color: '#aaa' }}>,</span> : ''}
+    </span>
+  ));
+  return <EllipsisWithTooltip ellipsis={true}>{depts}</EllipsisWithTooltip>;
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentManagement.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentManagement.tsx
new file mode 100644
index 0000000000..5bae972bf8
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentManagement.tsx
@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React from 'react';
+import { Col, Row } from 'antd';
+import { Department } from './Department';
+import { Member } from './Member';
+import { SchemaComponentOptions } from '@nocobase/client';
+import { SuperiorDepartmentSelect, DepartmentSelect } from './DepartmentTreeSelect';
+import { DepartmentsListProvider, UsersListProvider } from '../ResourcesProvider';
+
+export const DepartmentManagement: React.FC = () => {
+  return (
+    <SchemaComponentOptions components={{ SuperiorDepartmentSelect, DepartmentSelect }}>
+      <Row gutter={48} style={{ flexWrap: 'nowrap' }}>
+        <Col span={6} style={{ borderRight: '1px solid #eee', minWidth: '300px' }}>
+          <DepartmentsListProvider>
+            <Department />
+          </DepartmentsListProvider>
+        </Col>
+        <Col flex="auto" style={{ overflow: 'hidden' }}>
+          <UsersListProvider>
+            <Member />
+          </UsersListProvider>
+        </Col>
+      </Row>
+    </SchemaComponentOptions>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentOwnersField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentOwnersField.tsx
new file mode 100644
index 0000000000..6faffb38f3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentOwnersField.tsx
@@ -0,0 +1,115 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  ActionContextProvider,
+  ResourceActionProvider,
+  SchemaComponent,
+  useActionContext,
+  useRecord,
+} from '@nocobase/client';
+import React, { useEffect, useRef, useState } from 'react';
+import { Select } from 'antd';
+import { Field } from '@formily/core';
+import { useField } from '@formily/react';
+import { departmentOwnersSchema } from './schemas/departments';
+
+export const DepartmentOwnersField: React.FC = () => {
+  const [visible, setVisible] = useState(false);
+  const department = useRecord() as any;
+  const field = useField<Field>();
+  const [value, setValue] = useState([]);
+  const selectedRows = useRef([]);
+  const handleSelect = (_: number[], rows: any[]) => {
+    selectedRows.current = rows;
+  };
+
+  const useSelectOwners = () => {
+    const { setVisible } = useActionContext();
+    return {
+      run() {
+        const selected = field.value || [];
+        field.setValue([...selected, ...selectedRows.current]);
+        selectedRows.current = [];
+        setVisible(false);
+      },
+    };
+  };
+
+  useEffect(() => {
+    if (!field.value) {
+      return;
+    }
+    setValue(
+      field.value.map((owner: any) => ({
+        value: owner.id,
+        label: owner.nickname || owner.username,
+      })),
+    );
+  }, [field.value]);
+
+  const RequestProvider: React.FC = (props) => (
+    <ResourceActionProvider
+      collection="users"
+      request={{
+        resource: `departments/${department.id}/members`,
+        action: 'list',
+        params: {
+          filter: field.value?.length
+            ? {
+                id: {
+                  $notIn: field.value.map((owner: any) => owner.id),
+                },
+              }
+            : {},
+        },
+      }}
+    >
+      {props.children}
+    </ResourceActionProvider>
+  );
+
+  return (
+    <ActionContextProvider value={{ visible, setVisible }}>
+      <Select
+        open={false}
+        onChange={(value) => {
+          if (!value) {
+            field.setValue([]);
+            return;
+          }
+          field.setValue(
+            value.map(({ label, value }: { label: string; value: string }) => ({
+              id: value,
+              nickname: label,
+            })),
+          );
+        }}
+        mode="multiple"
+        value={value}
+        labelInValue={true}
+        onDropdownVisibleChange={(open) => setVisible(open)}
+      />
+      <SchemaComponent
+        schema={departmentOwnersSchema}
+        components={{ RequestProvider }}
+        scope={{ department, handleSelect, useSelectOwners }}
+      />
+    </ActionContextProvider>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx
new file mode 100644
index 0000000000..e86ca90309
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx
@@ -0,0 +1,261 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  CollectionContext,
+  CollectionProvider_deprecated,
+  ResourceActionContext,
+  SchemaComponent,
+  mergeFilter,
+  removeNullCondition,
+  useFilterFieldOptions,
+  useFilterFieldProps,
+  useResourceActionContext,
+} from '@nocobase/client';
+import React, { createContext, useContext, useEffect, useState } from 'react';
+import { useDepartmentManager } from '../hooks';
+import { Table, TablePaginationConfig } from 'antd';
+import { departmentCollection } from '../collections/departments';
+import { useDepartmentTranslation } from '../locale';
+import { useField } from '@formily/react';
+import { Field } from '@formily/core';
+import { uid } from '@formily/shared';
+import { getDepartmentTitle } from '../utils';
+
+const ExpandMetaContext = createContext<any>({});
+
+export const useFilterActionProps = () => {
+  const { setHasFilter, setExpandedKeys } = useContext(ExpandMetaContext);
+  const { t } = useDepartmentTranslation();
+  const collection = useContext(CollectionContext);
+  const options = useFilterFieldOptions(collection.fields);
+  const service = useResourceActionContext();
+  const { run, defaultRequest } = service;
+  const field = useField<Field>();
+  const { params } = defaultRequest || {};
+
+  return {
+    options,
+    onSubmit: async (values: any) => {
+      // filter parameter for the block
+      const defaultFilter = params.filter;
+      // filter parameter for the filter action
+      const filter = removeNullCondition(values?.filter);
+      run({
+        ...params,
+        page: 1,
+        pageSize: 10,
+        filter: mergeFilter([filter, defaultFilter]),
+      });
+      const items = filter?.$and || filter?.$or;
+      if (items?.length) {
+        field.title = t('{{count}} filter items', { count: items?.length || 0 });
+        setHasFilter(true);
+      } else {
+        field.title = t('Filter');
+        setHasFilter(false);
+      }
+    },
+    onReset() {
+      run({
+        ...(params || {}),
+        filter: {
+          ...(params?.filter || {}),
+          parentId: null,
+        },
+        page: 1,
+        pageSize: 10,
+      });
+      field.title = t('Filter');
+      setHasFilter(false);
+      setExpandedKeys([]);
+    },
+  };
+};
+
+const useDefaultDisabled = () => {
+  return {
+    disabled: () => false,
+  };
+};
+
+const InternalDepartmentTable: React.FC<{
+  useDisabled?: () => {
+    disabled: (record: any) => boolean;
+  };
+}> = ({ useDisabled = useDefaultDisabled }) => {
+  const { t } = useDepartmentTranslation();
+  const ctx = useResourceActionContext();
+  console.log(ctx);
+  const { run, data, loading, defaultRequest } = ctx;
+  const { resource, resourceOf, params } = defaultRequest || {};
+  const { treeData, initData, loadData } = useDepartmentManager({
+    resource,
+    resourceOf,
+    params,
+  });
+  const field = useField<Field>();
+  const { disabled } = useDisabled();
+  const { hasFilter, expandedKeys, setExpandedKeys } = useContext(ExpandMetaContext);
+
+  useEffect(() => {
+    if (hasFilter) {
+      return;
+    }
+    initData(data?.data);
+  }, [data, initData, loading, hasFilter]);
+
+  const pagination: TablePaginationConfig = {};
+  if (params?.pageSize) {
+    pagination.defaultPageSize = params.pageSize;
+  }
+  if (!pagination.total && data?.meta) {
+    const { count, page, pageSize } = data.meta;
+    pagination.total = count;
+    pagination.current = page;
+    pagination.pageSize = pageSize;
+  }
+
+  return (
+    <Table
+      rowKey="id"
+      columns={[
+        {
+          dataIndex: 'title',
+          title: t('Department name'),
+          render: (text, record) => (hasFilter ? getDepartmentTitle(record) : text),
+        },
+      ]}
+      rowSelection={{
+        selectedRowKeys: (field?.value || []).map((dept: any) => dept.id),
+        onChange: (keys, depts) => field?.setValue?.(depts),
+        getCheckboxProps: (record: any) => ({
+          disabled: disabled(record),
+        }),
+      }}
+      pagination={{
+        showSizeChanger: true,
+        ...pagination,
+        onChange(page, pageSize) {
+          run({
+            ...(ctx?.params?.[0] || {}),
+            page,
+            pageSize,
+          });
+        },
+      }}
+      dataSource={hasFilter ? data?.data || [] : treeData}
+      expandable={{
+        onExpand: (expanded, record) => {
+          loadData({
+            key: record.id,
+            children: record.children,
+          });
+        },
+        expandedRowKeys: expandedKeys,
+        onExpandedRowsChange: (keys) => setExpandedKeys(keys),
+      }}
+    />
+  );
+};
+
+const RequestProvider: React.FC<{
+  useDataSource: any;
+}> = (props) => {
+  const [expandedKeys, setExpandedKeys] = useState([]);
+  const [hasFilter, setHasFilter] = useState(false);
+  const { useDataSource } = props;
+  const service = useDataSource({
+    manual: true,
+  });
+  useEffect(() => {
+    service.run({
+      filter: {
+        parentId: null,
+      },
+      pageSize: 10,
+    });
+  }, []);
+  return (
+    <ResourceActionContext.Provider value={{ ...service }}>
+      <CollectionProvider_deprecated collection={departmentCollection}>
+        <ExpandMetaContext.Provider value={{ expandedKeys, setExpandedKeys, hasFilter, setHasFilter }}>
+          {props.children}
+        </ExpandMetaContext.Provider>
+      </CollectionProvider_deprecated>
+    </ResourceActionContext.Provider>
+  );
+};
+
+export const DepartmentTable: React.FC<{
+  useDataSource: any;
+  useDisabled?: (record: any) => boolean;
+}> = ({ useDataSource, useDisabled }) => {
+  return (
+    <SchemaComponent
+      scope={{ useDisabled, useFilterActionProps }}
+      components={{ InternalDepartmentTable, RequestProvider }}
+      schema={{
+        type: 'void',
+        properties: {
+          [uid()]: {
+            type: 'void',
+            'x-component': 'RequestProvider',
+            'x-component-props': {
+              useDataSource,
+            },
+            properties: {
+              actions: {
+                type: 'void',
+                'x-component': 'ActionBar',
+                'x-component-props': {
+                  style: {
+                    marginBottom: 16,
+                  },
+                },
+                properties: {
+                  filter: {
+                    type: 'void',
+                    title: '{{ t("Filter") }}',
+                    default: {
+                      $and: [{ title: { $includes: '' } }],
+                    },
+                    'x-action': 'filter',
+                    'x-component': 'Filter.Action',
+                    'x-use-component-props': 'useFilterActionProps',
+                    'x-component-props': {
+                      icon: 'FilterOutlined',
+                    },
+                    'x-align': 'left',
+                  },
+                },
+              },
+              departments: {
+                type: 'array',
+                'x-component': 'InternalDepartmentTable',
+                'x-component-props': {
+                  useDisabled: '{{ useDisabled }}',
+                },
+              },
+            },
+          },
+        },
+      }}
+    />
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTree.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTree.tsx
new file mode 100644
index 0000000000..03ac4080b6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTree.tsx
@@ -0,0 +1,181 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext, useEffect } from 'react';
+import { Tree, Dropdown, App, Empty } from 'antd';
+import { MoreOutlined } from '@ant-design/icons';
+import { useAPIClient, useResourceActionContext } from '@nocobase/client';
+import { useDepartmentTranslation } from '../locale';
+import { editDepartmentSchema, newSubDepartmentSchema } from './schemas/departments';
+import { ResourcesContext } from '../ResourcesProvider';
+import { DepartmentTreeContext } from './Department';
+import { css } from '@emotion/css';
+
+type DepartmentTreeProps = {
+  node: {
+    id: number;
+    title: string;
+    parent?: any;
+  };
+  setVisible: (visible: boolean) => void;
+  setDrawer: (schema: any) => void;
+};
+
+export const DepartmentTree: React.FC & {
+  Item: React.FC<DepartmentTreeProps>;
+} = () => {
+  const { data, loading } = useResourceActionContext();
+  const { department, setDepartment, setUser } = useContext(ResourcesContext);
+  const { treeData, nodeMap, loadData, loadedKeys, setLoadedKeys, initData, expandedKeys, setExpandedKeys } =
+    useContext(DepartmentTreeContext);
+  const handleSelect = (keys: number[]) => {
+    if (!keys.length) {
+      return;
+    }
+    const node = nodeMap[keys[0]];
+    setDepartment(node);
+    setUser(null);
+  };
+
+  const handleExpand = (keys: number[]) => {
+    setExpandedKeys(keys);
+  };
+
+  const handleLoad = (keys: number[]) => {
+    setLoadedKeys(keys);
+  };
+
+  useEffect(() => {
+    initData(data?.data);
+  }, [data, initData, loading]);
+
+  useEffect(() => {
+    if (!department) {
+      return;
+    }
+    const getIds = (node: any) => {
+      if (node.parent) {
+        return [node.parent.id, ...getIds(node.parent)];
+      }
+      return [];
+    };
+    const newKeys = getIds(department);
+    setExpandedKeys((keys) => Array.from(new Set([...keys, ...newKeys])));
+  }, [department, setExpandedKeys]);
+
+  return (
+    <div
+      className={css`
+        height: 65vh;
+        overflow: auto;
+        .ant-tree-node-content-wrapper {
+          overflow: hidden;
+        }
+      `}
+    >
+      {treeData?.length ? (
+        <Tree.DirectoryTree
+          loadData={loadData}
+          treeData={treeData}
+          loadedKeys={loadedKeys}
+          onSelect={handleSelect}
+          selectedKeys={[department?.id]}
+          onExpand={handleExpand}
+          onLoad={handleLoad}
+          expandedKeys={expandedKeys}
+          expandAction={false}
+          showIcon={false}
+          fieldNames={{
+            key: 'id',
+          }}
+        />
+      ) : (
+        <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+      )}
+    </div>
+  );
+};
+
+DepartmentTree.Item = function DepartmentTreeItem({ node, setVisible, setDrawer }: DepartmentTreeProps) {
+  const { t } = useDepartmentTranslation();
+  const { refreshAsync } = useResourceActionContext();
+  const { setLoadedKeys, expandedKeys, setExpandedKeys } = useContext(DepartmentTreeContext);
+  const { modal, message } = App.useApp();
+  const api = useAPIClient();
+  const deleteDepartment = () => {
+    modal.confirm({
+      title: t('Delete'),
+      content: t('Are you sure you want to delete it?'),
+      onOk: async () => {
+        await api.resource('departments').destroy({ filterByTk: node.id });
+        message.success(t('Deleted successfully'));
+        setExpandedKeys((keys) => keys.filter((k) => k !== node.id));
+        const expanded = [...expandedKeys];
+        setLoadedKeys([]);
+        setExpandedKeys([]);
+        await refreshAsync();
+        setExpandedKeys(expanded);
+      },
+    });
+  };
+  const openDrawer = (schema: any) => {
+    setDrawer({ schema, node });
+    setVisible(true);
+  };
+  const handleClick = ({ key, domEvent }) => {
+    domEvent.stopPropagation();
+    switch (key) {
+      case 'new-sub':
+        openDrawer(newSubDepartmentSchema);
+        break;
+      case 'edit':
+        openDrawer(editDepartmentSchema);
+        break;
+      case 'delete':
+        deleteDepartment();
+    }
+  };
+  return (
+    <div style={{ display: 'flex', justifyContent: 'space-between', overflow: 'hidden' }}>
+      <div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{node.title}</div>
+      <Dropdown
+        menu={{
+          items: [
+            {
+              label: t('New sub department'),
+              key: 'new-sub',
+            },
+            {
+              label: t('Edit department'),
+              key: 'edit',
+            },
+            {
+              label: t('Delete department'),
+              key: 'delete',
+            },
+          ],
+          onClick: handleClick,
+        }}
+      >
+        <div style={{ marginLeft: '15px' }}>
+          <MoreOutlined />
+        </div>
+      </Dropdown>
+    </div>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTreeSelect.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTreeSelect.tsx
new file mode 100644
index 0000000000..b66b511548
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTreeSelect.tsx
@@ -0,0 +1,136 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useCallback, useContext, useEffect } from 'react';
+import { TreeSelect } from 'antd';
+import { useField } from '@formily/react';
+import { Field } from '@formily/core';
+import { useRecord } from '@nocobase/client';
+import { ResourcesContext } from '../ResourcesProvider';
+import { useDepartmentManager } from '../hooks/departments-manager';
+
+export const DepartmentTreeSelect: React.FC<{
+  originData: any;
+  treeData: any[];
+  [key: string]: any;
+}> = (props) => {
+  const field = useField<Field>();
+  const [value, setValue] = React.useState({ label: null, value: null });
+  const { treeData, initData, getByKeyword, loadData, loadedKeys, setLoadedKeys, originData } = props;
+
+  const handleSearch = async (keyword: string) => {
+    if (!keyword) {
+      initData(originData);
+      return;
+    }
+    await getByKeyword(keyword);
+  };
+
+  const getTitle = useCallback((record: any) => {
+    const title = record.title;
+    const parent = record.parent;
+    if (parent) {
+      return getTitle(parent) + ' / ' + title;
+    }
+    return title;
+  }, []);
+
+  useEffect(() => {
+    initData(originData);
+  }, [originData, initData]);
+
+  useEffect(() => {
+    if (!field.value) {
+      setValue({ label: null, value: null });
+      return;
+    }
+    setValue({
+      label: getTitle(field.value) || field.value.label,
+      value: field.value.id,
+    });
+  }, [field.value, getTitle]);
+
+  return (
+    <TreeSelect
+      value={value}
+      onSelect={(_: any, node: any) => {
+        field.setValue(node);
+      }}
+      onChange={(value: any) => {
+        if (!value) {
+          field.setValue(null);
+        }
+      }}
+      treeData={treeData}
+      treeLoadedKeys={loadedKeys}
+      onTreeLoad={(keys: any[]) => setLoadedKeys(keys)}
+      loadData={(node: any) => loadData({ key: node.id, children: node.children })}
+      fieldNames={{
+        value: 'id',
+      }}
+      showSearch
+      allowClear
+      treeNodeFilterProp="title"
+      onSearch={handleSearch}
+      labelInValue={true}
+    />
+  );
+};
+
+export const DepartmentSelect: React.FC = () => {
+  const departmentManager = useDepartmentManager();
+  const { departmentsResource } = useContext(ResourcesContext);
+  const {
+    service: { data },
+  } = departmentsResource || {};
+  return <DepartmentTreeSelect {...departmentManager} originData={data?.data} />;
+};
+
+export const SuperiorDepartmentSelect: React.FC = () => {
+  const departmentManager = useDepartmentManager();
+  const { setTreeData, getChildrenIds } = departmentManager;
+  const record = useRecord() as any;
+  const { departmentsResource } = useContext(ResourcesContext);
+  const {
+    service: { data },
+  } = departmentsResource || {};
+
+  useEffect(() => {
+    if (!record.id) {
+      return;
+    }
+    const childrenIds = getChildrenIds(record.id);
+    childrenIds.push(record.id);
+    setTreeData((treeData) => {
+      const setDisabled = (treeData: any[]) => {
+        return treeData.map((node) => {
+          if (childrenIds.includes(node.id)) {
+            node.disabled = true;
+          }
+          if (node.children) {
+            node.children = setDisabled(node.children);
+          }
+          return node;
+        });
+      };
+      return setDisabled(treeData);
+    });
+  }, [setTreeData, record.id, getChildrenIds]);
+
+  return <DepartmentTreeSelect {...departmentManager} originData={data?.data} />;
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/IsOwnerField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/IsOwnerField.tsx
new file mode 100644
index 0000000000..e685d2d89a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/IsOwnerField.tsx
@@ -0,0 +1,30 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext } from 'react';
+import { useDepartmentTranslation } from '../locale';
+import { Checkbox, useRecord } from '@nocobase/client';
+import { ResourcesContext } from '../ResourcesProvider';
+
+export const IsOwnerField: React.FC = () => {
+  const { department } = useContext(ResourcesContext);
+  const record = useRecord() as any;
+  const dept = (record.departments || []).find((dept: any) => dept?.id === department?.id);
+
+  return <Checkbox.ReadPretty value={dept?.departmentsUsers.isOwner} />;
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/Member.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/Member.tsx
new file mode 100644
index 0000000000..a23aa2bde8
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/Member.tsx
@@ -0,0 +1,235 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext, useRef, useEffect, useMemo } from 'react';
+import { useDepartmentTranslation } from '../locale';
+import {
+  CollectionContext,
+  ResourceActionProvider,
+  SchemaComponent,
+  useAPIClient,
+  useActionContext,
+  useFilterFieldOptions,
+  useFilterFieldProps,
+  useRecord,
+  useResourceActionContext,
+  useTableBlockContext,
+} from '@nocobase/client';
+import { membersActionSchema, addMembersSchema, rowRemoveActionSchema, getMembersSchema } from './schemas/users';
+import { App } from 'antd';
+import { DepartmentField } from './DepartmentField';
+import { IsOwnerField } from './IsOwnerField';
+import { UserDepartmentsField } from './UserDepartmentsField';
+import { ResourcesContext } from '../ResourcesProvider';
+import { useTableBlockProps } from '../hooks/useTableBlockProps';
+
+const AddMembersListProvider: React.FC = (props) => {
+  const { department } = useContext(ResourcesContext);
+  return (
+    <ResourceActionProvider
+      {...{
+        collection: 'users',
+        request: {
+          resource: 'users',
+          action: 'listExcludeDept',
+          params: {
+            departmentId: department?.id,
+          },
+        },
+      }}
+    >
+      {props.children}
+    </ResourceActionProvider>
+  );
+};
+
+const useAddMembersFilterActionProps = () => {
+  const collection = useContext(CollectionContext);
+  const options = useFilterFieldOptions(collection.fields);
+  const service = useResourceActionContext();
+  return useFilterFieldProps({
+    options,
+    params: service.state?.params?.[0] || service.params,
+    service,
+  });
+};
+
+export const AddMembers: React.FC = () => {
+  const { department } = useContext(ResourcesContext);
+  // This resource is the list of members of the current department.
+  const {
+    service: { refresh },
+  } = useTableBlockContext();
+  const selectedKeys = useRef([]);
+  const api = useAPIClient();
+
+  const useAddMembersActionProps = () => {
+    const { department } = useContext(ResourcesContext);
+    const { setVisible } = useActionContext();
+    return {
+      async onClick() {
+        const selected = selectedKeys.current;
+        if (!selected?.length) {
+          return;
+        }
+        await api.resource('departments.members', department.id).add({
+          values: selected,
+        });
+        selectedKeys.current = [];
+        refresh();
+        setVisible?.(false);
+      },
+    };
+  };
+
+  const handleSelect = (keys: any[]) => {
+    selectedKeys.current = keys;
+  };
+
+  return (
+    <SchemaComponent
+      scope={{
+        useAddMembersActionProps,
+        department,
+        handleSelect,
+        useAddMembersFilterActionProps,
+      }}
+      components={{ AddMembersListProvider }}
+      schema={addMembersSchema}
+    />
+  );
+};
+
+const useBulkRemoveMembersAction = () => {
+  const { t } = useDepartmentTranslation();
+  const { message } = App.useApp();
+  const api = useAPIClient();
+  const {
+    service: { refresh },
+    field,
+  } = useTableBlockContext();
+  const { department } = useContext(ResourcesContext);
+  return {
+    async run() {
+      const selected = field?.data?.selectedRowKeys;
+      if (!selected?.length) {
+        message.warning(t('Please select members'));
+        return;
+      }
+      await api.resource('departments.members', department.id).remove({
+        values: selected,
+      });
+      field.data.selectedRowKeys = [];
+      refresh();
+    },
+  };
+};
+
+const useRemoveMemberAction = () => {
+  const api = useAPIClient();
+  const { department } = useContext(ResourcesContext);
+  const { id } = useRecord() as any;
+  const {
+    service: { refresh },
+  } = useTableBlockContext();
+  return {
+    async run() {
+      await api.resource('departments.members', department.id).remove({
+        values: [id],
+      });
+      refresh();
+    },
+  };
+};
+
+const useShowTotal = () => {
+  const {
+    service: { data },
+  } = useTableBlockContext();
+  const { t } = useDepartmentTranslation();
+  return t('Total {{count}} members', { count: data?.meta?.count });
+};
+
+const useRefreshActionProps = () => {
+  const { service } = useTableBlockContext();
+  return {
+    async onClick() {
+      service?.refresh?.();
+    },
+  };
+};
+
+const RowRemoveAction = () => {
+  const { department } = useContext(ResourcesContext);
+  return department ? <SchemaComponent scope={{ useRemoveMemberAction }} schema={rowRemoveActionSchema} /> : null;
+};
+
+const MemberActions = () => {
+  const { department } = useContext(ResourcesContext);
+  return department ? <SchemaComponent schema={membersActionSchema} /> : null;
+};
+
+const useMemberFilterActionProps = () => {
+  const collection = useContext(CollectionContext);
+  const options = useFilterFieldOptions(collection.fields);
+  const { service } = useTableBlockContext();
+  return useFilterFieldProps({
+    options,
+    params: service.state?.params?.[0] || service.params,
+    service,
+  });
+};
+
+export const Member: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  const { department, user } = useContext(ResourcesContext);
+  const {
+    service: { data, setState },
+  } = useTableBlockContext();
+
+  useEffect(() => {
+    setState?.({ selectedRowKeys: [] });
+  }, [data, setState]);
+
+  const schema = useMemo(() => getMembersSchema(department, user), [department, user]);
+
+  return (
+    <>
+      {!user ? <h2>{t(department?.title || 'All users')}</h2> : <h2>{t('Search results')}</h2>}
+      <SchemaComponent
+        scope={{
+          useBulkRemoveMembersAction,
+          t,
+          useShowTotal,
+          useRefreshActionProps,
+          useMemberFilterActionProps,
+          useTableBlockProps,
+        }}
+        components={{
+          MemberActions,
+          AddMembers,
+          RowRemoveAction,
+          DepartmentField,
+          IsOwnerField,
+          UserDepartmentsField,
+        }}
+        schema={schema}
+      />
+    </>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/NewDepartment.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/NewDepartment.tsx
new file mode 100644
index 0000000000..08f4e78a9f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/NewDepartment.tsx
@@ -0,0 +1,97 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { SchemaComponent } from '@nocobase/client';
+import React from 'react';
+import { useDepartmentTranslation } from '../locale';
+
+export const NewDepartment: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  return (
+    <SchemaComponent
+      scope={{ t }}
+      schema={{
+        type: 'void',
+        properties: {
+          newDepartment: {
+            type: 'void',
+            title: t('New department'),
+            'x-component': 'Action',
+            'x-component-props': {
+              type: 'text',
+              icon: 'PlusOutlined',
+              style: {
+                width: '100%',
+                textAlign: 'left',
+              },
+            },
+            properties: {
+              drawer: {
+                type: 'void',
+                'x-component': 'Action.Drawer',
+                'x-decorator': 'Form',
+                title: t('New department'),
+                properties: {
+                  title: {
+                    'x-component': 'CollectionField',
+                    'x-decorator': 'FormItem',
+                    required: true,
+                  },
+                  parent: {
+                    'x-component': 'CollectionField',
+                    'x-decorator': 'FormItem',
+                    'x-collection-field': 'departments.parent',
+                    'x-component-props': {
+                      component: 'DepartmentSelect',
+                    },
+                  },
+                  roles: {
+                    'x-component': 'CollectionField',
+                    'x-decorator': 'FormItem',
+                    'x-collection-field': 'departments.roles',
+                  },
+                  footer: {
+                    type: 'void',
+                    'x-component': 'Action.Drawer.Footer',
+                    properties: {
+                      cancel: {
+                        title: '{{t("Cancel")}}',
+                        'x-component': 'Action',
+                        'x-component-props': {
+                          useAction: '{{ cm.useCancelAction }}',
+                        },
+                      },
+                      submit: {
+                        title: '{{t("Submit")}}',
+                        'x-component': 'Action',
+                        'x-component-props': {
+                          type: 'primary',
+                          useAction: '{{ useCreateDepartment }}',
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      }}
+    />
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/UserDepartmentsField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/UserDepartmentsField.tsx
new file mode 100644
index 0000000000..e72869046a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/UserDepartmentsField.tsx
@@ -0,0 +1,273 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  ActionContextProvider,
+  SchemaComponent,
+  useAPIClient,
+  useRecord,
+  useRequest,
+  useResourceActionContext,
+  useTableBlockContext,
+} from '@nocobase/client';
+import React, { useState } from 'react';
+import { Tag, Button, Dropdown, App } from 'antd';
+import { PlusOutlined, MoreOutlined } from '@ant-design/icons';
+import { Field } from '@formily/core';
+import { useField, useForm } from '@formily/react';
+import { userDepartmentsSchema } from './schemas/users';
+import { getDepartmentTitle } from '../utils';
+import { useDepartmentTranslation } from '../locale';
+import { DepartmentTable } from './DepartmentTable';
+
+const useDataSource = (options?: any) => {
+  const defaultRequest = {
+    resource: 'departments',
+    action: 'list',
+    params: {
+      appends: ['parent(recursively=true)'],
+      // filter: {
+      //   parentId: null,
+      // },
+      sort: ['createdAt'],
+    },
+  };
+  const service = useRequest(defaultRequest, options);
+  return {
+    ...service,
+    defaultRequest,
+  };
+};
+
+export const UserDepartmentsField: React.FC = () => {
+  const { modal, message } = App.useApp();
+  const { t } = useDepartmentTranslation();
+  const [visible, setVisible] = useState(false);
+  const user = useRecord() as any;
+  const field = useField<Field>();
+  const {
+    service: { refresh },
+  } = useTableBlockContext();
+
+  const formatData = (data: any[]) => {
+    if (!data?.length) {
+      return [];
+    }
+
+    return data.map((department) => ({
+      ...department,
+      isMain: department.departmentsUsers?.isMain,
+      isOwner: department.departmentsUsers?.isOwner,
+      title: getDepartmentTitle(department),
+    }));
+  };
+
+  const api = useAPIClient();
+  useRequest(
+    () =>
+      api
+        .resource(`users.departments`, user.id)
+        .list({
+          appends: ['parent(recursively=true)'],
+          paginate: false,
+        })
+        .then((res) => {
+          const data = formatData(res?.data?.data);
+          field.setValue(data);
+        }),
+    {
+      ready: user.id,
+    },
+  );
+
+  const useAddDepartments = () => {
+    const api = useAPIClient();
+    const drawerForm = useForm();
+    const { departments } = drawerForm.values || {};
+    return {
+      async run() {
+        await api.resource('users.departments', user.id).add({
+          values: departments.map((dept: any) => dept.id),
+        });
+        drawerForm.reset();
+        field.setValue([
+          ...field.value,
+          ...departments.map((dept: any, index: number) => ({
+            ...dept,
+            isMain: index === 0 && field.value.length === 0,
+            title: getDepartmentTitle(dept),
+          })),
+        ]);
+        setVisible(false);
+        refresh();
+      },
+    };
+  };
+
+  const removeDepartment = (dept: any) => {
+    modal.confirm({
+      title: t('Remove department'),
+      content: t('Are you sure you want to remove it?'),
+      onOk: async () => {
+        await api.resource('users.departments', user.id).remove({ values: [dept.id] });
+        message.success(t('Deleted successfully'));
+        field.setValue(
+          field.value
+            .filter((d: any) => d.id !== dept.id)
+            .map((d: any, index: number) => ({
+              ...d,
+              isMain: (dept.isMain && index === 0) || d.isMain,
+            })),
+        );
+        refresh();
+      },
+    });
+  };
+
+  const setMainDepartment = async (dept: any) => {
+    await api.resource('users').setMainDepartment({
+      values: {
+        userId: user.id,
+        departmentId: dept.id,
+      },
+    });
+    message.success(t('Set successfully'));
+    field.setValue(
+      field.value.map((d: any) => ({
+        ...d,
+        isMain: d.id === dept.id,
+      })),
+    );
+    refresh();
+  };
+
+  const setOwner = async (dept: any) => {
+    await api.resource('departments').setOwner({
+      values: {
+        userId: user.id,
+        departmentId: dept.id,
+      },
+    });
+    message.success(t('Set successfully'));
+    field.setValue(
+      field.value.map((d: any) => ({
+        ...d,
+        isOwner: d.id === dept.id ? true : d.isOwner,
+      })),
+    );
+    refresh();
+  };
+
+  const removeOwner = async (dept: any) => {
+    await api.resource('departments').removeOwner({
+      values: {
+        userId: user.id,
+        departmentId: dept.id,
+      },
+    });
+    message.success(t('Set successfully'));
+    field.setValue(
+      field.value.map((d: any) => ({
+        ...d,
+        isOwner: d.id === dept.id ? false : d.isOwner,
+      })),
+    );
+    refresh();
+  };
+
+  const handleClick = (key: string, dept: any) => {
+    switch (key) {
+      case 'setMain':
+        setMainDepartment(dept);
+        break;
+      case 'setOwner':
+        setOwner(dept);
+        break;
+      case 'removeOwner':
+        removeOwner(dept);
+        break;
+      case 'remove':
+        removeDepartment(dept);
+    }
+  };
+
+  const useDisabled = () => ({
+    disabled: (record: any) => {
+      return field.value.some((dept: any) => dept.id === record.id);
+    },
+  });
+
+  return (
+    <ActionContextProvider value={{ visible, setVisible }}>
+      <>
+        {(field?.value || []).map((dept) => (
+          <Tag style={{ padding: '5px 8px', background: 'transparent', marginBottom: '5px' }} key={dept.id}>
+            <span style={{ marginRight: '5px' }}>{dept.title}</span>
+            {dept.isMain ? (
+              <Tag color="processing" bordered={false}>
+                {t('Main')}
+              </Tag>
+            ) : (
+              ''
+            )}
+            {/* {dept.isOwner ? ( */}
+            {/*   <Tag color="gold" bordered={false}> */}
+            {/*     {t('Owner')} */}
+            {/*   </Tag> */}
+            {/* ) : ( */}
+            {/*   '' */}
+            {/* )} */}
+            <Dropdown
+              menu={{
+                items: [
+                  ...(dept.isMain
+                    ? []
+                    : [
+                        {
+                          label: t('Set as main department'),
+                          key: 'setMain',
+                        },
+                      ]),
+                  // {
+                  //   label: dept.isOwner ? t('Remove owner role') : t('Set as owner'),
+                  //   key: dept.isOwner ? 'removeOwner' : 'setOwner',
+                  // },
+                  {
+                    label: t('Remove'),
+                    key: 'remove',
+                  },
+                ],
+                onClick: ({ key }) => handleClick(key, dept),
+              }}
+            >
+              <div style={{ float: 'right' }}>
+                <MoreOutlined />
+              </div>
+            </Dropdown>
+          </Tag>
+        ))}
+        <Button icon={<PlusOutlined />} onClick={() => setVisible(true)} />
+      </>
+      <SchemaComponent
+        schema={userDepartmentsSchema}
+        components={{ DepartmentTable }}
+        scope={{ user, useDataSource, useAddDepartments, useDisabled }}
+      />
+    </ActionContextProvider>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/departments.ts
new file mode 100644
index 0000000000..32272647c7
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/departments.ts
@@ -0,0 +1,291 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { useEffect } from 'react';
+import { uid } from '@formily/shared';
+import { useAPIClient, useActionContext, useRecord, useRequest } from '@nocobase/client';
+
+export const newSubDepartmentSchema = {
+  type: 'object',
+  properties: {
+    [uid()]: {
+      type: 'void',
+      'x-component': 'Action.Drawer',
+      'x-decorator': 'Form',
+      'x-decorator-props': {
+        useValues(options: any) {
+          const ctx = useActionContext();
+          const record = useRecord();
+          return useRequest(() => Promise.resolve({ data: { parent: { ...record } } }), {
+            ...options,
+            refreshDeps: [ctx.visible],
+          });
+        },
+      },
+      title: '{{t("New sub department")}}',
+      properties: {
+        title: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+        },
+        parent: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+          'x-collection-field': 'departments.parent',
+          'x-component-props': {
+            component: 'DepartmentSelect',
+          },
+        },
+        roles: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+          'x-collection-field': 'departments.roles',
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            submit: {
+              title: '{{t("Submit")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useCreateDepartment }}',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export const editDepartmentSchema = {
+  type: 'object',
+  properties: {
+    [uid()]: {
+      type: 'void',
+      'x-component': 'Action.Drawer',
+      'x-decorator': 'Form',
+      'x-decorator-props': {
+        useValues(options: any) {
+          const api = useAPIClient();
+          const ctx = useActionContext();
+          const record = useRecord();
+          const result = useRequest(
+            () =>
+              api
+                .resource('departments')
+                .get({
+                  filterByTk: record['id'],
+                  appends: ['parent(recursively=true)', 'roles', 'owners'],
+                })
+                .then((res: any) => res?.data),
+            { ...options, manual: true },
+          );
+          useEffect(() => {
+            if (ctx.visible) {
+              result.run();
+            }
+          }, [ctx.visible]);
+          return result;
+        },
+      },
+      title: '{{t("Edit department")}}',
+      properties: {
+        title: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+        },
+        parent: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+          'x-collection-field': 'departments.parent',
+          'x-component-props': {
+            component: 'SuperiorDepartmentSelect',
+          },
+        },
+        roles: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+          'x-collection-field': 'departments.roles',
+        },
+        owners: {
+          title: '{{t("Owners")}}',
+          'x-component': 'DepartmentOwnersField',
+          'x-decorator': 'FormItem',
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            submit: {
+              title: '{{t("Submit")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useUpdateDepartment }}',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export const departmentOwnersSchema = {
+  type: 'void',
+  properties: {
+    drawer: {
+      title: '{{t("Select Owners")}}',
+      'x-component': 'Action.Drawer',
+      properties: {
+        resource: {
+          type: 'void',
+          'x-decorator': 'FormItem',
+          'x-component': 'RequestProvider',
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'ActionBar',
+              'x-component-props': {
+                style: {
+                  marginBottom: 16,
+                },
+              },
+              properties: {
+                filter: {
+                  type: 'void',
+                  title: '{{ t("Filter") }}',
+                  default: {
+                    $and: [{ username: { $includes: '' } }, { nickname: { $includes: '' } }],
+                  },
+                  'x-action': 'filter',
+                  'x-component': 'Filter.Action',
+                  'x-use-component-props': 'useFilterActionProps',
+                  'x-component-props': {
+                    icon: 'FilterOutlined',
+                  },
+                  'x-align': 'left',
+                },
+              },
+            },
+            table: {
+              type: 'void',
+              'x-component': 'Table.Void',
+              'x-component-props': {
+                rowKey: 'id',
+                rowSelection: {
+                  type: 'checkbox',
+                  onChange: '{{ handleSelect }}',
+                },
+                useDataSource: '{{ cm.useDataSourceFromRAC }}',
+              },
+              properties: {
+                username: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    username: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                nickname: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    nickname: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                phone: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    phone: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                email: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    email: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            confirm: {
+              title: '{{t("Confirm")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useSelectOwners }}',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/users.ts b/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/users.ts
new file mode 100644
index 0000000000..66c2115d0e
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/users.ts
@@ -0,0 +1,464 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { uid } from '@formily/shared';
+
+export const membersActionSchema = {
+  type: 'void',
+  'x-component': 'Space',
+  properties: {
+    remove: {
+      type: 'void',
+      title: '{{t("Remove")}}',
+      'x-component': 'Action',
+      'x-component-props': {
+        icon: 'UserDeleteOutlined',
+        confirm: {
+          title: "{{t('Remove members')}}",
+          content: "{{t('Are you sure you want to remove these members?')}}",
+        },
+        style: {
+          marginRight: 8,
+        },
+        useAction: '{{ useBulkRemoveMembersAction }}',
+      },
+    },
+    create: {
+      type: 'void',
+      title: '{{t("Add members")}}',
+      'x-component': 'Action',
+      'x-component-props': {
+        type: 'primary',
+        icon: 'UserAddOutlined',
+      },
+      properties: {
+        drawer: {
+          type: 'void',
+          'x-component': 'AddMembers',
+        },
+      },
+    },
+  },
+};
+
+export const rowRemoveActionSchema = {
+  type: 'void',
+  properties: {
+    remove: {
+      title: '{{ t("Remove") }}',
+      'x-component': 'Action.Link',
+      'x-component-props': {
+        confirm: {
+          title: "{{t('Remove member')}}",
+          content: "{{t('Are you sure you want to remove it?')}}",
+        },
+        useAction: '{{ useRemoveMemberAction }}',
+      },
+    },
+  },
+};
+
+export const getMembersSchema = (department: any, user: any) => ({
+  type: 'void',
+  'x-component': 'CardItem',
+  'x-component-props': {
+    heightMode: 'fullHeight',
+  },
+  properties: {
+    ...(!user
+      ? {
+          actions: {
+            type: 'void',
+            'x-component': 'ActionBar',
+            'x-component-props': {
+              style: {
+                marginBottom: 16,
+              },
+            },
+            properties: {
+              [uid()]: {
+                type: 'void',
+                title: '{{ t("Filter") }}',
+                'x-action': 'filter',
+                'x-component': 'Filter.Action',
+                'x-use-component-props': 'useMemberFilterActionProps',
+                'x-component-props': {
+                  icon: 'FilterOutlined',
+                },
+                'x-align': 'left',
+              },
+              refresh: {
+                type: 'void',
+                title: '{{ t("Refresh") }}',
+                'x-action': 'refresh',
+                'x-component': 'Action',
+                'x-use-component-props': 'useRefreshActionProps',
+                'x-component-props': {
+                  icon: 'ReloadOutlined',
+                },
+              },
+              actions: {
+                type: 'void',
+                'x-component': 'MemberActions',
+              },
+            },
+          },
+        }
+      : {}),
+    table: {
+      type: 'array',
+      'x-component': 'TableV2',
+      'x-use-component-props': 'useTableBlockProps',
+      'x-component-props': {
+        rowKey: 'id',
+        rowSelection: {
+          type: 'checkbox',
+        },
+        pagination: {
+          showTotal: '{{ useShowTotal }}',
+        },
+      },
+      properties: {
+        nickname: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            nickname: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        username: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            username: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        departments: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            departments: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        ...(department
+          ? {
+              isOwner: {
+                type: 'void',
+                'x-decorator': 'Table.Column.Decorator',
+                'x-component': 'Table.Column',
+                'x-component-props': {
+                  style: {
+                    minWidth: 100,
+                  },
+                },
+                title: '{{t("Owner")}}',
+                properties: {
+                  isOwner: {
+                    type: 'boolean',
+                    'x-component': 'IsOwnerField',
+                  },
+                },
+              },
+            }
+          : {}),
+        phone: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            phone: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        email: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            email: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        actions: {
+          type: 'void',
+          title: '{{t("Actions")}}',
+          'x-component': 'Table.Column',
+          'x-component-props': {
+            fixed: 'right',
+          },
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'Space',
+              'x-component-props': {
+                split: '|',
+              },
+              properties: {
+                update: {
+                  type: 'void',
+                  title: '{{t("Configure")}}',
+                  'x-component': 'Action.Link',
+                  'x-component-props': {
+                    type: 'primary',
+                  },
+                  properties: {
+                    drawer: {
+                      type: 'void',
+                      'x-component': 'Action.Drawer',
+                      'x-decorator': 'FormV2',
+                      title: '{{t("Configure")}}',
+                      properties: {
+                        departments: {
+                          title: '{{t("Departments")}}',
+                          'x-decorator': 'FormItem',
+                          'x-component': 'UserDepartmentsField',
+                        },
+                        // footer: {
+                        //   type: 'void',
+                        //   'x-component': 'Action.Drawer.Footer',
+                        //   properties: {
+                        //     cancel: {
+                        //       title: '{{t("Cancel")}}',
+                        //       'x-component': 'Action',
+                        //       'x-component-props': {
+                        //         useAction: '{{ cm.useCancelAction }}',
+                        //       },
+                        //     },
+                        //     submit: {
+                        //       title: '{{t("Submit")}}',
+                        //       'x-component': 'Action',
+                        //       'x-component-props': {
+                        //         type: 'primary',
+                        //         // useAction: '{{ useSetDepartments }}',
+                        //       },
+                        //     },
+                        //   },
+                        // },
+                      },
+                    },
+                  },
+                },
+                ...(department
+                  ? {
+                      remove: {
+                        type: 'void',
+                        'x-component': 'RowRemoveAction',
+                      },
+                    }
+                  : {}),
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+});
+
+export const addMembersSchema = {
+  type: 'object',
+  properties: {
+    drawer: {
+      type: 'void',
+      'x-component': 'Action.Drawer',
+      'x-decorator': 'Form',
+      title: '{{t("Add members")}}',
+      properties: {
+        resource: {
+          type: 'void',
+          'x-decorator': 'FormItem',
+          'x-component': 'AddMembersListProvider',
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'ActionBar',
+              'x-component-props': {
+                style: {
+                  marginBottom: 16,
+                },
+              },
+              properties: {
+                filter: {
+                  type: 'void',
+                  title: '{{ t("Filter") }}',
+                  default: {
+                    $and: [{ username: { $includes: '' } }, { nickname: { $includes: '' } }],
+                  },
+                  'x-action': 'filter',
+                  'x-component': 'Filter.Action',
+                  'x-use-component-props': 'useAddMembersFilterActionProps',
+                  'x-component-props': {
+                    icon: 'FilterOutlined',
+                  },
+                  'x-align': 'left',
+                },
+              },
+            },
+            table: {
+              type: 'void',
+              'x-component': 'Table.Void',
+              'x-component-props': {
+                rowKey: 'id',
+                rowSelection: {
+                  type: 'checkbox',
+                  onChange: '{{ handleSelect }}',
+                },
+                useDataSource: '{{ cm.useDataSourceFromRAC }}',
+              },
+              properties: {
+                username: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    username: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                nickname: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    nickname: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                phone: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    phone: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                email: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    email: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            submit: {
+              title: '{{t("Submit")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+              },
+              'x-use-component-props': 'useAddMembersActionProps',
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export const userDepartmentsSchema = {
+  type: 'void',
+  properties: {
+    drawer: {
+      title: '{{t("Select Departments")}}',
+      'x-decorator': 'Form',
+      'x-component': 'Action.Drawer',
+      properties: {
+        table: {
+          type: 'void',
+          'x-decorator': 'FormItem',
+          'x-component': 'DepartmentTable',
+          'x-component-props': {
+            useDataSource: '{{ useDataSource }}',
+            useDisabled: '{{ useDisabled }}',
+          },
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            confirm: {
+              title: '{{t("Submit")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useAddDepartments }}',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/hooks/departments-manager.ts b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/departments-manager.ts
new file mode 100644
index 0000000000..57d99ee9aa
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/departments-manager.ts
@@ -0,0 +1,75 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { useAPIClient } from '@nocobase/client';
+import { TreeManagerOptions, useTreeManager } from './tree-manager';
+import deepmerge from 'deepmerge';
+
+type DepartmentManagerOptions = {
+  resource?: string;
+  resourceOf?: string;
+  params?: any;
+} & TreeManagerOptions;
+
+export const useDepartmentManager = (options?: DepartmentManagerOptions) => {
+  const { resource = 'departments', resourceOf, params = {} } = options || {};
+  const api = useAPIClient();
+  const resourceAPI = api.resource(resource, resourceOf);
+  const treeManager = useTreeManager(options);
+  const { setTreeData, updateTreeData, setLoadedKeys, initData } = treeManager;
+  const loadData = async ({ key, children }) => {
+    if (children?.length) {
+      return;
+    }
+    const { data } = await resourceAPI.list(
+      deepmerge(params, {
+        paginate: false,
+        appends: ['parent(recursively=true)'],
+        filter: {
+          parentId: key,
+        },
+      }),
+    );
+    if (!data?.data?.length) {
+      return;
+    }
+    setTreeData(updateTreeData(key, data?.data));
+  };
+
+  const getByKeyword = async (keyword: string) => {
+    const { data } = await resourceAPI.list(
+      deepmerge(params, {
+        paginate: false,
+        filter: {
+          title: {
+            $includes: keyword,
+          },
+        },
+        appends: ['parent(recursively=true)'],
+        pageSize: 100,
+      }),
+    );
+    initData(data?.data);
+  };
+
+  return {
+    ...treeManager,
+    loadData,
+    getByKeyword,
+  };
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/hooks/index.ts b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/index.ts
new file mode 100644
index 0000000000..72af4ce551
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/index.ts
@@ -0,0 +1,68 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  CollectionContext,
+  useActionContext,
+  useFilterFieldOptions,
+  useFilterFieldProps,
+  useResourceActionContext,
+  useResourceContext,
+} from '@nocobase/client';
+import { useContext } from 'react';
+import { useForm, useField } from '@formily/react';
+
+export const useCreateAction = () => {
+  const form = useForm();
+  const field = useField();
+  const ctx = useActionContext();
+  const { refresh } = useResourceActionContext();
+  const { resource } = useResourceContext();
+  return {
+    async run() {
+      try {
+        await form.submit();
+        field.data = field.data || {};
+        field.data.loading = true;
+        await resource.create({ values: form.values });
+        ctx.setVisible(false);
+        await form.reset();
+        field.data.loading = false;
+        refresh();
+      } catch (error) {
+        if (field.data) {
+          field.data.loading = false;
+        }
+      }
+    },
+  };
+};
+
+export const useFilterActionProps = () => {
+  const collection = useContext(CollectionContext);
+  const options = useFilterFieldOptions(collection.fields);
+  const service = useResourceActionContext();
+  return useFilterFieldProps({
+    options,
+    params: service.state?.params?.[0] || service.params,
+    service,
+  });
+};
+
+export * from './tree-manager';
+export * from './departments-manager';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/hooks/tree-manager.ts b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/tree-manager.ts
new file mode 100644
index 0000000000..d2ef32c348
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/tree-manager.ts
@@ -0,0 +1,142 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useCallback, useState } from 'react';
+
+export type TreeManagerOptions = {
+  label?: React.FC<{ node: any }>;
+};
+
+export const useTreeManager = (options?: TreeManagerOptions) => {
+  const { label } = options || {};
+  const [treeData, setTreeData] = useState([]);
+  const [nodeMap, setNodeMap] = useState({});
+  const [expandedKeys, setExpandedKeys] = useState([]);
+  const [loadedKeys, setLoadedKeys] = useState([]);
+
+  const buildNodeMap = useCallback((data: any[]) => {
+    const mp = {};
+    const setNodeMapFromChild = (node: any) => {
+      let child = node ? { ...node } : null;
+      while (child) {
+        const parentId = child.parentId || 'root';
+        if (mp[parentId]) {
+          mp[parentId].childrenMap[child.id] = child;
+        } else {
+          mp[parentId] = {
+            ...(child.parent || { id: parentId }),
+            childrenMap: {
+              [child.id]: child,
+            },
+          };
+        }
+        child = child.parent;
+      }
+    };
+    const setNodeMapFromParent = (node: any) => {
+      const childrenMap = {};
+      if (node.children && node.children.length) {
+        node.children.forEach((child: any) => {
+          childrenMap[child.id] = child;
+          setNodeMapFromParent(child);
+        });
+      }
+      mp[node.id] = {
+        ...node,
+        childrenMap,
+      };
+    };
+    if (!(data && data.length)) {
+      return mp;
+    }
+    data.forEach((node) => {
+      setNodeMapFromChild(node);
+      setNodeMapFromParent(node);
+    });
+    return mp;
+  }, []);
+
+  const constructTreeData = useCallback((nodeMap: { [parentId: string | number]: any }) => {
+    const getChildren = (id: any) => {
+      if (!nodeMap[id]) {
+        return null;
+      }
+      if (nodeMap[id].isLeaf) {
+        return null;
+      }
+      return Object.values(nodeMap[id]?.childrenMap || {}).map((node: any) => {
+        return {
+          ...node,
+          title: label ? React.createElement(label, { node }) : node.title,
+          children: getChildren(node.id),
+        };
+      });
+    };
+    return getChildren('root');
+  }, []);
+
+  const initData = useCallback(
+    (data: any[]) => {
+      const mp = buildNodeMap(data);
+      setNodeMap(mp);
+      const treeData = constructTreeData(mp) || [];
+      setTreeData(treeData);
+      // setLoadedKeys([]);
+    },
+    [setTreeData, buildNodeMap, constructTreeData],
+  );
+
+  const updateTreeData = (key: any, children: any[]) => {
+    const mp = buildNodeMap(children);
+    const newMap = { ...mp, ...nodeMap };
+    children.forEach((node) => {
+      newMap[key].childrenMap[node.id] = node;
+    });
+    setNodeMap(newMap);
+    return constructTreeData(newMap);
+  };
+
+  const getChildrenIds = useCallback(
+    (id: any) => {
+      if (!nodeMap[id]) {
+        return [];
+      }
+      const ids = [];
+      ids.push(...Object.keys(nodeMap[id].childrenMap).map((id) => Number(id)));
+      Object.keys(nodeMap[id].childrenMap).forEach((id) => {
+        ids.push(...getChildrenIds(id));
+      });
+      return ids;
+    },
+    [nodeMap],
+  );
+
+  return {
+    initData,
+    treeData,
+    setTreeData,
+    nodeMap,
+    updateTreeData,
+    constructTreeData,
+    getChildrenIds,
+    loadedKeys,
+    setLoadedKeys,
+    expandedKeys,
+    setExpandedKeys,
+  };
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/hooks/useTableBlockProps.ts b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/useTableBlockProps.ts
new file mode 100644
index 0000000000..fe5b35eb8a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/useTableBlockProps.ts
@@ -0,0 +1,175 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { ArrayField } from '@formily/core';
+import { useField, useFieldSchema } from '@formily/react';
+import { isEqual } from 'lodash';
+import { useCallback, useEffect, useRef } from 'react';
+import {
+  useTableBlockContext,
+  findFilterTargets,
+  DataBlock,
+  useFilterBlock,
+  mergeFilter,
+  removeNullCondition,
+} from '@nocobase/client';
+
+export const useTableBlockProps = () => {
+  const field = useField<ArrayField>();
+  const fieldSchema = useFieldSchema();
+  const ctx = useTableBlockContext();
+  const { getDataBlocks } = useFilterBlock();
+  const isLoading = ctx?.service?.loading;
+
+  const ctxRef = useRef(null);
+  ctxRef.current = ctx;
+
+  useEffect(() => {
+    if (!isLoading) {
+      const serviceResponse = ctx?.service?.data;
+      const data = serviceResponse?.data || [];
+      const meta = serviceResponse?.meta || {};
+      const selectedRowKeys = ctx?.field?.data?.selectedRowKeys;
+
+      if (!isEqual(field.value, data)) {
+        field.value = data;
+        field?.setInitialValue(data);
+      }
+      field.data = field.data || {};
+
+      if (!isEqual(field.data.selectedRowKeys, selectedRowKeys)) {
+        field.data.selectedRowKeys = selectedRowKeys;
+      }
+
+      field.componentProps.pagination = field.componentProps.pagination || {};
+      field.componentProps.pagination.pageSize = meta?.pageSize;
+      field.componentProps.pagination.total = meta?.count;
+      field.componentProps.pagination.current = meta?.page;
+    }
+  }, [field, ctx?.service?.data, isLoading, ctx?.field?.data?.selectedRowKeys]);
+
+  return {
+    bordered: ctx.bordered,
+    childrenColumnName: ctx.childrenColumnName,
+    loading: ctx?.service?.loading,
+    showIndex: ctx.showIndex,
+    dragSort: ctx.dragSort && ctx.dragSortBy,
+    rowKey: ctx.rowKey || fieldSchema?.['x-component-props']?.rowKey || 'id',
+    pagination: fieldSchema?.['x-component-props']?.pagination === false ? false : field.componentProps.pagination,
+    onRowSelectionChange: useCallback((selectedRowKeys, selectedRowData) => {
+      ctx.field.data = ctx?.field?.data || {};
+      ctx.field.data.selectedRowKeys = selectedRowKeys;
+      ctx.field.data.selectedRowData = selectedRowData;
+      ctx?.field?.onRowSelect?.(selectedRowKeys);
+    }, []),
+    onRowDragEnd: useCallback(
+      async ({ from, to }) => {
+        await ctx.resource.move({
+          sourceId: from[ctx.rowKey || 'id'],
+          targetId: to[ctx.rowKey || 'id'],
+          sortField: ctx.dragSort && ctx.dragSortBy,
+        });
+        ctx.service.refresh();
+        // ctx.resource
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+      },
+      [ctx.rowKey, ctx.dragSort, ctx.dragSortBy],
+    ),
+    onChange: useCallback(
+      ({ current, pageSize }, filters, sorter) => {
+        const globalSort = fieldSchema.parent?.['x-decorator-props']?.['params']?.['sort'];
+        const sort = sorter.order
+          ? sorter.order === `ascend`
+            ? [sorter.field]
+            : [`-${sorter.field}`]
+          : globalSort || ctxRef.current.dragSortBy;
+        const currentPageSize = pageSize || fieldSchema.parent?.['x-decorator-props']?.['params']?.pageSize;
+        const args = { ...ctxRef.current?.service?.params?.[0], page: current || 1, pageSize: currentPageSize };
+        if (sort) {
+          args['sort'] = sort;
+        }
+        ctxRef.current?.service.run(args);
+      },
+      [fieldSchema.parent],
+    ),
+    onClickRow: useCallback(
+      (record, setSelectedRow, selectedRow) => {
+        const { targets, uid } = findFilterTargets(fieldSchema);
+        const dataBlocks = getDataBlocks();
+
+        // 如果是之前创建的区块是没有 x-filter-targets 属性的，所以这里需要判断一下避免报错
+        if (!targets || !targets.some((target) => dataBlocks.some((dataBlock) => dataBlock.uid === target.uid))) {
+          // 当用户已经点击过某一行，如果此时再把相连接的区块给删除的话，行的高亮状态就会一直保留。
+          // 这里暂时没有什么比较好的方法，只是在用户再次点击的时候，把高亮状态给清除掉。
+          setSelectedRow((prev) => (prev.length ? [] : prev));
+          return;
+        }
+
+        const currentBlock = dataBlocks.find((block) => block.uid === fieldSchema.parent['x-uid']);
+
+        dataBlocks.forEach((block) => {
+          const target = targets.find((target) => target.uid === block.uid);
+          if (!target) return;
+
+          const isForeignKey = block.foreignKeyFields?.some((field) => field.name === target.field);
+          const sourceKey = getSourceKey(currentBlock, target.field);
+          const recordKey = isForeignKey ? sourceKey : ctx.rowKey;
+          const value = [record[recordKey]];
+
+          const param = block.service.params?.[0] || {};
+          // 保留原有的 filter
+          const storedFilter = block.service.params?.[1]?.filters || {};
+
+          if (selectedRow.includes(record[ctx.rowKey])) {
+            if (block.dataLoadingMode === 'manual') {
+              return block.clearData();
+            }
+            delete storedFilter[uid];
+          } else {
+            storedFilter[uid] = {
+              $and: [
+                {
+                  [target.field || ctx.rowKey]: {
+                    [target.field ? '$in' : '$eq']: value,
+                  },
+                },
+              ],
+            };
+          }
+
+          const mergedFilter = mergeFilter([
+            ...Object.values(storedFilter).map((filter) => removeNullCondition(filter)),
+            block.defaultFilter,
+          ]);
+
+          return block.doFilter(
+            {
+              ...param,
+              page: 1,
+              filter: mergedFilter,
+            },
+            { filters: storedFilter },
+          );
+        });
+
+        // 更新表格的选中状态
+        setSelectedRow((prev) => (prev?.includes(record[ctx.rowKey]) ? [] : [record[ctx.rowKey]]));
+      },
+      [ctx.rowKey, fieldSchema, getDataBlocks],
+    ),
+    onExpand: useCallback((expanded, record) => {
+      ctx?.field.onExpandClick?.(expanded, record);
+    }, []),
+  };
+};
+
+function getSourceKey(currentBlock: DataBlock, field: string) {
+  const associationField = currentBlock?.associatedFields?.find((item) => item.foreignKey === field);
+  return associationField?.sourceKey || 'id';
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/index.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/index.tsx
new file mode 100644
index 0000000000..798fddecd6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/index.tsx
@@ -0,0 +1,76 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Plugin, SchemaComponentContext, useSchemaComponentContext } from '@nocobase/client';
+import { tval } from '@nocobase/utils/client';
+import { DepartmentBlock } from './departments/DepartmentBlock';
+import React from 'react';
+import { ResourcesProvider } from './ResourcesProvider';
+import ACLPlugin from '@nocobase/plugin-acl/client';
+import { RoleDepartmentsManager } from './roles/RoleDepartmentsManager';
+import {
+  UserDepartmentsFieldSettings,
+  ReadOnlyAssociationField,
+  UserMainDepartmentFieldSettings,
+  DepartmentOwnersFieldSettings,
+} from './components';
+
+export class PluginDepartmentsClient extends Plugin {
+  async afterAdd() {
+    // await this.app.pm.add()
+  }
+
+  async beforeLoad() {}
+
+  // You can get and modify the app instance here
+  async load() {
+    this.app.addComponents({
+      UserDepartmentsField: ReadOnlyAssociationField,
+      UserMainDepartmentField: ReadOnlyAssociationField,
+      DepartmentOwnersField: ReadOnlyAssociationField,
+    });
+    this.app.schemaSettingsManager.add(UserDepartmentsFieldSettings);
+    this.app.schemaSettingsManager.add(UserMainDepartmentFieldSettings);
+    this.app.schemaSettingsManager.add(DepartmentOwnersFieldSettings);
+
+    this.app.pluginSettingsManager.add('users-permissions.departments', {
+      icon: 'ApartmentOutlined',
+      title: tval('Departments', { ns: 'departments' }),
+      Component: () => {
+        const scCtx = useSchemaComponentContext();
+        return (
+          <SchemaComponentContext.Provider value={{ ...scCtx, designable: false }}>
+            <ResourcesProvider>
+              <DepartmentBlock />
+            </ResourcesProvider>
+          </SchemaComponentContext.Provider>
+        );
+      },
+      sort: 2,
+      aclSnippet: 'pm.departments',
+    });
+
+    const acl = this.app.pm.get(ACLPlugin);
+    acl.rolesManager.add('departments', {
+      title: tval('Departments', { ns: 'departments' }),
+      Component: RoleDepartmentsManager,
+    });
+  }
+}
+
+export default PluginDepartmentsClient;
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/locale.ts b/packages/plugins/@nocobase/plugin-departments/src/client/locale.ts
new file mode 100644
index 0000000000..2899c172d4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/locale.ts
@@ -0,0 +1,23 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { useTranslation } from 'react-i18next';
+
+export function useDepartmentTranslation() {
+  return useTranslation(['departments', 'client'], { nsMode: 'fallback' });
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/roles/RoleDepartmentsManager.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/roles/RoleDepartmentsManager.tsx
new file mode 100644
index 0000000000..30d8badc1d
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/roles/RoleDepartmentsManager.tsx
@@ -0,0 +1,178 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext, useEffect, useMemo } from 'react';
+import { App } from 'antd';
+import { useDepartmentTranslation } from '../locale';
+import {
+  CollectionManagerContext,
+  CollectionProvider_deprecated,
+  ResourceActionContext,
+  SchemaComponent,
+  useAPIClient,
+  useActionContext,
+  useRecord,
+  useRequest,
+  useResourceActionContext,
+} from '@nocobase/client';
+import { RolesManagerContext } from '@nocobase/plugin-acl/client';
+import { departmentCollection } from '../collections/departments';
+import { getDepartmentsSchema } from './schemas/departments';
+import { useFilterActionProps } from '../hooks';
+import { DepartmentTable } from '../departments/DepartmentTable';
+import { useForm } from '@formily/react';
+
+const useRemoveDepartment = () => {
+  const api = useAPIClient();
+  const { role } = useContext(RolesManagerContext);
+  const { id } = useRecord();
+  const { refresh } = useResourceActionContext();
+  return {
+    async run() {
+      await api.resource(`roles/${role?.name}/departments`).remove({
+        values: [id],
+      });
+      refresh();
+    },
+  };
+};
+
+const useBulkRemoveDepartments = () => {
+  const { t } = useDepartmentTranslation();
+  const { message } = App.useApp();
+  const api = useAPIClient();
+  const { state, setState, refresh } = useResourceActionContext();
+  const { role } = useContext(RolesManagerContext);
+
+  return {
+    async run() {
+      const selected = state?.selectedRowKeys;
+      if (!selected?.length) {
+        message.warning(t('Please select departments'));
+        return;
+      }
+      await api.resource(`roles/${role?.name}/departments`).remove({
+        values: selected,
+      });
+      setState?.({ selectedRowKeys: [] });
+      refresh();
+    },
+  };
+};
+
+const DepartmentTitle: React.FC = () => {
+  const record = useRecord();
+  const getTitle = (record: any) => {
+    const title = record.title;
+    const parent = record.parent;
+    if (parent) {
+      return getTitle(parent) + ' / ' + title;
+    }
+    return title;
+  };
+
+  return <>{getTitle(record)}</>;
+};
+
+const useDataSource = (options?: any) => {
+  const defaultRequest = {
+    resource: 'departments',
+    action: 'list',
+    params: {
+      // filter: {
+      //   parentId: null,
+      // },
+      appends: ['roles', 'parent(recursively=true)'],
+      sort: ['createdAt'],
+    },
+  };
+  const service = useRequest(defaultRequest, options);
+  return {
+    ...service,
+    defaultRequest,
+  };
+};
+
+const useDisabled = () => {
+  const { role } = useContext(RolesManagerContext);
+  return {
+    disabled: (record: any) => record?.roles?.some((r: { name: string }) => r.name === role?.name),
+  };
+};
+
+const useAddDepartments = () => {
+  const { role } = useContext(RolesManagerContext);
+  const api = useAPIClient();
+  const form = useForm();
+  const { setVisible } = useActionContext();
+  const { refresh } = useResourceActionContext();
+  const { departments } = form.values || {};
+  return {
+    async run() {
+      await api.resource('roles.departments', role.name).add({
+        values: departments.map((dept: any) => dept.id),
+      });
+      form.reset();
+      setVisible(false);
+      refresh();
+    },
+  };
+};
+
+export const RoleDepartmentsManager: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  const { role } = useContext(RolesManagerContext);
+  const service = useRequest(
+    {
+      resource: `roles/${role?.name}/departments`,
+      action: 'list',
+      params: {
+        appends: ['parent', 'parent.parent(recursively=true)'],
+      },
+    },
+    {
+      ready: !!role,
+    },
+  );
+
+  useEffect(() => {
+    service.run();
+  }, [role]);
+
+  const schema = useMemo(() => getDepartmentsSchema(), [role]);
+
+  return (
+    <ResourceActionContext.Provider value={{ ...service }}>
+      <CollectionProvider_deprecated collection={departmentCollection}>
+        <SchemaComponent
+          schema={schema}
+          components={{ DepartmentTable, DepartmentTitle }}
+          scope={{
+            useFilterActionProps,
+            t,
+            useRemoveDepartment,
+            useBulkRemoveDepartments,
+            useDataSource,
+            useDisabled,
+            useAddDepartments,
+          }}
+        />
+      </CollectionProvider_deprecated>
+    </ResourceActionContext.Provider>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/roles/schemas/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/client/roles/schemas/departments.ts
new file mode 100644
index 0000000000..240a37635c
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/roles/schemas/departments.ts
@@ -0,0 +1,171 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { uid } from '@formily/shared';
+
+export const getDepartmentsSchema = () => ({
+  type: 'void',
+  properties: {
+    actions: {
+      type: 'void',
+      'x-component': 'ActionBar',
+      'x-component-props': {
+        style: {
+          marginBottom: 16,
+        },
+      },
+      properties: {
+        [uid()]: {
+          type: 'void',
+          title: '{{ t("Filter") }}',
+          'x-action': 'filter',
+          'x-component': 'Filter.Action',
+          'x-use-component-props': 'useFilterActionProps',
+          'x-component-props': {
+            icon: 'FilterOutlined',
+          },
+          'x-align': 'left',
+        },
+        actions: {
+          type: 'void',
+          'x-component': 'Space',
+          properties: {
+            remove: {
+              type: 'void',
+              title: '{{t("Remove")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                icon: 'MinusOutlined',
+                confirm: {
+                  title: "{{t('Remove')}}",
+                  content: "{{t('Are you sure you want to remove these departments?')}}",
+                },
+                style: {
+                  marginRight: 8,
+                },
+                useAction: '{{ useBulkRemoveDepartments }}',
+              },
+            },
+            create: {
+              type: 'void',
+              title: '{{t("Add departments")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                icon: 'PlusOutlined',
+              },
+              properties: {
+                drawer: {
+                  type: 'void',
+                  'x-component': 'Action.Drawer',
+                  'x-decorator': 'FormV2',
+                  title: '{{t("Add departments")}}',
+                  properties: {
+                    table: {
+                      type: 'void',
+                      'x-decorator': 'FormItem',
+                      'x-component': 'DepartmentTable',
+                      'x-component-props': {
+                        useDataSource: '{{ useDataSource }}',
+                        useDisabled: '{{ useDisabled }}',
+                      },
+                    },
+                    footer: {
+                      type: 'void',
+                      'x-component': 'Action.Drawer.Footer',
+                      properties: {
+                        cancel: {
+                          title: '{{t("Cancel")}}',
+                          'x-component': 'Action',
+                          'x-component-props': {
+                            useAction: '{{ cm.useCancelAction }}',
+                          },
+                        },
+                        submit: {
+                          title: '{{t("Submit")}}',
+                          'x-component': 'Action',
+                          'x-component-props': {
+                            type: 'primary',
+                            useAction: '{{ useAddDepartments }}',
+                          },
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+    table: {
+      type: 'void',
+      'x-component': 'Table.Void',
+      'x-component-props': {
+        rowKey: 'id',
+        rowSelection: {
+          type: 'checkbox',
+        },
+        useDataSource: '{{ cm.useDataSourceFromRAC }}',
+      },
+      properties: {
+        title: {
+          type: 'void',
+          title: '{{t("Department name")}}',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            title: {
+              type: 'string',
+              'x-component': 'DepartmentTitle',
+            },
+          },
+        },
+        actions: {
+          type: 'void',
+          title: '{{t("Actions")}}',
+          'x-component': 'Table.Column',
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'Space',
+              'x-component-props': {
+                split: '|',
+              },
+              properties: {
+                remove: {
+                  type: 'void',
+                  title: '{{ t("Remove") }}',
+                  'x-component': 'Action.Link',
+                  'x-component-props': {
+                    confirm: {
+                      title: "{{t('Remove department')}}",
+                      content: "{{t('Are you sure you want to remove it?')}}",
+                    },
+                    useAction: '{{ useRemoveDepartment }}',
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/utils.ts b/packages/plugins/@nocobase/plugin-departments/src/client/utils.ts
new file mode 100644
index 0000000000..52f6fb7663
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/utils.ts
@@ -0,0 +1,26 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export const getDepartmentTitle = (record: any) => {
+  const title = record.title;
+  const parent = record.parent;
+  if (parent) {
+    return getDepartmentTitle(parent) + ' / ' + title;
+  }
+  return title;
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/index.ts b/packages/plugins/@nocobase/plugin-departments/src/index.ts
new file mode 100644
index 0000000000..7d69462f4f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/index.ts
@@ -0,0 +1,20 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export * from './server';
+export { default } from './server';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-departments/src/locale/en-US.json
new file mode 100644
index 0000000000..f872121a10
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/locale/en-US.json
@@ -0,0 +1,35 @@
+{
+  "Department": "Department",
+  "All users": "All users",
+  "New department": "New department",
+  "Add department": "Add department",
+  "Add departments": "Add departments",
+  "New sub department": "New sub department",
+  "Edit department": "Edit department",
+  "Delete department": "Delete department",
+  "Departments": "Departments",
+  "Main department": "Main department",
+  "Owner": "Owner",
+  "Department name": "Department name",
+  "Superior department": "Superior department",
+  "Owners": "Owners",
+  "Add members": "Add members",
+  "Search for departments, users": "Search for departments, users",
+  "Search results": "Search results",
+  "Departments management": "Departments management",
+  "Roles management": "Roles management",
+  "Remove members": "Remove members",
+  "Remove member": "Remove member",
+  "Remove departments": "Remove departments",
+  "Remove department": "Remove department",
+  "Are you sure you want to remove it?": "Are you sure you want to remove it?",
+  "Are you sure you want to remove these members?": "Are you sure you want to remove these members?",
+  "Are you sure you want to remove these departments?": "Are you sure you want to remove these departments?",
+  "Please select members": "Please select members",
+  "Please select departments": "Please select departments",
+  "The department has sub-departments, please delete them first": "The department has sub-departments, please delete them first",
+  "The department has members, please remove them first": "The department has members, please remove them first",
+  "Main": "Main",
+  "Set as main department": "Set as main department",
+  "This field is currently not supported for use in form blocks.": "This field is currently not supported for use in form blocks."
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-departments/src/locale/zh-CN.json
new file mode 100644
index 0000000000..be5393b399
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/locale/zh-CN.json
@@ -0,0 +1,35 @@
+{
+  "Department": "部门",
+  "All users": "所有用户",
+  "New department": "新建部门",
+  "New sub department": "新建子部门",
+  "Add department": "添加部门",
+  "Add departments": "添加部门",
+  "Edit department": "编辑部门",
+  "Delete department": "删除部门",
+  "Departments": "部门",
+  "Main department": "主属部门",
+  "Owner": "负责人",
+  "Department name": "部门名称",
+  "Superior department": "上级部门",
+  "Owners": "负责人",
+  "Add members": "添加成员",
+  "Search for departments, users": "搜索部门、用户",
+  "Search results": "搜索结果",
+  "Departments management": "部门管理",
+  "Roles management": "角色管理",
+  "Remove members": "移除成员",
+  "Remove member": "移除成员",
+  "Remove departments": "移除部门",
+  "Remove department": "移除部门",
+  "Are you sure you want to remove it?": "你确定要移除吗？",
+  "Are you sure you want to remove these members?": "你确定要移除这些成员吗？",
+  "Are you sure you want to remove these departments?": "你确定要移除这些部门吗？",
+  "Please select members": "请选择成员",
+  "Please select departments": "请选择部门",
+  "The department has sub-departments, please delete them first": "部门下有子部门，请先删除子部门",
+  "The department has members, please remove them first": "部门下有成员，请先移除",
+  "Main": "主属部门",
+  "Set as main department": "设置为主属部门",
+  "This field is currently not supported for use in form blocks.": "该字段目前不支持在表单区块中使用。"
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts
new file mode 100644
index 0000000000..1cc536139b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts
@@ -0,0 +1,125 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('actions', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['field-sort', 'users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should list users exclude department', async () => {
+    const dept = await repo.create({
+      values: {
+        title: 'Test department',
+        members: [1],
+      },
+    });
+    const res = await agent.resource('users').listExcludeDept({
+      departmentId: dept.id,
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.data.length).toBe(0);
+  });
+
+  it('should list users exclude department with filter', async () => {
+    let res = await agent.resource('users').listExcludeDept({
+      departmentId: 1,
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.data.length).toBe(1);
+
+    res = await agent.resource('users').listExcludeDept({
+      departmentId: 1,
+      filter: {
+        id: 1,
+      },
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.data.length).toBe(1);
+
+    res = await agent.resource('users').listExcludeDept({
+      departmentId: 1,
+      filter: {
+        id: 2,
+      },
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.data.length).toBe(0);
+  });
+
+  it('should set main department', async () => {
+    const depts = await repo.create({
+      values: [
+        {
+          title: 'Dept1',
+          members: [1],
+        },
+        {
+          title: 'Dept2',
+          members: [1],
+        },
+      ],
+    });
+    const deptUsers = db.getRepository('departmentsUsers');
+    await deptUsers.update({
+      filter: {
+        departmentId: depts[0].id,
+        userId: 1,
+      },
+      values: {
+        isMain: true,
+      },
+    });
+    const res = await agent.resource('users').setMainDepartment({
+      values: {
+        userId: 1,
+        departmentId: depts[1].id,
+      },
+    });
+    expect(res.status).toBe(200);
+    const records = await deptUsers.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    const dept1 = records.find((record: any) => record.departmentId === depts[0].id);
+    const dept2 = records.find((record: any) => record.departmentId === depts[1].id);
+    expect(dept1.isMain).toBe(false);
+    expect(dept2.isMain).toBe(true);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts
new file mode 100644
index 0000000000..0471a66632
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts
@@ -0,0 +1,278 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import PluginUserDataSyncServer, { UserDataResourceManager } from '@nocobase/plugin-user-data-sync';
+import { MockDatabase, MockServer, createMockServer } from '@nocobase/test';
+
+describe('department data sync', async () => {
+  let app: MockServer;
+  let db: MockDatabase;
+  let resourceManager: UserDataResourceManager;
+
+  beforeEach(async () => {
+    app = await createMockServer({
+      plugins: ['field-sort', 'user-data-sync', 'users', 'departments'],
+    });
+    db = app.db;
+    const plugin = app.pm.get('user-data-sync') as PluginUserDataSyncServer;
+    resourceManager = plugin.resourceManager;
+  });
+
+  afterEach(async () => {
+    await db.clean({ drop: true });
+    await app.destroy();
+  });
+
+  it('should create department', async () => {
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test',
+        },
+        {
+          uid: '2',
+          title: 'sub-test',
+          parentUid: '1',
+        },
+      ],
+    });
+    const department = await db.getRepository('departments').findOne({
+      filter: {
+        title: 'test',
+      },
+      appends: ['children'],
+    });
+    expect(department).toBeTruthy();
+    expect(department.title).toBe('test');
+    expect(department.children).toHaveLength(1);
+    expect(department.children[0].title).toBe('sub-test');
+  });
+
+  it('should update department', async () => {
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test',
+        },
+      ],
+    });
+    const department = await db.getRepository('departments').findOne({
+      filter: {
+        title: 'test',
+      },
+      appends: ['children'],
+    });
+    expect(department).toBeTruthy();
+    expect(department.children).toHaveLength(0);
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test2',
+        },
+        {
+          uid: '2',
+          title: 'sub-test',
+          parentUid: '1',
+        },
+      ],
+    });
+    const department2 = await db.getRepository('departments').findOne({
+      filter: {
+        id: department.id,
+      },
+      appends: ['children'],
+    });
+    expect(department2).toBeTruthy();
+    expect(department2.title).toBe('test2');
+    expect(department2.children).toHaveLength(1);
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '2',
+          title: 'sub-test',
+        },
+      ],
+    });
+    const department3 = await db.getRepository('departments').findOne({
+      filter: {
+        id: department2.children[0].id,
+      },
+      appends: ['parent'],
+    });
+    expect(department3).toBeTruthy();
+    expect(department3.parent).toBeNull();
+  });
+
+  it('should update user department', async () => {
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '12',
+          title: 'test',
+        },
+      ],
+    });
+    const department = await db.getRepository('departments').findOne({
+      filter: {
+        title: 'test',
+      },
+    });
+    expect(department).toBeTruthy();
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'user',
+      records: [
+        {
+          uid: '1',
+          nickname: 'test',
+          email: 'test@nocobase.com',
+          departments: ['12'],
+        },
+      ],
+    });
+    const user = await db.getRepository('users').findOne({
+      filter: {
+        email: 'test@nocobase.com',
+      },
+      appends: ['departments'],
+    });
+    expect(user).toBeTruthy();
+    expect(user.departments).toHaveLength(1);
+    expect(user.departments[0].id).toBe(department.id);
+    const departmentUser = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        departmentId: department.id,
+        userId: user.id,
+      },
+    });
+    expect(departmentUser).toBeTruthy();
+    expect(departmentUser.isOwner).toBe(false);
+    expect(departmentUser.isMain).toBe(false);
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'user',
+      records: [
+        {
+          uid: '1',
+          nickname: 'test',
+          email: 'test@nocobase.com',
+          departments: [
+            {
+              uid: '12',
+              isOwner: true,
+              isMain: true,
+            },
+          ],
+        },
+      ],
+    });
+    const departmentUser2 = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        departmentId: department.id,
+        userId: user.id,
+      },
+    });
+    expect(departmentUser2).toBeTruthy();
+    expect(departmentUser2.isOwner).toBe(true);
+    expect(departmentUser2.isMain).toBe(true);
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'user',
+      records: [
+        {
+          uid: '2',
+          nickname: 'test2',
+          email: 'test2@nocobase.com',
+          departments: [
+            {
+              uid: '12',
+              isOwner: true,
+              isMain: false,
+            },
+          ],
+        },
+      ],
+    });
+    const user2 = await db.getRepository('users').findOne({
+      filter: {
+        email: 'test2@nocobase.com',
+      },
+      appends: ['departments'],
+    });
+    expect(user2).toBeTruthy();
+    expect(user2.departments).toHaveLength(1);
+    expect(user2.departments[0].id).toBe(department.id);
+    const departmentUser3 = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        departmentId: department.id,
+        userId: user2.id,
+      },
+    });
+    expect(departmentUser3).toBeTruthy();
+    expect(departmentUser3.isOwner).toBe(true);
+    expect(departmentUser3.isMain).toBe(false);
+  });
+
+  it('should update department custom field', async () => {
+    const departmemntCollection = db.getCollection('departments');
+    departmemntCollection.addField('customField', { type: 'string' });
+    await db.sync({
+      alter: true,
+    });
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test',
+          customField: 'testField',
+        },
+      ],
+    });
+    const department = await db.getRepository('departments').findOne({
+      filter: {
+        title: 'test',
+      },
+    });
+    expect(department).toBeTruthy();
+    expect(department.customField).toBe('testField');
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test',
+          customField: 'testField2',
+        },
+      ],
+    });
+    const department2 = await db.getRepository('departments').findOne({
+      filter: {
+        id: department.id,
+      },
+    });
+    expect(department2).toBeTruthy();
+    expect(department2.customField).toBe('testField2');
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts
new file mode 100644
index 0000000000..80355b551e
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts
@@ -0,0 +1,72 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('destroy department check', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['field-sort', 'users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should check if it has sub departments', async () => {
+    const dept = await repo.create({
+      values: {
+        title: 'Department',
+        children: [{ title: 'Sub department' }],
+      },
+    });
+    const res = await agent.resource('departments').destroy({
+      filterByTk: dept.id,
+    });
+    expect(res.status).toBe(400);
+    expect(res.text).toBe('The department has sub-departments, please delete them first');
+  });
+
+  it('should check if it has members', async () => {
+    const dept = await repo.create({
+      values: {
+        title: 'Department',
+        members: [1],
+      },
+    });
+    const res = await agent.resource('departments').destroy({
+      filterByTk: dept.id,
+    });
+    expect(res.status).toBe(400);
+    expect(res.text).toBe('The department has members, please remove them first');
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts
new file mode 100644
index 0000000000..7775b6e873
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts
@@ -0,0 +1,91 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('set department owners', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['field-sort', 'users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should set department owners', async () => {
+    await db.getRepository('users').create({
+      values: {
+        username: 'test',
+      },
+    });
+    const dept = await repo.create({
+      values: {
+        title: 'Department',
+        members: [1, 2],
+      },
+    });
+    await agent.resource('departments').update({
+      filterByTk: dept.id,
+      values: {
+        owners: [{ id: 1 }],
+      },
+    });
+    const deptUser = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        userId: 1,
+        departmentId: dept.id,
+      },
+    });
+    expect(deptUser.isOwner).toBe(true);
+    await agent.resource('departments').update({
+      filterByTk: dept.id,
+      values: {
+        owners: [{ id: 2 }],
+      },
+    });
+    const deptUser1 = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        userId: 1,
+        departmentId: dept.id,
+      },
+    });
+    expect(deptUser1.isOwner).toBe(false);
+    const deptUser2 = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        userId: 2,
+        departmentId: dept.id,
+      },
+    });
+    expect(deptUser2.isOwner).toBe(true);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts
new file mode 100644
index 0000000000..b6417fbefa
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts
@@ -0,0 +1,73 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+import { setDepartmentsInfo } from '../middlewares';
+
+describe('set departments info', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+  let ctx: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['field-sort', 'users', 'departments', 'acl', 'data-source-manager'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+    ctx = {
+      db,
+      cache: app.cache,
+      state: {},
+    };
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should set departments roles', async () => {
+    ctx.state.currentUser = await db.getRepository('users').findOne({
+      filterByTk: 1,
+    });
+    const role = await db.getRepository('roles').create({
+      values: {
+        name: 'test-role',
+        title: 'Test role',
+      },
+    });
+    await repo.create({
+      values: {
+        title: 'Department',
+        roles: [role.name],
+        members: [1],
+      },
+    });
+    await setDepartmentsInfo(ctx, () => {});
+    expect(ctx.state.attachRoles.length).toBe(1);
+    expect(ctx.state.attachRoles[0].name).toBe('test-role');
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts
new file mode 100644
index 0000000000..46a5b9d310
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts
@@ -0,0 +1,183 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('set main department', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['field-sort', 'users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+    await db.getRepository('departmentsUsers').destroy({ truncate: true });
+  });
+
+  it('should set main department when add department members', async () => {
+    const dept = await repo.create({
+      values: {
+        title: 'Department',
+      },
+    });
+    await db.getRepository('users').create({
+      values: {
+        username: 'test',
+      },
+    });
+    await agent.resource('departments.members', dept.id).add({
+      values: [1, 2],
+    });
+    const throughRepo = db.getRepository('departmentsUsers');
+    const deptUsers = await throughRepo.find({
+      filter: {
+        userId: {
+          $in: [1, 2],
+        },
+        departmentId: dept.id,
+      },
+    });
+    for (const item of deptUsers) {
+      expect(item.isMain).toBe(true);
+    }
+
+    const dept2 = await repo.create({
+      values: {
+        title: 'Department2',
+      },
+    });
+    await agent.resource('departments.members', dept2.id).add({
+      values: [2],
+    });
+    const deptUsers2 = await throughRepo.find({
+      filter: {
+        userId: 2,
+      },
+    });
+    expect(deptUsers2.length).toBe(2);
+    expect(deptUsers2.find((i: any) => i.departmentId === dept.id).isMain).toBe(true);
+    expect(deptUsers2.find((i: any) => i.departmentId === dept2.id).isMain).toBe(false);
+  });
+
+  it('should set main department when remove department members', async () => {
+    const depts = await repo.create({
+      values: [
+        {
+          title: 'Department',
+        },
+        {
+          title: 'Department2',
+        },
+      ],
+    });
+    await agent.resource('departments.members', depts[0].id).add({
+      values: [1],
+    });
+    await agent.resource('departments.members', depts[1].id).add({
+      values: [1],
+    });
+    const throughRepo = db.getRepository('departmentsUsers');
+    const deptUsers = await throughRepo.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    expect(deptUsers.length).toBe(2);
+    expect(deptUsers.find((i: any) => i.departmentId === depts[0].id).isMain).toBe(true);
+    expect(deptUsers.find((i: any) => i.departmentId === depts[1].id).isMain).toBe(false);
+
+    await agent.resource('departments.members', depts[0].id).remove({
+      values: [1],
+    });
+    const deptUsers2 = await throughRepo.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    expect(deptUsers2.length).toBe(1);
+    expect(deptUsers2[0].departmentId).toBe(depts[1].id);
+    expect(deptUsers2[0].isMain).toBe(true);
+  });
+
+  it('should set main department when add user departments', async () => {
+    const depts = await repo.create({
+      values: [
+        {
+          title: 'Department',
+        },
+        {
+          title: 'Department2',
+        },
+      ],
+    });
+    await agent.resource('users.departments', 1).add({
+      values: depts.map((dept: any) => dept.id),
+    });
+    const throughRepo = db.getRepository('departmentsUsers');
+    const deptUsers = await throughRepo.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    expect(deptUsers.length).toBe(2);
+    expect(deptUsers.find((i: any) => i.departmentId === depts[0].id).isMain).toBe(true);
+    expect(deptUsers.find((i: any) => i.departmentId === depts[1].id).isMain).toBe(false);
+  });
+
+  it('should set main department when remove user departments', async () => {
+    const depts = await repo.create({
+      values: [
+        {
+          title: 'Department',
+        },
+        {
+          title: 'Department2',
+        },
+      ],
+    });
+    await agent.resource('users.departments', 1).add({
+      values: depts.map((dept: any) => dept.id),
+    });
+    await agent.resource('users.departments', 1).remove({
+      values: [depts[0].id],
+    });
+    const throughRepo = db.getRepository('departmentsUsers');
+    const deptUsers = await throughRepo.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    expect(deptUsers.length).toBe(1);
+    expect(deptUsers[0].departmentId).toBe(depts[1].id);
+    expect(deptUsers[0].isMain).toBe(true);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts
new file mode 100644
index 0000000000..3f3803c485
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts
@@ -0,0 +1,102 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('update department isLeaf', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['field-sort', 'users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should update isLeaf when create sub department', async () => {
+    const res = await agent.resource('departments').create({
+      values: {
+        title: 'Department',
+      },
+    });
+    const dept = res.body.data;
+    expect(dept).toBeTruthy();
+    expect(dept.isLeaf).toBe(true);
+
+    await agent.resource('departments').create({
+      values: {
+        title: 'Sub Department',
+        parent: dept,
+      },
+    });
+    const record = await repo.findOne({
+      filterByTk: dept.id,
+    });
+    expect(record.isLeaf).toBe(false);
+  });
+
+  it('should update isLeaf when update department', async () => {
+    const res = await agent.resource('departments').create({
+      values: {
+        title: 'Department',
+      },
+    });
+    const res2 = await agent.resource('departments').create({
+      values: {
+        title: 'Department2',
+      },
+    });
+    const dept1 = res.body.data;
+    const dept2 = res2.body.data;
+    const res3 = await agent.resource('departments').create({
+      values: {
+        title: 'Sub Department',
+        parent: dept1,
+      },
+    });
+    const subDept = res3.body.data;
+    await agent.resource('departments').update({
+      filterByTk: subDept.id,
+      values: {
+        parent: dept2,
+      },
+    });
+    const record1 = await repo.findOne({
+      filterByTk: dept1.id,
+    });
+    expect(record1.isLeaf).toBe(true);
+    const record2 = await repo.findOne({
+      filterByTk: dept2.id,
+    });
+    expect(record2.isLeaf).toBe(false);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/actions/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/server/actions/departments.ts
new file mode 100644
index 0000000000..280fd8ab18
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/actions/departments.ts
@@ -0,0 +1,97 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import { DepartmentModel } from '../models/department';
+
+export const getAppendsOwners = async (ctx: Context, next: Next) => {
+  const { filterByTk, appends } = ctx.action.params;
+  const repo = ctx.db.getRepository('departments');
+  const department: DepartmentModel = await repo.findOne({
+    filterByTk,
+    appends,
+  });
+  const owners = await department.getOwners();
+  department.setDataValue('owners', owners);
+  ctx.body = department;
+  await next();
+};
+
+export const aggregateSearch = async (ctx: Context, next: Next) => {
+  const { keyword, type, last = 0, limit = 10 } = ctx.action.params.values || {};
+  let users = [];
+  let departments = [];
+  if (!type || type === 'user') {
+    const repo = ctx.db.getRepository('users');
+    users = await repo.find({
+      filter: {
+        id: { $gt: last },
+        $or: [
+          { username: { $includes: keyword } },
+          { nickname: { $includes: keyword } },
+          { phone: { $includes: keyword } },
+          { email: { $includes: keyword } },
+        ],
+      },
+      limit,
+    });
+  }
+  if (!type || type === 'department') {
+    const repo = ctx.db.getRepository('departments');
+    departments = await repo.find({
+      filter: {
+        id: { $gt: last },
+        title: { $includes: keyword },
+      },
+      appends: ['parent(recursively=true)'],
+      limit,
+    });
+  }
+  ctx.body = { users, departments };
+  await next();
+};
+
+export const setOwner = async (ctx: Context, next: Next) => {
+  const { userId, departmentId } = ctx.action.params.values || {};
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  await throughRepo.update({
+    filter: {
+      userId,
+      departmentId,
+    },
+    values: {
+      isOwner: true,
+    },
+  });
+  await next();
+};
+
+export const removeOwner = async (ctx: Context, next: Next) => {
+  const { userId, departmentId } = ctx.action.params.values || {};
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  await throughRepo.update({
+    filter: {
+      userId,
+      departmentId,
+    },
+    values: {
+      isOwner: false,
+    },
+  });
+  await next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/actions/users.ts b/packages/plugins/@nocobase/plugin-departments/src/server/actions/users.ts
new file mode 100644
index 0000000000..38681fa574
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/actions/users.ts
@@ -0,0 +1,133 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, DEFAULT_PAGE, DEFAULT_PER_PAGE, Next } from '@nocobase/actions';
+
+export const listExcludeDept = async (ctx: Context, next: Next) => {
+  const { departmentId, page = DEFAULT_PAGE, pageSize = DEFAULT_PER_PAGE } = ctx.action.params;
+  const repo = ctx.db.getRepository('users');
+  const members = await repo.find({
+    fields: ['id'],
+    filter: {
+      'departments.id': departmentId,
+    },
+  });
+  const memberIds = members.map((member: { id: number }) => member.id);
+  if (memberIds.length) {
+    ctx.action.mergeParams({
+      filter: {
+        id: {
+          $notIn: memberIds,
+        },
+      },
+    });
+  }
+  const { filter } = ctx.action.params;
+  const [rows, count] = await repo.findAndCount({
+    context: ctx,
+    offset: (page - 1) * pageSize,
+    limit: +pageSize,
+    filter,
+  });
+  ctx.body = {
+    count,
+    rows,
+    page: Number(page),
+    pageSize: Number(pageSize),
+    totalPage: Math.ceil(count / pageSize),
+  };
+  await next();
+};
+
+export const setDepartments = async (ctx: Context, next: Next) => {
+  const { values = {} } = ctx.action.params;
+  const { userId, departments = [] } = values;
+  const repo = ctx.db.getRepository('users');
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  const user = await repo.findOne({ filterByTk: userId });
+  if (!user) {
+    ctx.throw(400, ctx.t('User does not exist'));
+  }
+  const departmentIds = departments.map((department: any) => department.id);
+  const main = departments.find((department: any) => department.isMain);
+  const owners = departments.filter((department: any) => department.isOwner);
+  await ctx.db.sequelize.transaction(async (t) => {
+    await user.setDepartments(departmentIds, {
+      through: {
+        isMain: false,
+        isOwner: false,
+      },
+      transaction: t,
+    });
+    if (main) {
+      await throughRepo.update({
+        filter: {
+          userId,
+          departmentId: main.id,
+        },
+        values: {
+          isMain: true,
+        },
+        transaction: t,
+      });
+    }
+    if (owners.length) {
+      await throughRepo.update({
+        filter: {
+          userId,
+          departmentId: {
+            $in: owners.map((owner: any) => owner.id),
+          },
+        },
+        values: {
+          isOwner: true,
+        },
+        transaction: t,
+      });
+    }
+  });
+  await next();
+};
+
+export const setMainDepartment = async (ctx: Context, next: Next) => {
+  const { userId, departmentId } = ctx.action.params.values || {};
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  await ctx.db.sequelize.transaction(async (t) => {
+    await throughRepo.update({
+      filter: {
+        userId,
+        isMain: true,
+      },
+      values: {
+        isMain: false,
+      },
+      transaction: t,
+    });
+    await throughRepo.update({
+      filter: {
+        userId,
+        departmentId,
+      },
+      values: {
+        isMain: true,
+      },
+      transaction: t,
+    });
+  });
+  await next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/.gitkeep b/packages/plugins/@nocobase/plugin-departments/src/server/collections/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentRoles.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentRoles.ts
new file mode 100644
index 0000000000..b0f44497c2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentRoles.ts
@@ -0,0 +1,25 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { defineCollection } from '@nocobase/database';
+
+export default defineCollection({
+  name: 'departmentsRoles',
+  dumpRules: 'required',
+  migrationRules: ['overwrite'],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departments.ts
new file mode 100644
index 0000000000..a5881b35c9
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departments.ts
@@ -0,0 +1,156 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { defineCollection } from '@nocobase/database';
+
+export const ownersField = {
+  interface: 'm2m',
+  type: 'belongsToMany',
+  name: 'owners',
+  collectionName: 'departments',
+  target: 'users',
+  through: 'departmentsUsers',
+  foreignKey: 'departmentId',
+  otherKey: 'userId',
+  targetKey: 'id',
+  sourceKey: 'id',
+  throughScope: {
+    isOwner: true,
+  },
+  uiSchema: {
+    type: 'm2m',
+    title: '{{t("Owners")}}',
+    'x-component': 'DepartmentOwnersField',
+    'x-component-props': {
+      multiple: true,
+      fieldNames: {
+        label: 'nickname',
+        value: 'id',
+      },
+    },
+  },
+};
+
+export default defineCollection({
+  name: 'departments',
+  migrationRules: ['overwrite'],
+  title: '{{t("Departments")}}',
+  dumpRules: 'required',
+  tree: 'adjacency-list',
+  template: 'tree',
+  shared: true,
+  sortable: true,
+  model: 'DepartmentModel',
+  createdBy: true,
+  updatedBy: true,
+  logging: true,
+  fields: [
+    {
+      type: 'bigInt',
+      name: 'id',
+      primaryKey: true,
+      autoIncrement: true,
+      interface: 'id',
+      uiSchema: {
+        type: 'number',
+        title: '{{t("ID")}}',
+        'x-component': 'InputNumber',
+        'x-read-pretty': true,
+      },
+    },
+    {
+      type: 'string',
+      name: 'title',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Department name")}}',
+        'x-component': 'Input',
+      },
+    },
+    {
+      type: 'boolean',
+      name: 'isLeaf',
+    },
+    {
+      type: 'belongsTo',
+      name: 'parent',
+      target: 'departments',
+      foreignKey: 'parentId',
+      treeParent: true,
+      onDelete: 'CASCADE',
+      interface: 'm2o',
+      uiSchema: {
+        type: 'm2o',
+        title: '{{t("Superior department")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: false,
+          fieldNames: {
+            label: 'title',
+            value: 'id',
+          },
+        },
+      },
+    },
+    {
+      type: 'hasMany',
+      name: 'children',
+      target: 'departments',
+      foreignKey: 'parentId',
+      treeChildren: true,
+      onDelete: 'CASCADE',
+    },
+    {
+      type: 'belongsToMany',
+      name: 'members',
+      target: 'users',
+      through: 'departmentsUsers',
+      foreignKey: 'departmentId',
+      otherKey: 'userId',
+      targetKey: 'id',
+      sourceKey: 'id',
+      onDelete: 'CASCADE',
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'roles',
+      target: 'roles',
+      through: 'departmentsRoles',
+      foreignKey: 'departmentId',
+      otherKey: 'roleName',
+      targetKey: 'name',
+      sourceKey: 'id',
+      onDelete: 'CASCADE',
+      uiSchema: {
+        type: 'm2m',
+        title: '{{t("Roles")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            label: 'title',
+            value: 'name',
+          },
+        },
+      },
+    },
+    ownersField,
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentsUsers.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentsUsers.ts
new file mode 100644
index 0000000000..70d5534d2c
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentsUsers.ts
@@ -0,0 +1,39 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { defineCollection } from '@nocobase/database';
+
+export default defineCollection({
+  name: 'departmentsUsers',
+  dumpRules: 'required',
+  migrationRules: ['schema-only'],
+  fields: [
+    {
+      type: 'boolean',
+      name: 'isOwner', // Weather the user is the owner of the department
+      allowNull: false,
+      defaultValue: false,
+    },
+    {
+      type: 'boolean',
+      name: 'isMain', // Weather this is the main department of the user
+      allowNull: false,
+      defaultValue: false,
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/roles.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/roles.ts
new file mode 100644
index 0000000000..bac06fa60b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/roles.ts
@@ -0,0 +1,36 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { extendCollection } from '@nocobase/database';
+
+export default extendCollection({
+  name: 'roles',
+  fields: [
+    {
+      type: 'belongsToMany',
+      name: 'departments',
+      target: 'departments',
+      foreignKey: 'roleName',
+      otherKey: 'departmentId',
+      onDelete: 'CASCADE',
+      sourceKey: 'name',
+      targetKey: 'id',
+      through: 'departmentsRoles',
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/users.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/users.ts
new file mode 100644
index 0000000000..c5bcf488cc
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/users.ts
@@ -0,0 +1,79 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { extendCollection } from '@nocobase/database';
+
+export const departmentsField = {
+  collectionName: 'users',
+  interface: 'm2m',
+  type: 'belongsToMany',
+  name: 'departments',
+  target: 'departments',
+  foreignKey: 'userId',
+  otherKey: 'departmentId',
+  onDelete: 'CASCADE',
+  sourceKey: 'id',
+  targetKey: 'id',
+  through: 'departmentsUsers',
+  uiSchema: {
+    type: 'm2m',
+    title: '{{t("Departments")}}',
+    'x-component': 'UserDepartmentsField',
+    'x-component-props': {
+      multiple: true,
+      fieldNames: {
+        label: 'title',
+        value: 'name',
+      },
+    },
+  },
+};
+
+export const mainDepartmentField = {
+  collectionName: 'users',
+  interface: 'm2m',
+  type: 'belongsToMany',
+  name: 'mainDepartment',
+  target: 'departments',
+  foreignKey: 'userId',
+  otherKey: 'departmentId',
+  onDelete: 'CASCADE',
+  sourceKey: 'id',
+  targetKey: 'id',
+  through: 'departmentsUsers',
+  throughScope: {
+    isMain: true,
+  },
+  uiSchema: {
+    type: 'm2m',
+    title: '{{t("Main department")}}',
+    'x-component': 'UserMainDepartmentField',
+    'x-component-props': {
+      multiple: false,
+      fieldNames: {
+        label: 'title',
+        value: 'name',
+      },
+    },
+  },
+};
+
+export default extendCollection({
+  name: 'users',
+  fields: [departmentsField, mainDepartmentField],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/department-data-sync-resource.ts b/packages/plugins/@nocobase/plugin-departments/src/server/department-data-sync-resource.ts
new file mode 100644
index 0000000000..69d0d414df
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/department-data-sync-resource.ts
@@ -0,0 +1,333 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Model } from '@nocobase/database';
+import lodash from 'lodash';
+import {
+  FormatDepartment,
+  FormatUserDepartment,
+  OriginRecord,
+  PrimaryKey,
+  RecordResourceChanged,
+  SyncAccept,
+  UserDataResource,
+} from '@nocobase/plugin-user-data-sync';
+
+export class DepartmentDataSyncResource extends UserDataResource {
+  name = 'departments';
+  accepts: SyncAccept[] = ['user', 'department'];
+
+  get userRepo() {
+    return this.db.getRepository('users');
+  }
+
+  get deptRepo() {
+    return this.db.getRepository('departments');
+  }
+
+  get deptUserRepo() {
+    return this.db.getRepository('departmentsUsers');
+  }
+
+  getFlteredSourceDepartment(sourceDepartment: FormatDepartment) {
+    const deleteProps = [
+      'id',
+      'uid',
+      'createdAt',
+      'updatedAt',
+      'sort',
+      'createdById',
+      'updatedById',
+      'isDeleted',
+      'parentId',
+      'parentUid',
+    ];
+    return lodash.omit(sourceDepartment, deleteProps);
+  }
+
+  async update(record: OriginRecord, resourcePks: PrimaryKey[]): Promise<RecordResourceChanged[]> {
+    const { dataType, metaData, sourceName } = record;
+    if (dataType === 'user') {
+      const sourceUser = metaData;
+      if (sourceUser.isDeleted) {
+        if (!resourcePks || !resourcePks.length) {
+          return [];
+        } else {
+          return resourcePks.map((id) => ({ resourcesPk: id, isDeleted: true }));
+        }
+      }
+      const resources = record.resources.filter((r) => r.resource === 'users');
+      if (!resources.length) {
+        return [];
+      }
+      const user = await this.userRepo.findOne({
+        filterByTk: resources[0].resourcePk,
+      });
+      if (!user) {
+        if (!resourcePks || !resourcePks.length) {
+          return [];
+        } else {
+          return resourcePks.map((id) => ({ resourcesPk: id, isDeleted: true }));
+        }
+      } else {
+        return await this.updateUserDepartments(user, resourcePks, sourceUser.departments, sourceName);
+      }
+    } else if (dataType === 'department') {
+      const sourceDepartment = metaData;
+      const department = await this.deptRepo.findOne({
+        filterByTk: resourcePks[0],
+      });
+      if (!department) {
+        if (sourceDepartment.isDeleted) {
+          return [{ resourcesPk: resourcePks[0], isDeleted: true }];
+        }
+        const result = await this.create(record);
+        return [...result, { resourcesPk: resourcePks[0], isDeleted: true }];
+      }
+      await this.updateDepartment(department, sourceDepartment, sourceName);
+    } else {
+      this.logger.warn(`update department: unsupported data type: ${dataType}`);
+    }
+    return [];
+  }
+
+  async create(record: OriginRecord): Promise<RecordResourceChanged[]> {
+    const { dataType, metaData, sourceName } = record;
+    if (dataType === 'user') {
+      const sourceUser = metaData;
+      if (sourceUser.isDeleted) {
+        return [];
+      }
+      const resources = record.resources.filter((r) => r.resource === 'users');
+      if (!resources.length) {
+        return [];
+      }
+      const user = await this.userRepo.findOne({
+        filterByTk: resources[0].resourcePk,
+      });
+      return await this.updateUserDepartments(user, [], sourceUser.departments, sourceName);
+    } else if (dataType === 'department') {
+      const sourceDepartment = metaData;
+      const newDepartmentId = await this.createDepartment(sourceDepartment, sourceName);
+      return [{ resourcesPk: newDepartmentId, isDeleted: false }];
+    } else {
+      this.logger.warn(`create department: unsupported data type: ${dataType}`);
+    }
+    return [];
+  }
+
+  async getDepartmentIdsBySourceUks(sourceUks: PrimaryKey[], sourceName: string) {
+    const syncDepartmentRecords = await this.syncRecordRepo.find({
+      filter: {
+        sourceName,
+        dataType: 'department',
+        sourceUk: { $in: sourceUks },
+        'resources.resource': this.name,
+      },
+      appends: ['resources'],
+    });
+    const departmentIds = syncDepartmentRecords
+      .filter((record) => record.resources?.length)
+      .map((record) => record.resources[0].resourcePk);
+    return departmentIds;
+  }
+
+  async getDepartmentIdBySourceUk(sourceUk: PrimaryKey, sourceName: string) {
+    const syncDepartmentRecord = await this.syncRecordRepo.findOne({
+      filter: {
+        sourceName,
+        dataType: 'department',
+        sourceUk,
+        'resources.resource': this.name,
+      },
+      appends: ['resources'],
+    });
+    if (syncDepartmentRecord && syncDepartmentRecord.resources?.length) {
+      return syncDepartmentRecord.resources[0].resourcePk;
+    }
+  }
+
+  async updateUserDepartments(
+    user: any,
+    currentDepartmentIds: PrimaryKey[],
+    sourceDepartments: (PrimaryKey | FormatUserDepartment)[],
+    sourceName: string,
+  ): Promise<RecordResourceChanged[]> {
+    if (!this.deptRepo) {
+      return [];
+    }
+    if (!sourceDepartments || !sourceDepartments.length) {
+      const userDepartments = await user.getDepartments();
+      if (userDepartments.length) {
+        await user.removeDepartments(userDepartments);
+      }
+      if (currentDepartmentIds && currentDepartmentIds.length) {
+        return currentDepartmentIds.map((id) => ({ resourcesPk: id, isDeleted: true }));
+      } else {
+        return [];
+      }
+    } else {
+      const sourceDepartmentIds = sourceDepartments.map((sourceDepartment) => {
+        if (typeof sourceDepartment === 'string' || typeof sourceDepartment === 'number') {
+          return sourceDepartment;
+        }
+        return sourceDepartment.uid;
+      });
+      const newDepartmentIds = await this.getDepartmentIdsBySourceUks(sourceDepartmentIds, sourceName);
+      const newDepartments = await this.deptRepo.find({
+        filter: { id: { $in: newDepartmentIds } },
+      });
+      const realCurrentDepartments = await user.getDepartments();
+      // 需要删除的部门
+      const toRealRemoveDepartments = realCurrentDepartments.filter((currnetDepartment) => {
+        return !newDepartments.find((newDepartment) => newDepartment.id === currnetDepartment.id);
+      });
+      if (toRealRemoveDepartments.length) {
+        await user.removeDepartments(toRealRemoveDepartments);
+      }
+      // 需要添加的部门
+      const toRealAddDepartments = newDepartments.filter((newDepartment) => {
+        if (realCurrentDepartments.length === 0) {
+          return true;
+        }
+        return !realCurrentDepartments.find((currentDepartment) => currentDepartment.id === newDepartment.id);
+      });
+      if (toRealAddDepartments.length) {
+        await user.addDepartments(toRealAddDepartments);
+      }
+      // 更新部门主管和主部门
+      for (const sourceDepartment of sourceDepartments) {
+        this.logger.debug('update dept owner: ' + JSON.stringify(sourceDepartment));
+        let isOwner = false;
+        let isMain = false;
+        let uid;
+        if (typeof sourceDepartment !== 'string' && typeof sourceDepartment !== 'number') {
+          isOwner = sourceDepartment.isOwner || false;
+          isMain = sourceDepartment.isMain || false;
+          uid = sourceDepartment.uid;
+        } else {
+          uid = sourceDepartment;
+        }
+        const deptId = await this.getDepartmentIdBySourceUk(uid, sourceName);
+        this.logger.debug('update dept owner: ' + JSON.stringify({ deptId, isOwner, isMain, userId: user.id }));
+        if (!deptId) {
+          continue;
+        }
+        await this.deptUserRepo.update({
+          filter: {
+            userId: user.id,
+            departmentId: deptId,
+          },
+          values: {
+            isOwner,
+            isMain,
+          },
+        });
+      }
+      const recordResourceChangeds: RecordResourceChanged[] = [];
+      if (currentDepartmentIds !== undefined && currentDepartmentIds.length > 0) {
+        // 需要删除的部门ID
+        const toRemoveDepartmentIds = currentDepartmentIds.filter(
+          (currentDepartmentId) => !newDepartmentIds.includes(currentDepartmentId),
+        );
+        recordResourceChangeds.push(
+          ...toRemoveDepartmentIds.map((departmentId) => {
+            return { resourcesPk: departmentId, isDeleted: true };
+          }),
+        );
+        // 需要添加的部门ID
+        const toAddDepartmentIds = newDepartmentIds.filter(
+          (newDepartmentId) => !currentDepartmentIds.includes(newDepartmentId),
+        );
+        recordResourceChangeds.push(
+          ...toAddDepartmentIds.map((departmentId) => {
+            return { resourcesPk: departmentId, isDeleted: false };
+          }),
+        );
+      } else {
+        recordResourceChangeds.push(
+          ...toRealAddDepartments.map((department) => {
+            return {
+              resourcesPk: department.id,
+              isDeleted: false,
+            };
+          }),
+        );
+      }
+      return recordResourceChangeds;
+    }
+  }
+
+  async updateDepartment(department: Model, sourceDepartment: FormatDepartment, sourceName: string) {
+    if (sourceDepartment.isDeleted) {
+      // 删除部门
+      await department.destroy();
+      return;
+    }
+    let dataChanged = false;
+    const filteredSourceDepartment = this.getFlteredSourceDepartment(sourceDepartment);
+    lodash.forOwn(filteredSourceDepartment, (value, key) => {
+      if (department[key] !== value) {
+        department[key] = value;
+        dataChanged = true;
+      }
+    });
+    if (dataChanged) {
+      await department.save();
+    }
+    await this.updateParentDepartment(department, sourceDepartment.parentUid, sourceName);
+  }
+
+  async createDepartment(sourceDepartment: FormatDepartment, sourceName: string): Promise<string> {
+    const filteredSourceDepartment = this.getFlteredSourceDepartment(sourceDepartment);
+    const department = await this.deptRepo.create({
+      values: filteredSourceDepartment,
+    });
+    await this.updateParentDepartment(department, sourceDepartment.parentUid, sourceName);
+    return department.id;
+  }
+
+  async updateParentDepartment(department: Model, parentUid: string, sourceName: string) {
+    if (!parentUid) {
+      const parentDepartment = await department.getParent();
+      if (parentDepartment) {
+        await department.setParent(null);
+      }
+    } else {
+      const syncDepartmentRecord = await this.syncRecordRepo.findOne({
+        filter: {
+          sourceName,
+          dataType: 'department',
+          sourceUk: parentUid,
+          'resources.resource': this.name,
+        },
+        appends: ['resources'],
+      });
+      if (syncDepartmentRecord && syncDepartmentRecord.resources?.length) {
+        const parentDepartment = await this.deptRepo.findOne({
+          filterByTk: syncDepartmentRecord.resources[0].resourcePk,
+        });
+        if (!parentDepartment) {
+          await department.setParent(null);
+          return;
+        }
+        const parent = await department.getParent();
+        if (parent) {
+          if (parentDepartment.id !== parent.id) {
+            await department.setParent(parentDepartment);
+          }
+        } else {
+          await department.setParent(parentDepartment);
+        }
+      } else {
+        await department.setParent(null);
+      }
+    }
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/index.ts b/packages/plugins/@nocobase/plugin-departments/src/server/index.ts
new file mode 100644
index 0000000000..61787e8e89
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/index.ts
@@ -0,0 +1,19 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export { default } from './plugin';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/destroy-department-check.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/destroy-department-check.ts
new file mode 100644
index 0000000000..ade251e3d9
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/destroy-department-check.ts
@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+
+const destroyCheck = async (ctx: Context) => {
+  const { filterByTk } = ctx.action.params;
+  const repo = ctx.db.getRepository('departments');
+  const children = await repo.count({
+    filter: {
+      parentId: filterByTk,
+    },
+  });
+  if (children) {
+    ctx.throw(400, ctx.t('The department has sub-departments, please delete them first', { ns: 'departments' }));
+  }
+  const members = await ctx.db.getRepository('departmentsUsers').count({
+    filter: {
+      departmentId: filterByTk,
+    },
+  });
+  if (members) {
+    ctx.throw(400, ctx.t('The department has members, please remove them first', { ns: 'departments' }));
+  }
+};
+
+export const destroyDepartmentCheck = async (ctx: Context, next: Next) => {
+  const { resourceName, actionName } = ctx.action.params;
+  if (resourceName === 'departments' && actionName === 'destroy') {
+    await destroyCheck(ctx as any);
+  }
+  await next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/index.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/index.ts
new file mode 100644
index 0000000000..8d2e037c65
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/index.ts
@@ -0,0 +1,24 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export * from './destroy-department-check';
+export * from './reset-user-departments-cache';
+export * from './set-department-owners';
+export * from './update-department-isleaf';
+export * from './set-departments-roles';
+export * from './set-main-department';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/reset-user-departments-cache.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/reset-user-departments-cache.ts
new file mode 100644
index 0000000000..0606093be1
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/reset-user-departments-cache.ts
@@ -0,0 +1,41 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import { Cache } from '@nocobase/cache';
+
+export const resetUserDepartmentsCache = async (ctx: Context, next: Next) => {
+  await next();
+  const { associatedName, resourceName, associatedIndex, actionName, values } = ctx.action.params;
+  const cache = ctx.app.cache as Cache;
+  if (
+    associatedName === 'departments' &&
+    resourceName === 'members' &&
+    ['add', 'remove', 'set'].includes(actionName) &&
+    values?.length
+  ) {
+    // Delete cache when the members of a department changed
+    for (const memberId of values) {
+      await cache.del(`departments:${memberId}`);
+    }
+  }
+
+  if (associatedName === 'users' && resourceName === 'departments' && ['add', 'remove', 'set'].includes(actionName)) {
+    await cache.del(`departments:${associatedIndex}`);
+  }
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-department-owners.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-department-owners.ts
new file mode 100644
index 0000000000..56a0da774f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-department-owners.ts
@@ -0,0 +1,59 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import lodash from 'lodash';
+
+const setOwners = async (ctx: Context, filterByTk: any, owners: any[]) => {
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  await ctx.db.sequelize.transaction(async (t) => {
+    await throughRepo.update({
+      filter: {
+        departmentId: filterByTk,
+      },
+      values: {
+        isOwner: false,
+      },
+      transaction: t,
+    });
+    await throughRepo.update({
+      filter: {
+        departmentId: filterByTk,
+        userId: {
+          $in: owners.map((owner: any) => owner.id),
+        },
+      },
+      values: {
+        isOwner: true,
+      },
+      transaction: t,
+    });
+  });
+};
+
+export const setDepartmentOwners = async (ctx: Context, next: Next) => {
+  const { filterByTk, values = {}, resourceName, actionName } = ctx.action.params;
+  const { owners } = values;
+  if (resourceName === 'departments' && actionName === 'update' && owners) {
+    ctx.action.params.values = lodash.omit(values, ['owners']);
+    await next();
+    await setOwners(ctx as any, filterByTk, owners);
+  } else {
+    return next();
+  }
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-departments-roles.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-departments-roles.ts
new file mode 100644
index 0000000000..5171d69ae0
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-departments-roles.ts
@@ -0,0 +1,60 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import { Cache } from '@nocobase/cache';
+import { Model, Repository } from '@nocobase/database';
+
+export const setDepartmentsInfo = async (ctx: Context, next: Next) => {
+  const currentUser = ctx.state.currentUser;
+  if (!currentUser) {
+    return next();
+  }
+
+  const cache = ctx.cache as Cache;
+  const repo = ctx.db.getRepository('users.departments', currentUser.id) as unknown as Repository;
+  const departments = (await cache.wrap(`departments:${currentUser.id}`, () =>
+    repo.find({
+      appends: ['owners', 'roles', 'parent(recursively=true)'],
+      raw: true,
+    }),
+  )) as Model[];
+  if (!departments.length) {
+    return next();
+  }
+  ctx.state.currentUser.departments = departments;
+  ctx.state.currentUser.mainDeparmtent = departments.find((dept) => dept.isMain);
+
+  const departmentIds = departments.map((dept) => dept.id);
+  const roleRepo = ctx.db.getRepository('roles');
+  const roles = await roleRepo.find({
+    filter: {
+      'departments.id': {
+        $in: departmentIds,
+      },
+    },
+  });
+  if (!roles.length) {
+    return next();
+  }
+  const rolesMap = new Map();
+  roles.forEach((role: any) => rolesMap.set(role.name, role));
+  ctx.state.attachRoles = Array.from(rolesMap.values());
+
+  await next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-main-department.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-main-department.ts
new file mode 100644
index 0000000000..b5f7083fa3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-main-department.ts
@@ -0,0 +1,101 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+
+export const setMainDepartment = async (ctx: Context, next: Next) => {
+  await next();
+  const { associatedName, resourceName, associatedIndex, actionName, values } = ctx.action.params;
+  if (associatedName === 'departments' && resourceName === 'members' && values?.length) {
+    const throughRepo = ctx.db.getRepository('departmentsUsers');
+    const usersHasMain = await throughRepo.find({
+      filter: {
+        userId: {
+          $in: values,
+        },
+        isMain: true,
+      },
+    });
+    const userIdsHasMain = usersHasMain.map((item) => item.userId);
+    if (actionName === 'add' || actionName === 'set') {
+      await throughRepo.update({
+        filter: {
+          userId: {
+            $in: values.filter((id) => !userIdsHasMain.includes(id)),
+          },
+          departmentId: associatedIndex,
+        },
+        values: {
+          isMain: true,
+        },
+      });
+      return;
+    }
+
+    if (actionName === 'remove') {
+      const userIdsHasNoMain = values.filter((id) => !userIdsHasMain.includes(id));
+      for (const userId of userIdsHasNoMain) {
+        const firstDept = await throughRepo.findOne({
+          filter: {
+            userId,
+          },
+        });
+        if (firstDept) {
+          await throughRepo.update({
+            filter: {
+              userId,
+              departmentId: firstDept.departmentId,
+            },
+            values: {
+              isMain: true,
+            },
+          });
+        }
+      }
+    }
+  }
+
+  if (associatedName === 'users' && resourceName === 'departments' && ['add', 'remove', 'set'].includes(actionName)) {
+    const throughRepo = ctx.db.getRepository('departmentsUsers');
+    const hasMain = await throughRepo.findOne({
+      filter: {
+        userId: associatedIndex,
+        isMain: true,
+      },
+    });
+    if (hasMain) {
+      return;
+    }
+    const firstDept = await throughRepo.findOne({
+      filter: {
+        userId: associatedIndex,
+      },
+    });
+    if (firstDept) {
+      await throughRepo.update({
+        filter: {
+          userId: associatedIndex,
+          departmentId: firstDept.departmentId,
+        },
+        values: {
+          isMain: true,
+        },
+      });
+    }
+  }
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/update-department-isleaf.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/update-department-isleaf.ts
new file mode 100644
index 0000000000..9d0cbdf947
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/update-department-isleaf.ts
@@ -0,0 +1,88 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import { Repository } from '@nocobase/database';
+
+const updateIsLeafWhenAddChild = async (repo: Repository, parent: any) => {
+  if (parent && parent.isLeaf !== false) {
+    await repo.update({
+      filter: {
+        id: parent.id,
+      },
+      values: {
+        isLeaf: false,
+      },
+    });
+  }
+};
+
+const updateIsLeafWhenChangeChild = async (
+  repo: Repository,
+  oldParentId: number | null,
+  newParentId: number | null,
+) => {
+  if (oldParentId && oldParentId !== newParentId) {
+    const hasChild = await repo.count({
+      filter: {
+        parentId: oldParentId,
+      },
+    });
+    if (!hasChild) {
+      await repo.update({
+        filter: {
+          id: oldParentId,
+        },
+        values: {
+          isLeaf: true,
+        },
+      });
+    }
+  }
+};
+
+export const updateDepartmentIsLeaf = async (ctx: Context, next: Next) => {
+  const { filterByTk, values = {}, resourceName, actionName } = ctx.action.params;
+  const repo = ctx.db.getRepository('departments');
+  const { parent } = values;
+  if (resourceName === 'departments' && actionName === 'create') {
+    ctx.action.params.values = { ...values, isLeaf: true };
+    await next();
+    await updateIsLeafWhenAddChild(repo, parent);
+    return;
+  }
+
+  if (resourceName === 'departments' && actionName === 'update') {
+    const department = await repo.findOne({ filterByTk });
+    await next();
+    await Promise.all([
+      updateIsLeafWhenChangeChild(repo, department.parentId, parent?.id),
+      updateIsLeafWhenAddChild(repo, parent),
+    ]);
+    return;
+  }
+
+  if (resourceName === 'departments' && actionName === 'destroy') {
+    const department = await repo.findOne({ filterByTk });
+    await next();
+    await updateIsLeafWhenChangeChild(repo, department.parentId, null);
+    return;
+  }
+
+  return next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/migrations/update-field-uischemas-20240307124823.ts b/packages/plugins/@nocobase/plugin-departments/src/server/migrations/update-field-uischemas-20240307124823.ts
new file mode 100644
index 0000000000..542d5865bf
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/migrations/update-field-uischemas-20240307124823.ts
@@ -0,0 +1,96 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Migration } from '@nocobase/server';
+import { departmentsField, mainDepartmentField } from '../collections/users';
+import { ownersField } from '../collections/departments';
+
+export default class UpdateFieldUISchemasMigration extends Migration {
+  async up() {
+    const result = await this.app.version.satisfies('<=0.20.0-alpha.6');
+
+    if (!result) {
+      return;
+    }
+
+    const fieldRepo = this.db.getRepository('fields');
+    const departmentsFieldInstance = await fieldRepo.findOne({
+      filter: {
+        name: 'departments',
+        collectionName: 'users',
+      },
+    });
+    if (departmentsFieldInstance) {
+      const options = {
+        ...departmentsFieldInstance.options,
+        uiSchema: departmentsField.uiSchema,
+      };
+      await fieldRepo.update({
+        filter: {
+          name: 'departments',
+          collectionName: 'users',
+        },
+        values: {
+          options,
+        },
+      });
+    }
+    const mainDepartmentFieldInstance = await fieldRepo.findOne({
+      filter: {
+        name: 'mainDepartment',
+        collectionName: 'users',
+      },
+    });
+    if (mainDepartmentFieldInstance) {
+      const options = {
+        ...mainDepartmentFieldInstance.options,
+        uiSchema: mainDepartmentField.uiSchema,
+      };
+      await fieldRepo.update({
+        filter: {
+          name: 'mainDepartment',
+          collectionName: 'users',
+        },
+        values: {
+          options,
+        },
+      });
+    }
+    const ownersFieldInstance = await fieldRepo.findOne({
+      filter: {
+        name: 'owners',
+        collectionName: 'departments',
+      },
+    });
+    if (ownersFieldInstance) {
+      const options = {
+        ...ownersFieldInstance.options,
+        uiSchema: ownersField.uiSchema,
+      };
+      await fieldRepo.update({
+        filter: {
+          name: 'owners',
+          collectionName: 'departments',
+        },
+        values: {
+          options,
+        },
+      });
+    }
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/models/department.ts b/packages/plugins/@nocobase/plugin-departments/src/server/models/department.ts
new file mode 100644
index 0000000000..fddd8fc0ce
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/models/department.ts
@@ -0,0 +1,31 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Model } from '@nocobase/database';
+
+export class DepartmentModel extends Model {
+  getOwners() {
+    return this.getMembers({
+      through: {
+        where: {
+          isOwner: true,
+        },
+      },
+    });
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-departments/src/server/plugin.ts
new file mode 100644
index 0000000000..6aeaf51fe3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/plugin.ts
@@ -0,0 +1,156 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Cache } from '@nocobase/cache';
+import { InstallOptions, Plugin } from '@nocobase/server';
+import { aggregateSearch, removeOwner, setOwner } from './actions/departments';
+import { listExcludeDept, setMainDepartment } from './actions/users';
+import { departmentsField, mainDepartmentField } from './collections/users';
+import {
+  destroyDepartmentCheck,
+  resetUserDepartmentsCache,
+  setDepartmentOwners,
+  setMainDepartment as setMainDepartmentMiddleware,
+  updateDepartmentIsLeaf,
+} from './middlewares';
+import { setDepartmentsInfo } from './middlewares/set-departments-roles';
+import { DepartmentModel } from './models/department';
+import { DepartmentDataSyncResource } from './department-data-sync-resource';
+import PluginUserDataSyncServer from '@nocobase/plugin-user-data-sync';
+import { DataSource } from '@nocobase/data-source-manager';
+
+export class PluginDepartmentsServer extends Plugin {
+  afterAdd() {}
+
+  beforeLoad() {
+    this.app.db.registerModels({ DepartmentModel });
+
+    this.app.acl.addFixedParams('collections', 'destroy', () => {
+      return {
+        filter: {
+          'name.$notIn': ['departments', 'departmentsUsers', 'departmentsRoles'],
+        },
+      };
+    });
+  }
+
+  async load() {
+    this.app.resourceManager.registerActionHandlers({
+      'users:listExcludeDept': listExcludeDept,
+      'users:setMainDepartment': setMainDepartment,
+      'departments:aggregateSearch': aggregateSearch,
+      'departments:setOwner': setOwner,
+      'departments:removeOwner': removeOwner,
+    });
+
+    this.app.acl.allow('users', ['setMainDepartment', 'listExcludeDept'], 'loggedIn');
+    this.app.acl.registerSnippet({
+      name: `pm.${this.name}`,
+      actions: [
+        'departments:*',
+        'roles:list',
+        'users:list',
+        'users:listExcludeDept',
+        'users:setMainDepartment',
+        'users.departments:*',
+        'roles.departments:*',
+        'departments.members:*',
+      ],
+    });
+
+    this.app.resourceManager.use(setDepartmentsInfo, {
+      tag: 'setDepartmentsInfo',
+      before: 'setCurrentRole',
+      after: 'auth',
+    });
+    this.app.dataSourceManager.afterAddDataSource((dataSource: DataSource) => {
+      dataSource.resourceManager.use(setDepartmentsInfo, {
+        tag: 'setDepartmentsInfo',
+        before: 'setCurrentRole',
+        after: 'auth',
+      });
+    });
+
+    this.app.resourceManager.use(setDepartmentOwners);
+    this.app.resourceManager.use(destroyDepartmentCheck);
+    this.app.resourceManager.use(updateDepartmentIsLeaf);
+    this.app.resourceManager.use(resetUserDepartmentsCache);
+    this.app.resourceManager.use(setMainDepartmentMiddleware);
+
+    // Delete cache when the departments of a user changed
+    this.app.db.on('departmentsUsers.afterSave', async (model) => {
+      const cache = this.app.cache as Cache;
+      await cache.del(`departments:${model.get('userId')}`);
+    });
+    this.app.db.on('departmentsUsers.afterDestroy', async (model) => {
+      const cache = this.app.cache as Cache;
+      await cache.del(`departments:${model.get('userId')}`);
+    });
+    this.app.on('beforeSignOut', ({ userId }) => {
+      this.app.cache.del(`departments:${userId}`);
+    });
+
+    const userDataSyncPlugin = this.app.pm.get('user-data-sync') as PluginUserDataSyncServer;
+    if (userDataSyncPlugin && userDataSyncPlugin.enabled) {
+      userDataSyncPlugin.resourceManager.registerResource(new DepartmentDataSyncResource(this.db, this.app.logger), {
+        // write department records after writing user records
+        after: 'users',
+      });
+    }
+  }
+
+  async install(options?: InstallOptions) {
+    const collectionRepo = this.db.getRepository<any>('collections');
+    if (collectionRepo) {
+      await collectionRepo.db2cm('departments');
+    }
+    const fieldRepo = this.db.getRepository('fields');
+    if (fieldRepo) {
+      const isDepartmentsFieldExists = await fieldRepo.count({
+        filter: {
+          name: 'departments',
+          collectionName: 'users',
+        },
+      });
+      if (!isDepartmentsFieldExists) {
+        await fieldRepo.create({
+          values: departmentsField,
+        });
+      }
+      const isMainDepartmentFieldExists = await fieldRepo.count({
+        filter: {
+          name: 'mainDepartment',
+          collectionName: 'users',
+        },
+      });
+      if (!isMainDepartmentFieldExists) {
+        await fieldRepo.create({
+          values: mainDepartmentField,
+        });
+      }
+    }
+  }
+
+  async afterEnable() {}
+
+  async afterDisable() {}
+
+  async remove() {}
+}
+
+export default PluginDepartmentsServer;
diff --git a/packages/plugins/@nocobase/plugin-disable-pm-add/package.json b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json
index ab45a63c54..4361757d4c 100644
--- a/packages/plugins/@nocobase/plugin-disable-pm-add/package.json
+++ b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-disable-pm-add",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "./dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-environment-variables/package.json b/packages/plugins/@nocobase/plugin-environment-variables/package.json
index 868c5b8e84..ff41ff6d3d 100644
--- a/packages/plugins/@nocobase/plugin-environment-variables/package.json
+++ b/packages/plugins/@nocobase/plugin-environment-variables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-environment-variables",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-environment-variables/src/client/EnvironmentVariablesAndSecretsProvider.tsx b/packages/plugins/@nocobase/plugin-environment-variables/src/client/EnvironmentVariablesAndSecretsProvider.tsx
index 4346416cd6..557330c6e0 100644
--- a/packages/plugins/@nocobase/plugin-environment-variables/src/client/EnvironmentVariablesAndSecretsProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-environment-variables/src/client/EnvironmentVariablesAndSecretsProvider.tsx
@@ -8,7 +8,7 @@
  */
 
 import { observer } from '@formily/react';
-import { useIsAdminPage, useRequest } from '@nocobase/client';
+import { useIsLoggedIn, useRequest } from '@nocobase/client';
 import React, { createContext } from 'react';
 
 const EnvAndSecretsContext = createContext<any>({});
@@ -22,8 +22,8 @@ const InternalProvider = (props) => {
 
 const EnvironmentVariablesAndSecretsProvider = observer(
   (props) => {
-    const isAdminPage = useIsAdminPage();
-    if (!isAdminPage) {
+    const isLoggedIn = useIsLoggedIn();
+    if (!isLoggedIn) {
       return <>{props.children}</>;
     }
     return <InternalProvider {...props} />;
diff --git a/packages/plugins/@nocobase/plugin-error-handler/package.json b/packages/plugins/@nocobase/plugin-error-handler/package.json
index d74fe201d5..ee50a82b9d 100644
--- a/packages/plugins/@nocobase/plugin-error-handler/package.json
+++ b/packages/plugins/@nocobase/plugin-error-handler/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "错误处理器",
   "description": "Handling application errors and exceptions.",
   "description.zh-CN": "处理应用程序中的错误和异常。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-error-handler/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-error-handler/src/locale/it-IT.json
index a6c6b06d59..4cc1c90d77 100644
--- a/packages/plugins/@nocobase/plugin-error-handler/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-error-handler/src/locale/it-IT.json
@@ -1,6 +1,5 @@
 {
   "unique violation": "{{field}} già esiste",
   "notNull violation": "{{field}} non può essere vuoto",
-  "Validation error": "{{field}} errore di convalida",
-  "notNull Violation": "{{field}} non può essere vuoto"
+  "Validation error": "{{field}} errore di convalida"  
 }
diff --git a/packages/plugins/@nocobase/plugin-error-handler/src/server/error-handler.ts b/packages/plugins/@nocobase/plugin-error-handler/src/server/error-handler.ts
index 45d27d7a05..0cf3286bbf 100644
--- a/packages/plugins/@nocobase/plugin-error-handler/src/server/error-handler.ts
+++ b/packages/plugins/@nocobase/plugin-error-handler/src/server/error-handler.ts
@@ -26,13 +26,16 @@ export class ErrorHandler {
       message += `: ${err.cause.message}`;
     }
 
+    const errorData: { message: string; code: string; title?: string } = {
+      message,
+      code: err.code,
+    };
+
+    if (err?.title) {
+      errorData.title = err.title;
+    }
     ctx.body = {
-      errors: [
-        {
-          message,
-          code: err.code,
-        },
-      ],
+      errors: [errorData],
     };
   }
 
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/.npmignore b/packages/plugins/@nocobase/plugin-field-attachment-url/.npmignore
new file mode 100644
index 0000000000..65f5e8779f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/README.md b/packages/plugins/@nocobase/plugin-field-attachment-url/README.md
new file mode 100644
index 0000000000..806a995fd7
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/README.md
@@ -0,0 +1 @@
+# @nocobase/plugin-field-attachment-url
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/client.d.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/client.d.ts
new file mode 100644
index 0000000000..6c459cbac4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/client.js b/packages/plugins/@nocobase/plugin-field-attachment-url/client.js
new file mode 100644
index 0000000000..b6e3be70e6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/package.json b/packages/plugins/@nocobase/plugin-field-attachment-url/package.json
new file mode 100644
index 0000000000..c3b1c30d19
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "@nocobase/plugin-field-attachment-url",
+  "version": "1.6.20",
+  "main": "dist/server/index.js",
+  "displayName": "Collection field: Attachment(URL)",
+  "displayName.zh-CN": "数据表字段：附件（URL）",
+  "description": "Supports attachments in URL format.",
+  "description.zh-CN": "支持 URL 格式的附件。",
+  "peerDependencies": {
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x"
+  },
+  "devDependencies": {
+    "@nocobase/plugin-file-manager": "1.6.20"
+  },
+  "keywords": [
+    "Collection fields"
+  ]
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/server.d.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/server.d.ts
new file mode 100644
index 0000000000..c41081ddc6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/server.js b/packages/plugins/@nocobase/plugin-field-attachment-url/server.js
new file mode 100644
index 0000000000..972842039a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/__e2e__/createField.test.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/__e2e__/createField.test.ts
new file mode 100644
index 0000000000..89e1432ff4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/__e2e__/createField.test.ts
@@ -0,0 +1,28 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { expect, test } from '@nocobase/test/e2e';
+
+test('create Attachment (URL) field', async ({ page }) => {
+  await page.goto('/admin/settings/data-source-manager/main/collections?type=main');
+  await page.getByLabel('action-Action.Link-Configure fields-collections-users', { exact: true }).click();
+  await page.getByRole('button', { name: 'plus Add field' }).click();
+  await page.getByRole('menuitem', { name: 'Attachment (URL)' }).click();
+  const displayName = `a${Math.random().toString(36).substring(7)}`;
+  const name = `a${Math.random().toString(36).substring(7)}`;
+  await page.getByLabel('block-item-Input-fields-Field display name').getByRole('textbox').fill(displayName);
+  await page.getByLabel('block-item-Input-fields-Field name').getByRole('textbox').fill(name);
+  await expect(page.getByLabel('block-item-RemoteSelect-')).toBeVisible();
+  await page.getByLabel('action-Action-Submit-fields-').click();
+  await expect(page.getByText(name)).toBeVisible();
+
+  // 删除
+  await page.getByLabel(`action-CollectionFields-Delete-fields-${name}`).click();
+  await page.getByRole('button', { name: 'OK', exact: true }).click();
+});
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/client.d.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/client.d.ts
new file mode 100644
index 0000000000..4e96f83fa1
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/client.d.ts
@@ -0,0 +1,249 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// CSS modules
+type CSSModuleClasses = { readonly [key: string]: string };
+
+declare module '*.module.css' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.scss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.sass' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.less' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.styl' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.stylus' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.pcss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.sss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+
+// CSS
+declare module '*.css' { }
+declare module '*.scss' { }
+declare module '*.sass' { }
+declare module '*.less' { }
+declare module '*.styl' { }
+declare module '*.stylus' { }
+declare module '*.pcss' { }
+declare module '*.sss' { }
+
+// Built-in asset types
+// see `src/node/constants.ts`
+
+// images
+declare module '*.apng' {
+  const src: string;
+  export default src;
+}
+declare module '*.png' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpg' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpeg' {
+  const src: string;
+  export default src;
+}
+declare module '*.jfif' {
+  const src: string;
+  export default src;
+}
+declare module '*.pjpeg' {
+  const src: string;
+  export default src;
+}
+declare module '*.pjp' {
+  const src: string;
+  export default src;
+}
+declare module '*.gif' {
+  const src: string;
+  export default src;
+}
+declare module '*.svg' {
+  const src: string;
+  export default src;
+}
+declare module '*.ico' {
+  const src: string;
+  export default src;
+}
+declare module '*.webp' {
+  const src: string;
+  export default src;
+}
+declare module '*.avif' {
+  const src: string;
+  export default src;
+}
+
+// media
+declare module '*.mp4' {
+  const src: string;
+  export default src;
+}
+declare module '*.webm' {
+  const src: string;
+  export default src;
+}
+declare module '*.ogg' {
+  const src: string;
+  export default src;
+}
+declare module '*.mp3' {
+  const src: string;
+  export default src;
+}
+declare module '*.wav' {
+  const src: string;
+  export default src;
+}
+declare module '*.flac' {
+  const src: string;
+  export default src;
+}
+declare module '*.aac' {
+  const src: string;
+  export default src;
+}
+declare module '*.opus' {
+  const src: string;
+  export default src;
+}
+declare module '*.mov' {
+  const src: string;
+  export default src;
+}
+declare module '*.m4a' {
+  const src: string;
+  export default src;
+}
+declare module '*.vtt' {
+  const src: string;
+  export default src;
+}
+
+// fonts
+declare module '*.woff' {
+  const src: string;
+  export default src;
+}
+declare module '*.woff2' {
+  const src: string;
+  export default src;
+}
+declare module '*.eot' {
+  const src: string;
+  export default src;
+}
+declare module '*.ttf' {
+  const src: string;
+  export default src;
+}
+declare module '*.otf' {
+  const src: string;
+  export default src;
+}
+
+// other
+declare module '*.webmanifest' {
+  const src: string;
+  export default src;
+}
+declare module '*.pdf' {
+  const src: string;
+  export default src;
+}
+declare module '*.txt' {
+  const src: string;
+  export default src;
+}
+
+// wasm?init
+declare module '*.wasm?init' {
+  const initWasm: (options?: WebAssembly.Imports) => Promise<WebAssembly.Instance>;
+  export default initWasm;
+}
+
+// web worker
+declare module '*?worker' {
+  const workerConstructor: {
+    new(options?: { name?: string }): Worker;
+  };
+  export default workerConstructor;
+}
+
+declare module '*?worker&inline' {
+  const workerConstructor: {
+    new(options?: { name?: string }): Worker;
+  };
+  export default workerConstructor;
+}
+
+declare module '*?worker&url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?sharedworker' {
+  const sharedWorkerConstructor: {
+    new(options?: { name?: string }): SharedWorker;
+  };
+  export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&inline' {
+  const sharedWorkerConstructor: {
+    new(options?: { name?: string }): SharedWorker;
+  };
+  export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?raw' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?inline' {
+  const src: string;
+  export default src;
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx
new file mode 100644
index 0000000000..0cfa332988
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx
@@ -0,0 +1,184 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { RecursionField, connect, mapReadPretty, useField, useFieldSchema } from '@formily/react';
+import React, { useContext, useEffect, useState } from 'react';
+import {
+  FormProvider,
+  RecordPickerContext,
+  RecordPickerProvider,
+  SchemaComponentOptions,
+  useActionContext,
+  TableSelectorParamsProvider,
+  useTableSelectorProps as useTsp,
+  EllipsisWithTooltip,
+  CollectionProvider_deprecated,
+  useCollection_deprecated,
+  useCollectionManager_deprecated,
+  Upload,
+  useFieldNames,
+  ActionContextProvider,
+  AssociationField,
+  Input,
+} from '@nocobase/client';
+import schema from '../schema';
+import { useInsertSchema } from '../hook';
+
+const defaultToValueItem = (data) => {
+  return data?.thumbnailRule ? `${data?.url}${data?.thumbnailRule}` : data?.url;
+};
+
+const InnerAttachmentUrl = (props) => {
+  const { value, onChange, toValueItem = defaultToValueItem, disabled, underFilter, ...others } = props;
+  const fieldSchema = useFieldSchema();
+  const [visibleSelector, setVisibleSelector] = useState(false);
+  const [selectedRows, setSelectedRows] = useState([]);
+  const insertSelector = useInsertSchema('Selector');
+  const fieldNames = useFieldNames(props);
+  const field: any = useField();
+  const [options, setOptions] = useState();
+  const { getField } = useCollection_deprecated();
+  const collectionField = getField(field.props.name);
+  const { modalProps } = useActionContext();
+  const handleSelect = (ev) => {
+    ev.stopPropagation();
+    ev.preventDefault();
+    insertSelector(schema.Selector);
+    setVisibleSelector(true);
+    setSelectedRows([]);
+  };
+
+  useEffect(() => {
+    if (value && Object.keys(value).length > 0) {
+      setOptions(value);
+    } else {
+      setOptions(null);
+    }
+  }, [value, fieldNames?.label]);
+
+  const pickerProps = {
+    size: 'small',
+    fieldNames,
+    multiple: false,
+    association: {
+      target: collectionField?.target,
+    },
+    options,
+    onChange: props?.onChange,
+    selectedRows,
+    setSelectedRows,
+    collectionField,
+  };
+  const usePickActionProps = () => {
+    const { setVisible } = useActionContext();
+    const { selectedRows, onChange } = useContext(RecordPickerContext);
+    return {
+      onClick() {
+        onChange(toValueItem(selectedRows?.[0]) || null);
+        setVisible(false);
+      },
+    };
+  };
+  const useTableSelectorProps = () => {
+    const {
+      multiple,
+      options,
+      setSelectedRows,
+      selectedRows: rcSelectRows = [],
+      onChange,
+    } = useContext(RecordPickerContext);
+    const { onRowSelectionChange, rowKey = 'id', ...others } = useTsp();
+    const { setVisible } = useActionContext();
+    return {
+      ...others,
+      rowKey,
+      rowSelection: {
+        type: multiple ? 'checkbox' : 'radio',
+        selectedRowKeys: rcSelectRows?.filter((item) => options?.[rowKey] !== item[rowKey]).map((item) => item[rowKey]),
+      },
+      onRowSelectionChange(selectedRowKeys, selectedRows) {
+        setSelectedRows?.(selectedRows);
+        onRowSelectionChange?.(selectedRowKeys, selectedRows);
+        onChange(toValueItem(selectedRows?.[0]) || null);
+        setVisible(false);
+      },
+    };
+  };
+  if (underFilter) {
+    return <Input {...props} />;
+  }
+  console.log(collectionField);
+  return (
+    <div style={{ width: '100%', overflow: 'auto' }}>
+      <AssociationField.FileSelector
+        toValueItem={toValueItem}
+        value={options}
+        quickUpload={fieldSchema['x-component-props']?.quickUpload !== false}
+        selectFile={
+          collectionField?.target && collectionField?.target !== 'attachments'
+            ? fieldSchema['x-component-props']?.selectFile !== false
+            : false
+        }
+        action={`${collectionField?.target || 'attachments'}:create`}
+        onSelect={handleSelect}
+        onChange={onChange}
+        disabled={disabled}
+      />
+      <ActionContextProvider
+        value={{
+          openMode: 'drawer',
+          visible: visibleSelector,
+          setVisible: setVisibleSelector,
+          modalProps: {
+            getContainer: others?.getContainer || modalProps?.getContainer,
+          },
+          formValueChanged: false,
+        }}
+      >
+        {collectionField?.target && collectionField?.target !== 'attachments' && (
+          <RecordPickerProvider {...pickerProps}>
+            <CollectionProvider_deprecated name={collectionField?.target} dataSource={'main'}>
+              <FormProvider>
+                <TableSelectorParamsProvider params={{}}>
+                  <SchemaComponentOptions scope={{ usePickActionProps, useTableSelectorProps }}>
+                    <RecursionField
+                      onlyRenderProperties
+                      basePath={field.address}
+                      schema={fieldSchema}
+                      filterProperties={(s) => {
+                        return s['x-component'] === 'AssociationField.Selector';
+                      }}
+                    />
+                  </SchemaComponentOptions>
+                </TableSelectorParamsProvider>
+              </FormProvider>
+            </CollectionProvider_deprecated>
+          </RecordPickerProvider>
+        )}
+      </ActionContextProvider>
+    </div>
+  );
+};
+
+const FileManageReadPretty = connect((props) => {
+  const { value } = props;
+  const fieldSchema = useFieldSchema();
+  const componentMode = fieldSchema?.['x-component-props']?.['componentMode'];
+  const { getField } = useCollection_deprecated();
+  const { getCollectionJoinField } = useCollectionManager_deprecated();
+  const collectionField = getField(fieldSchema.name) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  if (componentMode === 'url') {
+    return <EllipsisWithTooltip ellipsis>{value}</EllipsisWithTooltip>;
+  }
+  return (
+    <EllipsisWithTooltip ellipsis>{collectionField ? <Upload.ReadPretty {...props} /> : null}</EllipsisWithTooltip>
+  );
+});
+
+export const AttachmentUrl = connect(InnerAttachmentUrl, mapReadPretty(FileManageReadPretty));
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts
new file mode 100644
index 0000000000..412cd9c469
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts
@@ -0,0 +1,106 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { useFieldSchema } from '@formily/react';
+import { useCollectionField, useDesignable, useRequest } from '@nocobase/client';
+import { cloneDeep, uniqBy } from 'lodash';
+import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+
+function useStorageRules(storage) {
+  const name = storage ?? '';
+  const { loading, data } = useRequest<any>(
+    {
+      url: `storages:getBasicInfo/${name}`,
+    },
+    {
+      refreshDeps: [name],
+    },
+  );
+  return (!loading && data?.data) || null;
+}
+export function useAttachmentUrlFieldProps(props) {
+  const field = useCollectionField();
+  const rules = useStorageRules(field?.storage);
+  return {
+    ...props,
+    rules,
+    action: `${field.target}:create${field.storage ? `?attachmentField=${field.collectionName}.${field.name}` : ''}`,
+    toValueItem: (data) => {
+      return data?.thumbnailRule ? `${data?.url}${data?.thumbnailRule}` : data?.url;
+    },
+    getThumbnailURL: (file) => {
+      return file?.url;
+    },
+  };
+}
+
+export const useInsertSchema = (component) => {
+  const fieldSchema = useFieldSchema();
+  const { insertAfterBegin } = useDesignable();
+  const insert = useCallback(
+    (ss) => {
+      const schema = fieldSchema.reduceProperties((buf, s) => {
+        if (s['x-component'] === 'AssociationField.' + component) {
+          return s;
+        }
+        return buf;
+      }, null);
+      if (!schema) {
+        insertAfterBegin(cloneDeep(ss));
+      }
+    },
+    [component, fieldSchema, insertAfterBegin],
+  );
+  return insert;
+};
+
+export const useAttachmentTargetProps = () => {
+  const { t } = useTranslation();
+  // TODO(refactor): whitelist should be changed to storage property，url is signed by plugin-s3-pro, this enmus is from plugin-file-manager
+  const buildInStorage = ['local', 'ali-oss', 's3', 'tx-cos'];
+  return {
+    service: {
+      resource: 'collections',
+      params: {
+        filter: {
+          'options.template': 'file',
+        },
+        paginate: false,
+      },
+    },
+    manual: false,
+    fieldNames: {
+      label: 'title',
+      value: 'name',
+    },
+    mapOptions: (value) => {
+      if (value.name === 'attachments') {
+        return {
+          ...value,
+          title: t('Attachments'),
+        };
+      }
+      return value;
+    },
+    toOptionsItem: (data) => {
+      data.unshift({
+        name: 'attachments',
+        title: t('Attachments'),
+      });
+      return uniqBy(
+        data.filter((v) => v.name),
+        'name',
+      );
+    },
+    optionFilter: (option) => {
+      return !option.storage || buildInStorage.includes(option.storage);
+    },
+  };
+};
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/index.tsx b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/index.tsx
new file mode 100644
index 0000000000..c535c97f67
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/index.tsx
@@ -0,0 +1,38 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Plugin, lazy } from '@nocobase/client';
+import { AttachmentURLFieldInterface } from './interfaces/attachment-url';
+import { useAttachmentUrlFieldProps } from './hook';
+// import { AttachmentUrl } from './component/AttachmentUrl';
+const { AttachmentUrl } = lazy(() => import('./component/AttachmentUrl'), 'AttachmentUrl');
+
+import { attachmentUrlComponentFieldSettings } from './settings';
+export class PluginFieldAttachmentUrlClient extends Plugin {
+  async afterAdd() {
+    // await this.app.pm.add()
+  }
+
+  async beforeLoad() {}
+
+  // You can get and modify the app instance here
+  async load() {
+    this.app.dataSourceManager.addFieldInterfaces([AttachmentURLFieldInterface]);
+    this.app.addScopes({ useAttachmentUrlFieldProps });
+
+    this.app.addComponents({ AttachmentUrl });
+    this.app.schemaSettingsManager.add(attachmentUrlComponentFieldSettings);
+
+    // this.app.addProvider()
+    // this.app.addProviders()
+    // this.app.router.add()
+  }
+}
+
+export default PluginFieldAttachmentUrlClient;
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx
new file mode 100644
index 0000000000..781da59f6b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx
@@ -0,0 +1,79 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client';
+import { ISchema } from '@formily/react';
+import { useAttachmentTargetProps } from '../hook';
+import { tStr } from '../locale';
+
+const { defaultProps, operators } = interfacesProperties;
+
+export const defaultToolbar = [
+  'headings',
+  'bold',
+  'italic',
+  'strike',
+  'link',
+  'list',
+  'ordered-list',
+  'check',
+  'quote',
+  'line',
+  'code',
+  'inline-code',
+  'upload',
+  'fullscreen',
+];
+
+export class AttachmentURLFieldInterface extends CollectionFieldInterface {
+  name = 'attachmentURL';
+  type = 'object';
+  group = 'media';
+  title = tStr('Attachment (URL)');
+  default = {
+    type: 'string',
+    // name,
+    uiSchema: {
+      type: 'string',
+      // title,
+      'x-component': 'AttachmentUrl',
+      'x-use-component-props': 'useAttachmentUrlFieldProps',
+    },
+  };
+  availableTypes = ['string', 'text'];
+  properties = {
+    ...defaultProps,
+    target: {
+      required: true,
+      default: 'attachments',
+      type: 'string',
+      title: tStr('Which file collection should it be uploaded to'),
+      'x-decorator': 'FormItem',
+      'x-component': 'RemoteSelect',
+      'x-use-component-props': useAttachmentTargetProps,
+    },
+    targetKey: {
+      'x-hidden': true,
+      default: 'id',
+      type: 'string',
+    },
+  };
+  schemaInitialize(schema: ISchema, { block }) {
+    schema['x-component-props'] = schema['x-component-props'] || {};
+    schema['x-component-props']['mode'] = 'AttachmentUrl';
+    if (['Table', 'Kanban'].includes(block)) {
+      schema['x-component-props']['ellipsis'] = true;
+      schema['x-component-props']['size'] = 'small';
+    }
+  }
+  filterable = {
+    operators: operators.bigField,
+  };
+  titleUsable = true;
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/locale.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/locale.ts
new file mode 100644
index 0000000000..a26dd0158f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/locale.ts
@@ -0,0 +1,30 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// @ts-ignore
+import pkg from '../../package.json';
+import { useApp } from '@nocobase/client';
+import { useTranslation } from 'react-i18next';
+
+export const NAMESPACE = 'attachmentUrl';
+
+export function useT() {
+  const app = useApp();
+  return (str: string) => app.i18n.t(str, { ns: [pkg.name, 'client'] });
+}
+
+export function tStr(key: string) {
+  return `{{t(${JSON.stringify(key)}, { ns: ['${pkg.name}', 'client'], nsMode: 'fallback' })}}`;
+}
+
+export function useAttachmentUrlTranslation() {
+  return useTranslation([NAMESPACE, 'client'], {
+    nsMode: 'fallback',
+  });
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/schema.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/schema.ts
new file mode 100644
index 0000000000..f5ae80d0ce
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/schema.ts
@@ -0,0 +1,53 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export default {
+  Selector: {
+    type: 'void',
+    'x-component': 'AssociationField.Selector',
+    title: '{{ t("Select record") }}',
+    'x-component-props': {
+      className: 'nb-record-picker-selector',
+    },
+    properties: {
+      grid: {
+        type: 'void',
+        'x-component': 'Grid',
+        'x-initializer': 'popup:tableSelector:addBlock',
+        properties: {},
+      },
+      footer: {
+        'x-component': 'Action.Container.Footer',
+        'x-component-props': {},
+        properties: {
+          actions: {
+            type: 'void',
+            'x-component': 'ActionBar',
+            'x-component-props': {},
+            properties: {
+              submit: {
+                title: '{{ t("Submit") }}',
+                'x-action': 'submit',
+                'x-component': 'Action',
+                'x-use-component-props': 'usePickActionProps',
+                // 'x-designer': 'Action.Designer',
+                'x-toolbar': 'ActionSchemaToolbar',
+                'x-settings': 'actionSettings:submit',
+                'x-component-props': {
+                  type: 'primary',
+                  htmlType: 'submit',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/settings/index.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/settings/index.ts
new file mode 100644
index 0000000000..52463073c2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/settings/index.ts
@@ -0,0 +1,171 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Field } from '@formily/core';
+import { useField, useFieldSchema, useForm } from '@formily/react';
+import { useTranslation } from 'react-i18next';
+import { useColumnSchema, useIsFieldReadPretty, SchemaSettings, useDesignable } from '@nocobase/client';
+
+const fieldComponent: any = {
+  name: 'fieldComponent',
+  type: 'select',
+  useComponentProps() {
+    const { t } = useTranslation();
+    const field = useField<Field>();
+    const { fieldSchema: tableColumnSchema } = useColumnSchema();
+    const schema = useFieldSchema();
+    const fieldSchema = tableColumnSchema || schema;
+    const { dn } = useDesignable();
+
+    return {
+      title: t('Field component'),
+      options: [
+        { label: t('URL'), value: 'url' },
+        { label: t('Preview'), value: 'preview' },
+      ],
+      value: fieldSchema['x-component-props']['componentMode'] || 'preview',
+      onChange(componentMode) {
+        const schema = {
+          ['x-uid']: fieldSchema['x-uid'],
+        };
+        fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+        fieldSchema['x-component-props']['componentMode'] = componentMode;
+        schema['x-component-props'] = fieldSchema['x-component-props'];
+        field.componentProps = field.componentProps || {};
+        field.componentProps.componentMode = componentMode;
+        void dn.emit('patch', {
+          schema,
+        });
+        dn.refresh();
+      },
+    };
+  },
+  useVisible() {
+    const readPretty = useIsFieldReadPretty();
+    const { fieldSchema: tableColumnSchema } = useColumnSchema();
+    return readPretty;
+  },
+};
+
+export const attachmentUrlComponentFieldSettings = new SchemaSettings({
+  name: 'fieldSettings:component:AttachmentUrl',
+  items: [
+    {
+      name: 'quickUpload',
+      type: 'switch',
+      useComponentProps() {
+        const { t } = useTranslation();
+        const field = useField<Field>();
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        const schema = useFieldSchema();
+        const fieldSchema = tableColumnSchema || schema;
+        const { dn, refresh } = useDesignable();
+        return {
+          title: t('Quick upload'),
+          checked: fieldSchema['x-component-props']?.quickUpload !== (false as boolean),
+          onChange(value) {
+            const schema = {
+              ['x-uid']: fieldSchema['x-uid'],
+            };
+            field.componentProps.quickUpload = value;
+            fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+            fieldSchema['x-component-props'].quickUpload = value;
+            schema['x-component-props'] = fieldSchema['x-component-props'];
+            dn.emit('patch', {
+              schema,
+            });
+            refresh();
+          },
+        };
+      },
+      useVisible() {
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        const field = useField();
+        const form = useForm();
+        const isReadPretty = tableColumnSchema?.['x-read-pretty'] || field.readPretty || form.readPretty;
+        return !isReadPretty && !field.componentProps.underFilter;
+      },
+    },
+    {
+      name: 'selectFile',
+      type: 'switch',
+      useComponentProps() {
+        const { t } = useTranslation();
+        const field = useField<Field>();
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        const schema = useFieldSchema();
+        const fieldSchema = tableColumnSchema || schema;
+        const { dn, refresh } = useDesignable();
+        return {
+          title: t('Select file'),
+          checked: fieldSchema['x-component-props']?.selectFile !== (false as boolean),
+          onChange(value) {
+            const schema = {
+              ['x-uid']: fieldSchema['x-uid'],
+            };
+            field.componentProps.selectFile = value;
+            fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+            fieldSchema['x-component-props'].selectFile = value;
+            schema['x-component-props'] = fieldSchema['x-component-props'];
+            dn.emit('patch', {
+              schema,
+            });
+            refresh();
+          },
+        };
+      },
+      useVisible() {
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        const field = useField();
+        const form = useForm();
+        const isReadPretty = tableColumnSchema?.['x-read-pretty'] || field.readPretty || form.readPretty;
+        return !isReadPretty && !field.componentProps.underFilter;
+      },
+    },
+    fieldComponent,
+    {
+      name: 'size',
+      type: 'select',
+      useVisible() {
+        const readPretty = useIsFieldReadPretty();
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        return readPretty && !tableColumnSchema;
+      },
+      useComponentProps() {
+        const { t } = useTranslation();
+        const field = useField<Field>();
+        const fieldSchema = useFieldSchema();
+        const { dn } = useDesignable();
+        return {
+          title: t('Size'),
+          options: [
+            { label: t('Large'), value: 'large' },
+            { label: t('Default'), value: 'default' },
+            { label: t('Small'), value: 'small' },
+          ],
+          value: field?.componentProps?.size || 'default',
+          onChange(size) {
+            const schema = {
+              ['x-uid']: fieldSchema['x-uid'],
+            };
+            fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+            fieldSchema['x-component-props']['size'] = size;
+            schema['x-component-props'] = fieldSchema['x-component-props'];
+            field.componentProps = field.componentProps || {};
+            field.componentProps.size = size;
+            dn.emit('patch', {
+              schema,
+            });
+            dn.refresh();
+          },
+        };
+      },
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/index.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/index.ts
new file mode 100644
index 0000000000..be99a2ff1a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/index.ts
@@ -0,0 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export * from './server';
+export { default } from './server';
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/en-US.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/en-US.json
@@ -0,0 +1 @@
+{}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/zh-CN.json
new file mode 100644
index 0000000000..78def6ea14
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/zh-CN.json
@@ -0,0 +1,4 @@
+{
+    "Which file collection should it be uploaded to":"上传到文件表",
+    "Attachment (URL)":"附件 (URL)"
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/collections/.gitkeep b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/collections/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/index.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/index.ts
new file mode 100644
index 0000000000..be989de7c3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/index.ts
@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export { default } from './plugin';
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts
new file mode 100644
index 0000000000..372274c091
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts
@@ -0,0 +1,28 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Plugin } from '@nocobase/server';
+
+export class PluginFieldAttachmentUrlServer extends Plugin {
+  async afterAdd() {}
+
+  async beforeLoad() {}
+
+  async load() {}
+
+  async install() {}
+
+  async afterEnable() {}
+
+  async afterDisable() {}
+
+  async remove() {}
+}
+
+export default PluginFieldAttachmentUrlServer;
diff --git a/packages/plugins/@nocobase/plugin-field-china-region/package.json b/packages/plugins/@nocobase/plugin-field-china-region/package.json
index 045b4e37ee..4c0497080d 100644
--- a/packages/plugins/@nocobase/plugin-field-china-region/package.json
+++ b/packages/plugins/@nocobase/plugin-field-china-region/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-field-china-region",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "displayName": "Collection field: administrative divisions of China",
   "displayName.zh-CN": "数据表字段：中国行政区划",
   "description": "Provides data and field type for administrative divisions of China.",
diff --git a/packages/plugins/@nocobase/plugin-field-formula/package.json b/packages/plugins/@nocobase/plugin-field-formula/package.json
index 4dfa623739..74a0a8a7c9 100644
--- a/packages/plugins/@nocobase/plugin-field-formula/package.json
+++ b/packages/plugins/@nocobase/plugin-field-formula/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：公式",
   "description": "Configure and store the results of calculations between multiple field values in the same record, supporting both Math.js and Excel formula functions.",
   "description.zh-CN": "可以配置并存储同一条记录的多字段值之间的计算结果，支持 Math.js 和 Excel formula functions 两种引擎",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-formula",
diff --git a/packages/plugins/@nocobase/plugin-field-formula/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-field-formula/src/locale/it-IT.json
index 1cc3afb64f..49a9f1cc42 100644
--- a/packages/plugins/@nocobase/plugin-field-formula/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-field-formula/src/locale/it-IT.json
@@ -4,5 +4,5 @@
   "Expression": "Espressione",
   "Expression syntax error": "Errore sintassi espressione",
   "Syntax references": "Riferimenti sintassi",
-  "Compute a value based on the other fields": "Calcola un valore in base a un altro campo"
+  "Configure and store the results of calculations between multiple field values in the same record, supporting both Math.js and Excel formula functions.": "Configura e memorizza i risultati dei calcoli tra più valori dei campi nello stesso record, supportando sia funzioni delle formule Math.js che quelli Excel."
 }
diff --git a/packages/plugins/@nocobase/plugin-field-formula/src/server/__tests__/formula-field.test.ts b/packages/plugins/@nocobase/plugin-field-formula/src/server/__tests__/formula-field.test.ts
index 187f767874..eab8c29e04 100644
--- a/packages/plugins/@nocobase/plugin-field-formula/src/server/__tests__/formula-field.test.ts
+++ b/packages/plugins/@nocobase/plugin-field-formula/src/server/__tests__/formula-field.test.ts
@@ -7,14 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database } from '@nocobase/database';
 import { FormulaField } from '../formula-field';
 
 describe('formula field', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     db.registerFieldTypes({
       formula: FormulaField,
diff --git a/packages/plugins/@nocobase/plugin-field-m2m-array/package.json b/packages/plugins/@nocobase/plugin-field-m2m-array/package.json
index 44626a5825..60913c459a 100644
--- a/packages/plugins/@nocobase/plugin-field-m2m-array/package.json
+++ b/packages/plugins/@nocobase/plugin-field-m2m-array/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：多对多 (数组)",
   "description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model.",
   "description.zh-CN": "支持通过在数组中存储目标表唯一键的方式建立多对多关系。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/issues.test.ts b/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/issues.test.ts
index 536d72d1a5..94b2f559b3 100644
--- a/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/issues.test.ts
+++ b/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/issues.test.ts
@@ -324,4 +324,100 @@ describe('issues', () => {
     }
     expect(res.status).toBe(200);
   });
+
+  test('filtering by fields of a relation collection with m2m array field', async () => {
+    await db.getRepository('collections').create({
+      values: {
+        name: 'tags',
+        fields: [
+          {
+            name: 'id',
+            type: 'bigInt',
+            autoIncrement: true,
+            primaryKey: true,
+            allowNull: false,
+          },
+          {
+            name: 'title',
+            type: 'string',
+          },
+        ],
+      },
+    });
+    await db.getRepository('collections').create({
+      values: {
+        name: 'users',
+        fields: [
+          {
+            name: 'id',
+            type: 'bigInt',
+            autoIncrement: true,
+            primaryKey: true,
+            allowNull: false,
+          },
+          {
+            name: 'username',
+            type: 'string',
+          },
+          {
+            name: 'tags',
+            type: 'belongsToArray',
+            foreignKey: 'tag_ids',
+            target: 'tags',
+            targetKey: 'id',
+          },
+        ],
+      },
+    });
+    await db.getRepository('collections').create({
+      values: {
+        name: 'projects',
+        fields: [
+          {
+            name: 'id',
+            type: 'bigInt',
+            autoIncrement: true,
+            primaryKey: true,
+            allowNull: false,
+          },
+          {
+            name: 'title',
+            type: 'string',
+          },
+          {
+            name: 'users',
+            type: 'belongsTo',
+            foreignKey: 'user_id',
+            target: 'users',
+          },
+        ],
+      },
+    });
+    // @ts-ignore
+    await db.getRepository('collections').load();
+    await db.sync();
+    await db.getRepository('tags').create({
+      values: [{ title: 'a' }, { title: 'b' }, { title: 'c' }],
+    });
+    await db.getRepository('users').create({
+      values: { id: 1, username: 'a' },
+    });
+    await db.getRepository('projects').create({
+      values: { id: 1, title: 'p1', user_id: 1 },
+    });
+    await expect(
+      db.getRepository('projects').findOne({
+        appends: ['users', 'users.tags'],
+        filter: {
+          $and: [
+            {
+              users: {
+                username: 'a',
+              },
+            },
+          ],
+        },
+      }),
+    ).resolves.toBeTruthy();
+  });
 });
diff --git a/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-bigint-api.test.ts b/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-bigint-api.test.ts
index e20b709e05..778c196582 100644
--- a/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-bigint-api.test.ts
+++ b/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-bigint-api.test.ts
@@ -207,15 +207,8 @@ describe('m2m array api, bigInt targetKey', () => {
           },
         },
       });
-      if (db.sequelize.getDialect() === 'postgres') {
-        const res = await search;
-        expect(res.length).toBe(1);
-      } else {
-        expect(search).rejects.toThrowError();
-      }
-      if (db.sequelize.getDialect() !== 'postgres') {
-        return;
-      }
+      const res1 = await search;
+      expect(res1.length).toBe(1);
       const search2 = db.getRepository('users').find({
         filter: {
           'tags.title': {
@@ -223,12 +216,8 @@ describe('m2m array api, bigInt targetKey', () => {
           },
         },
       });
-      if (db.sequelize.getDialect() === 'postgres') {
-        const res = await search2;
-        expect(res.length).toBe(2);
-      } else {
-        expect(search2).rejects.toThrowError();
-      }
+      const res2 = await search2;
+      expect(res2.length).toBe(2);
     });
 
     it('should create with belongsToArray', async () => {
diff --git a/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-string-api.test.ts b/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-string-api.test.ts
index 3d1f1d8265..2c0cf26e4b 100644
--- a/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-string-api.test.ts
+++ b/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-string-api.test.ts
@@ -186,15 +186,8 @@ describe('m2m array api, string targetKey', () => {
           },
         },
       });
-      if (db.sequelize.getDialect() === 'postgres') {
-        const res = await search;
-        expect(res.length).toBe(1);
-      } else {
-        expect(search).rejects.toThrowError();
-      }
-      if (db.sequelize.getDialect() !== 'postgres') {
-        return;
-      }
+      const res1 = await search;
+      expect(res1.length).toBe(1);
       const search2 = db.getRepository('users').find({
         filter: {
           'tags.title': {
@@ -202,12 +195,8 @@ describe('m2m array api, string targetKey', () => {
           },
         },
       });
-      if (db.sequelize.getDialect() === 'postgres') {
-        const res = await search2;
-        expect(res.length).toBe(2);
-      } else {
-        expect(search2).rejects.toThrowError();
-      }
+      const res2 = await search2;
+      expect(res2.length).toBe(2);
     });
 
     it('should create with belongsToArray', async () => {
diff --git a/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json b/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
index e0bc9abd46..76f265978f 100644
--- a/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
+++ b/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：Markdown(Vditor)",
   "description": "Used to store Markdown and render it using Vditor editor, supports common Markdown syntax such as list, code, quote, etc., and supports uploading images, recordings, etc.It also allows for instant rendering, where what you see is what you get.",
   "description.zh-CN": "用于存储 Markdown，并使用 Vditor 编辑器渲染，支持常见 Markdown 语法，如列表，代码，引用等，并支持上传图片，录音等。同时可以做到即时渲染，所见即所得。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-markdown-vditor",
diff --git a/packages/plugins/@nocobase/plugin-field-sequence/package.json b/packages/plugins/@nocobase/plugin-field-sequence/package.json
index 0db059d466..83d0e7cb23 100644
--- a/packages/plugins/@nocobase/plugin-field-sequence/package.json
+++ b/packages/plugins/@nocobase/plugin-field-sequence/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：自动编码",
   "description": "Automatically generate codes based on configured rules, supporting combinations of dates, numbers, and text.",
   "description.zh-CN": "根据配置的规则自动生成编码，支持日期、数字、文本的组合。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-sequence",
diff --git a/packages/plugins/@nocobase/plugin-field-sequence/src/client/index.tsx b/packages/plugins/@nocobase/plugin-field-sequence/src/client/index.tsx
index 0f0f8d0956..b3ad392b81 100644
--- a/packages/plugins/@nocobase/plugin-field-sequence/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-field-sequence/src/client/index.tsx
@@ -15,6 +15,9 @@ export class PluginFieldSequenceClient extends Plugin {
   async load() {
     this.app.use(SequenceFieldProvider);
     this.app.dataSourceManager.addFieldInterfaces([SequenceFieldInterface]);
+    const calendarPlugin: any = this.app.pm.get('calendar');
+    // 注册标题字段
+    calendarPlugin.registerTitleFieldInterface('sequence');
   }
 }
 
diff --git a/packages/plugins/@nocobase/plugin-field-sort/package.json b/packages/plugins/@nocobase/plugin-field-sort/package.json
index acf14f5c59..26ad0acf9c 100644
--- a/packages/plugins/@nocobase/plugin-field-sort/package.json
+++ b/packages/plugins/@nocobase/plugin-field-sort/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-field-sort",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "displayName": "Collection field: Sort",
   "displayName.zh-CN": "数据表字段：排序",
diff --git a/packages/plugins/@nocobase/plugin-field-sort/src/server/__tests__/sort.test.ts b/packages/plugins/@nocobase/plugin-field-sort/src/server/__tests__/sort.test.ts
index 8185c072e3..85ce42325a 100644
--- a/packages/plugins/@nocobase/plugin-field-sort/src/server/__tests__/sort.test.ts
+++ b/packages/plugins/@nocobase/plugin-field-sort/src/server/__tests__/sort.test.ts
@@ -7,12 +7,12 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Database, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, Database, mockDatabase } from '@nocobase/database';
 import { createMockServer, MockServer } from '@nocobase/test';
 
-import Plugin from '..';
 import { SequelizeCollectionManager, SequelizeDataSource } from '@nocobase/data-source-manager';
 import { uid } from '@nocobase/utils';
+import Plugin from '..';
 
 describe('sort field', () => {
   let app: MockServer;
@@ -30,7 +30,7 @@ describe('sort field', () => {
       new SequelizeDataSource({
         name: 'another',
         collectionManager: {
-          database: mockDatabase({
+          database: await createMockDatabase({
             tablePrefix: `t${uid(5)}`,
           }),
         },
diff --git a/packages/plugins/@nocobase/plugin-file-manager/package.json b/packages/plugins/@nocobase/plugin-file-manager/package.json
index 1aadbbb45e..9957f9dc80 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-file-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-file-manager/src/locale/it-IT.json
index e1d4a3aacb..778734b98a 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/locale/it-IT.json
@@ -1,12 +1,10 @@
 {
   "File manager": "Gestore file",
   "Attachment": "Allegato",
-  "MIME type": "Tipo MIME",
-  "Storage display name": "Nome visualizzato archivio",
+  "MIME type": "Tipo MIME",  
   "Storage name": "Nome archivio",
   "Storage type": "Tipo archivio",
-  "Default storage": "Archivio predefinito",
-  "Storage base URL": "URL base archivio",
+  "Default storage": "Archivio predefinito",  
   "Destination": "Destinazione",
   "Use the built-in static file server": "Usa il server di file statici integrato",
   "Local storage": "Archivio locale",
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/utils.test.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/utils.test.ts
new file mode 100644
index 0000000000..9264ef780a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/utils.test.ts
@@ -0,0 +1,50 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { getApp } from '.';
+import PluginFileManagerServer from '../server';
+
+import { STORAGE_TYPE_LOCAL } from '../../constants';
+
+import { getFileKey } from '../utils';
+
+describe('file manager > utils', () => {
+  let app;
+  let agent;
+  let db;
+  let plugin: PluginFileManagerServer;
+  let StorageRepo;
+  let AttachmentRepo;
+  let local;
+
+  beforeEach(async () => {
+    app = await getApp();
+    agent = app.agent();
+    db = app.db;
+    plugin = app.pm.get(PluginFileManagerServer) as PluginFileManagerServer;
+
+    AttachmentRepo = db.getCollection('attachments').repository;
+    StorageRepo = db.getCollection('storages').repository;
+    local = await StorageRepo.findOne({
+      filter: {
+        type: STORAGE_TYPE_LOCAL,
+      },
+    });
+  });
+
+  afterEach(async () => {
+    await app.destroy();
+  });
+
+  describe('getFileKey', () => {
+    it('path as null should works', async () => {
+      expect(getFileKey({ path: null, filename: 'test.jpg' })).toBe('test.jpg');
+    });
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/actions/attachments.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/actions/attachments.ts
index 7dd2c025f9..e21544fd43 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/actions/attachments.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/actions/attachments.ts
@@ -59,7 +59,7 @@ export async function getFileData(ctx: Context) {
     mimetype: file.mimetype,
     meta: ctx.request.body,
     storageId: storage.id,
-    ...(storageInstance.getFileData ? storageInstance.getFileData(file) : {}),
+    ...StorageType?.['getFileData']?.(file),
   };
 
   return data;
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts
index bf66f7624a..20e248f469 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts
@@ -21,6 +21,7 @@ export default defineCollection({
       type: 'string',
       name: 'title',
       translation: true,
+      trim: true,
     },
     {
       title: '英文标识',
@@ -28,6 +29,7 @@ export default defineCollection({
       type: 'uid',
       name: 'name',
       unique: true,
+      trim: true,
     },
     {
       comment: '类型标识，如 local/ali-oss 等',
@@ -51,12 +53,14 @@ export default defineCollection({
       type: 'text',
       name: 'path',
       defaultValue: '',
+      trim: true,
     },
     {
       comment: '访问地址前缀',
       type: 'string',
       name: 'baseUrl',
       defaultValue: '',
+      trim: true,
     },
     // TODO(feature): 需要使用一个实现了可设置默认值的字段
     {
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/server.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/server.ts
index 5b6b715e4e..a5dc7f2a30 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/server.ts
@@ -62,11 +62,21 @@ export class PluginFileManagerServer extends Plugin {
       return;
     }
 
+    if (!record.get('storageId')) {
+      return;
+    }
+
     const storage = this.storagesCache.get(record.get('storageId'));
+    if (!storage) {
+      return;
+    }
     if (storage?.paranoid) {
       return;
     }
     const Type = this.storageTypes.get(storage.type);
+    if (!Type) {
+      return;
+    }
     const storageConfig = new Type(storage);
     const result = await storageConfig.delete([record as unknown as AttachmentModel]);
     if (!result[0]) {
@@ -245,6 +255,15 @@ export class PluginFileManagerServer extends Plugin {
       );
     });
     Storage.afterDestroy((m, { transaction }) => {
+      for (const collection of this.db.collections.values()) {
+        if (collection?.options?.template === 'file' && collection?.options?.storage === m.name) {
+          throw new Error(
+            this.t(
+              `The storage "${m.name}" is in use in collection "${collection.name}" and cannot be deleted.`,
+            ) as any,
+          );
+        }
+      }
       this.storagesCache.delete(m.id);
       this.sendSyncMessage(
         {
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/index.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/index.ts
index 63c283ff16..355fb4ea00 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/index.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/index.ts
@@ -10,7 +10,7 @@
 import { isURL } from '@nocobase/utils';
 import { StorageEngine } from 'multer';
 import urlJoin from 'url-join';
-import { encodeURL } from '../utils';
+import { encodeURL, ensureUrlEncoded, getFileKey } from '../utils';
 
 export interface StorageModel {
   id?: number;
@@ -42,6 +42,10 @@ export abstract class StorageType {
   abstract make(): StorageEngine;
   abstract delete(records: AttachmentModel[]): [number, AttachmentModel[]] | Promise<[number, AttachmentModel[]]>;
 
+  getFileKey(record: AttachmentModel) {
+    return getFileKey(record);
+  }
+
   getFileData?(file: { [key: string]: any }): { [key: string]: any };
   getFileURL(file: AttachmentModel, preview?: boolean): string | Promise<string> {
     // 兼容历史数据
@@ -54,7 +58,7 @@ export abstract class StorageType {
     const keys = [
       this.storage.baseUrl,
       file.path && encodeURI(file.path),
-      encodeURIComponent(file.filename),
+      ensureUrlEncoded(file.filename),
       preview && this.storage.options.thumbnailRule,
     ].filter(Boolean);
     return urlJoin(keys);
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/s3.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/s3.ts
index 98113ce410..9e63d62478 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/s3.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/s3.ts
@@ -7,11 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { S3Client, DeleteObjectCommand } from '@aws-sdk/client-s3';
+import { DeleteObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import crypto from 'crypto';
 import { AttachmentModel, StorageType } from '.';
 import { STORAGE_TYPE_S3 } from '../../constants';
-import { cloudFilenameGetter, getFileKey } from '../utils';
+import { cloudFilenameGetter } from '../utils';
 
 export default class extends StorageType {
   static defaults() {
@@ -87,8 +87,8 @@ export default class extends StorageType {
   async delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]> {
     const { Deleted } = await this.deleteS3Objects(
       this.storage.options.bucket,
-      records.map((record) => getFileKey(record)),
+      records.map((record) => this.getFileKey(record)),
     );
-    return [Deleted.length, records.filter((record) => !Deleted.find((item) => item.Key === getFileKey(record)))];
+    return [Deleted.length, records.filter((record) => !Deleted.find((item) => item.Key === this.getFileKey(record)))];
   }
 }
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/tx-cos.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/tx-cos.ts
index 58b01e915f..463ec3c59a 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/tx-cos.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/tx-cos.ts
@@ -7,11 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+import { isURL } from '@nocobase/utils';
+import path from 'path';
+import urlJoin from 'url-join';
 import { promisify } from 'util';
-
 import { AttachmentModel, StorageType } from '.';
 import { STORAGE_TYPE_TX_COS } from '../../constants';
-import { getFilename, getFileKey } from '../utils';
+import { getFileKey, getFilename } from '../utils';
 
 export default class extends StorageType {
   static defaults() {
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/utils.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/utils.ts
index 1bfccecd3a..989aa8dd81 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/utils.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/utils.ts
@@ -9,6 +9,7 @@
 
 import { uid } from '@nocobase/utils';
 import path from 'path';
+import urlJoin from 'url-join';
 
 export function getFilename(req, file, cb) {
   const originalname = Buffer.from(file.originalname, 'binary').toString('utf8');
@@ -27,10 +28,10 @@ export const cloudFilenameGetter = (storage) => (req, file, cb) => {
 };
 
 export function getFileKey(record) {
-  return [record.path.replace(/^\/|\/$/g, ''), record.filename].filter(Boolean).join('/');
+  return urlJoin(record.path || '', record.filename).replace(/^\//, '');
 }
 
-function ensureUrlEncoded(value) {
+export function ensureUrlEncoded(value) {
   try {
     // 如果解码后与原字符串不同，说明已经被转义过
     if (decodeURIComponent(value) !== value) {
diff --git a/packages/plugins/@nocobase/plugin-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json
index e9d01caa66..d92f83ab9f 100644
--- a/packages/plugins/@nocobase/plugin-gantt/package.json
+++ b/packages/plugins/@nocobase/plugin-gantt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-gantt",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "displayName": "Block: Gantt",
   "displayName.zh-CN": "区块：甘特图",
   "description": "Provides Gantt block.",
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx
index 64e413d2b7..d0fabdab40 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx
@@ -104,10 +104,6 @@ export const GanttBlockProvider = (props) => {
   const collection = cm.getCollection(props.collection, props.dataSource);
   const params = { filter: props.params?.filter, paginate: false, sort: [collection?.primaryKey || 'id'] };
 
-  if (collection?.tree) {
-    params['tree'] = true;
-  }
-
   return (
     <div aria-label="block-item-gantt" role="button">
       <TableBlockProvider {...props} params={params}>
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
index 23669a1815..e01f7b59fd 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "可视化数据表管理",
   "description": "An ER diagram-like tool. Currently only the Master database is supported.",
   "description.zh-CN": "类似 ER 图的工具，目前只支持主数据库。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/graph-collection-manager",
diff --git a/packages/plugins/@nocobase/plugin-kanban/package.json b/packages/plugins/@nocobase/plugin-kanban/package.json
index 5df343774f..fc62a488f7 100644
--- a/packages/plugins/@nocobase/plugin-kanban/package.json
+++ b/packages/plugins/@nocobase/plugin-kanban/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-kanban",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/block-kanban",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/block-kanban",
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx
index d554caef17..f534d649cd 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx
@@ -135,20 +135,22 @@ export const KanbanCard: any = () => {
 
   return (
     <>
-      <Card onClick={handleCardClick} bordered={false} hoverable style={cardStyle} className={cardCss}>
-        <DndContext onDragStart={onDragStart} onDragEnd={onDragEnd}>
-          <FormLayout
-            layout={layout}
-            labelAlign={labelAlign}
-            labelWidth={layout === 'horizontal' ? labelWidth : null}
-            labelWrap={labelWrap}
-          >
-            <FormProvider form={form}>
-              <MemorizedRecursionField schema={fieldSchema} onlyRenderProperties />
-            </FormProvider>
-          </FormLayout>
-        </DndContext>
-      </Card>
+      <PopupContextProvider>
+        <Card onClick={handleCardClick} bordered={false} hoverable style={cardStyle} className={cardCss}>
+          <DndContext onDragStart={onDragStart} onDragEnd={onDragEnd}>
+            <FormLayout
+              layout={layout}
+              labelAlign={labelAlign}
+              labelWidth={layout === 'horizontal' ? labelWidth : null}
+              labelWrap={labelWrap}
+            >
+              <FormProvider form={form}>
+                <MemorizedRecursionField schema={fieldSchema} onlyRenderProperties />
+              </FormProvider>
+            </FormLayout>
+          </DndContext>
+        </Card>
+      </PopupContextProvider>
       <PopupContextProvider visible={visible} setVisible={setVisible}>
         <VariablePopupRecordProvider recordData={recordData} collection={collection}>
           <MemorizedRecursionField schema={wrappedPopupSchema} />
@@ -163,8 +165,12 @@ function getPopupSchemaFromParent(fieldSchema: Schema) {
     return fieldSchema.parent.properties.cardViewer.properties.drawer;
   }
 
-  const cardSchema = findSchemaByUid(fieldSchema['x-uid'], fieldSchema.root);
-  return cardSchema.parent.properties.cardViewer.properties.drawer;
+  try {
+    const cardSchema = findSchemaByUid(fieldSchema['x-uid'], fieldSchema.root);
+    return cardSchema.parent.properties.cardViewer.properties.drawer;
+  } catch (e) {
+    console.warn(e);
+  }
 }
 
 function findSchemaByUid(uid: string, rootSchema: Schema, resultRef: { value: Schema } = { value: null }) {
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/.npmignore b/packages/plugins/@nocobase/plugin-locale-tester/.npmignore
new file mode 100644
index 0000000000..65f5e8779f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/README.md b/packages/plugins/@nocobase/plugin-locale-tester/README.md
new file mode 100644
index 0000000000..cfac872027
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/README.md
@@ -0,0 +1 @@
+# @nocobase/plugin-locale-tester
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/client.d.ts b/packages/plugins/@nocobase/plugin-locale-tester/client.d.ts
new file mode 100644
index 0000000000..6c459cbac4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/client.js b/packages/plugins/@nocobase/plugin-locale-tester/client.js
new file mode 100644
index 0000000000..b6e3be70e6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/package.json b/packages/plugins/@nocobase/plugin-locale-tester/package.json
new file mode 100644
index 0000000000..4bfd11fcf9
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "@nocobase/plugin-locale-tester",
+  "displayName": "Locale tester",
+  "displayName.zh-CN": "翻译测试工具",
+  "version": "1.6.20",
+  "homepage": "https://github.com/nocobase/locales",
+  "main": "dist/server/index.js",
+  "peerDependencies": {
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x"
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/server.d.ts b/packages/plugins/@nocobase/plugin-locale-tester/server.d.ts
new file mode 100644
index 0000000000..c41081ddc6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/server.js b/packages/plugins/@nocobase/plugin-locale-tester/server.js
new file mode 100644
index 0000000000..972842039a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/client/client.d.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/client/client.d.ts
new file mode 100644
index 0000000000..4e96f83fa1
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/client/client.d.ts
@@ -0,0 +1,249 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// CSS modules
+type CSSModuleClasses = { readonly [key: string]: string };
+
+declare module '*.module.css' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.scss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.sass' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.less' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.styl' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.stylus' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.pcss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.sss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+
+// CSS
+declare module '*.css' { }
+declare module '*.scss' { }
+declare module '*.sass' { }
+declare module '*.less' { }
+declare module '*.styl' { }
+declare module '*.stylus' { }
+declare module '*.pcss' { }
+declare module '*.sss' { }
+
+// Built-in asset types
+// see `src/node/constants.ts`
+
+// images
+declare module '*.apng' {
+  const src: string;
+  export default src;
+}
+declare module '*.png' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpg' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpeg' {
+  const src: string;
+  export default src;
+}
+declare module '*.jfif' {
+  const src: string;
+  export default src;
+}
+declare module '*.pjpeg' {
+  const src: string;
+  export default src;
+}
+declare module '*.pjp' {
+  const src: string;
+  export default src;
+}
+declare module '*.gif' {
+  const src: string;
+  export default src;
+}
+declare module '*.svg' {
+  const src: string;
+  export default src;
+}
+declare module '*.ico' {
+  const src: string;
+  export default src;
+}
+declare module '*.webp' {
+  const src: string;
+  export default src;
+}
+declare module '*.avif' {
+  const src: string;
+  export default src;
+}
+
+// media
+declare module '*.mp4' {
+  const src: string;
+  export default src;
+}
+declare module '*.webm' {
+  const src: string;
+  export default src;
+}
+declare module '*.ogg' {
+  const src: string;
+  export default src;
+}
+declare module '*.mp3' {
+  const src: string;
+  export default src;
+}
+declare module '*.wav' {
+  const src: string;
+  export default src;
+}
+declare module '*.flac' {
+  const src: string;
+  export default src;
+}
+declare module '*.aac' {
+  const src: string;
+  export default src;
+}
+declare module '*.opus' {
+  const src: string;
+  export default src;
+}
+declare module '*.mov' {
+  const src: string;
+  export default src;
+}
+declare module '*.m4a' {
+  const src: string;
+  export default src;
+}
+declare module '*.vtt' {
+  const src: string;
+  export default src;
+}
+
+// fonts
+declare module '*.woff' {
+  const src: string;
+  export default src;
+}
+declare module '*.woff2' {
+  const src: string;
+  export default src;
+}
+declare module '*.eot' {
+  const src: string;
+  export default src;
+}
+declare module '*.ttf' {
+  const src: string;
+  export default src;
+}
+declare module '*.otf' {
+  const src: string;
+  export default src;
+}
+
+// other
+declare module '*.webmanifest' {
+  const src: string;
+  export default src;
+}
+declare module '*.pdf' {
+  const src: string;
+  export default src;
+}
+declare module '*.txt' {
+  const src: string;
+  export default src;
+}
+
+// wasm?init
+declare module '*.wasm?init' {
+  const initWasm: (options?: WebAssembly.Imports) => Promise<WebAssembly.Instance>;
+  export default initWasm;
+}
+
+// web worker
+declare module '*?worker' {
+  const workerConstructor: {
+    new(options?: { name?: string }): Worker;
+  };
+  export default workerConstructor;
+}
+
+declare module '*?worker&inline' {
+  const workerConstructor: {
+    new(options?: { name?: string }): Worker;
+  };
+  export default workerConstructor;
+}
+
+declare module '*?worker&url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?sharedworker' {
+  const sharedWorkerConstructor: {
+    new(options?: { name?: string }): SharedWorker;
+  };
+  export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&inline' {
+  const sharedWorkerConstructor: {
+    new(options?: { name?: string }): SharedWorker;
+  };
+  export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?raw' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?inline' {
+  const src: string;
+  export default src;
+}
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/client/index.tsx b/packages/plugins/@nocobase/plugin-locale-tester/src/client/index.tsx
new file mode 100644
index 0000000000..7ecfc9a69d
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/client/index.tsx
@@ -0,0 +1,124 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { useForm } from '@formily/react';
+import { ActionProps, ISchema, Plugin, SchemaComponent, useAPIClient, useApp, useRequest } from '@nocobase/client';
+import { Alert, App as AntdApp, Card, Spin } from 'antd';
+import React from 'react';
+import { useT } from './locale';
+
+function LocaleTester() {
+  const { data, loading } = useRequest<any>({
+    url: 'localeTester:get',
+  });
+  const t = useT();
+
+  const schema: ISchema = {
+    type: 'void',
+    name: 'root',
+    properties: {
+      test: {
+        type: 'void',
+        'x-component': 'FormV2',
+        properties: {
+          locale: {
+            type: 'string',
+            'x-decorator': 'FormItem',
+            'x-component': 'Input.JSON',
+            'x-component-props': {
+              autoSize: { minRows: 20, maxRows: 30 },
+            },
+            default: data?.data?.locale,
+            title: t('Translations'),
+          },
+          button: {
+            type: 'void',
+            'x-component': 'Action',
+            title: t('Submit'),
+            'x-use-component-props': 'useSubmitActionProps',
+          },
+        },
+      },
+    },
+  };
+
+  const useSubmitActionProps = () => {
+    const form = useForm();
+    const api = useAPIClient();
+    const { message } = AntdApp.useApp();
+    const app = useApp();
+
+    return {
+      type: 'primary',
+      htmlType: 'submit',
+      async onClick() {
+        await form.submit();
+        const values = form.values;
+        await api.request({
+          url: 'localeTester:updateOrCreate',
+          method: 'post',
+          params: {
+            filterKeys: ['id'],
+          },
+          data: {
+            id: data?.data?.id,
+            locale: values.locale,
+          },
+        });
+        message.success(app.i18n.t('Saved successfully!'));
+        window.location.reload();
+      },
+    };
+  };
+
+  if (loading) {
+    return <Spin />;
+  }
+  return (
+    <Card>
+      <Alert
+        style={{ marginBottom: 12 }}
+        description={
+          <div
+            dangerouslySetInnerHTML={{
+              __html: t(
+                `Please go to <a target="_blank" href="https://github.com/nocobase/locales">nocobase/locales</a> to get the language file that needs translation, then paste it below and provide the translation.`,
+              ),
+            }}
+          ></div>
+        }
+      />
+      <SchemaComponent schema={schema} scope={{ useSubmitActionProps }} />
+    </Card>
+  );
+}
+
+export class PluginLocaleTesterClient extends Plugin {
+  async afterAdd() {
+    // await this.app.pm.add()
+  }
+
+  async beforeLoad() {}
+
+  // You can get and modify the app instance here
+  async load() {
+    this.app.pluginSettingsManager.add('locale-tester', {
+      title: this.t('Locale tester'),
+      icon: 'TranslationOutlined',
+      Component: LocaleTester,
+    });
+    // this.app.addComponents({})
+    // this.app.addScopes({})
+    // this.app.addProvider()
+    // this.app.addProviders()
+    // this.app.router.add()
+  }
+}
+
+export default PluginLocaleTesterClient;
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/client/locale.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/client/locale.ts
new file mode 100644
index 0000000000..84797b7d1b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/client/locale.ts
@@ -0,0 +1,21 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// @ts-ignore
+import pkg from './../../package.json';
+import { useApp } from '@nocobase/client';
+
+export function useT() {
+  const app = useApp();
+  return (str: string) => app.i18n.t(str, { ns: [pkg.name, 'client'] });
+}
+
+export function tStr(key: string) {
+  return `{{t(${JSON.stringify(key)}, { ns: ['${pkg.name}', 'client'], nsMode: 'fallback' })}}`;
+}
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/index.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/index.ts
new file mode 100644
index 0000000000..be99a2ff1a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/index.ts
@@ -0,0 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export * from './server';
+export { default } from './server';
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-locale-tester/src/locale/en-US.json
new file mode 100644
index 0000000000..cc8bcdd470
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/locale/en-US.json
@@ -0,0 +1,5 @@
+{
+  "Locale": "Locale",
+  "Locale tester": "Locale tester",
+  "Please go to <a target=\"_blank\" href=\"https://github.com/nocobase/locales\">nocobase/locales</a> to get the language file that needs translation, then paste it below and provide the translation.": "Please go to <a target=\"_blank\" href=\"https://github.com/nocobase/locales\">nocobase/locales</a> to get the language file that needs translation, then paste it below and provide the translation."
+}
\ No newline at end of file
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-locale-tester/src/locale/zh-CN.json
new file mode 100644
index 0000000000..d4074a2ae0
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/locale/zh-CN.json
@@ -0,0 +1,5 @@
+{
+  "Translations": "翻译",
+  "Locale tester": "翻译测试工具",
+  "Please go to <a target=\"_blank\" href=\"https://github.com/nocobase/locales\">nocobase/locales</a> to get the language file that needs translation, then paste it below and provide the translation.": "请前往 <a target=\"_blank\" href=\"https://github.com/nocobase/locales\">nocobase/locales</a> 获取需要翻译的语言文件，粘贴到下方并进行翻译。"
+}
\ No newline at end of file
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/.gitkeep b/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/localeTester.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/localeTester.ts
new file mode 100644
index 0000000000..eceb54bbbc
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/localeTester.ts
@@ -0,0 +1,21 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { defineCollection } from '@nocobase/database';
+
+export default defineCollection({
+  name: 'localeTester',
+  autoGenId: true,
+  fields: [
+    {
+      type: 'json',
+      name: 'locale',
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/server/index.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/server/index.ts
new file mode 100644
index 0000000000..be989de7c3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/server/index.ts
@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export { default } from './plugin';
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/server/plugin.ts
new file mode 100644
index 0000000000..7c9367961a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/server/plugin.ts
@@ -0,0 +1,59 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Plugin } from '@nocobase/server';
+import _ from 'lodash';
+
+export class PluginLocaleTesterServer extends Plugin {
+  async afterAdd() {}
+
+  async beforeLoad() {
+    this.app.acl.registerSnippet({
+      name: `pm.${this.name}`,
+      actions: ['localeTester:*'],
+    });
+  }
+
+  async load() {
+    this.app.resourceManager.use(async (ctx, next) => {
+      await next();
+      const { resourceName, actionName } = ctx.action;
+      if (resourceName === 'app' && actionName === 'getLang') {
+        const repository = this.db.getRepository('localeTester');
+        const record = await repository.findOne();
+        const locale = record?.locale || {};
+        if (locale['cronstrue']) {
+          _.set(ctx.body, 'cronstrue', locale['cronstrue']);
+        }
+        if (locale['react-js-cron']) {
+          _.set(ctx.body, 'cron', locale['react-js-cron']);
+        }
+        Object.keys(locale).forEach((key) => {
+          if (key === 'cronstrue' || key === 'react-js-cron') {
+            return;
+          }
+          const value = locale[key];
+          _.set(ctx.body, ['resources', key], value);
+          const k = key.replace('@nocobase/', '').replace('@nocobase/plugin-', '');
+          _.set(ctx.body, ['resources', k], value);
+        });
+      }
+    });
+  }
+
+  async install() {}
+
+  async afterEnable() {}
+
+  async afterDisable() {}
+
+  async remove() {}
+}
+
+export default PluginLocaleTesterServer;
diff --git a/packages/plugins/@nocobase/plugin-localization/package.json b/packages/plugins/@nocobase/plugin-localization/package.json
index c39ed0da4e..eae73d9b08 100644
--- a/packages/plugins/@nocobase/plugin-localization/package.json
+++ b/packages/plugins/@nocobase/plugin-localization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-localization",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/localization-management",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/localization-management",
diff --git a/packages/plugins/@nocobase/plugin-localization/src/server/__tests__/source-manager.test.ts b/packages/plugins/@nocobase/plugin-localization/src/server/__tests__/source-manager.test.ts
index 755950534b..b0dd38bf55 100644
--- a/packages/plugins/@nocobase/plugin-localization/src/server/__tests__/source-manager.test.ts
+++ b/packages/plugins/@nocobase/plugin-localization/src/server/__tests__/source-manager.test.ts
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { MockDatabase, mockDatabase } from '@nocobase/database';
+import { createMockDatabase, MockDatabase } from '@nocobase/database';
 import { SourceManager } from '../source-manager';
 
 describe('source-manager', async () => {
@@ -16,7 +16,7 @@ describe('source-manager', async () => {
 
   beforeEach(async () => {
     sourceManager = new SourceManager();
-    db = mockDatabase();
+    db = await createMockDatabase();
   });
 
   afterEach(async () => {
diff --git a/packages/plugins/@nocobase/plugin-logger/package.json b/packages/plugins/@nocobase/plugin-logger/package.json
index bd442d115c..7e3f57a843 100644
--- a/packages/plugins/@nocobase/plugin-logger/package.json
+++ b/packages/plugins/@nocobase/plugin-logger/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "日志",
   "description": "Server-side logs, mainly including API request logs and system runtime logs, and allows to package and download log files.",
   "description.zh-CN": "服务端日志，主要包括接口请求日志和系统运行日志，并支持打包和下载日志文件。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/logger",
diff --git a/packages/plugins/@nocobase/plugin-map/package.json b/packages/plugins/@nocobase/plugin-map/package.json
index 4e002704cc..97772155f7 100644
--- a/packages/plugins/@nocobase/plugin-map/package.json
+++ b/packages/plugins/@nocobase/plugin-map/package.json
@@ -2,13 +2,13 @@
   "name": "@nocobase/plugin-map",
   "displayName": "Block: Map",
   "displayName.zh-CN": "区块：地图",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "Map block, support Gaode map and Google map, you can also extend more map types.",
   "description.zh-CN": "地图区块，支持高德地图和 Google 地图，你也可以扩展更多地图类型。",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
-  "homepage": "https://docs.nocobase.com/handbook/map",
-  "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/map",
+  "homepage": "https://docs.nocobase.com/handbook/block-map",
+  "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/block-map",
   "devDependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@amap/amap-jsapi-types": "^0.0.10",
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
index 589ef5185a..168cdb220c 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
@@ -32,10 +32,30 @@ const BaseConfiguration: React.FC<BaseConfigurationProps> = ({ type, children })
     return apiClient.resource(MapConfigurationResourceKey);
   }, [apiClient]);
 
-  const onSubmit = (values) => {
+  function removeInvisibleCharsFromObject(obj: Record<string, string>): Record<string, string | null> {
+    const cleanObj: Record<string, string | null> = {};
+    for (const [key, value] of Object.entries(obj)) {
+      if (typeof value === 'string') {
+        // 去除不可见字符
+        const cleanedValue = value.replace(/[\p{C}\p{Z}\p{Zl}\p{Zp}]+/gu, '');
+        // 如果清理后为空字符串，则赋值为 null
+        cleanObj[key] = cleanedValue || null;
+      }
+    }
+
+    return cleanObj;
+  }
+  const onSubmit = async (values) => {
+    // 移除不可见字符并更新表单值
+    const result = removeInvisibleCharsFromObject(values);
+    form.setFieldsValue(result);
+
+    // 等待表单值更新完成后再校验
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    await form.validateFields();
     resource
       .set({
-        ...values,
+        ...removeInvisibleCharsFromObject(values),
         type,
       })
       .then((res) => {
@@ -62,10 +82,18 @@ const AMapConfiguration = () => {
   const { t } = useMapTranslation();
   return (
     <BaseConfiguration type="amap">
-      <Form.Item required name="accessKey" label={t('Access key')}>
+      <Form.Item
+        rules={[{ required: true, message: t('Access key is required') }]}
+        name="accessKey"
+        label={t('Access key')}
+      >
         <TextAreaWithGlobalScope />
       </Form.Item>
-      <Form.Item required name="securityJsCode" label={t('securityJsCode or serviceHost')}>
+      <Form.Item
+        rules={[{ required: true, message: t('securityJsCode or serviceHost is required') }]}
+        name="securityJsCode"
+        label={t('securityJsCode or serviceHost')}
+      >
         <TextAreaWithGlobalScope />
       </Form.Item>
     </BaseConfiguration>
@@ -76,7 +104,7 @@ const GoogleMapConfiguration = () => {
   const { t } = useMapTranslation();
   return (
     <BaseConfiguration type="google">
-      <Form.Item required name="accessKey" label={t('Api key')}>
+      <Form.Item rules={[{ required: true, message: t('Api key is required') }]} name="accessKey" label={t('Api key')}>
         <TextAreaWithGlobalScope />
       </Form.Item>
     </BaseConfiguration>
diff --git a/packages/plugins/@nocobase/plugin-map/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-map/src/locale/it-IT.json
index c5483d21e8..bb16275a84 100644
--- a/packages/plugins/@nocobase/plugin-map/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-map/src/locale/it-IT.json
@@ -19,7 +19,7 @@
   "Enter keywords to search": "Inserisci parole chiave per la ricerca",
   "The AccessKey is incorrect, please check it": "La chiave di accesso non è corretta, controllala",
   "Please configure the AMap securityCode or serviceHost correctly": "Configura correttamente AMap securityCode o serviceHost",
-  "Map Manager": "Gestore Mappe",
+  "Map manager": "Gestore Mappe",
   "Configuration": "Configurazione",
   "Saved successfully": "Salvataggio riuscito",
   "Saved failed": "Salvataggio fallito",
diff --git a/packages/plugins/@nocobase/plugin-map/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-map/src/locale/zh-CN.json
index a55d5e3778..c8debc9810 100644
--- a/packages/plugins/@nocobase/plugin-map/src/locale/zh-CN.json
+++ b/packages/plugins/@nocobase/plugin-map/src/locale/zh-CN.json
@@ -47,5 +47,8 @@
   "Create map block": "创建地图区块",
   "Start point": "起点",
   "End point": "终点",
-  "Concatenation order field": "连接顺序字段"
+  "Concatenation order field": "连接顺序字段",
+  "securityJsCode or serviceHost is required": "securityJsCode 或 serviceHost 是必填",
+  "Access key is required": "访问密钥是必填",
+  "Api key is required": "Api key 是必填"
 }
diff --git a/packages/plugins/@nocobase/plugin-map/src/server/__tests__/fields.test.ts b/packages/plugins/@nocobase/plugin-map/src/server/__tests__/fields.test.ts
index 41b68d6e45..6efdd5281a 100644
--- a/packages/plugins/@nocobase/plugin-map/src/server/__tests__/fields.test.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/server/__tests__/fields.test.ts
@@ -8,7 +8,7 @@
  */
 
 import Database from '@nocobase/database';
-import { mockDatabase } from '@nocobase/test';
+import { createMockDatabase } from '@nocobase/test';
 import { CircleField, LineStringField, PointField, PolygonField } from '../fields';
 
 const data = {
@@ -32,7 +32,7 @@ describe('fields', () => {
   let db: Database;
 
   beforeEach(async () => {
-    db = mockDatabase();
+    db = await createMockDatabase();
     await db.clean({ drop: true });
     db.registerFieldTypes({
       point: PointField,
diff --git a/packages/plugins/@nocobase/plugin-mobile-client/package.json b/packages/plugins/@nocobase/plugin-mobile-client/package.json
index f7c5f97ad4..112e19f86f 100644
--- a/packages/plugins/@nocobase/plugin-mobile-client/package.json
+++ b/packages/plugins/@nocobase/plugin-mobile-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-mobile-client",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/mobile-client",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/mobile-client",
diff --git a/packages/plugins/@nocobase/plugin-mobile/package.json b/packages/plugins/@nocobase/plugin-mobile/package.json
index 53db3ac62c..cee4dc4d2f 100644
--- a/packages/plugins/@nocobase/plugin-mobile/package.json
+++ b/packages/plugins/@nocobase/plugin-mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-mobile",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/mobile",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/mobile",
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/ShowTipWhenNoPages.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/ShowTipWhenNoPages.tsx
index afbe8c7b9a..ad737d233a 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/ShowTipWhenNoPages.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/ShowTipWhenNoPages.tsx
@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+import { HighlightOutlined } from '@ant-design/icons';
 import { useDesignable } from '@nocobase/client';
 import { ErrorBlock } from 'antd-mobile';
 import _ from 'lodash';
@@ -23,10 +24,10 @@ export const ShowTipWhenNoPages: FC = ({ children }) => {
   if ((!designable || isMobile) && _.isEmpty(routeList)) {
     return (
       <ErrorBlock
-        status="empty"
+        image={<HighlightOutlined style={{ fontSize: '8em' }} />}
         fullPage
-        title={t('No accessible pages found')}
-        description={t('This might be due to permission configuration issues')}
+        title={t('No pages yet, please configure first')}
+        description={t('Click the "UI Editor" icon in the upper right corner to enter the UI Editor mode')}
       />
     );
   }
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/mobile-action-page/MobileActionPage.style.ts b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/mobile-action-page/MobileActionPage.style.ts
index e4c3540950..83b46cb8ad 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/mobile-action-page/MobileActionPage.style.ts
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/mobile-action-page/MobileActionPage.style.ts
@@ -21,10 +21,6 @@ export const useMobileActionPageStyle = genStyleHook('nb-mobile-action-page', (t
       bottom: 0,
       backgroundColor: token.colorBgLayout,
 
-      '.mobile-page-content > .nb-grid-container > .nb-grid > .nb-grid-warp > .ant-btn': {
-        margin: 20,
-      },
-
       '.nb-mobile-action-page-footer': {
         height: 'var(--nb-mobile-page-header-height)',
         paddingRight: 'var(--nb-mobile-page-tabs-content-padding)',
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/demos/DesktopMode-basic.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/demos/DesktopMode-basic.tsx
index 4db6026f42..4e2763269d 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/demos/DesktopMode-basic.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/demos/DesktopMode-basic.tsx
@@ -6,6 +6,8 @@ import React from 'react';
 
 const { apiClient, mockRequest } = mockAPIClient();
 
+apiClient.auth.setToken('test');
+
 mockRequest.onGet('/roles:check').reply(() => {
   return [
     200,
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/mobile-layout/mobile-tab-bar/styles.ts b/packages/plugins/@nocobase/plugin-mobile/src/client/mobile-layout/mobile-tab-bar/styles.ts
index 434308bcb4..db2cf1bbaf 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/mobile-layout/mobile-tab-bar/styles.ts
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/mobile-layout/mobile-tab-bar/styles.ts
@@ -28,6 +28,7 @@ export const useStyles = genStyleHook('nb-mobile-tab-bar', (token) => {
         alignItems: 'center',
         gap: '1em',
         height: '100%',
+        minHeight: 49,
       },
 
       '.mobile-tab-bar-list': {
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobilePicker.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobilePicker.tsx
index d02f503180..ac33034021 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobilePicker.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobilePicker.tsx
@@ -16,6 +16,7 @@ import { useTranslation } from 'react-i18next';
 const MobilePicker = connect(
   (props) => {
     const { value, onChange, disabled, options = [], mode } = props;
+    console.log(props);
     const { t } = useTranslation();
     const [visible, setVisible] = useState(false);
     const [selected, setSelected] = useState(value || []);
@@ -42,7 +43,7 @@ const MobilePicker = connect(
             disabled={disabled}
             value={value}
             dropdownStyle={{ display: 'none' }}
-            multiple={mode === 'multiple'}
+            multiple={['multiple', 'tags'].includes(mode)}
             onClear={() => {
               setVisible(false);
               onChange(null);
@@ -77,10 +78,10 @@ const MobilePicker = connect(
             }}
           >
             <CheckList
-              multiple={mode === 'multiple'}
+              multiple={['multiple', 'tags'].includes(mode)}
               value={Array.isArray(selected) ? selected : [selected] || []}
               onChange={(val) => {
-                if (mode === 'multiple') {
+                if (['multiple', 'tags'].includes(mode)) {
                   setSelected(val);
                 } else {
                   setSelected(val[0]);
@@ -96,7 +97,7 @@ const MobilePicker = connect(
               ))}
             </CheckList>
           </div>
-          {mode === 'multiple' && (
+          {['multiple', 'tags'].includes(mode) && (
             <Button block color="primary" onClick={handleConfirm} style={{ marginTop: '16px' }}>
               {t('Confirm')}
             </Button>
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/content/initializer.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/content/initializer.tsx
index 8026ff27ab..af89b5eb2b 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/content/initializer.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/content/initializer.tsx
@@ -15,9 +15,6 @@ export const mobileAddBlockInitializer = new SchemaInitializer({
   name: 'mobile:addBlock',
   icon: 'PlusOutlined',
   wrap: gridRowColWrap,
-  style: {
-    margin: 20,
-  },
   items: [
     {
       name: 'dataBlocks',
diff --git a/packages/plugins/@nocobase/plugin-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json
index edc114e691..8004cb3e8e 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/package.json
+++ b/packages/plugins/@nocobase/plugin-mock-collections/package.json
@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-mock-collections",
   "displayName": "mock-collections",
   "description": "mock-collections",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "peerDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
index 83a4b81292..eef94c1d18 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用管理器",
   "description": "Dynamically create multiple apps without separate deployments.",
   "description.zh-CN": "无需单独部署即可动态创建多个应用。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/multi-app-manager",
diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
index 1065babfb9..668c50a0bd 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用数据表共享",
   "description": "",
   "description.zh-CN": "",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "./dist/server/index.js",
   "devDependencies": {
     "@formily/react": "2.x",
diff --git a/packages/plugins/@nocobase/plugin-notification-email/package.json b/packages/plugins/@nocobase/plugin-notification-email/package.json
index 3449dd0296..680243a49c 100644
--- a/packages/plugins/@nocobase/plugin-notification-email/package.json
+++ b/packages/plugins/@nocobase/plugin-notification-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-email",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "displayName": "Notification: Email",
   "displayName.zh-CN": "通知：电子邮件",
   "description": "Used for sending email notifications with built-in SMTP transport.",
diff --git a/packages/plugins/@nocobase/plugin-notification-email/src/client/ConfigForm.tsx b/packages/plugins/@nocobase/plugin-notification-email/src/client/ConfigForm.tsx
index f1c0a8587f..c4c6c0470c 100644
--- a/packages/plugins/@nocobase/plugin-notification-email/src/client/ConfigForm.tsx
+++ b/packages/plugins/@nocobase/plugin-notification-email/src/client/ConfigForm.tsx
@@ -42,7 +42,7 @@ export const ChannelConfigForm = () => {
                     type: 'void',
                     'x-component': 'Grid.Col',
                     'x-component-props': {
-                      width: 50,
+                      width: 45,
                     },
                     properties: {
                       host: {
@@ -62,7 +62,7 @@ export const ChannelConfigForm = () => {
                     type: 'void',
                     'x-component': 'Grid.Col',
                     'x-component-props': {
-                      width: 25,
+                      width: 20,
                     },
                     properties: {
                       port: {
@@ -92,7 +92,7 @@ export const ChannelConfigForm = () => {
                     type: 'void',
                     'x-component': 'Grid.Col',
                     'x-component-props': {
-                      width: 25,
+                      width: 35,
                     },
                     properties: {
                       secure: {
@@ -100,6 +100,8 @@ export const ChannelConfigForm = () => {
                         title: '{{t("Secure")}}',
                         'x-decorator': 'FormItem',
                         'x-component': 'TextAreaWithGlobalScope',
+                        description:
+                          '{{t("In most cases, if using port 465, set it to true; otherwise, set it to false.")}}',
                         'x-component-props': {
                           boolean: true,
                           useTypedConstant: [['boolean', { style: { width: '100%' } }]],
diff --git a/packages/plugins/@nocobase/plugin-notification-email/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-notification-email/src/locale/zh-CN.json
index 6a74e27196..e29654a9eb 100644
--- a/packages/plugins/@nocobase/plugin-notification-email/src/locale/zh-CN.json
+++ b/packages/plugins/@nocobase/plugin-notification-email/src/locale/zh-CN.json
@@ -18,5 +18,6 @@
   "SMTP server host": "SMTP 服务器主机",
   "Content type": "内容格式",
   "Plain text": "纯文本",
-  "Transport": "传输方式"
+  "Transport": "传输方式",
+  "In most cases, if using port 465, set it to true; otherwise, set it to false.": "通常情况下，如果使用端口 465 ，请设置为 true ；否则，请设置为 false 。"
 }
diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json b/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json
index 0461847ab9..1d17c649e2 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-in-app-message",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "displayName": "Notification: In-app message",
   "displayName.zh-CN": "通知：站内信",
   "description": "It supports users in receiving real-time message notifications within the NocoBase application.",
diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/MessageList.tsx b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/MessageList.tsx
index c114023d2b..874c2d51e7 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/MessageList.tsx
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/MessageList.tsx
@@ -7,28 +7,36 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import React, { useState, useCallback } from 'react';
-import { observer } from '@formily/reactive-react';
 import { Schema } from '@formily/react';
-import { Card, Descriptions, Button, Spin, Tag, ConfigProvider, Typography, Tooltip, theme } from 'antd';
+import { observer } from '@formily/reactive-react';
 import { dayjs } from '@nocobase/utils/client';
+import { Button, Card, ConfigProvider, Descriptions, Spin, Tag, Tooltip, Typography, theme } from 'antd';
+import React, { useCallback, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useLocalTranslation } from '../../locale';
 
+import { useApp } from '@nocobase/client';
 import {
-  selectedChannelNameObs,
   channelMapObs,
   fetchMessages,
+  inboxVisible,
   isFecthingMessageObs,
+  selectedChannelNameObs,
   selectedMessageListObs,
   showMsgLoadingMoreObs,
   updateMessage,
-  inboxVisible,
 } from '../observables';
-import { useApp } from '@nocobase/client';
+
+function removeStringIfStartsWith(text: string, prefix: string): string {
+  if (text.startsWith(prefix)) {
+    return text.slice(prefix.length);
+  }
+  return text;
+}
 
 const MessageList = observer(() => {
   const app = useApp();
+  const basename = app.router.basename.replace(/\/+$/, '');
   const { t } = useLocalTranslation();
   const navigate = useNavigate();
   const { token } = theme.useToken();
@@ -51,7 +59,7 @@ const MessageList = observer(() => {
     if (message.options?.url) {
       inboxVisible.value = false;
       const url = message.options.url;
-      if (url.startsWith('/')) navigate(url);
+      if (url.startsWith('/')) navigate(removeStringIfStartsWith(url, basename));
       else {
         window.location.href = url;
       }
diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/locale/it-IT.json
index 8f0b8d40d1..c062312806 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/locale/it-IT.json
@@ -6,7 +6,7 @@
   "No more": "Non c'è altro",
   "Loading failed,": "Caricamento fallito,",
   "please reload": "ricarica",
-  "Detail": "Dettaglio",
+  "Detail": "Dettagli",
   "Content": "Contenuto",
   "Datetime": "Data e ora",
   "Status": "Stato",
@@ -14,11 +14,11 @@
   "Read": "Letto",
   "Unread": "Non letto",
   "In-app message": "Messaggio in-app",
-  "Receivers": "Destinatari",
-  "Channel name": "Nome canale",
+  "Receivers": "Destinatari",  
   "Message group name": "Nome gruppo messaggi",
   "Message title": "Titolo messaggio",
   "Message content": "Contenuto messaggio",
+  "detail URL": "dettagli URL",
   "Details page for desktop": "Pagina dettagli per desktop",
   "Support two types of links: internal links and external links. If using an internal link, the link starts with\"/\", for example, \"/admin\". If using an external link, the link starts with \"http\", for example, \"https://example.com\".": "Supporta due tipi di link: link interni e link esterni. Se si utilizza un link interno, il link inizia con \"/\", ad esempio, \"/admin\". Se si utilizza un link esterno, il link inizia con \"http\", ad esempio, \"https://example.com\".",
   "Mark as read": "Segna come letto",
diff --git a/packages/plugins/@nocobase/plugin-notification-manager/package.json b/packages/plugins/@nocobase/plugin-notification-manager/package.json
index a650ed14a5..32397f1558 100644
--- a/packages/plugins/@nocobase/plugin-notification-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-notification-manager/package.json
@@ -4,7 +4,7 @@
   "description": "Provides a unified management service that includes channel configuration, logging, and other features, supporting the configuration of various notification channels, including in-app message and email.",
   "displayName.zh-CN": "通知管理",
   "description.zh-CN": "提供统一的管理服务，涵盖渠道配置、日志记录等功能，支持多种通知渠道的配置，包括站内信和电子邮件等。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "homepage": "https://docs.nocobase.com/handbook/notification-manager",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/notification-manager",
   "main": "dist/server/index.js",
diff --git a/packages/plugins/@nocobase/plugin-notification-manager/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-notification-manager/src/locale/it-IT.json
index 326573c179..8810be949d 100644
--- a/packages/plugins/@nocobase/plugin-notification-manager/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-notification-manager/src/locale/it-IT.json
@@ -18,9 +18,9 @@
   "Channel display name": "Nome visualizzato canale",
   "Configure": "Configura",
   "Add new": "Aggiungi nuovo",
-  "Trigger From": "Attivato da",
+  "Trigger from": "Attivato da",
   "Status": "Stato",
-  "Created At": "Creato il",
+  "Created at": "Creato il",
   "Delete record": "Elimina record",
   "Are you sure you want to delete it?": "Sei sicuro di volerlo eliminare?",
   "Deleted successfully!": "Eliminato con successo!",
@@ -32,7 +32,7 @@
   "Select user": "Seleziona utente",
   "No channel enabled yet": "Nessun canale ancora abilitato",
   "Success": "Successo",
-  "Fail": "Fallito",
+  "Failure": "Fallimento",
   "Reason": "Motivo",
   "Failed reason": "Motivo fallimento",
   "Log detail": "Dettaglio registro",
diff --git a/packages/plugins/@nocobase/plugin-notifications/package.json b/packages/plugins/@nocobase/plugin-notifications/package.json
index 95b955841b..462c7ddd51 100644
--- a/packages/plugins/@nocobase/plugin-notifications/package.json
+++ b/packages/plugins/@nocobase/plugin-notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notifications",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
diff --git a/packages/plugins/@nocobase/plugin-public-forms/package.json b/packages/plugins/@nocobase/plugin-public-forms/package.json
index bec95738a5..51f6b318a1 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/package.json
+++ b/packages/plugins/@nocobase/plugin-public-forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-public-forms",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "displayName": "Public forms",
   "displayName.zh-CN": "公开表单",
diff --git a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx
index e0ef14cb01..b62b6e8b29 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx
+++ b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx
@@ -24,6 +24,7 @@ import {
   TextAreaWithGlobalScope,
   ApplicationContext,
   useGlobalVariable,
+  useCompile,
 } from '@nocobase/client';
 import {
   Breadcrumb,
@@ -71,6 +72,7 @@ export function AdminPublicFormPage() {
   const { t } = usePublicFormTranslation();
   const { theme } = useGlobalTheme();
   const apiClient = useAPIClient();
+  const compile = useCompile();
   const { token } = AntdTheme.useToken();
   const app = useApp();
   const environmentCtx = useGlobalVariable('$env');
@@ -145,12 +147,13 @@ export function AdminPublicFormPage() {
         }}
       >
         <Breadcrumb
+          style={{ marginLeft: '10px' }}
           items={[
             {
               title: <Link to={`/admin/settings/public-forms`}>{t('Public forms', { ns: NAMESPACE })}</Link>,
             },
             {
-              title: title,
+              title: compile(title),
             },
           ]}
         />
diff --git a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx
index b3ad843f22..4973888367 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx
+++ b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx
@@ -28,6 +28,7 @@ import {
   useApp,
   useRequest,
   VariablesProvider,
+  useCompile,
 } from '@nocobase/client';
 import { Input, Modal, Spin } from 'antd';
 import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
@@ -35,7 +36,6 @@ import { isDesktop } from 'react-device-detect';
 import { useParams } from 'react-router';
 import { usePublicSubmitActionProps } from '../hooks';
 import { UnEnabledFormPlaceholder, UnFoundFormPlaceholder } from './UnEnabledFormPlaceholder';
-
 import { Button as MobileButton, Dialog as MobileDialog } from 'antd-mobile';
 import { MobileDateTimePicker } from './components/MobileDatePicker';
 import { MobilePicker } from './components/MobilePicker';
@@ -83,6 +83,14 @@ function PublicAPIClientProvider({ children }) {
   return <APIClientProvider apiClient={apiClient}>{children}</APIClientProvider>;
 }
 
+function useTitle(data) {
+  const compile = useCompile();
+  useEffect(() => {
+    if (!data) return;
+    document.title = compile(data?.data?.title);
+  }, [data]);
+}
+
 export const PublicFormMessageContext = createContext<any>({});
 export const PageBackgroundColor = '#f5f5f5';
 
@@ -174,6 +182,7 @@ function InternalPublicForm() {
   );
   const [pwd, setPwd] = useState('');
   const ctx = useContext(SchemaComponentContext);
+  useTitle(data);
   // 设置的移动端 meta
   useEffect(() => {
     if (!isDesktop) {
diff --git a/packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts
index 6b04a5bac1..7a8c4ae98b 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts
@@ -73,6 +73,7 @@ export class PluginPublicFormsServer extends Plugin {
     const keys = instance.collection.split(':');
     const collectionName = keys.pop();
     const dataSourceKey = keys.pop() || 'main';
+    const title = instance.get('title');
     const schema = await uiSchema.getJsonSchema(filterByTk);
     const { getAssociationAppends } = parseAssociationNames(dataSourceKey, collectionName, this.app, schema);
     const { appends } = getAssociationAppends();
@@ -94,6 +95,7 @@ export class PluginPublicFormsServer extends Plugin {
         },
       ),
       schema,
+      title,
     };
   }
 
@@ -169,7 +171,7 @@ export class PluginPublicFormsServer extends Plugin {
         skip: true,
       };
     } else if (
-      (actionName === 'list' && ctx.PublicForm['targetCollections'].includes(resourceName)) ||
+      (['list', 'get'].includes(actionName) && ctx.PublicForm['targetCollections'].includes(resourceName)) ||
       (collection.options.template === 'file' && actionName === 'create') ||
       (resourceName === 'storages' && actionName === 'getBasicInfo') ||
       (resourceName === 'map-configuration' && actionName === 'get')
diff --git a/packages/plugins/@nocobase/plugin-sample-hello/package.json b/packages/plugins/@nocobase/plugin-sample-hello/package.json
index da131e7edf..7f06acda1c 100644
--- a/packages/plugins/@nocobase/plugin-sample-hello/package.json
+++ b/packages/plugins/@nocobase/plugin-sample-hello/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-sample-hello",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "./dist/server/index.js",
   "displayName": "Hello",
   "displayName.zh-CN": "Hello",
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/package.json b/packages/plugins/@nocobase/plugin-snapshot-field/package.json
index f99807627f..735336ef3e 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/package.json
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：关系快照",
   "description": "When adding a new record, create a snapshot for its relational record and save in the new record. The snapshot will not be updated when the relational record is updated.",
   "description.zh-CN": "在添加数据时，为它的关系数据创建快照，并保存在当前的数据中。关系数据更新时，快照不会更新。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-snapshot",
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-snapshot-field/src/locale/it-IT.json
index d8046c85b6..49e39c1495 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/locale/it-IT.json
@@ -2,7 +2,7 @@
   "Detail": "Dettaglio",
   "Snapshot": "Snapshot",  
   "Add block": "Aggiungi blocco",
-  "When adding a new record, create a snapshot for its relational record and save in the current record. The snapshot is not updated when the record is subsequently updated.": "Quando si aggiunge un nuovo record, crea uno snapshot del suo record relazionale e salvalo nel record corrente. Lo snapshot non viene aggiornato quando il record viene successivamente aggiornato.",
+  "When adding a new record, create a snapshot for its relational record and save in the new record. The snapshot will not be updated when the relational record is updated.": "Quando si aggiunge un nuovo record, crea uno snapshot del suo record relazionale e salvalo nel nuovo record. Quando il record relazionale viene aggiornato lo snapshot non verrà aggiornato .",
   "View record": "Visualizza record",
   "Allow linking to multiple records": "Consenti collegamento a più record",  
   "The association field to snapshot": "Campo di associazione per lo snapshot",
diff --git a/packages/plugins/@nocobase/plugin-system-settings/package.json b/packages/plugins/@nocobase/plugin-system-settings/package.json
index 7f04122728..7d4a96653c 100644
--- a/packages/plugins/@nocobase/plugin-system-settings/package.json
+++ b/packages/plugins/@nocobase/plugin-system-settings/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "系统设置",
   "description": "Used to adjust the system title, logo, language, etc.",
   "description.zh-CN": "用于调整系统的标题、LOGO、语言等。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/system-settings",
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/package.json b/packages/plugins/@nocobase/plugin-theme-editor/package.json
index a49e502d25..e7cbc6924b 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/package.json
+++ b/packages/plugins/@nocobase/plugin-theme-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-theme-editor",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/theme-editor",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/theme-editor",
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
index 30e77b4e05..2a0c0e1f14 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "UI schema 存储服务",
   "description": "Provides centralized UI schema storage service.",
   "description.zh-CN": "提供中心化的 UI schema 存储服务。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/ui-schema-storage",
diff --git a/packages/plugins/@nocobase/plugin-user-data-sync/package.json b/packages/plugins/@nocobase/plugin-user-data-sync/package.json
index bb047cdd72..4af7bfd597 100644
--- a/packages/plugins/@nocobase/plugin-user-data-sync/package.json
+++ b/packages/plugins/@nocobase/plugin-user-data-sync/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "用户数据同步",
   "description": "Reigster and manage extensible user data synchronization sources, with HTTP API provided by default. Support for synchronizing data to resources such as users and departments.",
   "description.zh-CN": "注册和管理可扩展的用户数据同步来源，默认提供 HTTP API。支持向用户和部门等资源同步数据。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-users/package.json b/packages/plugins/@nocobase/plugin-users/package.json
index 5c5cb5de73..38c3bc12db 100644
--- a/packages/plugins/@nocobase/plugin-users/package.json
+++ b/packages/plugins/@nocobase/plugin-users/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "用户",
   "description": "Provides basic user model, as well as created by and updated by fields.",
   "description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/users",
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/actions/users.ts b/packages/plugins/@nocobase/plugin-users/src/server/actions/users.ts
index ae2ab602bc..a002aaa929 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/actions/users.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/actions/users.ts
@@ -12,16 +12,39 @@ import { UiSchemaRepository } from '@nocobase/plugin-ui-schema-storage';
 import _ from 'lodash';
 import { namespace } from '..';
 import { ValidationError, ValidationErrorItem } from 'sequelize';
-import PluginSystemSettingsServer from '@nocobase/plugin-system-settings';
+
+function findNonVoidTypeObjects(obj: any, path = '', results = []): { name: string; props: any }[] {
+  for (const key in obj) {
+    const value = obj[key];
+
+    const currentPath = path ? `${path}.${key}` : key;
+
+    if (value && typeof value === 'object') {
+      if (value.type && value.type !== 'void') {
+        results.push({
+          name: key,
+          props: value,
+        });
+      }
+
+      if (value.properties) {
+        findNonVoidTypeObjects(value.properties, `${currentPath}.properties`, results);
+      } else {
+        findNonVoidTypeObjects(value, currentPath, results);
+      }
+    }
+  }
+
+  return results;
+}
 
 function parseProfileFormSchema(schema: any) {
   const properties = _.get(schema, 'properties.form.properties.edit.properties.grid.properties') || {};
   const fields = [];
   const requiredFields = [];
-  Object.values(properties).forEach((row: any) => {
-    const col = Object.values(row.properties)[0] as any;
-    const [name, props] = Object.entries(col.properties)[0];
-    if (props['x-read-pretty'] || props['x-disable']) {
+  const configs = findNonVoidTypeObjects(properties);
+  Object.values(configs).forEach(({ name, props }) => {
+    if (props['x-read-pretty'] || props['x-disabled']) {
       return;
     }
     if (props['required']) {
diff --git a/packages/plugins/@nocobase/plugin-verification/package.json b/packages/plugins/@nocobase/plugin-verification/package.json
index 93f4f5d5aa..7dbd553d80 100644
--- a/packages/plugins/@nocobase/plugin-verification/package.json
+++ b/packages/plugins/@nocobase/plugin-verification/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "验证码",
   "description": "verification setting.",
   "description.zh-CN": "验证码配置。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/verification",
diff --git a/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json b/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json
index 0db458aef4..d9633d514a 100644
--- a/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：操作后事件",
   "description": "Triggered after the completion of a request initiated through an action button or API, such as after adding, updating, deleting data, or \"submit to workflow\". Suitable for data processing, sending notifications, etc., after actions are completed.",
   "description.zh-CN": "通过操作按钮或 API 发起请求并在执行完成后触发，比如新增、更新、删除数据或者“提交至工作流”之后。适用于在操作完成后进行数据处理、发送通知等。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/plugins/workflow-action-trigger",
diff --git a/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/locale/it-IT.json
index fccf898cf0..e3e482f32b 100644
--- a/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/locale/it-IT.json
@@ -1,9 +1,17 @@
 {
-  "Form event": "Evento modulo",
-  "Event triggers when submitted a workflow bound form action.": "L'evento si attiva quando viene inviata un'azione di un modulo associato a un workflow.",
-  "Form data model": "Modello dati modulo",
-  "Use a collection to match form data.": "Utilizza una raccolta per abbinare i dati del modulo.",
+  "Post-action event": "Evento post-azione",
+  "Triggered after the completion of a request initiated through an action button or API, such as after adding or updating data. Suitable for data processing, sending notifications, etc., after actions are completed.":
+    "Attivato dopo il completamento con esito positivo di una richiesta avviata tramite un pulsante di azione o un'API, ad esempio dopo l'aggiunta o l'aggiornamento di dati. Adatto per l'elaborazione dei dati, l'invio di notifiche, ecc. dopo il completamento delle azioni.",  
+  "Collection": "Raccolta",
+  "The collection to which the triggered data belongs.": "La raccolta a cui appartengono i dati attivati.",
+  "Trigger mode": "Modalità di attivazione",
+  "Local mode, triggered after the completion of actions bound to this workflow": "Modalità locale, attivata dopo il completamento delle azioni associate a questo workflow",
+  "Global mode, triggered after the completion of the following actions": "Modalità globale, attivata dopo il completamento delle seguenti azioni",
+  "Select actions": "Seleziona azioni",
+  "Create record action": "Azione di creazione record",
+  "Update record action": "Azione di aggiornamento record",
   "Associations to use": "Associazioni da utilizzare",
-  "User submitted form": "Modulo inviato dall'utente",
-  "Role of user submitted form": "Ruolo del modulo inviato dall'utente"
+  "Trigger data": "Dati attivazione",
+  "User acted": "Utente che ha agito",
+  "Role of user acted": "Ruolo dell'utente che ha agito"
 }
diff --git a/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/server/ActionTrigger.ts b/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/server/ActionTrigger.ts
index df577cf496..3c970d84f5 100644
--- a/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/server/ActionTrigger.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/server/ActionTrigger.ts
@@ -174,7 +174,7 @@ export default class extends Trigger {
               });
             }
           }
-          event.push({ data: toJSON(payload), ...userInfo });
+          (workflow.sync ? syncGroup : asyncGroup).push([workflow, { data: toJSON(payload), ...userInfo }]);
         }
       } else {
         const { filterTargetKey, repository } = (<Application>context.app).dataSourceManager.dataSources
@@ -188,9 +188,8 @@ export default class extends Trigger {
             appends,
           });
         }
-        event.push({ data, ...userInfo });
+        (workflow.sync ? syncGroup : asyncGroup).push([workflow, { data, ...userInfo }]);
       }
-      (workflow.sync ? syncGroup : asyncGroup).push(event);
     }
 
     for (const event of syncGroup) {
diff --git a/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/server/__tests__/trigger.test.ts b/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/server/__tests__/trigger.test.ts
index 8654bf9b4c..d29d71facf 100644
--- a/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/server/__tests__/trigger.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/server/__tests__/trigger.test.ts
@@ -260,6 +260,40 @@ describe('workflow > action-trigger', () => {
       expect(e2.context.data).toHaveProperty('title', 't2');
       expect(e2.context.data).toHaveProperty('createdBy');
     });
+
+    it('bulk update', async () => {
+      const workflow = await WorkflowModel.create({
+        enabled: true,
+        type: 'action',
+        config: {
+          collection: 'posts',
+        },
+      });
+
+      const p1 = await PostRepo.create({
+        values: { title: 't1' },
+      });
+      const p2 = await PostRepo.create({
+        values: { title: 't2' },
+      });
+
+      const res1 = await userAgents[0].resource('posts').update({
+        filter: {
+          id: [p1.id, p2.id],
+        },
+        values: { title: 't3' },
+        triggerWorkflows: `${workflow.key}`,
+      });
+
+      await sleep(500);
+
+      const e1s = await workflow.getExecutions();
+      expect(e1s.length).toBe(2);
+      expect(e1s[0].status).toBe(EXECUTION_STATUS.RESOLVED);
+      expect(e1s[0].context.data).toHaveProperty('title', 't3');
+      expect(e1s[1].status).toBe(EXECUTION_STATUS.RESOLVED);
+      expect(e1s[1].context.data).toHaveProperty('title', 't3');
+    });
   });
 
   describe.skip('destroy', () => {
diff --git a/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json b/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
index 4929bef5a6..df8b17e6db 100644
--- a/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：聚合查询节点",
   "description": "Used to aggregate data against the database in workflow, such as: statistics, sum, average, etc.",
   "description.zh-CN": "可用于在工作流中对数据库进行聚合查询，如：统计数量、求和、平均值等。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-aggregate",
diff --git a/packages/plugins/@nocobase/plugin-workflow-aggregate/src/client/__e2e__/DataOfCollection.test.ts b/packages/plugins/@nocobase/plugin-workflow-aggregate/src/client/__e2e__/DataOfCollection.test.ts
index 492bfd181e..f3fbfecae2 100644
--- a/packages/plugins/@nocobase/plugin-workflow-aggregate/src/client/__e2e__/DataOfCollection.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-aggregate/src/client/__e2e__/DataOfCollection.test.ts
@@ -351,7 +351,7 @@ test.describe('filter', () => {
       aggregateNodeCollectionData.reduce((total, currentValue) => {
         return currentValue.staffnum > 3 ? total + currentValue.staffnum : total;
       }, 0) / aggregateNodeCollectionDataCount;
-    expect(aggregateNodeJobResult).toBe(round(aggregateNodeCollectionDataAvg, 14));
+    expect(aggregateNodeJobResult).toBe(round(aggregateNodeCollectionDataAvg, 2));
     // 4、后置处理：删除工作流
     await apiDeleteWorkflow(workflowId);
   });
diff --git a/packages/plugins/@nocobase/plugin-workflow-delay/package.json b/packages/plugins/@nocobase/plugin-workflow-delay/package.json
index fe2ef5754c..c0bc7c4308 100644
--- a/packages/plugins/@nocobase/plugin-workflow-delay/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-delay/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：延时节点",
   "description": "Could be used in workflow parallel branch for waiting other branches.",
   "description.zh-CN": "可用于工作流并行分支中等待其他分支执行完成。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-delay",
diff --git a/packages/plugins/@nocobase/plugin-workflow-delay/src/client/DelayInstruction.tsx b/packages/plugins/@nocobase/plugin-workflow-delay/src/client/DelayInstruction.tsx
index 81935fa347..245f1d6270 100644
--- a/packages/plugins/@nocobase/plugin-workflow-delay/src/client/DelayInstruction.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow-delay/src/client/DelayInstruction.tsx
@@ -8,11 +8,10 @@
  */
 
 import React from 'react';
-import { InputNumber, Select } from 'antd';
+import { Space } from 'antd';
 import { HourglassOutlined } from '@ant-design/icons';
 
-import { css, useCompile } from '@nocobase/client';
-import { Instruction, JOB_STATUS } from '@nocobase/plugin-workflow/client';
+import { Instruction, JOB_STATUS, WorkflowVariableInput } from '@nocobase/plugin-workflow/client';
 
 import { NAMESPACE } from '../locale';
 
@@ -24,47 +23,6 @@ const UnitOptions = [
   { value: 604800_000, label: `{{t('Weeks', { ns: "workflow" })}}` },
 ];
 
-function getNumberOption(v) {
-  return UnitOptions.slice()
-    .reverse()
-    .find((item) => !(v % item.value));
-}
-
-function Duration({ value = 60000, onChange }) {
-  const compile = useCompile();
-  const option = getNumberOption(value);
-  const quantity = Math.round(value / option.value);
-
-  return (
-    <fieldset
-      className={css`
-        display: flex;
-        gap: 0.5em;
-      `}
-    >
-      <InputNumber
-        min={1}
-        value={quantity}
-        onChange={(v) => onChange(Math.round(v * option.value))}
-        className="auto-width"
-      />
-      <Select
-        // @ts-ignore
-        role="button"
-        data-testid="select-time-unit"
-        popupMatchSelectWidth={false}
-        value={option.value}
-        onChange={(unit) => onChange(Math.round(quantity * unit))}
-        className="auto-width"
-        options={UnitOptions.map((item) => ({
-          value: item.value,
-          label: compile(item.label),
-        }))}
-      />
-    </fieldset>
-  );
-}
-
 export default class extends Instruction {
   title = `{{t("Delay", { ns: "${NAMESPACE}" })}}`;
   type = 'delay';
@@ -73,12 +31,40 @@ export default class extends Instruction {
   icon = (<HourglassOutlined style={{}} />);
   fieldset = {
     duration: {
-      type: 'number',
+      type: 'void',
       title: `{{t("Duration", { ns: "${NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
-      'x-component': 'Duration',
-      default: 60000,
+      'x-component': 'Space.Compact',
       required: true,
+      properties: {
+        unit: {
+          type: 'number',
+          'x-decorator': 'FormItem',
+          'x-component': 'Select',
+          'x-component-props': {
+            placeholder: `{{t("Unit", { ns: "${NAMESPACE}" })}}`,
+            className: 'auto-width',
+            allowClear: false,
+          },
+          enum: UnitOptions,
+          default: 60_000,
+        },
+        duration: {
+          type: 'number',
+          'x-decorator': 'FormItem',
+          'x-component': 'WorkflowVariableInput',
+          'x-component-props': {
+            placeholder: `{{t("Duration", { ns: "${NAMESPACE}" })}}`,
+            useTypedConstant: [['number', { min: 1 }]],
+            nullable: false,
+            parseOptions: {
+              defaultTypeOnNull: 'number',
+            },
+          },
+          default: 1,
+          required: true,
+        },
+      },
     },
     endStatus: {
       type: 'number',
@@ -94,7 +80,8 @@ export default class extends Instruction {
     },
   };
   components = {
-    Duration,
+    WorkflowVariableInput,
+    Space,
   };
   isAvailable({ engine, workflow, upstream, branchIndex }) {
     return !engine.isWorkflowSync(workflow);
diff --git a/packages/plugins/@nocobase/plugin-workflow-delay/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-workflow-delay/src/locale/zh-CN.json
index 0eb731514f..bee971650b 100644
--- a/packages/plugins/@nocobase/plugin-workflow-delay/src/locale/zh-CN.json
+++ b/packages/plugins/@nocobase/plugin-workflow-delay/src/locale/zh-CN.json
@@ -2,6 +2,7 @@
   "Delay": "延时",
   "Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.": "延时一段时间，然后继续或退出流程。可以用于并行分支中等待其他分支或设置超时时间。",
   "Duration": "时长",
+  "Unit": "单位",
   "End status": "到时状态",
   "Select status": "选择状态",
   "Succeed and continue": "通过并继续",
diff --git a/packages/plugins/@nocobase/plugin-workflow-delay/src/server/DelayInstruction.ts b/packages/plugins/@nocobase/plugin-workflow-delay/src/server/DelayInstruction.ts
index a4d476a6a2..3edebcc85f 100644
--- a/packages/plugins/@nocobase/plugin-workflow-delay/src/server/DelayInstruction.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-delay/src/server/DelayInstruction.ts
@@ -74,7 +74,7 @@ export default class extends Instruction {
   schedule(job) {
     const now = new Date();
     const createdAt = Date.parse(job.createdAt);
-    const delay = createdAt + job.node.config.duration - now.getTime();
+    const delay = createdAt + job.result - now.getTime();
     if (delay > 0) {
       const trigger = this.trigger.bind(this, job);
       this.timers.set(job.id, setTimeout(trigger, delay));
@@ -96,9 +96,10 @@ export default class extends Instruction {
   }
 
   async run(node, prevJob, processor: Processor) {
+    const duration = processor.getParsedValue(node.config.duration || 1, node.id) * (node.config.unit || 1_000);
     const job = await processor.saveJob({
       status: JOB_STATUS.PENDING,
-      result: null,
+      result: duration,
       nodeId: node.id,
       nodeKey: node.key,
       upstreamId: prevJob?.id ?? null,
diff --git a/packages/plugins/@nocobase/plugin-workflow-delay/src/server/__tests__/instruction.test.ts b/packages/plugins/@nocobase/plugin-workflow-delay/src/server/__tests__/instruction.test.ts
index 464d572cab..1335c06997 100644
--- a/packages/plugins/@nocobase/plugin-workflow-delay/src/server/__tests__/instruction.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-delay/src/server/__tests__/instruction.test.ts
@@ -47,7 +47,8 @@ describe('workflow > instructions > delay', () => {
       const n1 = await workflow.createNode({
         type: 'delay',
         config: {
-          duration: 2000,
+          duration: 2,
+          unit: 1000,
           endStatus: JOB_STATUS.RESOLVED,
         },
       });
@@ -73,7 +74,8 @@ describe('workflow > instructions > delay', () => {
       const n1 = await workflow.createNode({
         type: 'delay',
         config: {
-          duration: 2000,
+          duration: 2,
+          unit: 1000,
           endStatus: JOB_STATUS.FAILED,
         },
       });
@@ -95,11 +97,49 @@ describe('workflow > instructions > delay', () => {
       expect(j2.status).toBe(JOB_STATUS.FAILED);
     });
 
+    it('duration by variable', async () => {
+      const n1 = await workflow.createNode({
+        type: 'echoVariable',
+        config: {
+          variable: 2,
+        },
+      });
+
+      const n2 = await workflow.createNode({
+        type: 'delay',
+        config: {
+          duration: `{{$jobsMapByNodeKey.${n1.key}}}`,
+          unit: 1000,
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+        upstreamId: n1.id,
+      });
+
+      await n1.setDownstream(n2);
+
+      const post = await PostRepo.create({ values: { title: 't1' } });
+
+      await sleep(500);
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toEqual(EXECUTION_STATUS.STARTED);
+      const [, j1] = await e1.getJobs({ order: [['id', 'ASC']] });
+      expect(j1.status).toBe(JOB_STATUS.PENDING);
+
+      await sleep(2000);
+
+      const [e2] = await workflow.getExecutions();
+      expect(e2.status).toEqual(EXECUTION_STATUS.RESOLVED);
+      const [, j2] = await e2.getJobs({ order: [['id', 'ASC']] });
+      expect(j2.status).toBe(JOB_STATUS.RESOLVED);
+    });
+
     it('delay to resolve and downstream node error', async () => {
       const n1 = await workflow.createNode({
         type: 'delay',
         config: {
-          duration: 2000,
+          duration: 2,
+          unit: 1000,
           endStatus: JOB_STATUS.RESOLVED,
         },
       });
@@ -139,7 +179,8 @@ describe('workflow > instructions > delay', () => {
       await workflow.createNode({
         type: 'delay',
         config: {
-          duration: 2000,
+          duration: 2,
+          unit: 1000,
           endStatus: JOB_STATUS.RESOLVED,
         },
       });
diff --git a/packages/plugins/@nocobase/plugin-workflow-delay/src/server/__tests__/migrations/20250403223032-add-duration-unit.test.ts b/packages/plugins/@nocobase/plugin-workflow-delay/src/server/__tests__/migrations/20250403223032-add-duration-unit.test.ts
new file mode 100644
index 0000000000..addafa71a1
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-delay/src/server/__tests__/migrations/20250403223032-add-duration-unit.test.ts
@@ -0,0 +1,86 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { createMockServer } from '@nocobase/test';
+import Migration from '../../migrations/20250403223032-add-duration-unit';
+
+describe('20250403223032-add-duration-unit', () => {
+  let app;
+  let migration;
+  let NodeRepo;
+
+  beforeEach(async () => {
+    app = await createMockServer({
+      plugins: ['nocobase'],
+    });
+    await app.version.update('1.6.0');
+
+    migration = new Migration({ db: app.db, app } as any);
+
+    NodeRepo = app.db.getRepository('flow_nodes');
+  });
+
+  afterEach(async () => {
+    await app.destroy();
+  });
+
+  it(`duration as null`, async () => {
+    const n1 = await NodeRepo.create({
+      values: {
+        type: 'delay',
+        config: {},
+      },
+    });
+
+    await migration.up();
+
+    const n2 = await NodeRepo.findOne({
+      filterByTk: n1.id,
+    });
+    expect(n2.config.duration).toBeFalsy();
+  });
+
+  it(`duration as number (second)`, async () => {
+    const n1 = await NodeRepo.create({
+      values: {
+        type: 'delay',
+        config: {
+          duration: 1000,
+        },
+      },
+    });
+
+    await migration.up();
+
+    const n2 = await NodeRepo.findOne({
+      filterByTk: n1.id,
+    });
+    expect(n2.config.duration).toBe(1);
+    expect(n2.config.unit).toBe(1000);
+  });
+
+  it(`duration as number (day)`, async () => {
+    const n1 = await NodeRepo.create({
+      values: {
+        type: 'delay',
+        config: {
+          duration: 1000 * 60 * 60 * 24 * 2,
+        },
+      },
+    });
+
+    await migration.up();
+
+    const n2 = await NodeRepo.findOne({
+      filterByTk: n1.id,
+    });
+    expect(n2.config.duration).toBe(2);
+    expect(n2.config.unit).toBe(1000 * 60 * 60 * 24);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-workflow-delay/src/server/migrations/20250403223032-add-duration-unit.ts b/packages/plugins/@nocobase/plugin-workflow-delay/src/server/migrations/20250403223032-add-duration-unit.ts
new file mode 100644
index 0000000000..9c5600caa3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-delay/src/server/migrations/20250403223032-add-duration-unit.ts
@@ -0,0 +1,54 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Migration } from '@nocobase/server';
+
+const UnitOptions = [604800_000, 86400_000, 3600_000, 60_000, 1_000];
+
+function getNumberOption(v) {
+  return UnitOptions.find((item) => !(v % item));
+}
+
+export default class extends Migration {
+  appVersion = '<1.7.0';
+  async up() {
+    const { db } = this.context;
+
+    const NodeRepo = db.getRepository('flow_nodes');
+    await db.sequelize.transaction(async (transaction) => {
+      const nodes = await NodeRepo.find({
+        filter: {
+          type: 'delay',
+        },
+        transaction,
+      });
+
+      await nodes.reduce(
+        (promise, node) =>
+          promise.then(async () => {
+            if (node.config.unit) {
+              return;
+            }
+            if (!node.config.duration) {
+              return;
+            }
+            const unit = getNumberOption(node.config.duration);
+            const duration = node.config.duration / unit;
+            node.set('config', { ...node.config, duration, unit });
+            node.changed('config', true);
+            await node.save({
+              silent: true,
+              transaction,
+            });
+          }),
+        Promise.resolve(),
+      );
+    });
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
index 0a8b794a0a..afed0f797c 100644
--- a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：动态表达式计算节点",
   "description": "Useful plugin for doing dynamic calculation based on expression collection records in workflow.",
   "description.zh-CN": "用于在工作流中进行基于数据行的动态表达式计算。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-dynamic-calculation",
diff --git a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/locale/it-IT.json
index de4ad60b2a..11fabc54a9 100644
--- a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/locale/it-IT.json
@@ -1,11 +1,12 @@
 {
-  "Dynamic Calculation": "Calcolo dinamico",
+  "Expression": "Espressione",
+  "Dynamic expression calculation": "Calcolo dinamico",
   "Calculate an expression based on a calculation engine and obtain a value as the result. Variables in the upstream nodes can be used in the expression. The expression is dynamic one from an expression collections.": "Calcola un'espressione basata su un motore di calcolo e ottiene un valore come risultato. Nell'espressione è possibile utilizzare variabili dai nodi upstream. L'espressione è ottenuta dinamicamente da una raccolta di espressioni.",
   "Select dynamic expression": "Seleziona espressione dinamica",
   "Select the dynamic expression queried from the upstream node. You need to query it from an expression collection.": "Seleziona l'espressione dinamica interrogata dal nodo upstream. È necessario interrogarla da una raccolta di espressioni.",
   "Variable datasource": "Origine dati variabile",
   "Dynamic expression": "Espressione dinamica",
-  "An expression for calculation in each rows": "Un'espressione per il calcolo in ogni riga",
+  "Used to store expressions for use in workflows so that different expressions can be called for different data.": "Utilizzato per memorizzare espressioni da usare nei workflow in modo che per dati diversi possano essere chiamate espressioni diverse",
   "Unconfigured": "Non configurato",
   "Calculation result": "Risultato del calcolo"
 }
diff --git a/packages/plugins/@nocobase/plugin-workflow-loop/package.json b/packages/plugins/@nocobase/plugin-workflow-loop/package.json
index 326e69573d..9534d2724f 100644
--- a/packages/plugins/@nocobase/plugin-workflow-loop/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-loop/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：循环节点",
   "description": "Used to repeat the sub-process processing of each value in an array, and can also be used for fixed times of sub-process processing.",
   "description.zh-CN": "用于对一个数组中的每个值进行重复的子流程处理，也可用于固定次数的重复子流程处理。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-loop",
diff --git a/packages/plugins/@nocobase/plugin-workflow-loop/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-workflow-loop/src/locale/it-IT.json
index cf8c80770d..4fde1d0880 100644
--- a/packages/plugins/@nocobase/plugin-workflow-loop/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-workflow-loop/src/locale/it-IT.json
@@ -1,9 +1,22 @@
 {
   "Loop": "Ciclo",
   "Loop target": "Destinazione ciclo",
-  "Loop index": "Indice ciclo",
+  "Loop index (starts from 0)": "Indice del ciclo (inizia da 0)",
+  "Loop sequence (starts from 1)": "Sequenza del ciclo (inizia da 1)",  
   "Loop length": "Lunghezza ciclo",
-  "By using a loop node, you can perform the same operation on multiple sets of data. The source of these sets can be either multiple records from a query node or multiple associated records of a single record. Loop node can also be used for iterating a certain number of times or for looping through each character in a string. However, excessive looping may cause performance issues, so use with caution.": "Utilizzando un nodo ciclo, puoi eseguire la stessa operazione su più insiemi di dati. L' origine di questi insiemi può essere costituita da record multipli di un nodo query o da record multipli associati di singolo record. Il nodo ciclo può essere utilizzato anche per iterare un certo numero di volte o per scorrere ogni carattere in una stringa. Tuttavia, un numero eccessivamente elevato di cicli può causare problemi di prestazioni, quindi usalo con cautela.",
-  "Scope variables": "Variabili ambito",
-  "A single number will be treated as a loop count, a single string will be treated as an array of characters, and other non-array values will be converted to arrays. The loop node ends when the loop count is reached, or when the array loop is completed. You can also add condition nodes to the loop to terminate it.": "Un singolo numero verrà trattato come conteggio del ciclo, una singola stringa verrà trattata come un array di caratteri e altri valori non-array verranno convertiti in array. Il nodo ciclo termina quando viene raggiunto il conteggio del ciclo o quando il ciclo dell'array è completato. Puoi anche aggiungere nodi condizione al ciclo per terminarlo."
+  "By using a loop node, you can perform the same operation on multiple sets of data. The source of these sets can be either multiple records from a query node or multiple associated records of a single record. Loop node can also be used for iterating a certain number of times or for looping through each character in a string. However, excessive looping may cause performance issues, so use with caution.": "Utilizzando un nodo ciclo, puoi eseguire la stessa operazione su più insiemi di dati. L' origine di questi insiemi può essere costituita da record multipli di un nodo query o da record multipli associati di singolo record. Il nodo ciclo può essere utilizzato anche per iterare un certo numero di volte o per scorrere ogni carattere in una stringa. Tuttavia, un numero eccessivamente elevato di cicli può causare problemi di prestazioni, quindi usalo con cautela.",  
+  "A single number will be treated as a loop count, a single string will be treated as an array of characters, and other non-array values will be converted to arrays. The loop node ends when the loop count is reached, or when the array loop is completed. You can also add condition nodes to the loop to terminate it.": "Un singolo numero verrà trattato come conteggio del ciclo, una singola stringa verrà trattata come un array di caratteri e altri valori non-array verranno convertiti in array. Il nodo ciclo termina quando viene raggiunto il conteggio del ciclo o quando il ciclo dell'array è completato. Puoi anche aggiungere nodi condizione al ciclo per terminarlo.",
+  "Enable loop condition": "Abilita condizione del ciclo",
+  "Loop condition on each item": "Condizione del ciclo su ciascun elemento",
+  "When to check": "Quando controllare",
+  "Before each starts": "Prima dell'inizio di ogni ciclo",
+  "After each ends": "Dopo la fine di ogni ciclo",
+  "When condition is not met on item": "Quando la condizione non è soddisfatta sull'elemento",
+  "Exit loop": "Esci dal ciclo",
+  "Continue on next item": "Continua con l'elemento successivo",
+  "Condition": "Condizione",
+  "When node inside loop failed": "Quando il nodo all'interno del ciclo fallisce",
+  "Continue loop on next item": "Continua il ciclo con l'elemento successivo",
+  "Exit loop and continue workflow": "Esci dal ciclo e continua il workflow",
+  "Exit workflow": "Esci dal workflow"
 }
diff --git a/packages/plugins/@nocobase/plugin-workflow-mailer/package.json b/packages/plugins/@nocobase/plugin-workflow-mailer/package.json
index 4319a37fa8..d0d535a681 100644
--- a/packages/plugins/@nocobase/plugin-workflow-mailer/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-mailer/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：邮件发送节点",
   "description": "Send email in workflow.",
   "description.zh-CN": "可用于在工作流中发送电子邮件。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-smtp-mailer",
diff --git a/packages/plugins/@nocobase/plugin-workflow-mailer/src/client/MailerInstruction.tsx b/packages/plugins/@nocobase/plugin-workflow-mailer/src/client/MailerInstruction.tsx
index 08c148521d..4b02a7d641 100644
--- a/packages/plugins/@nocobase/plugin-workflow-mailer/src/client/MailerInstruction.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow-mailer/src/client/MailerInstruction.tsx
@@ -7,9 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import React from 'react';
 import { MailOutlined } from '@ant-design/icons';
 import { ArrayItems } from '@formily/antd-v5';
+import React from 'react';
 
 import { SchemaComponentContext, css } from '@nocobase/client';
 import {
@@ -112,6 +112,7 @@ export default class extends Instruction {
                     secure: {
                       type: 'boolean',
                       title: `{{t("Secure", { ns: "${NAMESPACE}" })}}`,
+                      description: `{{t("In most cases, if using port 465, set it to true; otherwise, set it to false.", { ns: "${NAMESPACE}" })}}`,
                       'x-decorator': 'FormItem',
                       'x-component': 'WorkflowVariableInput',
                       'x-component-props': {
diff --git a/packages/plugins/@nocobase/plugin-workflow-mailer/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-workflow-mailer/src/locale/en-US.json
index acd2ea3219..297e52cb70 100644
--- a/packages/plugins/@nocobase/plugin-workflow-mailer/src/locale/en-US.json
+++ b/packages/plugins/@nocobase/plugin-workflow-mailer/src/locale/en-US.json
@@ -15,5 +15,6 @@
   "Content": "Content",
   "Content type": "Content type",
   "Plain text": "Plain text",
-  "Ignore failed sending and continue workflow": "Ignore failed sending and continue workflow"
+  "Ignore failed sending and continue workflow": "Ignore failed sending and continue workflow",
+  "In most cases, if using port 465, set it to true; otherwise, set it to false.": "In most cases, if using port 465, set it to true; otherwise, set it to false."
 }
diff --git a/packages/plugins/@nocobase/plugin-workflow-mailer/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-workflow-mailer/src/locale/zh-CN.json
index b5b32d5f1b..ed678386b8 100644
--- a/packages/plugins/@nocobase/plugin-workflow-mailer/src/locale/zh-CN.json
+++ b/packages/plugins/@nocobase/plugin-workflow-mailer/src/locale/zh-CN.json
@@ -15,5 +15,6 @@
   "Content": "内容",
   "Content type": "内容格式",
   "Plain text": "纯文本",
-  "Ignore failed sending and continue workflow": "忽略失败的发送并继续工作流"
+  "Ignore failed sending and continue workflow": "忽略失败的发送并继续工作流",
+  "In most cases, if using port 465, set it to true; otherwise, set it to false.": "通常情况下，如果使用端口 465 ，请设置为 true ；否则，请设置为 false 。"
 }
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/package.json b/packages/plugins/@nocobase/plugin-workflow-manual/package.json
index 593504cb88..254f696be1 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：人工处理节点",
   "description": "Could be used for workflows which some of decisions are made by users.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-manual",
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm1.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm1.test.ts
index aa147d43d2..ce07b3321a 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm1.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm1.test.ts
@@ -130,7 +130,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     // 定义获取2位小数
     const manualNodeRecord = faker.number.float({ min: 0, max: 100, precision: 2 });
     await page.getByRole('spinbutton').fill(manualNodeRecord.toString());
@@ -266,7 +266,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     // const manualNodeRecord = faker.number.float();
     await page.getByRole('checkbox').check();
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -401,7 +401,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await page.getByTestId('select-single').click();
     await page.getByRole('option', { name: '存续' }).click();
     await page.getByRole('button', { name: 'Continue the process' }).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm2.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm2.test.ts
index a0db26183d..98120f7a39 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm2.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm2.test.ts
@@ -130,7 +130,7 @@ test.describe('action button', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = manualNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -271,7 +271,7 @@ test.describe('action button', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = manualNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Terminate the process' }).click();
@@ -412,7 +412,7 @@ test.describe('action button', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = manualNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Save temporarily' }).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm3.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm3.test.ts
index 19daf4c2c3..61617bd417 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm3.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm3.test.ts
@@ -130,7 +130,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await page.getByTestId('select-multiple').click();
     await page.getByRole('option', { name: '软件销售', exact: true }).click();
     await page.getByRole('option', { name: '软件开发', exact: true }).click();
@@ -273,7 +273,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await page.getByLabel('存续').check();
     await page.getByRole('button', { name: 'Continue the process' }).click();
 
@@ -407,7 +407,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await page.getByLabel('软件销售', { exact: true }).check();
     await page.getByLabel('软件开发', { exact: true }).check();
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -548,7 +548,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = dayjs().format('YYYY-MM-DD');
     await page.getByPlaceholder('Select date').click();
     await page.getByTitle(manualNodeRecord.toString()).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm4.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm4.test.ts
index fc8c393323..766a2fafa8 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm4.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm4.test.ts
@@ -130,7 +130,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = manualNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -265,7 +265,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = manualNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -400,7 +400,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = manualNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm5.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm5.test.ts
index e7edbb8d5e..caf1439d35 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm5.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/createRecordForm5.test.ts
@@ -130,7 +130,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = faker.internet.email();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -265,7 +265,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = faker.number.int();
     await page.getByRole('spinbutton').fill(manualNodeRecord.toString());
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -400,7 +400,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = faker.number.float({ min: 0, max: 999999999, precision: 2 });
     await page.getByRole('spinbutton').fill(manualNodeRecord.toString());
     await page.getByRole('button', { name: 'Continue the process' }).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks.test.ts
index 60ebdbf903..a367f1b6ea 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks.test.ts
@@ -140,7 +140,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = faker.number.float({ min: 0, max: 100, precision: 2 });
     await page.getByRole('spinbutton').fill(manualNodeRecord.toString());
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -279,7 +279,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     // const manualNodeRecord = faker.number.float({ min: 0, max: 100, precision: 2 });
     await page.getByRole('checkbox').check();
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -424,7 +424,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     // const manualNodeRecord = faker.number.float({ min: 0, max: 100, precision: 2 });
     await page.getByTestId('select-single').click();
     await page.getByRole('option', { name: '存续' }).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks1.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks1.test.ts
index 023cc4a280..1e6c2411fb 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks1.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks1.test.ts
@@ -142,7 +142,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await page.getByTestId('select-multiple').click();
     await page.getByRole('option', { name: '软件销售', exact: true }).click();
     await page.getByRole('option', { name: '软件开发', exact: true }).click();
@@ -295,7 +295,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     // const manualNodeRecord = faker.number.float({ min: 0, max: 100, precision: 2 });
     await page.getByLabel('存续').check();
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -440,7 +440,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await page.getByLabel('软件销售', { exact: true }).check();
     await page.getByLabel('软件开发', { exact: true }).check();
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -585,7 +585,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = dayjs().format('YYYY-MM-DD');
     await page.getByPlaceholder('Select date').click();
     await page.getByTitle(manualNodeRecord.toString()).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks2.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks2.test.ts
index ed46ee118b..b8db06721c 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks2.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks2.test.ts
@@ -136,7 +136,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = manualNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -275,7 +275,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = manualNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -414,7 +414,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = manualNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks3.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks3.test.ts
index 61de8cabc4..8eaf078d67 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks3.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks3.test.ts
@@ -136,7 +136,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = faker.internet.email();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -275,7 +275,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = faker.number.int();
     await page.getByRole('spinbutton').fill(manualNodeRecord.toString());
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -414,7 +414,7 @@ test.describe('field data entry', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = faker.number.float();
     await page.getByRole('spinbutton').fill(manualNodeRecord.toString());
     await page.getByRole('button', { name: 'Continue the process' }).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks.test.ts
index eebceff70e..cdb3c501ac 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks.test.ts
@@ -145,7 +145,7 @@ test.describe('field data', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await expect(page.getByText(triggerNodeCollectionRecordOne)).toBeAttached();
     // 4、后置处理：删除工作流
     await apiDeleteWorkflow(workflowId);
@@ -301,7 +301,7 @@ test.describe('field data', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     // await expect(page.getByText('8')).toBeAttached();
     await expect(
       page
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks1.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks1.test.ts
index 06df2a7f1b..369f943420 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks1.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks1.test.ts
@@ -175,7 +175,7 @@ test.describe('field data', () => {
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
     await page
-      .locator('.ant-list', { hasText: preManualNodeTitle })
+      .locator('.itemCss', { hasText: preManualNodeTitle })
       .getByLabel('action-Action.Link-View-view-')
       .click();
     const preManualNodeRecord = triggerNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
@@ -189,7 +189,7 @@ test.describe('field data', () => {
     await page.getByRole('textbox').first().fill(manualNodeName);
     await page.getByRole('button', { name: 'Submit' }).click();
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await expect(page.getByText(preManualNodeRecord)).toBeAttached();
     // 4、后置处理：删除工作流
     await apiDeleteWorkflow(workflowId);
@@ -335,7 +335,7 @@ test.describe('field data', () => {
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
     await page
-      .locator('.ant-list', { hasText: preManualNodeTitle })
+      .locator('.itemCss', { hasText: preManualNodeTitle })
       .getByLabel('action-Action.Link-View-view-')
       .click();
     const preManualNodeRecord = triggerNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
@@ -348,7 +348,7 @@ test.describe('field data', () => {
     await page.getByRole('textbox').first().fill(manualNodeName);
     await page.getByRole('button', { name: 'Submit' }).click();
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await expect(page.getByText(preManualNodeRecord)).toBeAttached();
 
     const createNodeCollectionData = await apiGetList(preManualNodeCollectionName);
@@ -543,7 +543,7 @@ test.describe('field data', () => {
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
     await page
-      .locator('.ant-list', { hasText: preManualNodeTitle })
+      .locator('.itemCss', { hasText: preManualNodeTitle })
       .getByLabel('action-Action.Link-View-view-')
       .click();
     const preManualNodeRecord = triggerNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
@@ -556,7 +556,7 @@ test.describe('field data', () => {
     await page.getByRole('textbox').first().fill(manualNodeName);
     await page.getByRole('button', { name: 'Submit' }).click();
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await expect(page.getByText(preManualNodeRecord)).toBeAttached();
     const filter = `pageSize=20&page=1&filter={"$and":[{"orgname":{"$eq":"${preManualNodeRecord}"}}]}`;
     const createNodeCollectionData = await apiFilterList(preManualNodeCollectionName, filter);
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks2.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks2.test.ts
index 5eafd4d43c..8b82c7f562 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks2.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks2.test.ts
@@ -114,7 +114,7 @@ test.describe('field data', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await expect(page.getByText(triggerNodeCollectionRecordOne)).toBeAttached();
     // 4、后置处理：删除工作流
     await apiDeleteWorkflow(workflowId);
@@ -222,7 +222,7 @@ test.describe('field data', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await expect(page.getByText(triggerNodeCollectionRecordOne)).toBeAttached();
     // 4、后置处理：删除工作流
     await apiDeleteWorkflow(workflowId);
@@ -341,7 +341,7 @@ test.describe('field data', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await expect(page.getByText(triggerNodeCollectionRecordOne)).toBeAttached();
     // 4、后置处理：删除工作流
     await apiDeleteWorkflow(workflowId);
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm.test.ts
index d86344f49b..cbb6117471 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm.test.ts
@@ -181,7 +181,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = faker.number.float({ min: 0, max: 100, precision: 2 });
     await page.getByRole('spinbutton').fill(manualNodeRecord.toString());
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -360,7 +360,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     // const manualNodeRecord = faker.number.float({ min: 0, max: 100, precision: 2 });
     await page.getByRole('checkbox').check();
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -539,7 +539,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     // const manualNodeRecord = faker.number.float({ min: 0, max: 100, precision: 2 });
     await page.getByTestId('select-single').click();
     await page.getByRole('option', { name: '存续' }).click();
@@ -719,7 +719,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     // const manualNodeRecord = faker.number.float({ min: 0, max: 100, precision: 2 });
     await page.getByTestId('select-multiple').click();
     await page.getByRole('option', { name: '软件销售', exact: true }).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm1.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm1.test.ts
index 805efaeeb8..b60688b1e4 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm1.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm1.test.ts
@@ -173,7 +173,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     // const manualNodeRecord = faker.number.float({ min: 0, max: 100, precision: 2 });
     await page.getByLabel('存续').check();
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -352,7 +352,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     await page.getByLabel('软件销售', { exact: true }).check();
     await page.getByLabel('软件开发', { exact: true }).check();
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -537,7 +537,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = dayjs().format('YYYY-MM-DD');
     await page.getByPlaceholder('Select date').click();
     await page.getByTitle(manualNodeRecord.toString()).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm2.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm2.test.ts
index e319a53a2b..8792d8364b 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm2.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm2.test.ts
@@ -157,7 +157,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = manualNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -320,7 +320,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = manualNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -483,7 +483,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = manualNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm3.test.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm3.test.ts
index b661191c17..f27c51028e 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm3.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/updateRecordForm3.test.ts
@@ -157,7 +157,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = faker.internet.email();
     await page.getByRole('textbox').fill(manualNodeRecord);
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -320,7 +320,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = faker.number.int();
     await page.getByRole('spinbutton').fill(manualNodeRecord.toString());
     await page.getByRole('button', { name: 'Continue the process' }).click();
@@ -483,7 +483,7 @@ test.describe('field data update', () => {
     await page.getByRole('menuitem', { name: 'check-square Workflow todos' }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page.waitForTimeout(300);
-    await page.locator('.ant-list', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
+    await page.locator('.itemCss', { hasText: manualNodeName }).getByLabel('action-Action.Link-View-view-').click();
     const manualNodeRecord = faker.number.float();
     await page.getByRole('spinbutton').fill(manualNodeRecord.toString());
     await page.getByRole('button', { name: 'Continue the process' }).click();
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-workflow-manual/src/locale/it-IT.json
index f8edafafc9..fa6734c64b 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/locale/it-IT.json
@@ -7,10 +7,10 @@
   "User interface": "Interfaccia utente",
   "Configure user interface": "Configura interfaccia utente",
   "View user interface": "Visualizza interfaccia utente",
-  "Separately": "Separato",
-  "Each user has own task": "Ogni utente ha il proprio compito",
+  "Separately": "Separato",  
+  "Each user has own task": "Ogni utente ha la propria attività",
   "Collaboratively": "Collaborativo",
-  "Everyone shares one task": "Tutti condividono un compito",
+  "Everyone shares one task": "Tutti condividono un attività",
   "Negotiation": "Negoziazione",
   "All pass": "Tutti passano",
   "Everyone should pass": "Tutti dovrebbero passare",
@@ -25,6 +25,11 @@
   "Create record form": "Modulo creazione record",
   "Update record form": "Modulo aggiornamento record",
   "Filter settings": "Impostazioni filtro",
-  "Workflow todos": "'Da fare' del workflow",
-  "Task": "Compito"
+  "Workflow todos": "Da fare",  
+  "Task node": "Nodo attività",
+  "Unprocessed": "Non elaborato",
+  "Please check one of your update record form, and add at least one filter condition in form settings.": "Verifica uno dei tuoi moduli di aggiornamento record e aggiungi almeno una condizione nel filtro nelle impostazioni del modulo.",
+  "My manual tasks": "Le mie attività manuali",
+  "Task title": "Titolo attività",
+  "Title of each task item. Default to node title.": "Titolo di ogni elemento attività. Predefinito: titolo del nodo."
 }
diff --git a/packages/plugins/@nocobase/plugin-workflow-notification/package.json b/packages/plugins/@nocobase/plugin-workflow-notification/package.json
index c0e73755de..a17379f4c1 100644
--- a/packages/plugins/@nocobase/plugin-workflow-notification/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-notification/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：通知节点",
   "description": "Send notification in workflow.",
   "description.zh-CN": "可用于在工作流中发送各类通知。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-smtp-mailer",
diff --git a/packages/plugins/@nocobase/plugin-workflow-notification/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-workflow-notification/src/locale/it-IT.json
index 5f0df3352a..71dab29fc9 100644
--- a/packages/plugins/@nocobase/plugin-workflow-notification/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-workflow-notification/src/locale/it-IT.json
@@ -1,4 +1,4 @@
 {
-  "Send email. You can use the variables in the upstream nodes as receivers, subject and content of the email.": "Invia email chiamando il servizio SMTP. Puoi usare le variabili nei nodi upstream come destinatari, oggetto e contenuto dell'email.",
-  "Ignore failed sending and continue workflow": "Ignora l'invio fallito e continua il workflow"
+  "Notification": "Notifiche",
+  "Send notification. You can use the variables in the upstream nodes as content and ohter config.": "Invia notifica. Puoi usare le variabili nei nodi upstream come contenuto e altre configurazioni"
 }
diff --git a/packages/plugins/@nocobase/plugin-workflow-parallel/package.json b/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
index 2d7f392f07..e4e279fc10 100644
--- a/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：并行分支节点",
   "description": "Could be used for parallel execution of branch processes in the workflow.",
   "description.zh-CN": "用于在工作流中需要并行执行的分支流程。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-parallel",
diff --git a/packages/plugins/@nocobase/plugin-workflow-parallel/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-workflow-parallel/src/locale/it-IT.json
index 5ecee1775a..6fcd80285e 100644
--- a/packages/plugins/@nocobase/plugin-workflow-parallel/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-workflow-parallel/src/locale/it-IT.json
@@ -2,6 +2,7 @@
   "Parallel branch": "Ramo parallelo",
   "Run multiple branch processes in parallel.": "Esegui più processi del ramo in parallelo.",
   "Add branch": "Aggiungi ramo",
+  "Mode": "Modalità di esecuzione",
   "All succeeded": "Tutti riusciti",
   "Any succeeded": "Qualsiasi riuscito",
   "Any succeeded or failed": "Qualsiasi riuscito o fallito",
diff --git a/packages/plugins/@nocobase/plugin-workflow-request/package.json b/packages/plugins/@nocobase/plugin-workflow-request/package.json
index 6fc88fcddc..635ab965a0 100644
--- a/packages/plugins/@nocobase/plugin-workflow-request/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-request/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：HTTP 请求节点",
   "description": "Send HTTP requests to any HTTP service for data interaction in workflow.",
   "description.zh-CN": "可用于在工作流中向任意 HTTP 服务发送请求，进行数据交互。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-request",
diff --git a/packages/plugins/@nocobase/plugin-workflow-request/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-workflow-request/src/locale/it-IT.json
index 8dd08cce30..fc1828e86c 100644
--- a/packages/plugins/@nocobase/plugin-workflow-request/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-workflow-request/src/locale/it-IT.json
@@ -9,12 +9,16 @@
   "Add parameter": "Aggiungi parametro",
   "Body": "Corpo",
   "Use variable": "Usa variabile",
+  "Add key-value pairs": "Aggiungi coppie chiave-valore",
   "Format": "Formato",
   "Insert": "Inserisci",
-  "Timeout config": "Configurazione timeout",
-  "ms": "ms",
+  "Timeout": "Timeout",  
+  "Milliseconds": "ms",
   "Input request data": "Inserisci dati richiesta",
   "Only support standard JSON data": "Supporta solo dati JSON standard",
-  "\"Content-Type\" only support \"application/json\", and no need to specify": "\"Content-Type\" supporta solo \"application/json\", e non è necessario specificarlo",
-  "Ignore failed request and continue workflow": "Ignora la richiesta fallita e continua il workflow"
+  "\"Content-Type\" will be ignored from headers.": "\"Content-Type\" sarà ignorato dall'intestazione",
+  "Ignore failed request and continue workflow": "Ignora la richiesta fallita e continua il workflow",
+  "Status code": "Codice stato",
+  "Data": "Dati",
+  "Response headers": "Intestazioni risposta"
 }
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/.npmignore b/packages/plugins/@nocobase/plugin-workflow-response-message/.npmignore
new file mode 100644
index 0000000000..65f5e8779f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/README.md b/packages/plugins/@nocobase/plugin-workflow-response-message/README.md
new file mode 100644
index 0000000000..8ced21e948
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/README.md
@@ -0,0 +1 @@
+# @nocobase/plugin-workflow-response-message
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/client.d.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/client.d.ts
new file mode 100644
index 0000000000..6c459cbac4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/client.js b/packages/plugins/@nocobase/plugin-workflow-response-message/client.js
new file mode 100644
index 0000000000..b6e3be70e6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/package.json b/packages/plugins/@nocobase/plugin-workflow-response-message/package.json
new file mode 100644
index 0000000000..5edc73f17d
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "@nocobase/plugin-workflow-response-message",
+  "version": "1.6.20",
+  "displayName": "Workflow: Response message",
+  "displayName.zh-CN": "工作流：响应消息",
+  "description": "Used for assemble response message and showing to client in form event and request interception workflows.",
+  "description.zh-CN": "用于在表单事件和请求拦截工作流中组装并向客户端显示响应消息。",
+  "main": "dist/server/index.js",
+  "homepage": "https://docs.nocobase.com/handbook/workflow-response-message",
+  "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow-response-message",
+  "peerDependencies": {
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x",
+    "@nocobase/utils": "1.x"
+  },
+  "devDependencies": {
+    "@nocobase/plugin-workflow": "1.6.20"
+  },
+  "keywords": [
+    "Workflow"
+  ],
+  "gitHead": "080fc78c1a744d47e010b3bbe5840446775800e4"
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/server.d.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/server.d.ts
new file mode 100644
index 0000000000..c41081ddc6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/server.js b/packages/plugins/@nocobase/plugin-workflow-response-message/server.js
new file mode 100644
index 0000000000..972842039a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/ResponseMessageInstruction.tsx b/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/ResponseMessageInstruction.tsx
new file mode 100644
index 0000000000..efdd6a7241
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/ResponseMessageInstruction.tsx
@@ -0,0 +1,87 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React from 'react';
+import { InfoCircleOutlined } from '@ant-design/icons';
+import { Alert, Space } from 'antd';
+
+import {
+  Instruction,
+  RadioWithTooltip,
+  WorkflowVariableInput,
+  WorkflowVariableTextArea,
+} from '@nocobase/plugin-workflow/client';
+
+import { NAMESPACE } from '../locale';
+
+export default class extends Instruction {
+  title = `{{t("Response message", { ns: "${NAMESPACE}" })}}`;
+  type = 'response-message';
+  group = 'extended';
+  description = `{{t("Add response message, will be send to client when process of request ends.", { ns: "${NAMESPACE}" })}}`;
+  icon = (<InfoCircleOutlined />);
+  fieldset = {
+    message: {
+      type: 'string',
+      title: `{{t("Message content", { ns: "${NAMESPACE}" })}}`,
+      description: `{{t('Supports variables in template.', { ns: "${NAMESPACE}", name: '{{name}}' })}}`,
+      'x-decorator': 'FormItem',
+      'x-component': 'WorkflowVariableTextArea',
+    },
+    info: {
+      type: 'void',
+      'x-component': 'Space',
+      'x-component-props': {
+        direction: 'vertical',
+      },
+      properties: {
+        success: {
+          type: 'void',
+          'x-component': 'Alert',
+          'x-component-props': {
+            type: 'success',
+            showIcon: true,
+            description: `{{t('If the workflow ends normally, the response message will return a success status by default.', { ns: "${NAMESPACE}" })}}`,
+          },
+        },
+        failure: {
+          type: 'void',
+          'x-component': 'Alert',
+          'x-component-props': {
+            type: 'error',
+            showIcon: true,
+            description: `{{t('If you want to return a failure status, please add an "End Process" node downstream to terminate the workflow.', { ns: "${NAMESPACE}" })}}`,
+          },
+        },
+      },
+    },
+  };
+  scope = {};
+  components = {
+    RadioWithTooltip,
+    WorkflowVariableTextArea,
+    WorkflowVariableInput,
+    Alert,
+    Space,
+  };
+  isAvailable({ workflow, upstream, branchIndex }) {
+    return (
+      workflow.type === 'request-interception' || (['action', 'custom-action'].includes(workflow.type) && workflow.sync)
+    );
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/index.tsx b/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/index.tsx
new file mode 100644
index 0000000000..258f6c8d8b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/index.tsx
@@ -0,0 +1,31 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Plugin } from '@nocobase/client';
+import WorkflowPlugin from '@nocobase/plugin-workflow/client';
+
+import ResponseMessageInstruction from './ResponseMessageInstruction';
+
+export class PluginWorkflowResponseMessageClient extends Plugin {
+  async load() {
+    const workflowPlugin = this.app.pm.get('workflow') as WorkflowPlugin;
+    workflowPlugin.registerInstruction('response-message', ResponseMessageInstruction);
+  }
+}
+
+export default PluginWorkflowResponseMessageClient;
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/index.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/index.ts
new file mode 100644
index 0000000000..7d69462f4f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/index.ts
@@ -0,0 +1,20 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export * from './server';
+export { default } from './server';
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/en-US.json
new file mode 100644
index 0000000000..11832d6610
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/en-US.json
@@ -0,0 +1,6 @@
+{
+  "Response message": "Response message",
+  "Add response message, will be send to client when process of request ends.": "Add response message, will be send to client when process of request ends.",
+  "Message content": "Message content",
+  "Supports variables in template.": "Supports variables in template."
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/index.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/index.ts
new file mode 100644
index 0000000000..543b392f21
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/index.ts
@@ -0,0 +1,25 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { i18n } from '@nocobase/client';
+
+export const NAMESPACE = '@nocobase/plugin-workflow-response-message';
+
+export function lang(key: string, options = {}) {
+  return i18n.t(key, { ...options, ns: NAMESPACE });
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/zh-CN.json
new file mode 100644
index 0000000000..c8b986cace
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/zh-CN.json
@@ -0,0 +1,8 @@
+{
+  "Response message": "响应消息",
+  "Add response message, will be send to client when process of request ends.": "添加响应消息，将在请求处理结束时发送给客户端。",
+  "Message content": "消息内容",
+  "Supports variables in template.": "支持模板变量。",
+  "If the workflow ends normally, the response message will return a success status by default.": "如果工作流正常结束，响应消息默认返回成功状态。",
+  "If you want to return a failure status, please add an \"End Process\" node downstream to terminate the workflow.": "如果希望返回失败状态，请在下游添加“结束流程”节点终止工作流。"
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/Plugin.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/Plugin.ts
new file mode 100644
index 0000000000..cdd6eece72
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/Plugin.ts
@@ -0,0 +1,31 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Plugin } from '@nocobase/server';
+import PluginWorkflowServer from '@nocobase/plugin-workflow';
+
+import ResponseMessageInstruction from './ResponseMessageInstruction';
+
+export class PluginWorkflowResponseMessageServer extends Plugin {
+  async load() {
+    const workflowPlugin = this.app.pm.get(PluginWorkflowServer) as PluginWorkflowServer;
+    workflowPlugin.registerInstruction('response-message', ResponseMessageInstruction);
+  }
+}
+
+export default PluginWorkflowResponseMessageServer;
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/ResponseMessageInstruction.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/ResponseMessageInstruction.ts
new file mode 100644
index 0000000000..e277a44e35
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/ResponseMessageInstruction.ts
@@ -0,0 +1,55 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Instruction, Processor, JOB_STATUS, FlowNodeModel } from '@nocobase/plugin-workflow';
+
+interface Config {
+  message?: string;
+}
+
+export default class extends Instruction {
+  async run(node: FlowNodeModel, prevJob, processor: Processor) {
+    const { httpContext } = processor.options;
+
+    if (!httpContext) {
+      return {
+        status: JOB_STATUS.RESOLVED,
+        result: null,
+      };
+    }
+
+    if (!httpContext.state) {
+      httpContext.state = {};
+    }
+
+    if (!httpContext.state.messages) {
+      httpContext.state.messages = [];
+    }
+
+    const message = processor.getParsedValue(node.config.message, node.id);
+
+    if (message) {
+      httpContext.state.messages.push({ message });
+    }
+
+    return {
+      status: JOB_STATUS.RESOLVED,
+      result: message,
+    };
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts
new file mode 100644
index 0000000000..500a70cefe
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts
@@ -0,0 +1,346 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import Database from '@nocobase/database';
+import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
+import { getApp } from '@nocobase/plugin-workflow-test';
+import { MockServer } from '@nocobase/test';
+
+import Plugin from '..';
+
+describe.skip('workflow > instructions > response-message', () => {
+  let app: MockServer;
+  let db: Database;
+  let PostRepo;
+  let WorkflowModel;
+  let workflow;
+  let users;
+  let userAgents;
+
+  beforeEach(async () => {
+    app = await getApp({
+      plugins: ['users', 'auth', 'error-handler', 'workflow-request-interceptor', Plugin],
+    });
+
+    db = app.db;
+
+    PostRepo = db.getCollection('posts').repository;
+
+    WorkflowModel = db.getModel('workflows');
+    workflow = await WorkflowModel.create({
+      enabled: true,
+      type: 'request-interception',
+      config: {
+        global: true,
+        actions: ['create'],
+        collection: 'posts',
+      },
+    });
+
+    const UserModel = db.getCollection('users').model;
+    users = await UserModel.bulkCreate([
+      { id: 2, nickname: 'a' },
+      { id: 3, nickname: 'b' },
+    ]);
+
+    userAgents = await Promise.all(users.map((user) => app.agent().login(user)));
+  });
+
+  afterEach(() => app.destroy());
+
+  describe('no end, pass flow', () => {
+    it('no message', async () => {
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(0);
+    });
+
+    it('has node, but null message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+
+    it('has node, but empty message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: '',
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+
+    it('single static message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toEqual([{ message: 'm1' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+
+    it('multiple static messages', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+      const n2 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm2',
+        },
+        upstreamId: n1.id,
+      });
+      await n1.setDownstream(n2);
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toEqual([{ message: 'm1' }, { message: 'm2' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(2);
+    });
+
+    it('single dynamic message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'new post "{{ $context.params.values.title }}" by {{ $context.user.nickname }}',
+        },
+      });
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toEqual([{ message: `new post "t1" by ${users[0].nickname}` }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+  });
+
+  describe('end as success', () => {
+    it('no message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+
+      const posts = await PostRepo.find();
+      expect(posts.length).toBe(0);
+    });
+
+    it('single static message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+
+      const n2 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+        upstreamId: n1.id,
+      });
+
+      await n1.setDownstream(n2);
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toEqual([{ message: 'm1' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(2);
+    });
+  });
+
+  describe('end as failure', () => {
+    it('no message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.FAILED,
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(400);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.FAILED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+
+    it('single static message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+
+      const n2 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.FAILED,
+        },
+        upstreamId: n1.id,
+      });
+
+      await n1.setDownstream(n2);
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(400);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.errors).toEqual([{ message: 'm1' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.FAILED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(2);
+    });
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts
new file mode 100644
index 0000000000..21f207c449
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts
@@ -0,0 +1,185 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import Database from '@nocobase/database';
+import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
+import { getApp } from '@nocobase/plugin-workflow-test';
+import { MockServer } from '@nocobase/test';
+
+import Plugin from '..';
+
+describe.skip('workflow > multiple workflows', () => {
+  let app: MockServer;
+  let db: Database;
+  let PostRepo;
+  let WorkflowModel;
+  let workflow;
+  let users;
+  let userAgents;
+
+  beforeEach(async () => {
+    app = await getApp({
+      plugins: ['users', 'auth', 'error-handler', 'workflow-request-interceptor', Plugin],
+    });
+
+    db = app.db;
+
+    PostRepo = db.getCollection('posts').repository;
+
+    WorkflowModel = db.getModel('workflows');
+    workflow = await WorkflowModel.create({
+      enabled: true,
+      type: 'request-interception',
+      config: {
+        global: true,
+        actions: ['create'],
+        collection: 'posts',
+      },
+    });
+
+    const UserModel = db.getCollection('users').model;
+    users = await UserModel.bulkCreate([
+      { id: 2, nickname: 'a' },
+      { id: 3, nickname: 'b' },
+    ]);
+
+    userAgents = await Promise.all(users.map((user) => app.agent().login(user)));
+  });
+
+  afterEach(() => app.destroy());
+
+  describe('order', () => {
+    it('workflow 2 run first and pass, workflow 1 ends as success', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+      const n2 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+        upstreamId: n1.id,
+      });
+      await n1.setDownstream(n2);
+
+      const w2 = await WorkflowModel.create({
+        enabled: true,
+        type: 'request-interception',
+        config: {
+          action: 'create',
+          collection: 'posts',
+        },
+      });
+
+      const n3 = await w2.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm2',
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+        triggerWorkflows: w2.key,
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toEqual([{ message: 'm2' }, { message: 'm1' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const j1s = await e1.getJobs();
+      expect(j1s.length).toBe(2);
+
+      const [e2] = await w2.getExecutions();
+      expect(e2.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const j2s = await e2.getJobs();
+      expect(j2s.length).toBe(1);
+    });
+
+    it('local workflow in trigger key order', async () => {
+      const w1 = await WorkflowModel.create({
+        enabled: true,
+        type: 'request-interception',
+        config: {
+          action: 'create',
+          collection: 'posts',
+        },
+      });
+
+      const n1 = await w1.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+
+      const w2 = await WorkflowModel.create({
+        enabled: true,
+        type: 'request-interception',
+        config: {
+          action: 'create',
+          collection: 'posts',
+        },
+      });
+
+      const n2 = await w2.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm2',
+        },
+      });
+
+      const n3 = await w2.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+        upstreamId: n2.id,
+      });
+
+      await n2.setDownstream(n3);
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+        triggerWorkflows: [w2.key, w1.key].join(),
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toEqual([{ message: 'm2' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const e1s = await w1.getExecutions();
+      expect(e1s.length).toBe(0);
+      const [e2] = await w2.getExecutions();
+      expect(e2.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e2.getJobs();
+      expect(jobs.length).toBe(2);
+    });
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/index.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/index.ts
new file mode 100644
index 0000000000..b0c269d075
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/index.ts
@@ -0,0 +1,19 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export { default } from './Plugin';
diff --git a/packages/plugins/@nocobase/plugin-workflow-sql/package.json b/packages/plugins/@nocobase/plugin-workflow-sql/package.json
index 20d3206bd4..dc4b0d5f57 100644
--- a/packages/plugins/@nocobase/plugin-workflow-sql/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-sql/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：SQL 节点",
   "description": "Execute SQL statements in workflow.",
   "description.zh-CN": "可用于在工作流中对数据库执行任意 SQL 语句。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-sql",
diff --git a/packages/plugins/@nocobase/plugin-workflow-sql/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-workflow-sql/src/locale/it-IT.json
index 4aaa8d60fa..b34f90eccf 100644
--- a/packages/plugins/@nocobase/plugin-workflow-sql/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-workflow-sql/src/locale/it-IT.json
@@ -1,5 +1,7 @@
 {
   "SQL action": "Azione SQL",
-  "Execute a SQL statement in database": "Esegui un'istruzione SQL nel database",
-  "Usage of SQL query result is not supported yet.": "L'utilizzo del risultato della query SQL non è ancora supportato."
+  "Execute a SQL statement in database.": "Esegui un'istruzione SQL nel database.",
+  "Select a data source to execute SQL.": "Seleziona un origine dati per eseguire SQL.",
+  "SQL query result could be used through <1>JSON query node</1> (Commercial plugin).": "Il risultato della query SQL potrebbe essere utilizzato tramite il <1>nodo JSON query</1>（plugin commerciale).",
+  "Include meta information of this query in result": "Includi meta informazioni di questa query nel risultato"
 }
diff --git a/packages/plugins/@nocobase/plugin-workflow-test/package.json b/packages/plugins/@nocobase/plugin-workflow-test/package.json
index d5672ff387..43bddb9d88 100644
--- a/packages/plugins/@nocobase/plugin-workflow-test/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-test/package.json
@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-workflow-test",
   "displayName": "Workflow: test kit",
   "displayName.zh-CN": "工作流：测试工具包",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "dist/server/index.js",
   "types": "./dist/server/index.d.ts",
diff --git a/packages/plugins/@nocobase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts b/packages/plugins/@nocobase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts
index a962df653e..dfe589300b 100644
--- a/packages/plugins/@nocobase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts
@@ -114,10 +114,10 @@ export class ApprovalTriggerNode {
     this.collectionDropDown = page
       .getByLabel('block-item-DataSourceCollectionCascader-workflows-Collection')
       .locator('.ant-select-selection-search-input');
-    this.dataBlocksInitiationRadio = page.getByLabel('Initiate and approve in data blocks only');
-    this.dataBlocksAndGlobalApprovalBlocksInitiationRadio = page.getByLabel(
-      'Initiate and approve in both data blocks and global approval blocks',
-    );
+    this.dataBlocksInitiationRadio = page.getByRole('radio', { name: 'Initiate in data blocks only' });
+    this.dataBlocksAndGlobalApprovalBlocksInitiationRadio = page.getByRole('radio', {
+      name: 'Initiate in both data blocks',
+    });
     this.allowedToBeWithdrawnCheckbox = page.getByLabel('Allowed to be withdrawn');
     this.goToconfigureButton = page.getByRole('button', { name: 'Go to configure' });
     this.addBlockButton = page.getByLabel(`schema-initializer-Grid-ApprovalApplyAddBlockButton-${collectionName}`);
@@ -189,7 +189,7 @@ export class ApprovalPassthroughModeNode {
     this.detailsConfigureFieldsButton = page.getByLabel(
       `schema-initializer-Grid-details:configureFields-${collectionName}`,
     );
-    this.addActionsMenu = page.getByRole('menuitem', { name: 'Process form' }).getByRole('switch');
+    this.addActionsMenu = page.getByRole('menuitem', { name: 'Process form' });
     this.actionsConfigureFieldsButton = page.getByLabel('schema-initializer-Grid-FormItemInitializers-approvalRecords');
     this.actionsConfigureActionsButton = page.getByLabel(
       'schema-initializer-ActionBar-ApprovalProcessAddActionButton-',
@@ -262,7 +262,7 @@ export class ApprovalBranchModeNode {
     this.detailsConfigureFieldsButton = page.getByLabel(
       `schema-initializer-Grid-details:configureFields-${collectionName}`,
     );
-    this.addActionsMenu = page.getByRole('menuitem', { name: 'Process form' }).getByRole('switch');
+    this.addActionsMenu = page.getByRole('menuitem', { name: 'Process form' });
     this.actionsConfigureFieldsButton = page.getByLabel('schema-initializer-Grid-FormItemInitializers-approvalRecords');
     this.actionsConfigureActionsButton = page.getByLabel('schema-initializer-ActionBar-');
     this.addApproveButton = page.getByRole('menuitem', { name: 'Approve' }).getByRole('switch');
diff --git a/packages/plugins/@nocobase/plugin-workflow-test/src/server/index.ts b/packages/plugins/@nocobase/plugin-workflow-test/src/server/index.ts
index 064c1b8f7c..8f505d5c0d 100644
--- a/packages/plugins/@nocobase/plugin-workflow-test/src/server/index.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-test/src/server/index.ts
@@ -10,13 +10,20 @@
 import path from 'path';
 
 import { ApplicationOptions, Plugin } from '@nocobase/server';
-import { MockClusterOptions, MockServer, createMockCluster, createMockServer, mockDatabase } from '@nocobase/test';
+import {
+  MockClusterOptions,
+  MockServer,
+  createMockCluster,
+  createMockDatabase,
+  createMockServer,
+  mockDatabase,
+} from '@nocobase/test';
 
-import functions from './functions';
-import triggers from './triggers';
-import instructions from './instructions';
 import { SequelizeCollectionManager, SequelizeDataSource } from '@nocobase/data-source-manager';
 import { uid } from '@nocobase/utils';
+import functions from './functions';
+import instructions from './instructions';
+import triggers from './triggers';
 export { sleep } from '@nocobase/test';
 
 interface WorkflowMockServerOptions extends ApplicationOptions {
@@ -62,7 +69,7 @@ export async function getApp({
     new SequelizeDataSource({
       name: 'another',
       collectionManager: {
-        database: mockDatabase({
+        database: await createMockDatabase({
           tablePrefix: `t${uid(5)}`,
         }),
       },
diff --git a/packages/plugins/@nocobase/plugin-workflow/package.json b/packages/plugins/@nocobase/plugin-workflow/package.json
index 852f8b0b6b..e86d4339d9 100644
--- a/packages/plugins/@nocobase/plugin-workflow/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow/package.json
@@ -4,13 +4,13 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
   "description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow",
   "dependencies": {
-    "@nocobase/plugin-workflow-test": "1.6.6"
+    "@nocobase/plugin-workflow-test": "1.6.20"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx
index c78dd5bd43..7d57fdfddb 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx
@@ -61,11 +61,10 @@ function SyncOptionSelect(props) {
       if (trigger.sync != null) {
         field.setValue(trigger.sync);
       } else {
-        field.setInitialValue(false);
+        field.setInitialValue(props.value ?? false);
       }
     }
-  }, [record.id, field, workflowPlugin.triggers]);
-
+  }, [record.id, field, workflowPlugin.triggers, record.type, props.value]);
   return <RadioWithTooltip {...props} />;
 }
 
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx
index 606624e949..c8415ad0b9 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx
@@ -6,12 +6,12 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+import { CheckCircleOutlined } from '@ant-design/icons';
+import { PageHeader } from '@ant-design/pro-layout';
+import { Badge, Button, Layout, Menu, Tabs, Tooltip } from 'antd';
+import classnames from 'classnames';
 import React, { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { Link, Outlet, useNavigate, useParams } from 'react-router-dom';
-import { Button, Layout, Menu, Badge, Tooltip, Tabs } from 'antd';
-import { PageHeader } from '@ant-design/pro-layout';
-import { CheckCircleOutlined } from '@ant-design/icons';
-import classnames from 'classnames';
 
 import {
   css,
@@ -22,7 +22,7 @@ import {
   useApp,
   useCompile,
   useDocumentTitle,
-  useIsAdminPage,
+  useIsLoggedIn,
   usePlugin,
   useRequest,
   useToken,
@@ -371,7 +371,7 @@ function TasksCountsProvider(props: any) {
 }
 
 export const TasksProvider = (props: any) => {
-  const isAdminPage = useIsAdminPage();
+  const isLoggedIn = useIsLoggedIn();
 
   const content = (
     <PinnedPluginListProvider
@@ -389,5 +389,5 @@ export const TasksProvider = (props: any) => {
     </PinnedPluginListProvider>
   );
 
-  return isAdminPage ? <TasksCountsProvider>{content}</TasksCountsProvider> : content;
+  return isLoggedIn ? <TasksCountsProvider>{content}</TasksCountsProvider> : content;
 };
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/RepeatField.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/RepeatField.tsx
index 206f8b273a..9024a5a614 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/RepeatField.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/RepeatField.tsx
@@ -42,7 +42,7 @@ function getRepeatTypeValue(v) {
   return 'none';
 }
 
-function CommonRepeatField({ value, onChange }) {
+function CommonRepeatField({ value, onChange, disabled }) {
   const { t } = useWorkflowTranslation();
   const option = getNumberOption(value);
 
@@ -59,11 +59,12 @@ function CommonRepeatField({ value, onChange }) {
       addonBefore={t('Every')}
       addonAfter={t(option.unitText)}
       className="auto-width"
+      disabled={disabled}
     />
   );
 }
 
-export function RepeatField({ value = null, onChange }) {
+export function RepeatField({ value = null, onChange, disabled }) {
   const { t } = useWorkflowTranslation();
   const typeValue = getRepeatTypeValue(value);
   const onTypeChange = useCallback(
@@ -114,20 +115,23 @@ export function RepeatField({ value = null, onChange }) {
         }
       `}
     >
-      <Select value={typeValue} onChange={onTypeChange} className="auto-width">
+      <Select value={typeValue} onChange={onTypeChange} className="auto-width" disabled={disabled}>
         {RepeatOptions.map((item) => (
           <Select.Option key={item.value} value={item.value}>
             {t(item.text)}
           </Select.Option>
         ))}
       </Select>
-      {typeof typeValue === 'number' ? <CommonRepeatField value={value} onChange={onChange} /> : null}
+      {typeof typeValue === 'number' ? (
+        <CommonRepeatField value={value} onChange={onChange} disabled={disabled} />
+      ) : null}
       {typeValue === 'cron' ? (
         <Cron
           value={value.trim().split(/\s+/).slice(1).join(' ')}
           setValue={(v) => onChange(`0 ${v}`)}
           clearButton={false}
           locale={window['cronLocale']}
+          disabled={disabled}
         />
       ) : null}
     </fieldset>
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/locale/it-IT.json b/packages/plugins/@nocobase/plugin-workflow/src/locale/it-IT.json
index b5f141b641..c714b7c4b2 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/locale/it-IT.json
+++ b/packages/plugins/@nocobase/plugin-workflow/src/locale/it-IT.json
@@ -53,13 +53,8 @@
   "By custom date": "Per data personalizzata",
   "Advanced": "Avanzato",
   "End": "Fine",
-  "Node result": "Risultato nodo",
-  "Constant": "Costante",
-  "Null": "Null",
-  "Boolean": "Booleano",
-  "String": "Stringa",
-  "Operator": "Operatore",
-  "Arithmetic calculation": "Calcolo aritmetico",
+  "Node result": "Risultato nodo",    
+  "Operator": "Operatore",  
   "String operation": "Operazione stringa",
   "Executed at": "Eseguito alle",
   "Queueing": "In coda",
@@ -73,28 +68,138 @@
   "Collection operations": "Operazioni raccolta",
   "Extended types": "Tipi estesi",
   "Node type": "Tipo nodo",
-  "Calculation": "Calcolo",
-  "Configure calculation": "Configura calcolo",
+  "Calculation": "Calcolo",  
   "Calculation result": "Risultato calcolo",
   "True": "Vero",
   "False": "Falso",
   "concat": "concatena",
   "Condition": "Condizione",
   "Mode": "Modalità",
-  "Continue when \"Yes\"": "Continua quando \"Yes\"",
-  "Branch into \"Yes\" and \"No\"": "Dirama in \"Yes\" e \"No\"",
-  "Conditions": "Condizioni",
+  "Continue when \"Yes\"": "Continua quando \"Sì\"",
+  "Branch into \"Yes\" and \"No\"": "Dirama in \"Sì\" e \"No\"",  
   "Create record": "Crea record",
   "Update record": "Aggiorna record",
   "Query record": "Interroga record",
   "Multiple records": "Record multipli",
   "Please select collection first": "Seleziona prima la raccolta",
-  "Only update records matching conditions": "Aggiorna solo i record che corrispondono alle condizioni",
-  "Fields that are not assigned a value will be set to the default value, and those that do not have a default value are set to null.": "I campi a cui non è assegnato un valore verranno impostati sul valore predefinito, e quelli che non hanno un valore predefinito verranno impostati su null.",
-  "Trigger in executed workflow cannot be modified": "Il trigger nel workflow eseguito non può essere modificato",
-  "Node in executed workflow cannot be modified": "Il nodo nel workflow eseguito non può essere modificato",
+  "Only update records matching conditions": "Aggiorna solo i record che corrispondono alle condizioni",    
   "Can not delete": "Impossibile eliminare",
   "The result of this node has been referenced by other nodes ({{nodes}}), please remove the usage before deleting.": "Il risultato di questo nodo è stato referenziato da altri nodi ({{nodes}}), rimuovi l'utilizzo prima di eliminare.",
-  "Maximum number of loop calls": "Numero massimo di chiamate ciclo",
-  "If the number of loop calls is too large, there will be performance issues.": "Se il numero di chiamate ciclo è troppo grande, ci saranno problemi di prestazioni."
+  "Clear all executions": "Cancella tutte le esecuzioni",
+  "Clear executions will not reset executed count, and started executions will not be deleted, are you sure you want to delete them all?": "La cancellazione delle esecuzioni non reimposta il conteggio delle esecuzioni e le esecuzioni avviate non verranno eliminate. Sei sicuro di volerle eliminare tutte?",
+  "Sync": "Sincronizza",
+  "Sync enabled status of all workflows from database": "Sincronizza lo stato abilitato di tutti i workflow dal database",
+  "Duplicate to new workflow": "Duplica in un nuovo workflow",
+  "Delete a main version will cause all other revisions to be deleted too.": "L'eliminazione di una versione principale comporterà l'eliminazione anche di tutte le altre revisioni.",
+  "Execute manually": "Esegui manualmente",
+  "The trigger is not configured correctly, please check the trigger configuration.": "Il trigger non è configurato correttamente, controlla la configurazione del trigger.",
+  "This type of trigger has not been supported to be executed manually.": "Questo tipo di trigger non è supportato per l'esecuzione manuale.",
+  "Trigger variables need to be filled for executing.": "Le variabili del trigger devono essere compilate per l'esecuzione.",
+  "A new version will be created automatically after execution if current version is not executed.": "Se la versione corrente non è stata eseguita, verrà creata automaticamente una nuova versione dopo l'esecuzione.",
+  "This will perform all the actions configured in the workflow. Are you sure you want to continue?": "Verranno eseguite tutte le azioni configurate nel workflow. Sei sicuro di voler continuare?",
+  "Automatically create a new version after execution": "Crea automaticamente una nuova versione dopo l'esecuzione",
+  "Workflow executed, the result status is <1>{{statusText}}</1><2>View the execution</2>": "Workflow eseguito, lo stato del risultato è <1>{{statusText}}</1><2>Visualizza l'esecuzione</2>",
+  "Use transaction": "Usa transazione",
+  "Data operation nodes in workflow will run in a same transaction until any interruption. Any failure will cause data rollback, and will also rollback the history of the execution.": "I nodi di operazione dati nel workflow verranno eseguiti nella stessa transazione fino a qualsiasi interruzione. Qualsiasi errore causerà il rollback dei dati e ripristinerà anche la cronologia dell'esecuzione.",
+  "Auto delete history when execution is on end status": "Elimina automaticamente la cronologia quando l'esecuzione è in stato finale",
+  "Maximum number of cycling triggers": "Numero massimo di trigger ciclici",
+  "The triggers of same workflow by some node (create, update and sub-flow etc.) more than this number will be ignored. Large number may cause performance issues. Please use with caution.": "I trigger dello stesso workflow da un nodo (crea, aggiorna e sub-flow ecc.) superiori a questo numero verranno ignorati. Un numero elevato può causare problemi di prestazioni. Si prega di usare con cautela.",
+  "Unknown trigger": "Trigger sconosciuto",
+  "Workflow with unknown type will cause error. Please delete it or check plugin which provide this type.": "Un workflow con tipo sconosciuto causerà un errore. Si prega di eliminarlo o controllare il plugin che fornisce questo tipo.",
+  "Execute mode": "Modalità di esecuzione",
+  "Execute workflow asynchronously or synchronously based on trigger type, and could not be changed after created.": "Esegui il workflow in modo asincrono o sincrono in base al tipo di trigger e non può essere modificato dopo la creazione.",
+  "Asynchronously": "Asincrono",
+  "Synchronously": "Sincrono",
+  "Will be executed in the background as a queued task.": "Verrà eseguito in background come attività in coda.",
+  "For user actions that require immediate feedback. Can not use asynchronous nodes in such mode, and it is not recommended to perform time-consuming operations under synchronous mode.": "Per le azioni dell'utente che richiedono un feedback immediato. Non è possibile utilizzare nodi asincroni in questa modalità e non è consigliabile eseguire operazioni che richiedono tempo in modalità sincrona.",
+  "Go back": "Torna indietro",
+  "Bind workflows": "Collega workflow",
+  "Support pre-action event (local mode), post-action event (local mode), and approval event here.": "Qui sono supportati evento pre-azione (modalità locale), evento post-azione (modalità locale) e evento di approvazione.",
+  "Workflow will be triggered directly once the button clicked, without data saving. Only supports to be bound with \"Custom action event\".": "Il workflow verrà attivato direttamente una volta cliccato il pulsante, senza salvataggio dei dati. Supporta solo il collegamento con \"evento azione personalizzata\".",
+  "\"Submit to workflow\" to \"Post-action event\" is deprecated, please use \"Custom action event\" instead.": "\"Invia a workflow\" a \"evento post-azione\" è obsoleto, si prega di utilizzare invece \"evento azione personalizzata\".",
+  "Workflow will be triggered before deleting succeeded (only supports pre-action event in local mode).": "Il workflow verrà attivato prima dell'eliminazione riuscita (supporta solo l'evento pre-azione in modalità locale).",
+  "Submit to workflow": "Invia a workflow",
+  "Add workflow": "Aggiungi workflow",
+  "Select workflow": "Seleziona workflow",
+  "Trigger data context": "Contesto dati trigger",
+  "Full form data": "Dati completi del modulo",
+  "Select context": "Seleziona contesto",
+  "Triggered when data changes in the collection, such as after adding, updating, or deleting a record. Unlike \"Post-action event\", Collection event listens for data changes rather than HTTP requests. Unless you understand the exact meaning, it is recommended to use \"Post-action event\".": "Attivato quando i dati cambiano nella raccolta, ad esempio dopo l'aggiunta, l'aggiornamento o l'eliminazione di un record. A differenza dell' \"evento post-azione\", l'evento raccolta ascolta le modifiche dei dati anziché le richieste HTTP. A meno che tu non capisca il significato esatto, si consiglia di utilizzare \"Evento post-azione\".",
+  "Preload associations": "Precarica associazioni",
+  "Please select the associated fields that need to be accessed in subsequent nodes. With more than two levels of to-many associations may cause performance issue, please use with caution.": "Seleziona i campi associati a cui è necessario accedere nei nodi successivi. Con più di due livelli di associazioni molti-a-molti possono verificarsi problemi di prestazioni, si prega di usare con cautela.",
+  "Choose a record or primary key of a record in the collection to trigger.": "Scegli un record o la chiave primaria di un record nella raccolta per attivare.",
+  "Triggered according to preset time conditions. Suitable for one-time or periodic tasks, such as sending notifications and cleaning data on a schedule.": "Attivato secondo condizioni di tempo preimpostate. Adatto per attività una tantum o periodiche, come l'invio di notifiche e la pulizia dei dati in base a una pianificazione.",
+  "Execute on": "Esegui su",
+  "Current time": "Ora corrente",
+  "Variable key of node": "Chiave variabile del nodo",
+  "Scope variables": "Variabili di ambito",
+  "Calculate an expression based on a calculation engine and obtain a value as the result. Variables in the upstream nodes can be used in the expression.": "Calcola un'espressione basata su un motore di calcolo e ottieni un valore come risultato. Le variabili nei nodi upstream possono essere utilizzate nell'espressione.",
+  "System variables": "Variabili di sistema",
+  "System time": "Ora di sistema",
+  "Date variables": "Variabili data",
+  "Date range": "Intervallo date",
+  "Resolved": "Risolto",
+  "Error": "Errore",
+  "Aborted": "Interrotto",
+  "Rejected": "Rifiutato",
+  "Retry needed": "Richiesto nuovo tentativo",
+  "Completed": "Completato",
+  "All": "Tutto",
+  "View result": "Visualizza risultato",
+  "Triggered but still waiting in queue to execute.": "Attivato ma ancora in attesa in coda per l'esecuzione.",
+  "Started and executing, maybe waiting for an async callback (manual, delay etc.).": "Avviato ed in esecuzione, forse in attesa di un callback asincrono (manuale, ritardo ecc.).",
+  "Successfully finished.": "Terminato con successo.",
+  "Failed to satisfy node configurations.": "Fallito nel soddisfare le configurazioni del nodo.",
+  "Some node meets error.": "Qualche nodo presenta un errore.",
+  "Running of some node was aborted by program flow.": "L'esecuzione di qualche nodo è stata interrotta dal flusso del programma.",
+  "Manually canceled whole execution when waiting.": "L'intera esecuzione è stata cancellata manualmente durante l'attesa.",
+  "Rejected from a manual node.": "Rifiutato da un nodo manuale.",
+  "General failed but should do another try.": "Fallimento generico, ma dovrebbe essere fatto un altro tentativo.",
+  "Cancel the execution": "Annulla l'esecuzione",
+  "Are you sure you want to cancel the execution?": "Sei sicuro di voler annullare l'esecuzione?",
+  "Operations": "Operazioni",
+  "Manual": "Manuale",
+  "Unknown node": "Nodo sconosciuto",
+  "Node with unknown type will cause error. Please delete it or check plugin which provide this type.": "Un nodo con tipo sconosciuto causerà un errore. Si prega di eliminarlo o controllare il plugin che fornisce questo tipo.",
+  "Calculation engine": "Motore di calcolo",
+  "Basic": "Base",
+  "Calculation expression": "Espressione di calcolo",
+  "Expression syntax error": "Errore di sintassi dell'espressione",
+  "Syntax references: ": "Riferimenti di sintassi:",
+  "Based on boolean result of the calculation to determine whether to \"continue\" or \"exit\" the process, or continue on different branches of \"yes\" and \"no\".": "Basato sul risultato booleano del calcolo per determinare se \"continuare\" o \"uscire\" dal processo, o continuare su rami diversi di \"sì\" e \"no\".",
+  "Condition expression": "Espressione di condizione",
+  "Inside of \"Yes\" branch": "All'interno del ramo \"Sì\"",
+  "Inside of \"No\" branch": "All'interno del ramo \"No\"",
+  "Add new record to a collection. You can use variables from upstream nodes to assign values to fields.": "Aggiungi un nuovo record a una raccolta. Puoi usare variabili dai nodi upstream per assegnare valori ai campi.",
+  "Update records of a collection. You can use variables from upstream nodes as query conditions and field values.": "Aggiorna i record di una raccolta. Puoi usare variabili dai nodi upstream come condizioni di query e valori campo.",
+  "Update mode": "Modalità di aggiornamento",
+  "Update in a batch": "Aggiornamento in batch",
+  "Update one by one": "Aggiornamento uno per uno",
+  "Update all eligible data at one time, which has better performance when the amount of data is large. But association fields are not supported (unless foreign key in current collection), and the updated data will not trigger other workflows.": "Aggiorna tutti i dati idonei in una volta, il che ha prestazioni migliori quando la quantità di dati è grande. Ma i campi di associazione non sono supportati (a meno che la chiave esterna non sia nella raccolta corrente), e i dati aggiornati non attiveranno altri workflow.",
+  "The updated data can trigger other workflows, and the audit log will also be recorded. But it is usually only applicable to several or dozens of pieces of data, otherwise there will be performance problems.": "I dati aggiornati possono attivare altri workflow, e il registro eventi sarà anche registrato. Ma di solito è applicabile solo a diverse o decine di dati, altrimenti ci saranno problemi di prestazioni.",
+  "Query records from a collection. You can use variables from upstream nodes as query conditions.": "Interroga i record da una raccolta. Puoi usare variabili dai nodi upstream come condizioni di query.",
+  "Allow multiple records as result": "Consenti più record come risultato",
+  "If checked, when there are multiple records in the query result, an array will be returned as the result, which can be operated on one by one using a loop node. Otherwise, only one record will be returned.": "Se selezionato, quando ci sono più record nel risultato della query, sarà restituito come risultato un array, che può essere operato uno per uno usando un nodo ciclo. Altrimenti, sarà restituito solo un record.",
+  "Result type": "Tipo risultato",
+  "Single record": "Record singolo",
+  "The result will be an object of the first matching record only, or null if no matched record.": "Il risultato sarà un oggetto solo del primo record corrispondente, oppure null se non vi è alcun record corrispondente.",
+  "The result will be an array containing matched records, or an empty one if no matching records. This can be used to be processed in a loop node.": "Il risultato sarà un array contenente record corrispondenti, o uno vuoto se non ci sono record corrispondenti. Questo può essere usato per essere elaborato in un nodo ciclo.",
+  "Exit when query result is null": "Esci quando il risultato della query è null",
+  "Please add at least one condition": "Si prega di aggiungere almeno una condizione",
+  "Unassigned fields will be set to default values, and those without default values will be set to null.": "I campi non assegnati saranno impostati ai valori predefiniti, e quelli senza valori predefiniti saranno impostati a null.",
+  "Delete record": "Elimina record",
+  "Delete records of a collection. Could use variables in workflow context as filter. All records match the filter will be deleted.": "Elimina i record di una raccolta. Potrebbe usare variabili nel contesto del workflow come filtro. Tutti i record che corrispondono al filtro saranno eliminati.",
+  "Executed workflow cannot be modified. Could be copied to a new version to modify.": "Il workflow eseguito non può essere modificato. Potrebbe essere copiato in una nuova versione per essere modificato.",
+  "End process": "Termina processo",
+  "End the process immediately, with set status.": "Termina il processo immediatamente, con stato impostato.",
+  "End status": "Stato finale",
+  "Test run": "Test run",
+  "Test run will do the actual data manipulating or API calling, please use with caution.": "Il test run farà l'effettiva manipolazione dei dati o la chiamata API, si prega di usare con cautela.",
+  "No variable": "Nessuna variabile",
+  "Add node": "Aggiungi nodo",
+  "Move all downstream nodes to": "Sposta tutti i nodi downstream a",
+  "After end of branches": "Dopo la fine dei rami",
+  "Inside of branch": "All'interno del ramo",
+  "Workflow todos": "Da fare",
+  "New version enabled": "Nuova versione abilitata"
 }
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
index a9abb48bee..998ddc42a9 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
@@ -15,7 +15,7 @@ import LRUCache from 'lru-cache';
 
 import { Op } from '@nocobase/database';
 import { Plugin } from '@nocobase/server';
-import { Registry } from '@nocobase/utils';
+import { Registry, uid } from '@nocobase/utils';
 import { SequelizeCollectionManager } from '@nocobase/data-source-manager';
 import { Logger, LoggerOptions } from '@nocobase/logger';
 
@@ -75,6 +75,10 @@ export default class PluginWorkflowServer extends Plugin {
   private onBeforeSave = async (instance: WorkflowModel, { transaction }) => {
     const Model = <typeof WorkflowModel>instance.constructor;
 
+    if (!instance.key) {
+      instance.set('key', uid());
+    }
+
     if (instance.enabled) {
       instance.set('current', true);
     }
@@ -362,11 +366,16 @@ export default class PluginWorkflowServer extends Plugin {
       const prev = workflow.previous();
       if (prev.config) {
         trigger.off({ ...workflow.get(), ...prev });
+        this.getLogger(workflow.id).info(`toggle OFF workflow ${workflow.id} based on configuration before updated`);
       }
       trigger.on(workflow);
+      this.getLogger(workflow.id).info(`toggle ON workflow ${workflow.id}`);
+
       this.enabledCache.set(workflow.id, workflow);
     } else {
       trigger.off(workflow);
+      this.getLogger(workflow.id).info(`toggle OFF workflow ${workflow.id}`);
+
       this.enabledCache.delete(workflow.id);
     }
     if (!silent) {
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts
index f67b7a84e4..cff13e5d64 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts
@@ -359,6 +359,50 @@ describe('workflow > triggers > collection', () => {
       const executions = await workflow.getExecutions();
       expect(executions.length).toBe(1);
     });
+
+    it('datetime field not changed', async () => {
+      const workflow = await WorkflowModel.create({
+        enabled: true,
+        sync: true,
+        type: 'collection',
+        config: {
+          mode: 2,
+          collection: 'posts',
+          changed: ['createdAt'],
+        },
+      });
+
+      const post = await PostRepo.create({ values: { title: 't1' } });
+      await PostRepo.update({ filterByTk: post.id, values: { ...post.get(), title: 't2' } });
+
+      const executions = await workflow.getExecutions();
+      expect(executions.length).toBe(0);
+    });
+
+    it('datetimeNoTz field not changed', async () => {
+      db.getCollection('posts').addField('dateOnly', {
+        type: 'datetimeNoTz',
+      });
+
+      await db.sync();
+
+      const workflow = await WorkflowModel.create({
+        enabled: true,
+        sync: true,
+        type: 'collection',
+        config: {
+          mode: 2,
+          collection: 'posts',
+          changed: ['dateOnly'],
+        },
+      });
+
+      const post = await PostRepo.create({ values: { title: 't1', dateOnly: '2020-01-01 00:00:00' } });
+      await PostRepo.update({ filterByTk: post.id, values: { ...post.get(), title: 't2' } });
+
+      const executions = await workflow.getExecutions();
+      expect(executions.length).toBe(0);
+    });
   });
 
   describe('config.condition', () => {
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts
index c720e13eca..5a62986a72 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts
@@ -104,50 +104,54 @@ export default class DateFieldScheduleTrigger {
   // caching workflows in range, default to 5min
   cacheCycle = 300_000;
 
+  onAfterStart = () => {
+    if (this.timer) {
+      return;
+    }
+
+    this.timer = setInterval(() => this.reload(), this.cacheCycle);
+
+    this.reload();
+  };
+
+  onBeforeStop = () => {
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
+
+    for (const [key, timer] of this.cache.entries()) {
+      clearTimeout(timer);
+      this.cache.delete(key);
+    }
+  };
+
   constructor(public workflow: Plugin) {
-    workflow.app.on('afterStart', async () => {
-      if (this.timer) {
-        return;
-      }
-
-      this.timer = setInterval(() => this.reload(), this.cacheCycle);
-
-      this.reload();
-    });
-
-    workflow.app.on('beforeStop', () => {
-      if (this.timer) {
-        clearInterval(this.timer);
-      }
-
-      for (const [key, timer] of this.cache.entries()) {
-        clearTimeout(timer);
-        this.cache.delete(key);
-      }
-    });
+    workflow.app.on('afterStart', this.onAfterStart);
+    workflow.app.on('beforeStop', this.onBeforeStop);
   }
 
-  async reload() {
+  reload() {
+    for (const [key, timer] of this.cache.entries()) {
+      clearTimeout(timer);
+      this.cache.delete(key);
+    }
+
     const workflows = Array.from(this.workflow.enabledCache.values()).filter(
       (item) => item.type === 'schedule' && item.config.mode === SCHEDULE_MODE.DATE_FIELD,
     );
 
-    // NOTE: clear cached jobs in last cycle
-    this.cache = new Map();
-
-    this.inspect(workflows);
+    workflows.forEach((workflow) => {
+      this.inspect(workflow);
+    });
   }
 
-  inspect(workflows: WorkflowModel[]) {
+  async inspect(workflow: WorkflowModel) {
     const now = new Date();
-
-    workflows.forEach(async (workflow) => {
-      const records = await this.loadRecordsToSchedule(workflow, now);
-      this.workflow.getLogger(workflow.id).info(`[Schedule on date field] ${records.length} records to schedule`);
-      records.forEach((record) => {
-        const nextTime = this.getRecordNextTime(workflow, record);
-        this.schedule(workflow, record, nextTime, Boolean(nextTime));
-      });
+    const records = await this.loadRecordsToSchedule(workflow, now);
+    this.workflow.getLogger(workflow.id).info(`[Schedule on date field] ${records.length} records to schedule`);
+    records.forEach((record) => {
+      const nextTime = this.getRecordNextTime(workflow, record);
+      this.schedule(workflow, record, nextTime, Boolean(nextTime));
     });
   }
 
@@ -233,8 +237,6 @@ export default class DateFieldScheduleTrigger {
                 [Op.gte]: new Date(endTimestamp),
               },
             });
-          } else {
-            this.workflow.getLogger(id).warn(`[Schedule on date field] "endsOn.field" is not configured`);
           }
         }
       }
@@ -367,7 +369,7 @@ export default class DateFieldScheduleTrigger {
   }
 
   on(workflow: WorkflowModel) {
-    this.inspect([workflow]);
+    this.inspect(workflow);
 
     const { collection } = workflow.config;
     const [dataSourceName, collectionName] = parseCollectionName(collection);
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/StaticScheduleTrigger.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/StaticScheduleTrigger.ts
index 9552ceae22..988c4f545b 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/StaticScheduleTrigger.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/StaticScheduleTrigger.ts
@@ -18,36 +18,39 @@ const MAX_SAFE_INTERVAL = 2147483647;
 export default class StaticScheduleTrigger {
   private timers: Map<string, NodeJS.Timeout | null> = new Map();
 
-  constructor(public workflow: Plugin) {
-    workflow.app.on('afterStart', async () => {
-      const workflows = Array.from(this.workflow.enabledCache.values()).filter(
-        (item) => item.type === 'schedule' && item.config.mode === SCHEDULE_MODE.STATIC,
-      );
-
-      this.inspect(workflows);
-    });
-
-    workflow.app.on('beforeStop', () => {
-      for (const timer of this.timers.values()) {
-        clearInterval(timer);
-      }
-    });
-  }
-
-  inspect(workflows: WorkflowModel[]) {
-    const now = new Date();
+  onAfterStart = () => {
+    const workflows = Array.from(this.workflow.enabledCache.values()).filter(
+      (item) => item.type === 'schedule' && item.config.mode === SCHEDULE_MODE.STATIC,
+    );
 
     workflows.forEach((workflow) => {
-      const nextTime = this.getNextTime(workflow, now);
-      if (nextTime) {
-        this.workflow
-          .getLogger(workflow.id)
-          .info(`caching scheduled workflow will run at: ${new Date(nextTime).toISOString()}`);
-      } else {
-        this.workflow.getLogger(workflow.id).info('workflow will not be scheduled');
-      }
-      this.schedule(workflow, nextTime, nextTime >= now.getTime());
+      this.inspect(workflow);
     });
+  };
+
+  onBeforeStop = () => {
+    for (const timer of this.timers.values()) {
+      clearInterval(timer);
+    }
+  };
+
+  constructor(public workflow: Plugin) {
+    workflow.app.on('afterStart', this.onAfterStart);
+    workflow.app.on('beforeStop', this.onBeforeStop);
+  }
+
+  inspect(workflow: WorkflowModel) {
+    const now = new Date();
+
+    const nextTime = this.getNextTime(workflow, now);
+    if (nextTime) {
+      this.workflow
+        .getLogger(workflow.id)
+        .info(`caching scheduled workflow will run at: ${new Date(nextTime).toISOString()}`);
+    } else {
+      this.workflow.getLogger(workflow.id).info('workflow will not be scheduled');
+    }
+    this.schedule(workflow, nextTime, nextTime >= now.getTime());
   }
 
   getNextTime({ config, allExecuted }: WorkflowModel, currentDate: Date, nextSecond = false) {
@@ -130,7 +133,7 @@ export default class StaticScheduleTrigger {
   }
 
   on(workflow) {
-    this.inspect([workflow]);
+    this.inspect(workflow);
   }
 
   off(workflow) {
diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json
index c1ad557e29..3c1968cc3c 100644
--- a/packages/presets/nocobase/package.json
+++ b/packages/presets/nocobase/package.json
@@ -1,80 +1,84 @@
 {
   "name": "@nocobase/preset-nocobase",
-  "version": "1.6.6",
+  "version": "1.6.20",
   "license": "AGPL-3.0",
   "main": "./lib/server/index.js",
   "dependencies": {
     "@formily/json-schema": "2.x",
-    "@nocobase/plugin-acl": "1.6.6",
-    "@nocobase/plugin-action-bulk-edit": "1.6.6",
-    "@nocobase/plugin-action-bulk-update": "1.6.6",
-    "@nocobase/plugin-action-custom-request": "1.6.6",
-    "@nocobase/plugin-action-duplicate": "1.6.6",
-    "@nocobase/plugin-action-export": "1.6.6",
-    "@nocobase/plugin-action-import": "1.6.6",
-    "@nocobase/plugin-action-print": "1.6.6",
-    "@nocobase/plugin-ai": "1.6.6",
-    "@nocobase/plugin-api-doc": "1.6.6",
-    "@nocobase/plugin-api-keys": "1.6.6",
-    "@nocobase/plugin-async-task-manager": "1.6.6",
-    "@nocobase/plugin-audit-logs": "1.6.6",
-    "@nocobase/plugin-auth": "1.6.6",
-    "@nocobase/plugin-auth-sms": "1.6.6",
-    "@nocobase/plugin-backup-restore": "1.6.6",
-    "@nocobase/plugin-block-iframe": "1.6.6",
-    "@nocobase/plugin-block-workbench": "1.6.6",
-    "@nocobase/plugin-calendar": "1.6.6",
-    "@nocobase/plugin-charts": "1.6.6",
-    "@nocobase/plugin-client": "1.6.6",
-    "@nocobase/plugin-collection-sql": "1.6.6",
-    "@nocobase/plugin-collection-tree": "1.6.6",
-    "@nocobase/plugin-data-source-main": "1.6.6",
-    "@nocobase/plugin-data-source-manager": "1.6.6",
-    "@nocobase/plugin-data-visualization": "1.6.6",
-    "@nocobase/plugin-environment-variables": "1.6.6",
-    "@nocobase/plugin-error-handler": "1.6.6",
-    "@nocobase/plugin-field-china-region": "1.6.6",
-    "@nocobase/plugin-field-formula": "1.6.6",
-    "@nocobase/plugin-field-m2m-array": "1.6.6",
-    "@nocobase/plugin-field-markdown-vditor": "1.6.6",
-    "@nocobase/plugin-field-sequence": "1.6.6",
-    "@nocobase/plugin-field-sort": "1.6.6",
-    "@nocobase/plugin-file-manager": "1.6.6",
-    "@nocobase/plugin-gantt": "1.6.6",
-    "@nocobase/plugin-graph-collection-manager": "1.6.6",
-    "@nocobase/plugin-kanban": "1.6.6",
-    "@nocobase/plugin-localization": "1.6.6",
-    "@nocobase/plugin-logger": "1.6.6",
-    "@nocobase/plugin-map": "1.6.6",
-    "@nocobase/plugin-mobile": "1.6.6",
-    "@nocobase/plugin-mobile-client": "1.6.6",
-    "@nocobase/plugin-mock-collections": "1.6.6",
-    "@nocobase/plugin-multi-app-manager": "1.6.6",
-    "@nocobase/plugin-multi-app-share-collection": "1.6.6",
-    "@nocobase/plugin-notification-email": "1.6.6",
-    "@nocobase/plugin-notification-in-app-message": "1.6.6",
-    "@nocobase/plugin-notification-manager": "1.6.6",
-    "@nocobase/plugin-public-forms": "1.6.6",
-    "@nocobase/plugin-snapshot-field": "1.6.6",
-    "@nocobase/plugin-system-settings": "1.6.6",
-    "@nocobase/plugin-theme-editor": "1.6.6",
-    "@nocobase/plugin-ui-schema-storage": "1.6.6",
-    "@nocobase/plugin-user-data-sync": "1.6.6",
-    "@nocobase/plugin-users": "1.6.6",
-    "@nocobase/plugin-verification": "1.6.6",
-    "@nocobase/plugin-workflow": "1.6.6",
-    "@nocobase/plugin-workflow-action-trigger": "1.6.6",
-    "@nocobase/plugin-workflow-aggregate": "1.6.6",
-    "@nocobase/plugin-workflow-delay": "1.6.6",
-    "@nocobase/plugin-workflow-dynamic-calculation": "1.6.6",
-    "@nocobase/plugin-workflow-loop": "1.6.6",
-    "@nocobase/plugin-workflow-mailer": "1.6.6",
-    "@nocobase/plugin-workflow-manual": "1.6.6",
-    "@nocobase/plugin-workflow-notification": "1.6.6",
-    "@nocobase/plugin-workflow-parallel": "1.6.6",
-    "@nocobase/plugin-workflow-request": "1.6.6",
-    "@nocobase/plugin-workflow-sql": "1.6.6",
-    "@nocobase/server": "1.6.6",
+    "@nocobase/plugin-acl": "1.6.20",
+    "@nocobase/plugin-action-bulk-edit": "1.6.20",
+    "@nocobase/plugin-action-bulk-update": "1.6.20",
+    "@nocobase/plugin-action-custom-request": "1.6.20",
+    "@nocobase/plugin-action-duplicate": "1.6.20",
+    "@nocobase/plugin-action-export": "1.6.20",
+    "@nocobase/plugin-action-import": "1.6.20",
+    "@nocobase/plugin-action-print": "1.6.20",
+    "@nocobase/plugin-ai": "1.6.20",
+    "@nocobase/plugin-api-doc": "1.6.20",
+    "@nocobase/plugin-api-keys": "1.6.20",
+    "@nocobase/plugin-async-task-manager": "1.6.20",
+    "@nocobase/plugin-audit-logs": "1.6.20",
+    "@nocobase/plugin-auth": "1.6.20",
+    "@nocobase/plugin-auth-sms": "1.6.20",
+    "@nocobase/plugin-backup-restore": "1.6.20",
+    "@nocobase/plugin-block-iframe": "1.6.20",
+    "@nocobase/plugin-block-workbench": "1.6.20",
+    "@nocobase/plugin-calendar": "1.6.20",
+    "@nocobase/plugin-charts": "1.6.20",
+    "@nocobase/plugin-client": "1.6.20",
+    "@nocobase/plugin-collection-sql": "1.6.20",
+    "@nocobase/plugin-collection-tree": "1.6.20",
+    "@nocobase/plugin-data-source-main": "1.6.20",
+    "@nocobase/plugin-data-source-manager": "1.6.20",
+    "@nocobase/plugin-data-visualization": "1.6.20",
+    "@nocobase/plugin-departments": "1.6.20",
+    "@nocobase/plugin-environment-variables": "1.6.20",
+    "@nocobase/plugin-error-handler": "1.6.20",
+    "@nocobase/plugin-field-attachment-url": "1.6.20",
+    "@nocobase/plugin-field-china-region": "1.6.20",
+    "@nocobase/plugin-field-formula": "1.6.20",
+    "@nocobase/plugin-field-m2m-array": "1.6.20",
+    "@nocobase/plugin-field-markdown-vditor": "1.6.20",
+    "@nocobase/plugin-field-sequence": "1.6.20",
+    "@nocobase/plugin-field-sort": "1.6.20",
+    "@nocobase/plugin-file-manager": "1.6.20",
+    "@nocobase/plugin-gantt": "1.6.20",
+    "@nocobase/plugin-graph-collection-manager": "1.6.20",
+    "@nocobase/plugin-kanban": "1.6.20",
+    "@nocobase/plugin-locale-tester": "1.6.20",
+    "@nocobase/plugin-localization": "1.6.20",
+    "@nocobase/plugin-logger": "1.6.20",
+    "@nocobase/plugin-map": "1.6.20",
+    "@nocobase/plugin-mobile": "1.6.20",
+    "@nocobase/plugin-mobile-client": "1.6.20",
+    "@nocobase/plugin-mock-collections": "1.6.20",
+    "@nocobase/plugin-multi-app-manager": "1.6.20",
+    "@nocobase/plugin-multi-app-share-collection": "1.6.20",
+    "@nocobase/plugin-notification-email": "1.6.20",
+    "@nocobase/plugin-notification-in-app-message": "1.6.20",
+    "@nocobase/plugin-notification-manager": "1.6.20",
+    "@nocobase/plugin-public-forms": "1.6.20",
+    "@nocobase/plugin-snapshot-field": "1.6.20",
+    "@nocobase/plugin-system-settings": "1.6.20",
+    "@nocobase/plugin-theme-editor": "1.6.20",
+    "@nocobase/plugin-ui-schema-storage": "1.6.20",
+    "@nocobase/plugin-user-data-sync": "1.6.20",
+    "@nocobase/plugin-users": "1.6.20",
+    "@nocobase/plugin-verification": "1.6.20",
+    "@nocobase/plugin-workflow": "1.6.20",
+    "@nocobase/plugin-workflow-action-trigger": "1.6.20",
+    "@nocobase/plugin-workflow-aggregate": "1.6.20",
+    "@nocobase/plugin-workflow-delay": "1.6.20",
+    "@nocobase/plugin-workflow-dynamic-calculation": "1.6.20",
+    "@nocobase/plugin-workflow-loop": "1.6.20",
+    "@nocobase/plugin-workflow-mailer": "1.6.20",
+    "@nocobase/plugin-workflow-manual": "1.6.20",
+    "@nocobase/plugin-workflow-notification": "1.6.20",
+    "@nocobase/plugin-workflow-parallel": "1.6.20",
+    "@nocobase/plugin-workflow-request": "1.6.20",
+    "@nocobase/plugin-workflow-response-message": "1.6.20",
+    "@nocobase/plugin-workflow-sql": "1.6.20",
+    "@nocobase/server": "1.6.20",
     "cronstrue": "^2.11.0",
     "fs-extra": "^11.1.1"
   },