diff --git a/CHANGELOG.md b/CHANGELOG.md
index 779e8ea09..db0484926 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,52 @@ 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.1](https://github.com/nocobase/nocobase/compare/v0.20.0-alpha.17...v0.21.0-alpha.1) - 2024-03-29
+
+### Merged
+
+- fix: association parent request [`#3865`](https://github.com/nocobase/nocobase/pull/3865)
+- test: add unit test for parseHTML [`#3870`](https://github.com/nocobase/nocobase/pull/3870)
+- fix(data-vi): bug when filtering chart with assocations [`#3867`](https://github.com/nocobase/nocobase/pull/3867)
+- fix: table settings get collectionField [`#3837`](https://github.com/nocobase/nocobase/pull/3837)
+- refactor(plugin-workflow): add transaction check from data source [`#3857`](https://github.com/nocobase/nocobase/pull/3857)
+- fix(data-vi): charts size bug when changing chart type [`#3859`](https://github.com/nocobase/nocobase/pull/3859)
+- fix(server): commands failed to load properly on Windows [`#3858`](https://github.com/nocobase/nocobase/pull/3858)
+- fix(LinkageRules): should work properly after the block is saved as a template [`#3855`](https://github.com/nocobase/nocobase/pull/3855)
+- test: main data source e2e test [`#3816`](https://github.com/nocobase/nocobase/pull/3816)
+- fix: delete field style improve [`#3820`](https://github.com/nocobase/nocobase/pull/3820)
+- chore: remove add-attach option from bulk update action [`#3854`](https://github.com/nocobase/nocobase/pull/3854)
+- refactor: default role & default field storage [`#3844`](https://github.com/nocobase/nocobase/pull/3844)
+- refactor: linkage rule fireImmediately [`#3847`](https://github.com/nocobase/nocobase/pull/3847)
+- fix: reporting error when clicking on the print button for the detail block [`#3845`](https://github.com/nocobase/nocobase/pull/3845)
+- fix(data-vi): canvas height keeps increasing when filtering/reseting [`#3849`](https://github.com/nocobase/nocobase/pull/3849)
+-  create nocobase app  unit test  [`#3833`](https://github.com/nocobase/nocobase/pull/3833)
+- refactor(DataBlock): details block [`#3776`](https://github.com/nocobase/nocobase/pull/3776)
+- fix: client internal method (T-3711 and T-3712 and T-3713) [`#3839`](https://github.com/nocobase/nocobase/pull/3839)
+- refactor(DataBlock): grid card block [`#3781`](https://github.com/nocobase/nocobase/pull/3781)
+- refactor(DataBlock): filter form [`#3785`](https://github.com/nocobase/nocobase/pull/3785)
+- fix: improve app manager [`#3841`](https://github.com/nocobase/nocobase/pull/3841)
+- refactor(DataBlock): kanban and gantt and map and calendar [`#3792`](https://github.com/nocobase/nocobase/pull/3792)
+- refactor(DataBlock): filter collapse block [`#3786`](https://github.com/nocobase/nocobase/pull/3786)
+- refactor(DataBlock): table selector [`#3784`](https://github.com/nocobase/nocobase/pull/3784)
+- refactor(DataBlock): list block [`#3779`](https://github.com/nocobase/nocobase/pull/3779)
+- refactor(DataBlock): form block [`#3771`](https://github.com/nocobase/nocobase/pull/3771)
+- fix(client): disable the default onSubmit event of the form [`#3834`](https://github.com/nocobase/nocobase/pull/3834)
+- fix(data-vi): charts flickers [`#3836`](https://github.com/nocobase/nocobase/pull/3836)
+- fix: acl e2e failed [`#3835`](https://github.com/nocobase/nocobase/pull/3835)
+- chore: menu permissions & plugins setting permissions [`#3822`](https://github.com/nocobase/nocobase/pull/3822)
+- fix: e2e-failed [`#3828`](https://github.com/nocobase/nocobase/pull/3828)
+- fix: missing button icon [`#3832`](https://github.com/nocobase/nocobase/pull/3832)
+- refactor: action icon [`#3831`](https://github.com/nocobase/nocobase/pull/3831)
+- Optimize building tools [`#3824`](https://github.com/nocobase/nocobase/pull/3824)
+- optimize ci [`#3825`](https://github.com/nocobase/nocobase/pull/3825)
+
+### Commits
+
+- chore(versions): 😊 publish v0.21.0-alpha.1 [`6e20ab1`](https://github.com/nocobase/nocobase/commit/6e20ab1a77303cf27debc2b851ab44bc90f107a6)
+- feat: update docker config [`f2d4188`](https://github.com/nocobase/nocobase/commit/f2d4188ccf5137bf75700832052dac8292e1da12)
+- chore: update changelog [`dd0538a`](https://github.com/nocobase/nocobase/commit/dd0538ae048353266f99f52fbd9f6a9de420c572)
+
 ## [v0.20.0-alpha.17](https://github.com/nocobase/nocobase/compare/v0.20.0-alpha.16...v0.20.0-alpha.17) - 2024-03-26
 
 ### Merged
diff --git a/lerna.json b/lerna.json
index 57a40e21d..5c3cffa25 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "npmClientArgs": ["--ignore-engines"],
diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json
index ea10f05c7..31f082e78 100644
--- a/packages/core/acl/package.json
+++ b/packages/core/acl/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "0.20.0-alpha.17",
-    "@nocobase/utils": "0.20.0-alpha.17",
+    "@nocobase/resourcer": "0.21.0-alpha.1",
+    "@nocobase/utils": "0.21.0-alpha.1",
     "minimatch": "^5.1.1"
   },
   "repository": {
diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json
index 6db4dba4d..aaf3c42b1 100644
--- a/packages/core/actions/package.json
+++ b/packages/core/actions/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@nocobase/actions",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cache": "0.20.0-alpha.17",
-    "@nocobase/database": "0.20.0-alpha.17",
-    "@nocobase/resourcer": "0.20.0-alpha.17"
+    "@nocobase/cache": "0.21.0-alpha.1",
+    "@nocobase/database": "0.21.0-alpha.1",
+    "@nocobase/resourcer": "0.21.0-alpha.1"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/app/package.json b/packages/core/app/package.json
index 8b2572dfd..380dacc52 100644
--- a/packages/core/app/package.json
+++ b/packages/core/app/package.json
@@ -1,17 +1,17 @@
 {
   "name": "@nocobase/app",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/database": "0.20.0-alpha.17",
-    "@nocobase/preset-nocobase": "0.20.0-alpha.17",
-    "@nocobase/server": "0.20.0-alpha.17"
+    "@nocobase/database": "0.21.0-alpha.1",
+    "@nocobase/preset-nocobase": "0.21.0-alpha.1",
+    "@nocobase/server": "0.21.0-alpha.1"
   },
   "devDependencies": {
-    "@nocobase/client": "0.20.0-alpha.17"
+    "@nocobase/client": "0.21.0-alpha.1"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json
index 9e2da52a3..17a59240b 100644
--- a/packages/core/auth/package.json
+++ b/packages/core/auth/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.20.0-alpha.17",
-    "@nocobase/cache": "0.20.0-alpha.17",
-    "@nocobase/database": "0.20.0-alpha.17",
-    "@nocobase/resourcer": "0.20.0-alpha.17",
-    "@nocobase/utils": "0.20.0-alpha.17",
+    "@nocobase/actions": "0.21.0-alpha.1",
+    "@nocobase/cache": "0.21.0-alpha.1",
+    "@nocobase/database": "0.21.0-alpha.1",
+    "@nocobase/resourcer": "0.21.0-alpha.1",
+    "@nocobase/utils": "0.21.0-alpha.1",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
diff --git a/packages/core/build/package.json b/packages/core/build/package.json
index 8bee12eb9..6d18dd9c0 100755
--- a/packages/core/build/package.json
+++ b/packages/core/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
diff --git a/packages/core/cache/package.json b/packages/core/cache/package.json
index 7c911ae76..9f73c3cc9 100644
--- a/packages/core/cache/package.json
+++ b/packages/core/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cache",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json
index b3af7a018..ed32c33be 100644
--- a/packages/core/cli/package.json
+++ b/packages/core/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "0.20.0-alpha.17",
+    "@nocobase/app": "0.21.0-alpha.1",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,7 +25,7 @@
     "tsx": "^4.6.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.20.0-alpha.17"
+    "@nocobase/devtools": "0.21.0-alpha.1"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/client/package.json b/packages/core/client/package.json
index cd4247f48..0d9a1301b 100644
--- a/packages/core/client/package.json
+++ b/packages/core/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -26,9 +26,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "0.20.0-alpha.17",
-    "@nocobase/sdk": "0.20.0-alpha.17",
-    "@nocobase/utils": "0.20.0-alpha.17",
+    "@nocobase/evaluators": "0.21.0-alpha.1",
+    "@nocobase/sdk": "0.21.0-alpha.1",
+    "@nocobase/utils": "0.21.0-alpha.1",
     "ahooks": "^3.7.2",
     "antd": "^5.12.8",
     "antd-style": "3.4.5",
diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json
index 0a6fe47a2..b0f571217 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "main": "src/index.js",
   "license": "Apache-2.0",
   "dependencies": {
diff --git a/packages/core/data-source-manager/package.json b/packages/core/data-source-manager/package.json
index b8a0ec0ba..2347657b4 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.20.0-alpha.17",
-    "@nocobase/cache": "0.20.0-alpha.17",
-    "@nocobase/database": "0.20.0-alpha.17",
-    "@nocobase/resourcer": "0.20.0-alpha.17",
-    "@nocobase/utils": "0.20.0-alpha.17",
+    "@nocobase/actions": "0.21.0-alpha.1",
+    "@nocobase/cache": "0.21.0-alpha.1",
+    "@nocobase/database": "0.21.0-alpha.1",
+    "@nocobase/resourcer": "0.21.0-alpha.1",
+    "@nocobase/utils": "0.21.0-alpha.1",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
diff --git a/packages/core/database/package.json b/packages/core/database/package.json
index 1fb7420f8..812ecddbf 100644
--- a/packages/core/database/package.json
+++ b/packages/core/database/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.20.0-alpha.17",
-    "@nocobase/utils": "0.20.0-alpha.17",
+    "@nocobase/logger": "0.21.0-alpha.1",
+    "@nocobase/utils": "0.21.0-alpha.1",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json
index 88ceb0513..3fbab7aef 100644
--- a/packages/core/devtools/package.json
+++ b/packages/core/devtools/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/devtools",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "0.20.0-alpha.17",
-    "@nocobase/client": "0.20.0-alpha.17",
-    "@nocobase/test": "0.20.0-alpha.17",
+    "@nocobase/build": "0.21.0-alpha.1",
+    "@nocobase/client": "0.21.0-alpha.1",
+    "@nocobase/test": "0.21.0-alpha.1",
     "@types/koa": "^2.13.4",
     "@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 3e31615fc..ce1179982 100644
--- a/packages/core/evaluators/package.json
+++ b/packages/core/evaluators/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/evaluators",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
     "@formulajs/formulajs": "4.2.0",
-    "@nocobase/utils": "0.20.0-alpha.17",
+    "@nocobase/utils": "0.21.0-alpha.1",
     "mathjs": "^10.6.0"
   },
   "repository": {
diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json
index 041756f45..542580d2f 100644
--- a/packages/core/logger/package.json
+++ b/packages/core/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "nocobase logging library",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
diff --git a/packages/core/resourcer/package.json b/packages/core/resourcer/package.json
index 54abdc1b4..c09fb47c8 100644
--- a/packages/core/resourcer/package.json
+++ b/packages/core/resourcer/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/utils": "0.20.0-alpha.17",
+    "@nocobase/utils": "0.21.0-alpha.1",
     "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 7b6dbd326..ccc240ced 100644
--- a/packages/core/sdk/package.json
+++ b/packages/core/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/sdk",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/core/server/package.json b/packages/core/server/package.json
index 548b5ace3..0ebd5c44a 100644
--- a/packages/core/server/package.json
+++ b/packages/core/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "0.20.0-alpha.17",
+    "version": "0.21.0-alpha.1",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "Apache-2.0",
@@ -10,18 +10,18 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "0.20.0-alpha.17",
-        "@nocobase/actions": "0.20.0-alpha.17",
-        "@nocobase/auth": "0.20.0-alpha.17",
-        "@nocobase/cache": "0.20.0-alpha.17",
-        "@nocobase/data-source-manager": "0.20.0-alpha.17",
-        "@nocobase/database": "0.20.0-alpha.17",
-        "@nocobase/evaluators": "0.20.0-alpha.17",
-        "@nocobase/logger": "0.20.0-alpha.17",
-        "@nocobase/resourcer": "0.20.0-alpha.17",
-        "@nocobase/sdk": "0.20.0-alpha.17",
-        "@nocobase/telemetry": "0.20.0-alpha.17",
-        "@nocobase/utils": "0.20.0-alpha.17",
+        "@nocobase/acl": "0.21.0-alpha.1",
+        "@nocobase/actions": "0.21.0-alpha.1",
+        "@nocobase/auth": "0.21.0-alpha.1",
+        "@nocobase/cache": "0.21.0-alpha.1",
+        "@nocobase/data-source-manager": "0.21.0-alpha.1",
+        "@nocobase/database": "0.21.0-alpha.1",
+        "@nocobase/evaluators": "0.21.0-alpha.1",
+        "@nocobase/logger": "0.21.0-alpha.1",
+        "@nocobase/resourcer": "0.21.0-alpha.1",
+        "@nocobase/sdk": "0.21.0-alpha.1",
+        "@nocobase/telemetry": "0.21.0-alpha.1",
+        "@nocobase/utils": "0.21.0-alpha.1",
         "@types/decompress": "4.2.4",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
diff --git a/packages/core/telemetry/package.json b/packages/core/telemetry/package.json
index c205f1b0e..7d64e04d0 100644
--- a/packages/core/telemetry/package.json
+++ b/packages/core/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/telemetry",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "nocobase telemetry library",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -11,7 +11,7 @@
     "directory": "packages/telemetry"
   },
   "dependencies": {
-    "@nocobase/utils": "0.20.0-alpha.17",
+    "@nocobase/utils": "0.21.0-alpha.1",
     "@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 28fbf7c5a..46aaa8e6b 100644
--- a/packages/core/test/package.json
+++ b/packages/core/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -41,12 +41,12 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "0.20.0-alpha.17",
+    "@nocobase/server": "0.21.0-alpha.1",
     "@playwright/test": "^1.42.1",
+    "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.0.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.4.3",
-    "@testing-library/jest-dom": "^6.4.2",
     "@types/supertest": "^2.0.11",
     "@vitejs/plugin-react": "^4.0.0",
     "jsdom": "^16.0.0",
diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json
index 50c910c32..26c3aa693 100644
--- a/packages/core/utils/package.json
+++ b/packages/core/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
diff --git a/packages/plugins/@nocobase/plugin-acl/package.json b/packages/plugins/@nocobase/plugin-acl/package.json
index 6ac8bc994..b695e1cd1 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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 539686547..3c99b1e93 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-update/package.json b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
index 631d952ac..c0d15fe12 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-duplicate/package.json b/packages/plugins/@nocobase/plugin-action-duplicate/package.json
index 791087636..aa49f6cd3 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-print/package.json b/packages/plugins/@nocobase/plugin-action-print/package.json
index 3fe51127a..fe49b9c79 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-api-doc/package.json b/packages/plugins/@nocobase/plugin-api-doc/package.json
index fb771dec3..eadf6161d 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "displayName": "API documentation",
   "displayName.zh-CN": "API 文档",
   "description": "An OpenAPI documentation generator for NocoBase HTTP API.",
diff --git a/packages/plugins/@nocobase/plugin-api-keys/package.json b/packages/plugins/@nocobase/plugin-api-keys/package.json
index 182ad552b..01f4f09a3 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/api-keys",
diff --git a/packages/plugins/@nocobase/plugin-audit-logs/package.json b/packages/plugins/@nocobase/plugin-audit-logs/package.json
index ae8af0f71..e72bb3290 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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/package.json b/packages/plugins/@nocobase/plugin-auth/package.json
index c52486684..2be49024f 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-backup-restore/package.json b/packages/plugins/@nocobase/plugin-backup-restore/package.json
index dc3e49088..a83b95188 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/backup-restore",
diff --git a/packages/plugins/@nocobase/plugin-calendar/package.json b/packages/plugins/@nocobase/plugin-calendar/package.json
index 30c9721e7..c06b62663 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-cas/package.json b/packages/plugins/@nocobase/plugin-cas/package.json
index 98071299d..8b1bc972d 100644
--- a/packages/plugins/@nocobase/plugin-cas/package.json
+++ b/packages/plugins/@nocobase/plugin-cas/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：CAS",
   "description": "CAS authentication.",
   "description.zh-CN": "通过 CAS 协议认证身份。",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/auth-cas",
diff --git a/packages/plugins/@nocobase/plugin-charts/package.json b/packages/plugins/@nocobase/plugin-charts/package.json
index c03c11de7..207d0a5d4 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-china-region/package.json b/packages/plugins/@nocobase/plugin-china-region/package.json
index 9708a553f..68c1f05e3 100644
--- a/packages/plugins/@nocobase/plugin-china-region/package.json
+++ b/packages/plugins/@nocobase/plugin-china-region/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-china-region",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "displayName": "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-client/package.json b/packages/plugins/@nocobase/plugin-client/package.json
index fe35b9fd9..103ee08fc 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/package.json b/packages/plugins/@nocobase/plugin-collection-manager/package.json
index 9164115ce..bb9dd9a0c 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-collection-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as MySQL, PostgreSQL, SQLite and so on.",
   "description.zh-CN": "NocoBase 主数据库，支持 MySQL、PostgreSQL、SQLite 等关系型数据库。",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-custom-request/package.json b/packages/plugins/@nocobase/plugin-custom-request/package.json
index bdc32ba68..d715f1878 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/package.json
+++ b/packages/plugins/@nocobase/plugin-custom-request/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-custom-request",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-data-source-manager/package.json b/packages/plugins/@nocobase/plugin-data-source-manager/package.json
index 0ab3e4806..c8d4e09f4 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "main": "dist/server/index.js",
   "displayName": "Data source manager",
   "displayName.zh-CN": "数据源管理",
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx
index 87a07cff5..7d7f4133c 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx
@@ -69,7 +69,7 @@ const getSchema = (schema: IField, record: any, compile, getContainer): ISchema
             'x-decorator': 'FormItem',
             'x-component': 'Select',
             enum: '{{filterTargetKeyOptions}}',
-            'x-visible': '{{isView}}',
+            'x-visible': '{{!!isView}}',
           },
           footer: {
             type: 'void',
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/package.json b/packages/plugins/@nocobase/plugin-data-visualization/package.json
index 8838b7f05..0ed14e562 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-disable-pm-add/package.json b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json
index aaf90c631..bebdb2afc 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "main": "./dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "0.x",
diff --git a/packages/plugins/@nocobase/plugin-error-handler/package.json b/packages/plugins/@nocobase/plugin-error-handler/package.json
index 0609166cd..825a280e1 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-excel-formula-field/package.json b/packages/plugins/@nocobase/plugin-excel-formula-field/package.json
index 03ddd392d..5d97ff8fb 100644
--- a/packages/plugins/@nocobase/plugin-excel-formula-field/package.json
+++ b/packages/plugins/@nocobase/plugin-excel-formula-field/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-excel-formula-field",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
diff --git a/packages/plugins/@nocobase/plugin-export/package.json b/packages/plugins/@nocobase/plugin-export/package.json
index 6a647a256..e37081df7 100644
--- a/packages/plugins/@nocobase/plugin-export/package.json
+++ b/packages/plugins/@nocobase/plugin-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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-export",
diff --git a/packages/plugins/@nocobase/plugin-file-manager/package.json b/packages/plugins/@nocobase/plugin-file-manager/package.json
index 20e117c3d..b57f140bc 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-formula-field/package.json b/packages/plugins/@nocobase/plugin-formula-field/package.json
index 898ec5df8..9485174bf 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/package.json
+++ b/packages/plugins/@nocobase/plugin-formula-field/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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-formula",
diff --git a/packages/plugins/@nocobase/plugin-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json
index 26d104095..b081fce18 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "displayName": "Block: Gantt",
   "displayName.zh-CN": "区块：甘特图",
   "description": "Provides Gantt block.",
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
index 666137456..7b209099e 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-iframe-block/package.json b/packages/plugins/@nocobase/plugin-iframe-block/package.json
index 51a0f115c..65dead2ab 100644
--- a/packages/plugins/@nocobase/plugin-iframe-block/package.json
+++ b/packages/plugins/@nocobase/plugin-iframe-block/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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/block-iframe",
diff --git a/packages/plugins/@nocobase/plugin-import/package.json b/packages/plugins/@nocobase/plugin-import/package.json
index 05dcda968..92c6ff1a6 100644
--- a/packages/plugins/@nocobase/plugin-import/package.json
+++ b/packages/plugins/@nocobase/plugin-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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-import",
diff --git a/packages/plugins/@nocobase/plugin-kanban/package.json b/packages/plugins/@nocobase/plugin-kanban/package.json
index 8231d6b51..44f28fa66 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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 23274e4a8..2bd9e8e3e 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx
@@ -24,7 +24,14 @@ export const KanbanCard: any = observer(
       <SchemaComponentOptions components={{}} scope={{}}>
         <Card
           onClick={(e) => {
-            setVisible(true);
+            const targetElement = e.target as Element; // 将事件目标转换为Element类型
+            const currentTargetElement = e.currentTarget as Element;
+            if (currentTargetElement.contains(targetElement)) {
+              setVisible(true);
+              e.stopPropagation();
+            } else {
+              e.stopPropagation();
+            }
           }}
           bordered={false}
           hoverable
diff --git a/packages/plugins/@nocobase/plugin-localization-management/package.json b/packages/plugins/@nocobase/plugin-localization-management/package.json
index 0b97125dc..359a8febf 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/package.json
+++ b/packages/plugins/@nocobase/plugin-localization-management/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-localization-management",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-logger/package.json b/packages/plugins/@nocobase/plugin-logger/package.json
index e2c1eff6f..9097e4bbe 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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 6da8d793a..bbcd54cba 100644
--- a/packages/plugins/@nocobase/plugin-map/package.json
+++ b/packages/plugins/@nocobase/plugin-map/package.json
@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-map",
   "displayName": "Block: Map",
   "displayName.zh-CN": "区块：地图",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "Map block, support Gaode map and Google map, you can also extend more map types.",
   "description.zh-CN": "地图区块，支持高德地图和 Google 地图，你也可以扩展更多地图类型。",
   "license": "AGPL-3.0",
diff --git a/packages/plugins/@nocobase/plugin-math-formula-field/package.json b/packages/plugins/@nocobase/plugin-math-formula-field/package.json
index 25a9494b6..10edaecba 100644
--- a/packages/plugins/@nocobase/plugin-math-formula-field/package.json
+++ b/packages/plugins/@nocobase/plugin-math-formula-field/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数学公式字段",
   "description": "A powerful mathematical formula field plugin designed to provide flexible mathematical and formula calculation capabilities for databases or data management systems. It seamlessly integrates with various database systems such as MySQL, PostgreSQL, and offers an intuitive user interface for defining and executing mathematical formula fields.",
   "description.zh-CN": "一个功能强大的数学公式字段插件，旨在为数据库或数据管理系统提供灵活的数学计算和公式计算功能。它可以与各种数据库系统（如MySQL、PostgreSQL）无缝集成，并提供直观的用户界面来定义和执行数学公式字段。",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-mobile-client/package.json b/packages/plugins/@nocobase/plugin-mobile-client/package.json
index bf0cdebd5..c93526e63 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json
index e5546f232..349bf8135 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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 d9a8563ef..0bd5d9a00 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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 45fc0f2b0..c1d2eec43 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "main": "./dist/server/index.js",
   "devDependencies": {
     "@formily/react": "2.x",
diff --git a/packages/plugins/@nocobase/plugin-notifications/package.json b/packages/plugins/@nocobase/plugin-notifications/package.json
index 1641330de..0630129bd 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
diff --git a/packages/plugins/@nocobase/plugin-oidc/package.json b/packages/plugins/@nocobase/plugin-oidc/package.json
index 4cdcbbced..c76977f35 100644
--- a/packages/plugins/@nocobase/plugin-oidc/package.json
+++ b/packages/plugins/@nocobase/plugin-oidc/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：OIDC",
   "description": "OIDC (OpenID Connect) authentication.",
   "description.zh-CN": "通过 OIDC (OpenID Connect) 协议认证身份。",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/auth-oidc",
diff --git a/packages/plugins/@nocobase/plugin-saml/package.json b/packages/plugins/@nocobase/plugin-saml/package.json
index a98b5ce7e..27d36e3ca 100644
--- a/packages/plugins/@nocobase/plugin-saml/package.json
+++ b/packages/plugins/@nocobase/plugin-saml/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：SAML 2.0",
   "description": "SAML 2.0 authentication.",
   "description.zh-CN": "通过 SAML 2.0 协议认证身份。",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/auth-saml",
diff --git a/packages/plugins/@nocobase/plugin-sample-hello/package.json b/packages/plugins/@nocobase/plugin-sample-hello/package.json
index d970cdcfb..6e8eaea11 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "main": "./dist/server/index.js",
   "displayName": "Hello",
   "displayName.zh-CN": "Hello",
diff --git a/packages/plugins/@nocobase/plugin-sequence-field/package.json b/packages/plugins/@nocobase/plugin-sequence-field/package.json
index 8c07760e7..fb7551942 100644
--- a/packages/plugins/@nocobase/plugin-sequence-field/package.json
+++ b/packages/plugins/@nocobase/plugin-sequence-field/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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-sequence",
diff --git a/packages/plugins/@nocobase/plugin-sms-auth/package.json b/packages/plugins/@nocobase/plugin-sms-auth/package.json
index 082c68cf2..667474078 100644
--- a/packages/plugins/@nocobase/plugin-sms-auth/package.json
+++ b/packages/plugins/@nocobase/plugin-sms-auth/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：短信",
   "description": "SMS authentication.",
   "description.zh-CN": "通过短信验证码认证身份。",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-snapshot-field/package.json b/packages/plugins/@nocobase/plugin-snapshot-field/package.json
index d684b5585..7551b856a 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-snapshot",
diff --git a/packages/plugins/@nocobase/plugin-system-settings/package.json b/packages/plugins/@nocobase/plugin-system-settings/package.json
index c475876ea..3a212a4ee 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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 55277ce30..ffa98e7a9 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-routes-storage/package.json b/packages/plugins/@nocobase/plugin-ui-routes-storage/package.json
index e11e757ee..a189a8d11 100644
--- a/packages/plugins/@nocobase/plugin-ui-routes-storage/package.json
+++ b/packages/plugins/@nocobase/plugin-ui-routes-storage/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "路由管理",
   "description": "manage the routes of nocobase",
   "description.zh-CN": "管理页面路由。",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
index be6191d2f..352423f1d 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-users/package.json b/packages/plugins/@nocobase/plugin-users/package.json
index 562952a8e..c55893c04 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/users",
diff --git a/packages/plugins/@nocobase/plugin-verification/package.json b/packages/plugins/@nocobase/plugin-verification/package.json
index 5c4d83060..c03599e2d 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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 a521c898c..06f90e43a 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": "Bind action buttons to trigger workflow events when clicked.",
   "description.zh-CN": "可对数据操作按钮绑定，在点击后触发对应的工作流事件。",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-aggregate/package.json b/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
index b2caaae55..b7dc034aa 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-delay/package.json b/packages/plugins/@nocobase/plugin-workflow-delay/package.json
index b3bb47a55..7d8067e4e 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-dynamic-calculation/package.json b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
index 4eae623d5..945989db6 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-loop/package.json b/packages/plugins/@nocobase/plugin-workflow-loop/package.json
index 49610212d..15ede216a 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-manual/package.json b/packages/plugins/@nocobase/plugin-workflow-manual/package.json
index 833458260..caacc9c5d 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-parallel/package.json b/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
index 6d62c58ec..d0b0208de 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-request/package.json b/packages/plugins/@nocobase/plugin-workflow-request/package.json
index 15a5b639c..5019936fa 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-sql/package.json b/packages/plugins/@nocobase/plugin-workflow-sql/package.json
index 2ddd45046..007d5773d 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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-test/package.json b/packages/plugins/@nocobase/plugin-workflow-test/package.json
index e9df67eee..ee733a6de 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "dist/server/index.js",
   "types": "./dist/server/index.d.ts",
diff --git a/packages/plugins/@nocobase/plugin-workflow/package.json b/packages/plugins/@nocobase/plugin-workflow/package.json
index 2adfaa6b8..638fc1b62 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": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "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": "0.20.0-alpha.17"
+    "@nocobase/plugin-workflow-test": "0.21.0-alpha.1"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/instructions/CreateInstruction.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/instructions/CreateInstruction.ts
index fd5efeb73..6173bb393 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/instructions/CreateInstruction.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/instructions/CreateInstruction.ts
@@ -11,7 +11,7 @@ export class CreateInstruction extends Instruction {
     const { collection, params: { appends = [], ...params } = {} } = node.config;
     const [dataSourceName, collectionName] = parseCollectionName(collection);
 
-    const { repository, model } = this.workflow.app.dataSourceManager.dataSources
+    const { repository, filterTargetKey } = this.workflow.app.dataSourceManager.dataSources
       .get(dataSourceName)
       .collectionManager.getCollection(collectionName);
     const options = processor.getParsedValue(params, node.id);
@@ -33,7 +33,7 @@ export class CreateInstruction extends Instruction {
         return set;
       }, new Set());
       result = await repository.findOne({
-        filterByTk: created[model.primaryKeyAttribute],
+        filterByTk: created[filterTargetKey],
         appends: Array.from(includeFields),
         transaction,
       });
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/CollectionTrigger.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/CollectionTrigger.ts
index 7650112ca..1bec73ee8 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/CollectionTrigger.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/CollectionTrigger.ts
@@ -42,7 +42,7 @@ async function handler(this: CollectionTrigger, workflow: WorkflowModel, data: M
     .get(dataSourceName)
     .collectionManager.getCollection(collectionName);
   const { transaction, context } = options;
-  const { repository, model } = collection;
+  const { repository, filterTargetKey } = collection;
 
   // NOTE: if no configured fields changed, do not trigger
   if (
@@ -62,7 +62,7 @@ async function handler(this: CollectionTrigger, workflow: WorkflowModel, data: M
     // const calculation = toCalculation(condition);
     const count = await repository.count({
       filter: {
-        $and: [condition, { [model.primaryKeyAttribute]: data[model.primaryKeyAttribute] }],
+        $and: [condition, { [filterTargetKey]: data[filterTargetKey] }],
       },
       context,
       transaction,
@@ -82,7 +82,7 @@ async function handler(this: CollectionTrigger, workflow: WorkflowModel, data: M
       return set;
     }, new Set());
     result = await repository.findOne({
-      filterByTk: data[model.primaryKeyAttribute],
+      filterByTk: data[filterTargetKey],
       appends: Array.from(includeFields),
       transaction,
     });
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 b31231ae3..1340ce269 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
@@ -283,8 +283,11 @@ export default class ScheduleTrigger {
   }
 
   schedule(workflow: WorkflowModel, record, nextTime, toggle = true, options = {}) {
-    const { model } = this.workflow.app.db.getCollection(workflow.config.collection);
-    const recordPk = record.get(model.primaryKeyAttribute);
+    const [dataSourceName, collectionName] = parseCollectionName(workflow.config.collection);
+    const { filterTargetKey } = this.workflow.app.dataSourceManager.dataSources
+      .get(dataSourceName)
+      .collectionManager.getCollection(collectionName);
+    const recordPk = record.get(filterTargetKey);
     if (toggle) {
       const nextInterval = Math.max(0, nextTime - Date.now());
       const key = `${workflow.id}:${recordPk}@${nextTime}`;
@@ -307,8 +310,11 @@ export default class ScheduleTrigger {
   }
 
   async trigger(workflow: WorkflowModel, record, nextTime, { transaction }: Transactionable = {}) {
-    const { repository, model } = this.workflow.app.db.getCollection(workflow.config.collection);
-    const recordPk = record.get(model.primaryKeyAttribute);
+    const [dataSourceName, collectionName] = parseCollectionName(workflow.config.collection);
+    const { repository, filterTargetKey } = this.workflow.app.dataSourceManager.dataSources
+      .get(dataSourceName)
+      .collectionManager.getCollection(collectionName);
+    const recordPk = record.get(filterTargetKey);
     const data = await repository.findOne({
       filterByTk: recordPk,
       appends: workflow.config.appends,
diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json
index ffda2f8a9..30ec10cc9 100644
--- a/packages/presets/nocobase/package.json
+++ b/packages/presets/nocobase/package.json
@@ -1,66 +1,66 @@
 {
   "name": "@nocobase/preset-nocobase",
-  "version": "0.20.0-alpha.17",
+  "version": "0.21.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./lib/server/index.js",
   "dependencies": {
     "@formily/json-schema": "2.x",
-    "@nocobase/plugin-acl": "0.20.0-alpha.17",
-    "@nocobase/plugin-action-bulk-edit": "0.20.0-alpha.17",
-    "@nocobase/plugin-action-bulk-update": "0.20.0-alpha.17",
-    "@nocobase/plugin-action-duplicate": "0.20.0-alpha.17",
-    "@nocobase/plugin-action-print": "0.20.0-alpha.17",
-    "@nocobase/plugin-api-doc": "0.20.0-alpha.17",
-    "@nocobase/plugin-api-keys": "0.20.0-alpha.17",
-    "@nocobase/plugin-audit-logs": "0.20.0-alpha.17",
-    "@nocobase/plugin-auth": "0.20.0-alpha.17",
-    "@nocobase/plugin-backup-restore": "0.20.0-alpha.17",
-    "@nocobase/plugin-calendar": "0.20.0-alpha.17",
-    "@nocobase/plugin-cas": "0.20.0-alpha.17",
-    "@nocobase/plugin-charts": "0.20.0-alpha.17",
-    "@nocobase/plugin-china-region": "0.20.0-alpha.17",
-    "@nocobase/plugin-client": "0.20.0-alpha.17",
-    "@nocobase/plugin-collection-manager": "0.20.0-alpha.17",
-    "@nocobase/plugin-custom-request": "0.20.0-alpha.17",
-    "@nocobase/plugin-data-source-manager": "0.20.0-alpha.17",
-    "@nocobase/plugin-data-visualization": "0.20.0-alpha.17",
-    "@nocobase/plugin-error-handler": "0.20.0-alpha.17",
-    "@nocobase/plugin-export": "0.20.0-alpha.17",
-    "@nocobase/plugin-file-manager": "0.20.0-alpha.17",
-    "@nocobase/plugin-formula-field": "0.20.0-alpha.17",
-    "@nocobase/plugin-gantt": "0.20.0-alpha.17",
-    "@nocobase/plugin-graph-collection-manager": "0.20.0-alpha.17",
-    "@nocobase/plugin-iframe-block": "0.20.0-alpha.17",
-    "@nocobase/plugin-import": "0.20.0-alpha.17",
-    "@nocobase/plugin-kanban": "0.20.0-alpha.17",
-    "@nocobase/plugin-localization-management": "0.20.0-alpha.17",
-    "@nocobase/plugin-logger": "0.20.0-alpha.17",
-    "@nocobase/plugin-map": "0.20.0-alpha.17",
-    "@nocobase/plugin-mobile-client": "0.20.0-alpha.17",
-    "@nocobase/plugin-mock-collections": "0.20.0-alpha.17",
-    "@nocobase/plugin-multi-app-manager": "0.20.0-alpha.17",
-    "@nocobase/plugin-multi-app-share-collection": "0.20.0-alpha.17",
-    "@nocobase/plugin-oidc": "0.20.0-alpha.17",
-    "@nocobase/plugin-saml": "0.20.0-alpha.17",
-    "@nocobase/plugin-sequence-field": "0.20.0-alpha.17",
-    "@nocobase/plugin-sms-auth": "0.20.0-alpha.17",
-    "@nocobase/plugin-snapshot-field": "0.20.0-alpha.17",
-    "@nocobase/plugin-system-settings": "0.20.0-alpha.17",
-    "@nocobase/plugin-theme-editor": "0.20.0-alpha.17",
-    "@nocobase/plugin-ui-schema-storage": "0.20.0-alpha.17",
-    "@nocobase/plugin-users": "0.20.0-alpha.17",
-    "@nocobase/plugin-verification": "0.20.0-alpha.17",
-    "@nocobase/plugin-workflow": "0.20.0-alpha.17",
-    "@nocobase/plugin-workflow-action-trigger": "0.20.0-alpha.17",
-    "@nocobase/plugin-workflow-aggregate": "0.20.0-alpha.17",
-    "@nocobase/plugin-workflow-delay": "0.20.0-alpha.17",
-    "@nocobase/plugin-workflow-dynamic-calculation": "0.20.0-alpha.17",
-    "@nocobase/plugin-workflow-loop": "0.20.0-alpha.17",
-    "@nocobase/plugin-workflow-manual": "0.20.0-alpha.17",
-    "@nocobase/plugin-workflow-parallel": "0.20.0-alpha.17",
-    "@nocobase/plugin-workflow-request": "0.20.0-alpha.17",
-    "@nocobase/plugin-workflow-sql": "0.20.0-alpha.17",
-    "@nocobase/server": "0.20.0-alpha.17",
+    "@nocobase/plugin-acl": "0.21.0-alpha.1",
+    "@nocobase/plugin-action-bulk-edit": "0.21.0-alpha.1",
+    "@nocobase/plugin-action-bulk-update": "0.21.0-alpha.1",
+    "@nocobase/plugin-action-duplicate": "0.21.0-alpha.1",
+    "@nocobase/plugin-action-print": "0.21.0-alpha.1",
+    "@nocobase/plugin-api-doc": "0.21.0-alpha.1",
+    "@nocobase/plugin-api-keys": "0.21.0-alpha.1",
+    "@nocobase/plugin-audit-logs": "0.21.0-alpha.1",
+    "@nocobase/plugin-auth": "0.21.0-alpha.1",
+    "@nocobase/plugin-backup-restore": "0.21.0-alpha.1",
+    "@nocobase/plugin-calendar": "0.21.0-alpha.1",
+    "@nocobase/plugin-cas": "0.21.0-alpha.1",
+    "@nocobase/plugin-charts": "0.21.0-alpha.1",
+    "@nocobase/plugin-china-region": "0.21.0-alpha.1",
+    "@nocobase/plugin-client": "0.21.0-alpha.1",
+    "@nocobase/plugin-collection-manager": "0.21.0-alpha.1",
+    "@nocobase/plugin-custom-request": "0.21.0-alpha.1",
+    "@nocobase/plugin-data-source-manager": "0.21.0-alpha.1",
+    "@nocobase/plugin-data-visualization": "0.21.0-alpha.1",
+    "@nocobase/plugin-error-handler": "0.21.0-alpha.1",
+    "@nocobase/plugin-export": "0.21.0-alpha.1",
+    "@nocobase/plugin-file-manager": "0.21.0-alpha.1",
+    "@nocobase/plugin-formula-field": "0.21.0-alpha.1",
+    "@nocobase/plugin-gantt": "0.21.0-alpha.1",
+    "@nocobase/plugin-graph-collection-manager": "0.21.0-alpha.1",
+    "@nocobase/plugin-iframe-block": "0.21.0-alpha.1",
+    "@nocobase/plugin-import": "0.21.0-alpha.1",
+    "@nocobase/plugin-kanban": "0.21.0-alpha.1",
+    "@nocobase/plugin-localization-management": "0.21.0-alpha.1",
+    "@nocobase/plugin-logger": "0.21.0-alpha.1",
+    "@nocobase/plugin-map": "0.21.0-alpha.1",
+    "@nocobase/plugin-mobile-client": "0.21.0-alpha.1",
+    "@nocobase/plugin-mock-collections": "0.21.0-alpha.1",
+    "@nocobase/plugin-multi-app-manager": "0.21.0-alpha.1",
+    "@nocobase/plugin-multi-app-share-collection": "0.21.0-alpha.1",
+    "@nocobase/plugin-oidc": "0.21.0-alpha.1",
+    "@nocobase/plugin-saml": "0.21.0-alpha.1",
+    "@nocobase/plugin-sequence-field": "0.21.0-alpha.1",
+    "@nocobase/plugin-sms-auth": "0.21.0-alpha.1",
+    "@nocobase/plugin-snapshot-field": "0.21.0-alpha.1",
+    "@nocobase/plugin-system-settings": "0.21.0-alpha.1",
+    "@nocobase/plugin-theme-editor": "0.21.0-alpha.1",
+    "@nocobase/plugin-ui-schema-storage": "0.21.0-alpha.1",
+    "@nocobase/plugin-users": "0.21.0-alpha.1",
+    "@nocobase/plugin-verification": "0.21.0-alpha.1",
+    "@nocobase/plugin-workflow": "0.21.0-alpha.1",
+    "@nocobase/plugin-workflow-action-trigger": "0.21.0-alpha.1",
+    "@nocobase/plugin-workflow-aggregate": "0.21.0-alpha.1",
+    "@nocobase/plugin-workflow-delay": "0.21.0-alpha.1",
+    "@nocobase/plugin-workflow-dynamic-calculation": "0.21.0-alpha.1",
+    "@nocobase/plugin-workflow-loop": "0.21.0-alpha.1",
+    "@nocobase/plugin-workflow-manual": "0.21.0-alpha.1",
+    "@nocobase/plugin-workflow-parallel": "0.21.0-alpha.1",
+    "@nocobase/plugin-workflow-request": "0.21.0-alpha.1",
+    "@nocobase/plugin-workflow-sql": "0.21.0-alpha.1",
+    "@nocobase/server": "0.21.0-alpha.1",
     "cronstrue": "^2.11.0"
   },
   "repository": {