diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10245f4321..2024d4f6fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [v1.2.14-alpha](https://github.com/nocobase/nocobase/compare/v1.2.13-alpha...v1.2.14-alpha) - 2024-07-11
+
+### Merged
+
+- fix(Safari): resolve issue with menu page not refreshing in Safari [`#4835`](https://github.com/nocobase/nocobase/pull/4835)
+- chore(bot): optimize comment content [`#4856`](https://github.com/nocobase/nocobase/pull/4856)
+- chore: fetch-depth=0 [`#4854`](https://github.com/nocobase/nocobase/pull/4854)
+
+### Commits
+
+- chore(versions): 😊 publish v1.2.14-alpha [`4e53736`](https://github.com/nocobase/nocobase/commit/4e537360dd8c5eaf15dbea254cffd24ea5e3f244)
+- chore: update release ci [`b564221`](https://github.com/nocobase/nocobase/commit/b56422139f2590a68f95df80e3dd30866f2e8c1f)
+- chore: update changelog [`a89a95c`](https://github.com/nocobase/nocobase/commit/a89a95cfbc84f1d462c7824351f984b6c6cbab7a)
+
 ## [v1.2.13-alpha](https://github.com/nocobase/nocobase/compare/v1.2.12-alpha...v1.2.13-alpha) - 2024-07-10
 
 ### Merged
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 def3e7d31e..a81d461af6 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
@@ -221,7 +221,7 @@ const MenuEditor = (props) => {
   }
   return (
     <SchemaIdContext.Provider value={defaultSelectedUid}>
-      <SchemaComponent distributed memoized scope={scope} schema={schema} />
+      <SchemaComponent distributed scope={scope} schema={schema} />
     </SchemaIdContext.Provider>
   );
 };
diff --git a/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx b/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx
index 3fa948fb95..0407c4b725 100644
--- a/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx
+++ b/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx
@@ -62,10 +62,10 @@ const RequestSchemaComponent: React.FC<RemoteSchemaComponentProps> = (props) =>
     return <Spin />;
   }
   return noForm ? (
-    <SchemaComponent memoized components={components} scope={scope} schema={schemaTransform(schema || {})} />
+    <SchemaComponent components={components} scope={scope} schema={schemaTransform(schema || {})} />
   ) : (
     <FormProvider form={form}>
-      <SchemaComponent memoized components={components} scope={scope} schema={schemaTransform(schema || {})} />
+      <SchemaComponent components={components} scope={scope} schema={schemaTransform(schema || {})} />
     </FormProvider>
   );
 };
diff --git a/packages/plugins/@nocobase/plugin-field-china-region/package.json b/packages/plugins/@nocobase/plugin-field-china-region/package.json
index 7d031f18d7..2773f3ad6e 100644
--- a/packages/plugins/@nocobase/plugin-field-china-region/package.json
+++ b/packages/plugins/@nocobase/plugin-field-china-region/package.json
@@ -1,6 +1,10 @@
 {
   "name": "@nocobase/plugin-field-china-region",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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-field-formula/package.json b/packages/plugins/@nocobase/plugin-field-formula/package.json
index 58fdc1844b..01e6109e91 100644
--- a/packages/plugins/@nocobase/plugin-field-formula/package.json
+++ b/packages/plugins/@nocobase/plugin-field-formula/package.json
@@ -4,7 +4,11 @@
   "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 两种引擎",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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-markdown-vditor/package.json b/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
index 7537d8a2fc..3e56cd13b2 100644
--- a/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
+++ b/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
@@ -4,7 +4,11 @@
   "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 语法，如列表，代码，引用等，并支持上传图片，录音等。同时可以做到即时渲染，所见即所得。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 e9cfadc178..356caa2135 100644
--- a/packages/plugins/@nocobase/plugin-field-sequence/package.json
+++ b/packages/plugins/@nocobase/plugin-field-sequence/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "数据表字段：自动编码",
   "description": "Automatically generate codes based on configured rules, supporting combinations of dates, numbers, and text.",
   "description.zh-CN": "根据配置的规则自动生成编码，支持日期、数字、文本的组合。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-sequence",
diff --git a/packages/plugins/@nocobase/plugin-file-manager/package.json b/packages/plugins/@nocobase/plugin-file-manager/package.json
index a68bbf8d55..9b53a2a218 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-file-manager/package.json
@@ -1,6 +1,10 @@
 {
   "name": "@nocobase/plugin-file-manager",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json
index 527e977da9..a926d094c5 100644
--- a/packages/plugins/@nocobase/plugin-gantt/package.json
+++ b/packages/plugins/@nocobase/plugin-gantt/package.json
@@ -1,6 +1,10 @@
 {
   "name": "@nocobase/plugin-gantt",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 9ae3cf1f28..47bf907f8b 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "可视化数据表管理",
   "description": "An ER diagram-like tool. Currently only the Master database is supported.",
   "description.zh-CN": "类似 ER 图的工具，目前只支持主数据库。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 d838d8fb6a..6b8653f06a 100644
--- a/packages/plugins/@nocobase/plugin-kanban/package.json
+++ b/packages/plugins/@nocobase/plugin-kanban/package.json
@@ -1,6 +1,10 @@
 {
   "name": "@nocobase/plugin-kanban",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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-localization/package.json b/packages/plugins/@nocobase/plugin-localization/package.json
index 86fb1058d9..5f2919802c 100644
--- a/packages/plugins/@nocobase/plugin-localization/package.json
+++ b/packages/plugins/@nocobase/plugin-localization/package.json
@@ -1,6 +1,10 @@
 {
   "name": "@nocobase/plugin-localization",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 95be05e54c..941d5068cc 100644
--- a/packages/plugins/@nocobase/plugin-logger/package.json
+++ b/packages/plugins/@nocobase/plugin-logger/package.json
@@ -4,7 +4,11 @@
   "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": "服务端日志，主要包括接口请求日志和系统运行日志，并支持打包和下载日志文件。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 acf00f08f5..04395aed1b 100644
--- a/packages/plugins/@nocobase/plugin-map/package.json
+++ b/packages/plugins/@nocobase/plugin-map/package.json
@@ -2,7 +2,11 @@
   "name": "@nocobase/plugin-map",
   "displayName": "Block: Map",
   "displayName.zh-CN": "区块：地图",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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-mobile-client/package.json b/packages/plugins/@nocobase/plugin-mobile-client/package.json
index cd973bfd26..ae2e8a946d 100644
--- a/packages/plugins/@nocobase/plugin-mobile-client/package.json
+++ b/packages/plugins/@nocobase/plugin-mobile-client/package.json
@@ -1,6 +1,10 @@
 {
   "name": "@nocobase/plugin-mobile-client",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 88407d721f..5c13877ecc 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/package.json
+++ b/packages/plugins/@nocobase/plugin-mock-collections/package.json
@@ -2,7 +2,11 @@
   "name": "@nocobase/plugin-mock-collections",
   "displayName": "mock-collections",
   "description": "mock-collections",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 bf416e681d..7f5d75dbff 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "多应用管理器",
   "description": "Dynamically create multiple apps without separate deployments.",
   "description.zh-CN": "无需单独部署即可动态创建多个应用。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 49971ad888..d4a6062317 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,11 @@
   "displayName.zh-CN": "多应用数据表共享",
   "description": "",
   "description.zh-CN": "",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 824c764469..4a7c025118 100644
--- a/packages/plugins/@nocobase/plugin-notifications/package.json
+++ b/packages/plugins/@nocobase/plugin-notifications/package.json
@@ -1,6 +1,10 @@
 {
   "name": "@nocobase/plugin-notifications",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "description": "",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
diff --git a/packages/plugins/@nocobase/plugin-sample-hello/package.json b/packages/plugins/@nocobase/plugin-sample-hello/package.json
index 32bd69c7b0..cbba04d1e8 100644
--- a/packages/plugins/@nocobase/plugin-sample-hello/package.json
+++ b/packages/plugins/@nocobase/plugin-sample-hello/package.json
@@ -1,6 +1,10 @@
 {
   "name": "@nocobase/plugin-sample-hello",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 d66fa2a552..e12462ed88 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/package.json
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/package.json
@@ -4,7 +4,11 @@
   "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": "在添加数据时，为它的关系数据创建快照，并保存在当前的数据中。关系数据更新时，快照不会更新。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 60967108bf..ede7324d71 100644
--- a/packages/plugins/@nocobase/plugin-system-settings/package.json
+++ b/packages/plugins/@nocobase/plugin-system-settings/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "系统设置",
   "description": "Used to adjust the system title, logo, language, etc.",
   "description.zh-CN": "用于调整系统的标题、LOGO、语言等。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 160501cfee..9c9fde7c75 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/package.json
+++ b/packages/plugins/@nocobase/plugin-theme-editor/package.json
@@ -1,6 +1,10 @@
 {
   "name": "@nocobase/plugin-theme-editor",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 9fe1c31c7f..1adc44789c 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "UI schema 存储服务",
   "description": "Provides centralized UI schema storage service.",
   "description.zh-CN": "提供中心化的 UI schema 存储服务。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 3ca3dddc81..fa3b56009e 100644
--- a/packages/plugins/@nocobase/plugin-users/package.json
+++ b/packages/plugins/@nocobase/plugin-users/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "用户",
   "description": "Provides basic user model, as well as created by and updated by fields.",
   "description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 68ea58c9c7..b3b79582fe 100644
--- a/packages/plugins/@nocobase/plugin-verification/package.json
+++ b/packages/plugins/@nocobase/plugin-verification/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "验证码",
   "description": "verification setting.",
   "description.zh-CN": "验证码配置。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 f7dcee430d..8045dea918 100644
--- a/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json
@@ -4,7 +4,11 @@
   "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 发起请求并在执行完成后触发，比如新增、更新、删除数据或者“提交至工作流”之后。适用于在操作完成后进行数据处理、发送通知等。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 f6b7492910..12136acf68 100644
--- a/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "工作流：聚合查询节点",
   "description": "Used to aggregate data against the database in workflow, such as: statistics, sum, average, etc.",
   "description.zh-CN": "可用于在工作流中对数据库进行聚合查询，如：统计数量、求和、平均值等。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 10739cf0e0..b00fcfcc44 100644
--- a/packages/plugins/@nocobase/plugin-workflow-delay/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-delay/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "工作流：延时节点",
   "description": "Could be used in workflow parallel branch for waiting other branches.",
   "description.zh-CN": "可用于工作流并行分支中等待其他分支执行完成。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 8efde06650..809fc3d9a2 100644
--- a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "工作流：动态表达式计算节点",
   "description": "Useful plugin for doing dynamic calculation based on expression collection records in workflow.",
   "description.zh-CN": "用于在工作流中进行基于数据行的动态表达式计算。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 78a487a431..38245a5522 100644
--- a/packages/plugins/@nocobase/plugin-workflow-loop/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-loop/package.json
@@ -4,7 +4,11 @@
   "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": "用于对一个数组中的每个值进行重复的子流程处理，也可用于固定次数的重复子流程处理。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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-mailer/package.json b/packages/plugins/@nocobase/plugin-workflow-mailer/package.json
index bd9012d105..06224e4cc1 100644
--- a/packages/plugins/@nocobase/plugin-workflow-mailer/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-mailer/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "工作流：邮件发送节点",
   "description": "Send email in workflow.",
   "description.zh-CN": "可用于在工作流中发送电子邮件。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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-manual/package.json b/packages/plugins/@nocobase/plugin-workflow-manual/package.json
index 8f2b11f3cc..a45b6fcad8 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "工作流：人工处理节点",
   "description": "Could be used for workflows which some of decisions are made by users.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 584d099667..4d8e840007 100644
--- a/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "工作流：并行分支节点",
   "description": "Could be used for parallel execution of branch processes in the workflow.",
   "description.zh-CN": "用于在工作流中需要并行执行的分支流程。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 8f3502c7e4..d75ad15f17 100644
--- a/packages/plugins/@nocobase/plugin-workflow-request/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-request/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "工作流：HTTP 请求节点",
   "description": "Send HTTP requests to any HTTP service for data interaction in workflow.",
   "description.zh-CN": "可用于在工作流中向任意 HTTP 服务发送请求，进行数据交互。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 1a1a63d80e..f57164d664 100644
--- a/packages/plugins/@nocobase/plugin-workflow-sql/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-sql/package.json
@@ -4,7 +4,11 @@
   "displayName.zh-CN": "工作流：SQL 节点",
   "description": "Execute SQL statements in workflow.",
   "description.zh-CN": "可用于在工作流中对数据库执行任意 SQL 语句。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 07bf8dee4a..1df70f9043 100644
--- a/packages/plugins/@nocobase/plugin-workflow-test/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-test/package.json
@@ -2,7 +2,11 @@
   "name": "@nocobase/plugin-workflow-test",
   "displayName": "Workflow: test kit",
   "displayName.zh-CN": "工作流：测试工具包",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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 d6dcca4aaf..7dac2beeee 100644
--- a/packages/plugins/@nocobase/plugin-workflow/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow/package.json
@@ -4,13 +4,21 @@
   "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 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "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": {
+<<<<<<< HEAD
     "@nocobase/plugin-workflow-test": "1.3.0-alpha"
+=======
+    "@nocobase/plugin-workflow-test": "1.2.14-alpha"
+>>>>>>> main
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json
index 202b3c3ec3..3feb7813d2 100644
--- a/packages/presets/nocobase/package.json
+++ b/packages/presets/nocobase/package.json
@@ -1,10 +1,15 @@
 {
   "name": "@nocobase/preset-nocobase",
+<<<<<<< HEAD
   "version": "1.3.0-alpha",
+=======
+  "version": "1.2.14-alpha",
+>>>>>>> main
   "license": "AGPL-3.0",
   "main": "./lib/server/index.js",
   "dependencies": {
     "@formily/json-schema": "2.x",
+<<<<<<< HEAD
     "@nocobase/plugin-acl": "1.3.0-alpha",
     "@nocobase/plugin-action-bulk-edit": "1.3.0-alpha",
     "@nocobase/plugin-action-bulk-update": "1.3.0-alpha",
@@ -63,6 +68,65 @@
     "@nocobase/plugin-workflow-request": "1.3.0-alpha",
     "@nocobase/plugin-workflow-sql": "1.3.0-alpha",
     "@nocobase/server": "1.3.0-alpha",
+=======
+    "@nocobase/plugin-acl": "1.2.14-alpha",
+    "@nocobase/plugin-action-bulk-edit": "1.2.14-alpha",
+    "@nocobase/plugin-action-bulk-update": "1.2.14-alpha",
+    "@nocobase/plugin-action-custom-request": "1.2.14-alpha",
+    "@nocobase/plugin-action-duplicate": "1.2.14-alpha",
+    "@nocobase/plugin-action-export": "1.2.14-alpha",
+    "@nocobase/plugin-action-import": "1.2.14-alpha",
+    "@nocobase/plugin-action-print": "1.2.14-alpha",
+    "@nocobase/plugin-api-doc": "1.2.14-alpha",
+    "@nocobase/plugin-api-keys": "1.2.14-alpha",
+    "@nocobase/plugin-audit-logs": "1.2.14-alpha",
+    "@nocobase/plugin-auth": "1.2.14-alpha",
+    "@nocobase/plugin-auth-sms": "1.2.14-alpha",
+    "@nocobase/plugin-backup-restore": "1.2.14-alpha",
+    "@nocobase/plugin-block-iframe": "1.2.14-alpha",
+    "@nocobase/plugin-block-workbench": "1.2.14-alpha",
+    "@nocobase/plugin-calendar": "1.2.14-alpha",
+    "@nocobase/plugin-charts": "1.2.14-alpha",
+    "@nocobase/plugin-client": "1.2.14-alpha",
+    "@nocobase/plugin-collection-sql": "1.2.14-alpha",
+    "@nocobase/plugin-data-source-main": "1.2.14-alpha",
+    "@nocobase/plugin-data-source-manager": "1.2.14-alpha",
+    "@nocobase/plugin-data-visualization": "1.2.14-alpha",
+    "@nocobase/plugin-error-handler": "1.2.14-alpha",
+    "@nocobase/plugin-field-china-region": "1.2.14-alpha",
+    "@nocobase/plugin-field-formula": "1.2.14-alpha",
+    "@nocobase/plugin-field-markdown-vditor": "1.2.14-alpha",
+    "@nocobase/plugin-field-sequence": "1.2.14-alpha",
+    "@nocobase/plugin-file-manager": "1.2.14-alpha",
+    "@nocobase/plugin-gantt": "1.2.14-alpha",
+    "@nocobase/plugin-graph-collection-manager": "1.2.14-alpha",
+    "@nocobase/plugin-kanban": "1.2.14-alpha",
+    "@nocobase/plugin-localization": "1.2.14-alpha",
+    "@nocobase/plugin-logger": "1.2.14-alpha",
+    "@nocobase/plugin-map": "1.2.14-alpha",
+    "@nocobase/plugin-mobile-client": "1.2.14-alpha",
+    "@nocobase/plugin-mock-collections": "1.2.14-alpha",
+    "@nocobase/plugin-multi-app-manager": "1.2.14-alpha",
+    "@nocobase/plugin-multi-app-share-collection": "1.2.14-alpha",
+    "@nocobase/plugin-snapshot-field": "1.2.14-alpha",
+    "@nocobase/plugin-system-settings": "1.2.14-alpha",
+    "@nocobase/plugin-theme-editor": "1.2.14-alpha",
+    "@nocobase/plugin-ui-schema-storage": "1.2.14-alpha",
+    "@nocobase/plugin-users": "1.2.14-alpha",
+    "@nocobase/plugin-verification": "1.2.14-alpha",
+    "@nocobase/plugin-workflow": "1.2.14-alpha",
+    "@nocobase/plugin-workflow-action-trigger": "1.2.14-alpha",
+    "@nocobase/plugin-workflow-aggregate": "1.2.14-alpha",
+    "@nocobase/plugin-workflow-delay": "1.2.14-alpha",
+    "@nocobase/plugin-workflow-dynamic-calculation": "1.2.14-alpha",
+    "@nocobase/plugin-workflow-loop": "1.2.14-alpha",
+    "@nocobase/plugin-workflow-mailer": "1.2.14-alpha",
+    "@nocobase/plugin-workflow-manual": "1.2.14-alpha",
+    "@nocobase/plugin-workflow-parallel": "1.2.14-alpha",
+    "@nocobase/plugin-workflow-request": "1.2.14-alpha",
+    "@nocobase/plugin-workflow-sql": "1.2.14-alpha",
+    "@nocobase/server": "1.2.14-alpha",
+>>>>>>> main
     "cronstrue": "^2.11.0"
   },
   "repository": {