diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfdb965ef..af5df1bb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,67 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [v0.21.0-alpha.7](https://github.com/nocobase/nocobase/compare/v0.21.0-alpha.6...v0.21.0-alpha.7) - 2024-04-13
+
+### Merged
+
+- fix: scopeKeyOptions should be obtained in real-time [`#4029`](https://github.com/nocobase/nocobase/pull/4029)
+- fix(addText): should use FormItemSchemaToolbar instead of BlockSchema… [`#3963`](https://github.com/nocobase/nocobase/pull/3963)
+- feat: register once hook in datasource manager [`#4024`](https://github.com/nocobase/nocobase/pull/4024)
+- fix: snippets [`#4030`](https://github.com/nocobase/nocobase/pull/4030)
+- fix: vitest single bug [`#4031`](https://github.com/nocobase/nocobase/pull/4031)
+- feat(data-vi): improved user experiences (refer to pr) [`#4013`](https://github.com/nocobase/nocobase/pull/4013)
+- test: add frontend unit test [`#3991`](https://github.com/nocobase/nocobase/pull/3991)
+- feat: support Others option in popup [`#4015`](https://github.com/nocobase/nocobase/pull/4015)
+- fix(collection-manager): no refresh after override the field [`#4022`](https://github.com/nocobase/nocobase/pull/4022)
+- chore: add export & import warnings [`#4027`](https://github.com/nocobase/nocobase/pull/4027)
+- refactor: third party data source support sort field grouped sorting edit [`#4023`](https://github.com/nocobase/nocobase/pull/4023)
+- fix(plugin-acl): pm.acl.roles snippet [`#4026`](https://github.com/nocobase/nocobase/pull/4026)
+- test: association name block e2e test [`#4021`](https://github.com/nocobase/nocobase/pull/4021)
+- fix: get api url [`#4020`](https://github.com/nocobase/nocobase/pull/4020)
+- fix(Sub-details): the initializer button is not displayed when the field value is empty [`#4019`](https://github.com/nocobase/nocobase/pull/4019)
+- fix: initializer use useAassociationName [`#4018`](https://github.com/nocobase/nocobase/pull/4018)
+- fix(auth): cas login bug when use subdirectory deployment [`#4017`](https://github.com/nocobase/nocobase/pull/4017)
+- fix(TreeTable): add child error [`#4008`](https://github.com/nocobase/nocobase/pull/4008)
+- fix: remove active field should not clear value [`#4012`](https://github.com/nocobase/nocobase/pull/4012)
+- fix(plugin-acl): datasource roles snippet [`#4016`](https://github.com/nocobase/nocobase/pull/4016)
+- fix: after selecting all, bulk update prompts for unselected data [`#4010`](https://github.com/nocobase/nocobase/pull/4010)
+- refactor: tree table is not enabled by default [`#4001`](https://github.com/nocobase/nocobase/pull/4001)
+- feat(plugin-workflow-action-trigger): support association actions to trigger [`#4007`](https://github.com/nocobase/nocobase/pull/4007)
+- Update application.ts [`#4006`](https://github.com/nocobase/nocobase/pull/4006)
+- fix: tag filed setting [`#4009`](https://github.com/nocobase/nocobase/pull/4009)
+- fix(users): remove phone validation due to incorrect check of foreign phone numebrs [`#4005`](https://github.com/nocobase/nocobase/pull/4005)
+- fix: association block action permission verification failed [`#3994`](https://github.com/nocobase/nocobase/pull/3994)
+- refactor: fields for table sorting cannot select sorting fields with scopekey [`#3984`](https://github.com/nocobase/nocobase/pull/3984)
+- fix(Form): invalid parentRecord [`#3998`](https://github.com/nocobase/nocobase/pull/3998)
+- fix(plugin-workflow): adjust locale [`#3993`](https://github.com/nocobase/nocobase/pull/3993)
+- fix: sub -table support allowSelectExistingRecord setting [`#4004`](https://github.com/nocobase/nocobase/pull/4004)
+- fix(auth): sign up page not found when entering with url directly [`#4002`](https://github.com/nocobase/nocobase/pull/4002)
+- chore(database): set null value when field is unique and value is empty string [`#3997`](https://github.com/nocobase/nocobase/pull/3997)
+- chore(gateway): report error with cause message [`#3999`](https://github.com/nocobase/nocobase/pull/3999)
+- chore(error-handler): display message cause the error [`#3996`](https://github.com/nocobase/nocobase/pull/3996)
+- fix: restore with table name in camel case [`#3995`](https://github.com/nocobase/nocobase/pull/3995)
+- refactor(plugin-workflow): adjust comments [`#3990`](https://github.com/nocobase/nocobase/pull/3990)
+- fix: gantt collapse & expand [`#3982`](https://github.com/nocobase/nocobase/pull/3982)
+- fix(BulkForm): should be required when switching to 'Changed to' [`#3965`](https://github.com/nocobase/nocobase/pull/3965)
+- fix: move action [`#3985`](https://github.com/nocobase/nocobase/pull/3985)
+- refactor: sort field should not has defaultValue [`#3986`](https://github.com/nocobase/nocobase/pull/3986)
+- chore: update class names of plugins [`#3981`](https://github.com/nocobase/nocobase/pull/3981)
+- feat(plugin-workflow-sync): add sync when multi-app-share-collection enabled [`#3969`](https://github.com/nocobase/nocobase/pull/3969)
+- fix(localization): incorrect locale when first entering [`#3968`](https://github.com/nocobase/nocobase/pull/3968)
+- chore: adjust and add api comments [`#3951`](https://github.com/nocobase/nocobase/pull/3951)
+- refactor: select options configuration [`#3964`](https://github.com/nocobase/nocobase/pull/3964)
+- fix(GridCard): set the count of columns displayed in a row [`#3960`](https://github.com/nocobase/nocobase/pull/3960)
+- refactor: only numerical formula fields support format [`#3962`](https://github.com/nocobase/nocobase/pull/3962)
+- chore(plugin-workflow): add comments [`#3959`](https://github.com/nocobase/nocobase/pull/3959)
+- chore: remove legacy formula plugins [`#3939`](https://github.com/nocobase/nocobase/pull/3939)
+
+### Commits
+
+- chore(versions): 😊 publish v0.21.0-alpha.7 [`d66c2ba`](https://github.com/nocobase/nocobase/commit/d66c2baa53a0670ff01dc7d8609f314518b46534)
+- chore: update docs of Theme editor [`71366e3`](https://github.com/nocobase/nocobase/commit/71366e3dea46d6d2af92bde4eca4dedd72800fed)
+- test: fix e2e [`3dcbdf3`](https://github.com/nocobase/nocobase/commit/3dcbdf35922ea770deb7227e4a1e8b06a3cb3296)
+
 ## [v0.21.0-alpha.6](https://github.com/nocobase/nocobase/compare/v0.21.0-alpha.5...v0.21.0-alpha.6) - 2024-04-07
 
 ### Merged
@@ -977,7 +1038,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix: load field when source collection not found [`95bec22`](https://github.com/nocobase/nocobase/commit/95bec2278ff2f53dfb1307e47bc8aca90d5a606a)
 - chore: update changelog [`34e026c`](https://github.com/nocobase/nocobase/commit/34e026cec5742c1a1347f2969a03446fa98c44c3)
 
-## [v0.17.0-alpha.1](https://github.com/nocobase/nocobase/compare/v0.16.0-alpha.6...v0.17.0-alpha.1) - 2023-12-04
+## [v0.17.0-alpha.1](https://github.com/nocobase/nocobase/compare/v0.16.0-alpha.7...v0.17.0-alpha.1) - 2023-12-04
 
 ### Merged
 
@@ -986,8 +1047,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 ### Commits
 
 - chore(versions): 😊 publish v0.17.0-alpha.1 [`1757a96`](https://github.com/nocobase/nocobase/commit/1757a96b51c7bb17f607b61467ab867e5add6567)
+- chore(versions): 😊 publish v0.16.0-alpha.6 [`9d64430`](https://github.com/nocobase/nocobase/commit/9d644304c10be0f8404f2f3370a43d2dc00e8aed)
 - chore: update changelog [`69abfc9`](https://github.com/nocobase/nocobase/commit/69abfc98327b36bbc6b7e225294835bb457518d6)
 
+## [v0.16.0-alpha.7](https://github.com/nocobase/nocobase/compare/v0.16.0-alpha.6...v0.16.0-alpha.7) - 2023-12-04
+
+### Commits
+
+- chore(versions): 😊 publish v0.16.0-alpha.7 [`d077a17`](https://github.com/nocobase/nocobase/commit/d077a17ee8cafc901a995f1ec7271ca78e4c32c3)
+- chore(versions): 😊 publish v [`7810332`](https://github.com/nocobase/nocobase/commit/78103320eb6ee01559609784e7ba1a4493399c2c)
+
 ## [v0.16.0-alpha.6](https://github.com/nocobase/nocobase/compare/v0.16.0-alpha.5...v0.16.0-alpha.6) - 2023-12-04
 
 ### Merged