diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6876191de..5c18d03854 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,43 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.6.14](https://github.com/nocobase/nocobase/compare/v1.6.13...v1.6.14) - 2025-03-29
+
+### 🐛 Bug Fixes
+
+- **[Calendar]** missing data on boundary dates in weekly calendar view ([#6587](https://github.com/nocobase/nocobase/pull/6587)) by @katherinehhh
+
+- **[Auth: OIDC]** Incorrect redirection occurs when the callback path is the string 'null' by @2013xile
+
+- **[Workflow: Approval]** Fix approval node configuration is incorrect after schema changed by @mytharcher
+
+## [v1.6.13](https://github.com/nocobase/nocobase/compare/v1.6.12...v1.6.13) - 2025-03-28
+
+### 🚀 Improvements
+
+- **[Async task manager]** optimize import/export buttons in Pro ([#6531](https://github.com/nocobase/nocobase/pull/6531)) by @chenos
+
+- **[Action: Export records Pro]** optimize import/export buttons in Pro by @katherinehhh
+
+- **[Migration manager]** allow skip automatic backup and restore for migration by @gchust
+
+### 🐛 Bug Fixes
+
+- **[client]** linkage conflict between same-named association fields in different sub-tables within the same form ([#6577](https://github.com/nocobase/nocobase/pull/6577)) by @katherinehhh
+
+- **[Action: Batch edit]** Click the batch edit button, configure the pop-up window, and then open it again, the pop-up window is blank ([#6578](https://github.com/nocobase/nocobase/pull/6578)) by @zhangzhonghe
+
+## [v1.6.12](https://github.com/nocobase/nocobase/compare/v1.6.11...v1.6.12) - 2025-03-27
+
+### 🐛 Bug Fixes
+
+- **[Block: Multi-step form]**
+  - the submit button has the same color in its default and highlighted by @jiannx
+
+  - fixed the bug that form reset is invalid when the field is associated with other field by @jiannx
+
+- **[Workflow: Approval]** Fix approval form values to submit by @mytharcher
+
 ## [v1.6.11](https://github.com/nocobase/nocobase/compare/v1.6.10...v1.6.11) - 2025-03-27
 
 ### 🚀 Improvements
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 07972fddec..baefbb61c6 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -5,6 +5,43 @@
 格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/),
 并且本项目遵循 [语义化版本](https://semver.org/spec/v2.0.0.html)。
 
+## [v1.6.14](https://github.com/nocobase/nocobase/compare/v1.6.13...v1.6.14) - 2025-03-29
+
+### 🐛 修复
+
+- **[日历]** 日历区块以周为视图时，边界日期不显示数据 ([#6587](https://github.com/nocobase/nocobase/pull/6587)) by @katherinehhh
+
+- **[认证：OIDC]** 回调路径是字符串'null'时导致跳转不正确 by @2013xile
+
+- **[工作流：审批]** 修复审批节点界面配置变更后数据未同步的问题 by @mytharcher
+
+## [v1.6.13](https://github.com/nocobase/nocobase/compare/v1.6.12...v1.6.13) - 2025-03-28
+
+### 🚀 优化
+
+- **[异步任务管理器]** 优化 Pro 导入导出按钮异步逻辑 ([#6531](https://github.com/nocobase/nocobase/pull/6531)) by @chenos
+
+- **[操作：导出记录 Pro]** 优化 Pro 导入导出按钮 by @katherinehhh
+
+- **[迁移管理]** 允许执行迁移时跳过自动备份还原 by @gchust
+
+### 🐛 修复
+
+- **[client]** 同一表单中不同关系字段的同名关系字段的联动互相影响 ([#6577](https://github.com/nocobase/nocobase/pull/6577)) by @katherinehhh
+
+- **[操作：批量编辑]** 点击批量编辑按钮，配置完弹窗再打开，弹窗是空白的 ([#6578](https://github.com/nocobase/nocobase/pull/6578)) by @zhangzhonghe
+
+## [v1.6.12](https://github.com/nocobase/nocobase/compare/v1.6.11...v1.6.12) - 2025-03-27
+
+### 🐛 修复
+
+- **[区块：分步表单]**
+  - 提交按钮默认和高亮情况下颜色一样 by @jiannx
+
+  - 修复当字段与其他表单字段存在关联时，表单重置无效 by @jiannx
+
+- **[工作流：审批]** 修复审批表单提交值的问题 by @mytharcher
+
 ## [v1.6.11](https://github.com/nocobase/nocobase/compare/v1.6.10...v1.6.11) - 2025-03-27
 
 ### 🚀 优化
diff --git a/lerna.json b/lerna.json
index 23e6020e76..d7f203d8ac 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "npmClientArgs": ["--ignore-engines"],
diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json
index bc56252d00..330795e2f5 100644
--- a/packages/core/acl/package.json
+++ b/packages/core/acl/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "1.7.0-beta.9",
-    "@nocobase/utils": "1.7.0-beta.9",
+    "@nocobase/resourcer": "1.7.0-beta.12",
+    "@nocobase/utils": "1.7.0-beta.12",
     "minimatch": "^5.1.1"
   },
   "repository": {
diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json
index 38dc5e54f6..0ff6035665 100644
--- a/packages/core/actions/package.json
+++ b/packages/core/actions/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@nocobase/actions",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cache": "1.7.0-beta.9",
-    "@nocobase/database": "1.7.0-beta.9",
-    "@nocobase/resourcer": "1.7.0-beta.9"
+    "@nocobase/cache": "1.7.0-beta.12",
+    "@nocobase/database": "1.7.0-beta.12",
+    "@nocobase/resourcer": "1.7.0-beta.12"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/app/package.json b/packages/core/app/package.json
index 5e313604bd..50a99c0c0a 100644
--- a/packages/core/app/package.json
+++ b/packages/core/app/package.json
@@ -1,17 +1,17 @@
 {
   "name": "@nocobase/app",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/database": "1.7.0-beta.9",
-    "@nocobase/preset-nocobase": "1.7.0-beta.9",
-    "@nocobase/server": "1.7.0-beta.9"
+    "@nocobase/database": "1.7.0-beta.12",
+    "@nocobase/preset-nocobase": "1.7.0-beta.12",
+    "@nocobase/server": "1.7.0-beta.12"
   },
   "devDependencies": {
-    "@nocobase/client": "1.7.0-beta.9"
+    "@nocobase/client": "1.7.0-beta.12"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json
index e9f3bc982c..727831fc2f 100644
--- a/packages/core/auth/package.json
+++ b/packages/core/auth/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.7.0-beta.9",
-    "@nocobase/cache": "1.7.0-beta.9",
-    "@nocobase/database": "1.7.0-beta.9",
-    "@nocobase/resourcer": "1.7.0-beta.9",
-    "@nocobase/utils": "1.7.0-beta.9",
+    "@nocobase/actions": "1.7.0-beta.12",
+    "@nocobase/cache": "1.7.0-beta.12",
+    "@nocobase/database": "1.7.0-beta.12",
+    "@nocobase/resourcer": "1.7.0-beta.12",
+    "@nocobase/utils": "1.7.0-beta.12",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
diff --git a/packages/core/build/package.json b/packages/core/build/package.json
index 640469707d..a734ed24e2 100644
--- a/packages/core/build/package.json
+++ b/packages/core/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 d140f17eb7..1ff4683d88 100644
--- a/packages/core/cache/package.json
+++ b/packages/core/cache/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/cache",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/lock-manager": "1.7.0-beta.9",
+    "@nocobase/lock-manager": "1.7.0-beta.12",
     "bloom-filters": "^3.0.1",
     "cache-manager": "^5.2.4",
     "cache-manager-redis-yet": "^4.1.2"
diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json
index 9cccced612..40eb72242d 100644
--- a/packages/core/cli/package.json
+++ b/packages/core/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.7.0-beta.9",
+    "@nocobase/app": "1.7.0-beta.12",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,7 +25,7 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "1.7.0-beta.9"
+    "@nocobase/devtools": "1.7.0-beta.12"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/client/package.json b/packages/core/client/package.json
index 66f15cedf8..6c91930d52 100644
--- a/packages/core/client/package.json
+++ b/packages/core/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -27,9 +27,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "1.7.0-beta.9",
-    "@nocobase/sdk": "1.7.0-beta.9",
-    "@nocobase/utils": "1.7.0-beta.9",
+    "@nocobase/evaluators": "1.7.0-beta.12",
+    "@nocobase/sdk": "1.7.0-beta.12",
+    "@nocobase/utils": "1.7.0-beta.12",
     "ahooks": "^3.7.2",
     "antd": "5.24.2",
     "antd-style": "3.7.1",
diff --git a/packages/core/client/src/common/SelectWithTitle.tsx b/packages/core/client/src/common/SelectWithTitle.tsx
index 4bd43648a3..b3e0be59a8 100644
--- a/packages/core/client/src/common/SelectWithTitle.tsx
+++ b/packages/core/client/src/common/SelectWithTitle.tsx
@@ -18,7 +18,14 @@ export interface SelectWithTitleProps {
   onChange?: (...args: any[]) => void;
 }
 
-export function SelectWithTitle({ title, defaultValue, onChange, options, fieldNames }: SelectWithTitleProps) {
+export function SelectWithTitle({
+  title,
+  defaultValue,
+  onChange,
+  options,
+  fieldNames,
+  ...others
+}: SelectWithTitleProps) {
   const [open, setOpen] = useState(false);
   const timerRef = useRef<any>(null);
   return (
@@ -36,6 +43,7 @@ export function SelectWithTitle({ title, defaultValue, onChange, options, fieldN
     >
       {title}
       <Select
+        {...others}
         open={open}
         data-testid={`select-${title}`}
         popupMatchSelectWidth={false}
diff --git a/packages/core/client/src/schema-component/antd/action/Action.tsx b/packages/core/client/src/schema-component/antd/action/Action.tsx
index eb78cc1296..6f5b3e0a7e 100644
--- a/packages/core/client/src/schema-component/antd/action/Action.tsx
+++ b/packages/core/client/src/schema-component/antd/action/Action.tsx
@@ -563,6 +563,7 @@ const RenderButtonInner = observer(
       designerProps,
       title,
       isLink,
+      onlyIcon,
       ...others
     } = props;
     const debouncedClick = useCallback(
@@ -606,7 +607,7 @@ const RenderButtonInner = observer(
         type={type === 'danger' ? undefined : type}
         title={actionTitle}
       >
-        {actionTitle && (
+        {!onlyIcon && actionTitle && (
           <span className={icon ? 'nb-action-title' : null} style={linkStyle}>
             {actionTitle}
           </span>
diff --git a/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx b/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx
index 708a2cff30..a2f4741536 100644
--- a/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx
@@ -69,6 +69,11 @@ export const filterAnalyses = (filters): any[] => {
   return results;
 };
 
+function getFieldPath(str) {
+  const lastIndex = str.lastIndexOf('.');
+  return lastIndex === -1 ? str : str.slice(0, lastIndex);
+}
+
 const InternalAssociationSelect = observer(
   (props: AssociationSelectProps) => {
     const { objectValue = true, addMode: propsAddMode, ...rest } = props;
@@ -100,11 +105,14 @@ const InternalAssociationSelect = observer(
         //支持深层次子表单
         onFieldInputValueChange('*', (fieldPath: any) => {
           const linkageFields = filterAnalyses(field.componentProps?.service?.params?.filter) || [];
+          const linageFieldEntire = getFieldPath(fieldPath.address.entire);
+          const targetFieldEntire = getFieldPath(field.address.entire);
           if (
             linkageFields.includes(fieldPath?.props?.name) &&
             field.value &&
             isEqual(fieldPath?.indexes, field?.indexes) &&
-            fieldPath?.props?.name !== field.props.name
+            fieldPath?.props?.name !== field.props.name &&
+            (!field?.indexes?.length || isEqual(linageFieldEntire, targetFieldEntire))
           ) {
             field.setValue(null);
             setInnerValue(null);
diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx
index 1d1be90a8c..b59dec00ad 100644
--- a/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx
@@ -13,6 +13,8 @@ import { FormProvider, connect, createSchemaField, observer, useField, useFieldS
 import { uid } from '@formily/shared';
 import { Select as AntdSelect, Input, Space, Spin, Tag } from 'antd';
 import dayjs from 'dayjs';
+import { css } from '@emotion/css';
+import { debounce } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAPIClient, useCollectionManager_deprecated } from '../../../';
@@ -152,7 +154,11 @@ const CascadeSelect = connect((props) => {
     } else {
       associationField.value = option;
     }
-    onChange?.(options);
+    if (options.length === 1 && !options[0].value) {
+      onChange?.(null);
+    } else {
+      onChange?.(options);
+    }
   };
 
   const onDropdownVisibleChange = async (visible, selectedValue, index) => {
@@ -238,28 +244,38 @@ export const InternalCascadeSelect = observer(
     const fieldSchema = useFieldSchema();
     const { loading, data: formData } = useDataBlockRequest() || {};
     const initialValue = formData?.data?.[fieldSchema.name];
+
+    const handleFormValuesChange = debounce((form) => {
+      if (collectionField.interface === 'm2o') {
+        // 对 m2o 类型字段，提取最后一个非 null 值
+        const value = extractLastNonNullValueObjects(form.values?.[fieldSchema.name]);
+        setTimeout(() => {
+          form.setValuesIn(fieldSchema.name, value);
+          field.value = value;
+        });
+      } else {
+        // 对 select_array 类型字段，过滤掉空对象
+        const value = extractLastNonNullValueObjects(form.values?.select_array).filter(
+          (v) => v && Object.keys(v).length > 0,
+        );
+        setTimeout(() => {
+          field.value = value;
+        });
+      }
+    }, 300);
+
     useEffect(() => {
       const id = uid();
       selectForm.addEffects(id, () => {
         onFormValuesChange((form) => {
-          if (collectionField.interface === 'm2o') {
-            const value = extractLastNonNullValueObjects(form.values?.[fieldSchema.name]);
-            setTimeout(() => {
-              form.setValuesIn(fieldSchema.name, value);
-              field.value = value;
-            });
-          } else {
-            const value = extractLastNonNullValueObjects(form.values?.select_array).filter(
-              (v) => v && Object.keys(v).length > 0,
-            );
-            setTimeout(() => {
-              field.value = value;
-            });
-          }
+          handleFormValuesChange(form);
         });
       });
+
       return () => {
         selectForm.removeEffects(id);
+        // 清除防抖定时器
+        handleFormValuesChange.cancel();
       };
     }, []);
 
@@ -282,6 +298,24 @@ export const InternalCascadeSelect = observer(
           items: {
             type: 'void',
             'x-component': 'Space',
+            'x-component-props': {
+              style: {
+                width: '100%',
+                display: 'flex',
+              },
+              className: css`
+                .ant-formily-item-control {
+                  max-width: 100% !important;
+                }
+                .ant-space-item:nth-child(1) {
+                  flex: 0.1;
+                }
+
+                .ant-space-item:nth-child(2) {
+                  flex: 3;
+                }
+              `,
+            },
             properties: {
               sort: {
                 type: 'void',
diff --git a/packages/core/client/src/schema-component/antd/grid/Grid.tsx b/packages/core/client/src/schema-component/antd/grid/Grid.tsx
index 734aa9e34f..082943cb7f 100644
--- a/packages/core/client/src/schema-component/antd/grid/Grid.tsx
+++ b/packages/core/client/src/schema-component/antd/grid/Grid.tsx
@@ -20,7 +20,6 @@ import { FilterBlockProvider } from '../../../filter-provider/FilterProvider';
 import {
   NocoBaseRecursionField,
   RefreshComponentProvider,
-  useRefreshComponent,
   useRefreshFieldSchema,
 } from '../../../formily/NocoBaseRecursionField';
 import { DndContext, DndContextProps } from '../../common/dnd-context';
@@ -379,11 +378,9 @@ export const Grid: any = observer(
     }, [fieldSchema, render, InitializerComponent, showDivider]);
 
     const refreshFieldSchema = useRefreshFieldSchema();
-    const refreshComponent = useRefreshComponent();
     const refresh = useCallback(() => {
       refreshFieldSchema?.();
-      refreshComponent?.();
-    }, [refreshComponent, refreshFieldSchema]);
+    }, [refreshFieldSchema]);
 
     return (
       <RefreshComponentProvider refresh={refresh}>
diff --git a/packages/core/client/src/schema-settings/SchemaSettings.tsx b/packages/core/client/src/schema-settings/SchemaSettings.tsx
index 0cf7546b09..ed058d67c0 100644
--- a/packages/core/client/src/schema-settings/SchemaSettings.tsx
+++ b/packages/core/client/src/schema-settings/SchemaSettings.tsx
@@ -568,13 +568,14 @@ export interface SchemaSettingsSelectItemProps
   extends Omit<SchemaSettingsItemProps, 'onChange' | 'onClick'>,
     Omit<SelectWithTitleProps, 'title' | 'defaultValue'> {
   value?: SelectWithTitleProps['defaultValue'];
+  optionRender?: (option: any, info: { index: number }) => React.ReactNode;
 }
 export const SchemaSettingsSelectItem: FC<SchemaSettingsSelectItemProps> = (props) => {
-  const { title, options, value, onChange, ...others } = props;
+  const { title, options, value, onChange, optionRender, ...others } = props;
 
   return (
     <SchemaSettingsItem title={title} {...others}>
-      <SelectWithTitle {...{ title, defaultValue: value, onChange, options }} />
+      <SelectWithTitle {...{ title, defaultValue: value, onChange, options, optionRender }} />
     </SchemaSettingsItem>
   );
 };
diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json
index 05084946fa..3aaa63a349 100755
--- a/packages/core/create-nocobase-app/package.json
+++ b/packages/core/create-nocobase-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-nocobase-app",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "src/index.js",
   "license": "AGPL-3.0",
   "dependencies": {
diff --git a/packages/core/data-source-manager/package.json b/packages/core/data-source-manager/package.json
index 6f579e30d1..9e94e4bdc2 100644
--- a/packages/core/data-source-manager/package.json
+++ b/packages/core/data-source-manager/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.7.0-beta.9",
-    "@nocobase/cache": "1.7.0-beta.9",
-    "@nocobase/database": "1.7.0-beta.9",
-    "@nocobase/resourcer": "1.7.0-beta.9",
-    "@nocobase/utils": "1.7.0-beta.9",
+    "@nocobase/actions": "1.7.0-beta.12",
+    "@nocobase/cache": "1.7.0-beta.12",
+    "@nocobase/database": "1.7.0-beta.12",
+    "@nocobase/resourcer": "1.7.0-beta.12",
+    "@nocobase/utils": "1.7.0-beta.12",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
diff --git a/packages/core/database/package.json b/packages/core/database/package.json
index b07abbcfca..f17463cee8 100644
--- a/packages/core/database/package.json
+++ b/packages/core/database/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.7.0-beta.9",
-    "@nocobase/utils": "1.7.0-beta.9",
+    "@nocobase/logger": "1.7.0-beta.12",
+    "@nocobase/utils": "1.7.0-beta.12",
     "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 f567922e23..f96b882470 100644
--- a/packages/core/devtools/package.json
+++ b/packages/core/devtools/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/devtools",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "1.7.0-beta.9",
-    "@nocobase/client": "1.7.0-beta.9",
-    "@nocobase/test": "1.7.0-beta.9",
+    "@nocobase/build": "1.7.0-beta.12",
+    "@nocobase/client": "1.7.0-beta.12",
+    "@nocobase/test": "1.7.0-beta.12",
     "@types/koa": "^2.15.0",
     "@types/koa-bodyparser": "^4.3.4",
     "@types/lodash": "^4.14.177",
diff --git a/packages/core/evaluators/package.json b/packages/core/evaluators/package.json
index 87ab563ca3..96ce1f0a30 100644
--- a/packages/core/evaluators/package.json
+++ b/packages/core/evaluators/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/evaluators",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
     "@formulajs/formulajs": "4.4.9",
-    "@nocobase/utils": "1.7.0-beta.9",
+    "@nocobase/utils": "1.7.0-beta.12",
     "mathjs": "^10.6.0"
   },
   "repository": {
diff --git a/packages/core/lock-manager/package.json b/packages/core/lock-manager/package.json
index 40bec6a979..e05f733f72 100644
--- a/packages/core/lock-manager/package.json
+++ b/packages/core/lock-manager/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nocobase/lock-manager",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "lib/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@nocobase/utils": "1.7.0-beta.9",
+    "@nocobase/utils": "1.7.0-beta.12",
     "async-mutex": "^0.5.0"
   }
 }
diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json
index 43bac59e8f..44a97ee497 100644
--- a/packages/core/logger/package.json
+++ b/packages/core/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "nocobase logging library",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
diff --git a/packages/core/resourcer/package.json b/packages/core/resourcer/package.json
index d391468d38..e2d9d73bbd 100644
--- a/packages/core/resourcer/package.json
+++ b/packages/core/resourcer/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/utils": "1.7.0-beta.9",
+    "@nocobase/utils": "1.7.0-beta.12",
     "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 dbae1fe657..0ab62eba25 100644
--- a/packages/core/sdk/package.json
+++ b/packages/core/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/sdk",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.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 6781c07eeb..34c9fa02af 100644
--- a/packages/core/server/package.json
+++ b/packages/core/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,19 +10,19 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.0.2",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "1.7.0-beta.9",
-    "@nocobase/actions": "1.7.0-beta.9",
-    "@nocobase/auth": "1.7.0-beta.9",
-    "@nocobase/cache": "1.7.0-beta.9",
-    "@nocobase/data-source-manager": "1.7.0-beta.9",
-    "@nocobase/database": "1.7.0-beta.9",
-    "@nocobase/evaluators": "1.7.0-beta.9",
-    "@nocobase/lock-manager": "1.7.0-beta.9",
-    "@nocobase/logger": "1.7.0-beta.9",
-    "@nocobase/resourcer": "1.7.0-beta.9",
-    "@nocobase/sdk": "1.7.0-beta.9",
-    "@nocobase/telemetry": "1.7.0-beta.9",
-    "@nocobase/utils": "1.7.0-beta.9",
+    "@nocobase/acl": "1.7.0-beta.12",
+    "@nocobase/actions": "1.7.0-beta.12",
+    "@nocobase/auth": "1.7.0-beta.12",
+    "@nocobase/cache": "1.7.0-beta.12",
+    "@nocobase/data-source-manager": "1.7.0-beta.12",
+    "@nocobase/database": "1.7.0-beta.12",
+    "@nocobase/evaluators": "1.7.0-beta.12",
+    "@nocobase/lock-manager": "1.7.0-beta.12",
+    "@nocobase/logger": "1.7.0-beta.12",
+    "@nocobase/resourcer": "1.7.0-beta.12",
+    "@nocobase/sdk": "1.7.0-beta.12",
+    "@nocobase/telemetry": "1.7.0-beta.12",
+    "@nocobase/utils": "1.7.0-beta.12",
     "@types/decompress": "4.2.7",
     "@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 fa906c5420..ddb1a514f0 100644
--- a/packages/core/telemetry/package.json
+++ b/packages/core/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/telemetry",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "nocobase telemetry library",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
@@ -11,7 +11,7 @@
     "directory": "packages/telemetry"
   },
   "dependencies": {
-    "@nocobase/utils": "1.7.0-beta.9",
+    "@nocobase/utils": "1.7.0-beta.12",
     "@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 41d3559b66..954ba71f79 100644
--- a/packages/core/test/package.json
+++ b/packages/core/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "1.7.0-beta.9",
+    "@nocobase/server": "1.7.0-beta.12",
     "@playwright/test": "^1.45.3",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.0.0",
diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json
index 4232d4d795..986e033e79 100644
--- a/packages/core/utils/package.json
+++ b/packages/core/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
diff --git a/packages/plugins/@nocobase/plugin-acl/package.json b/packages/plugins/@nocobase/plugin-acl/package.json
index 066d83863b..7261345e22 100644
--- a/packages/plugins/@nocobase/plugin-acl/package.json
+++ b/packages/plugins/@nocobase/plugin-acl/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "权限控制",
   "description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/union-role.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/union-role.test.ts
index 36ad2cbf17..53758c0d25 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/union-role.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/union-role.test.ts
@@ -51,7 +51,11 @@ describe('union role: full permissions', async () => {
         roles: [role1.name, role2.name],
       },
     });
-
+    await rootAgent.resource('roles').setSystemRoleMode({
+      values: {
+        roleMode: SystemRoleMode.allowUseUnion,
+      },
+    });
     agent = await app.agent().login(user, UNION_ROLE_KEY);
   });
 
@@ -415,15 +419,15 @@ describe('union role: full permissions', async () => {
     const rootAgent = await app.agent().login(rootUser);
     let rolesResponse = await agent.resource('roles').check();
     expect(rolesResponse.status).toBe(200);
-    expect(rolesResponse.body.data.roleMode).toStrictEqual(SystemRoleMode.default);
+    expect(rolesResponse.body.data.roleMode).toStrictEqual(SystemRoleMode.allowUseUnion);
     await rootAgent.resource('roles').setSystemRoleMode({
       values: {
-        roleMode: SystemRoleMode.allowUseUnion,
+        roleMode: SystemRoleMode.default,
       },
     });
     rolesResponse = await agent.resource('roles').check();
     expect(rolesResponse.status).toBe(200);
-    expect(rolesResponse.body.data.roleMode).toStrictEqual(SystemRoleMode.allowUseUnion);
+    expect(rolesResponse.body.data.roleMode).toStrictEqual(SystemRoleMode.default);
   });
 
   it(`should response no permission when createdById field is missing in data tables`, async () => {
@@ -501,4 +505,29 @@ describe('union role: full permissions', async () => {
     expect(getRolesResponse.statusCode).toBe(200);
     expect(getRolesResponse.body.meta.allowedActions.update.length).toBe(0);
   });
+
+  it('should login successfully when use __union__ role in allowUseUnion mode #1906', async () => {
+    const rootAgent = await app.agent().login(rootUser);
+    await rootAgent.resource('roles').setSystemRoleMode({
+      values: {
+        roleMode: SystemRoleMode.allowUseUnion,
+      },
+    });
+    agent = await app.agent().login(user);
+    const createRoleResponse = await agent.resource('roles').check();
+    expect(createRoleResponse.statusCode).toBe(200);
+  });
+
+  it('should currentRole not be __union__ when default role mode #1907', async () => {
+    const rootAgent = await app.agent().login(rootUser);
+    await rootAgent.resource('roles').setSystemRoleMode({
+      values: {
+        roleMode: SystemRoleMode.default,
+      },
+    });
+    agent = await app.agent().login(user, UNION_ROLE_KEY);
+    const createRoleResponse = await agent.resource('roles').check();
+    expect(createRoleResponse.statusCode).toBe(200);
+    expect(createRoleResponse.body.data.role).not.toBe(UNION_ROLE_KEY);
+  });
 });
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/middlewares/setCurrentRole.ts b/packages/plugins/@nocobase/plugin-acl/src/server/middlewares/setCurrentRole.ts
index 49b8acaf14..626a6d5c9c 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/middlewares/setCurrentRole.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/middlewares/setCurrentRole.ts
@@ -14,7 +14,7 @@ import { UNION_ROLE_KEY } from '../constants';
 import { SystemRoleMode } from '../enum';
 
 export async function setCurrentRole(ctx: Context, next) {
-  const currentRole = ctx.get('X-Role');
+  let currentRole = ctx.get('X-Role');
 
   if (currentRole === 'anonymous') {
     ctx.state.currentRole = currentRole;
@@ -49,7 +49,8 @@ export async function setCurrentRole(ctx: Context, next) {
   ctx.state.currentUser.roles = userRoles;
   const systemSettings = await ctx.db.getRepository('systemSettings').findOne();
   const roleMode = systemSettings?.get('roleMode') || SystemRoleMode.default;
-  if (ctx.state.currentRole === UNION_ROLE_KEY && roleMode === SystemRoleMode.default) {
+  if ([currentRole, ctx.state.currentRole].includes(UNION_ROLE_KEY) && roleMode === SystemRoleMode.default) {
+    currentRole = userRoles[0].name;
     ctx.state.currentRole = userRoles[0].name;
     ctx.headers['x-role'] = userRoles[0].name;
   } else if (roleMode === SystemRoleMode.onlyUseUnion) {
@@ -85,7 +86,7 @@ export async function setCurrentRole(ctx: Context, next) {
   // 2. If the X-Role is not set, or the X-Role does not belong to the user, use the default role
   if (!role) {
     const defaultRole = userRoles.find((role) => role?.rolesUsers?.default);
-    role = (defaultRole || userRoles[0])?.name;
+    role = (defaultRole || userRoles.find((x) => x.name !== UNION_ROLE_KEY))?.name;
   }
   ctx.state.currentRole = role;
   ctx.state.currentRoles = [role];
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
index 8df016986d..533b6dca11 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-bulk-edit",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-bulk-edit",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-bulk-edit",
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/refresh.test.ts b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/refresh.test.ts
new file mode 100644
index 0000000000..8cc2b184c2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/refresh.test.ts
@@ -0,0 +1,34 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { expect, test } from '@nocobase/test/e2e';
+import { afterConfiguringTheModalWhenReopeningItTheContentShouldPersist } from './utils';
+
+test.describe('refresh', () => {
+  test('After configuring the modal, when reopening it, the content should persist', async ({ mockPage, page }) => {
+    await mockPage(afterConfiguringTheModalWhenReopeningItTheContentShouldPersist).goto();
+
+    // 1. 点击 Bulk edit 按钮，打开弹窗
+    await page.getByLabel('action-Action-Bulk edit-').click();
+
+    // 2. 新增一个表单区块
+    await page.getByLabel('schema-initializer-Grid-popup').hover();
+    await page.getByRole('menuitem', { name: 'form Form' }).click();
+
+    // 3. 新增一个名为 Nickname 的字段
+    await page.getByLabel('schema-initializer-Grid-bulkEditForm:configureFields-users').hover();
+    await page.getByRole('menuitem', { name: 'Nickname' }).click();
+
+    // 4. 关闭弹窗，然后再打开，刚才新增的字段应该还在
+    await page.getByLabel('drawer-Action.Container-users-Bulk edit-mask').click();
+    await page.getByLabel('action-Action-Bulk edit-').click();
+    await expect(page.getByLabel('block-item-BulkEditField-').getByText('Nickname')).toBeVisible();
+    await page.getByLabel('block-item-BulkEditField-').click();
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/utils.ts
index 3e67dc3ad2..d2068a7c82 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/utils.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/utils.ts
@@ -1243,3 +1243,388 @@ export const theAddBlockButtonInDrawerShouldBeVisible = {
     'x-index': 1,
   },
 };
+export const afterConfiguringTheModalWhenReopeningItTheContentShouldPersist = {
+  pageSchema: {
+    type: 'void',
+    'x-component': 'Page',
+    name: 'rjzvy4bmawn',
+    'x-uid': '1rs9caegbf2',
+    'x-async': false,
+    properties: {
+      tab: {
+        type: 'void',
+        'x-component': 'Grid',
+        'x-initializer': 'page:addBlock',
+        properties: {
+          bmsmf8futai: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'x84k7qs6jko',
+            'x-async': false,
+            'x-index': 4,
+          },
+          noe2oca30hc: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 't7jxa830ps6',
+            'x-async': false,
+            'x-index': 5,
+          },
+          w2hnq7rau9p: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': '0fjjtg8z7ws',
+            'x-async': false,
+            'x-index': 7,
+          },
+          fcfs4oot86g: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'nklv7lonpgn',
+            'x-async': false,
+            'x-index': 8,
+          },
+          i22fydav355: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'fz4g6cr9jvr',
+            'x-async': false,
+            'x-index': 10,
+          },
+          row_6u7y7uccrvz: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-index': 12,
+            'x-uid': '7tzumo4nec7',
+            'x-async': false,
+          },
+          higfesvgj7g: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': '8hpa6qf3sez',
+            'x-async': false,
+            'x-index': 13,
+          },
+          '37myao9n0wc': {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'uw1dp2qxd3y',
+            'x-async': false,
+            'x-index': 14,
+          },
+          uvfd76q4ye9: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'nc56fu33m42',
+            'x-async': false,
+            'x-index': 15,
+          },
+          miidizeqgot: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'jf4qarrcs0z',
+            'x-async': false,
+            'x-index': 16,
+          },
+          hxmr87i5imu: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'l3kdiqd9a7k',
+            'x-async': false,
+            'x-index': 17,
+          },
+          pa8dwdi4h5a: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'uz5wcet83qn',
+            'x-async': false,
+            'x-index': 18,
+          },
+          pno0a05tbnp: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'b4bakhhasp3',
+            'x-async': false,
+            'x-index': 19,
+          },
+          uj09g5xgnr1: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'qks035fnfl6',
+            'x-async': false,
+            'x-index': 20,
+          },
+          giobcwj316k: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            'x-uid': 'awwsb89nyso',
+            'x-async': false,
+            'x-index': 22,
+          },
+          oznewtbvuyw: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Row',
+            'x-app-version': '1.6.11',
+            properties: {
+              bwtax0bnnp3: {
+                _isJSONSchemaObject: true,
+                version: '2.0',
+                type: 'void',
+                'x-component': 'Grid.Col',
+                'x-app-version': '1.6.11',
+                properties: {
+                  c0bypj7wg5q: {
+                    _isJSONSchemaObject: true,
+                    version: '2.0',
+                    type: 'void',
+                    'x-decorator': 'TableBlockProvider',
+                    'x-acl-action': 'users:list',
+                    'x-use-decorator-props': 'useTableBlockDecoratorProps',
+                    'x-decorator-props': {
+                      collection: 'users',
+                      dataSource: 'main',
+                      action: 'list',
+                      params: {
+                        pageSize: 20,
+                      },
+                      rowKey: 'id',
+                      showIndex: true,
+                      dragSort: false,
+                    },
+                    'x-toolbar': 'BlockSchemaToolbar',
+                    'x-settings': 'blockSettings:table',
+                    'x-component': 'CardItem',
+                    'x-filter-targets': [],
+                    'x-app-version': '1.6.11',
+                    properties: {
+                      actions: {
+                        _isJSONSchemaObject: true,
+                        version: '2.0',
+                        type: 'void',
+                        'x-initializer': 'table:configureActions',
+                        'x-component': 'ActionBar',
+                        'x-component-props': {
+                          style: {
+                            marginBottom: 'var(--nb-spacing)',
+                          },
+                        },
+                        'x-app-version': '1.6.11',
+                        properties: {
+                          '1dlvhzr308c': {
+                            _isJSONSchemaObject: true,
+                            version: '2.0',
+                            type: 'void',
+                            title: '{{t("Bulk edit")}}',
+                            'x-component': 'Action',
+                            'x-action': 'customize:bulkEdit',
+                            'x-action-settings': {
+                              updateMode: 'selected',
+                            },
+                            'x-component-props': {
+                              openMode: 'drawer',
+                              icon: 'EditOutlined',
+                            },
+                            'x-align': 'right',
+                            'x-decorator': 'BulkEditActionDecorator',
+                            'x-toolbar': 'ActionSchemaToolbar',
+                            'x-settings': 'actionSettings:bulkEdit',
+                            'x-acl-action': 'update',
+                            'x-acl-action-props': {
+                              skipScopeCheck: true,
+                            },
+                            'x-app-version': '1.6.11',
+                            properties: {
+                              drawer: {
+                                _isJSONSchemaObject: true,
+                                version: '2.0',
+                                type: 'void',
+                                title: '{{t("Bulk edit")}}',
+                                'x-component': 'Action.Container',
+                                'x-component-props': {
+                                  className: 'nb-action-popup',
+                                },
+                                'x-app-version': '1.6.11',
+                                properties: {
+                                  tabs: {
+                                    _isJSONSchemaObject: true,
+                                    version: '2.0',
+                                    type: 'void',
+                                    'x-component': 'Tabs',
+                                    'x-component-props': {},
+                                    'x-initializer': 'popup:addTab',
+                                    'x-initializer-props': {
+                                      gridInitializer: 'popup:bulkEdit:addBlock',
+                                    },
+                                    'x-app-version': '1.6.11',
+                                    properties: {
+                                      tab1: {
+                                        _isJSONSchemaObject: true,
+                                        version: '2.0',
+                                        type: 'void',
+                                        title: '{{t("Bulk edit")}}',
+                                        'x-component': 'Tabs.TabPane',
+                                        'x-designer': 'Tabs.Designer',
+                                        'x-component-props': {},
+                                        'x-app-version': '1.6.11',
+                                        properties: {
+                                          grid: {
+                                            _isJSONSchemaObject: true,
+                                            version: '2.0',
+                                            type: 'void',
+                                            'x-component': 'Grid',
+                                            'x-initializer': 'popup:bulkEdit:addBlock',
+                                            'x-app-version': '1.6.11',
+                                            'x-uid': '5ejbu8v5ol8',
+                                            'x-async': false,
+                                            'x-index': 1,
+                                          },
+                                        },
+                                        'x-uid': 'gfheiqtl7f7',
+                                        'x-async': false,
+                                        'x-index': 1,
+                                      },
+                                    },
+                                    'x-uid': 'if2rcx1dy2n',
+                                    'x-async': false,
+                                    'x-index': 1,
+                                  },
+                                },
+                                'x-uid': 'cxyi8q6lm3n',
+                                'x-async': false,
+                                'x-index': 1,
+                              },
+                            },
+                            'x-uid': 'vbvf13xq15t',
+                            'x-async': false,
+                            'x-index': 1,
+                          },
+                        },
+                        'x-uid': 'amlzm32jhwg',
+                        'x-async': false,
+                        'x-index': 1,
+                      },
+                      f232o2ds23n: {
+                        _isJSONSchemaObject: true,
+                        version: '2.0',
+                        type: 'array',
+                        'x-initializer': 'table:configureColumns',
+                        'x-component': 'TableV2',
+                        'x-use-component-props': 'useTableBlockProps',
+                        'x-component-props': {
+                          rowKey: 'id',
+                          rowSelection: {
+                            type: 'checkbox',
+                          },
+                        },
+                        'x-app-version': '1.6.11',
+                        properties: {
+                          actions: {
+                            _isJSONSchemaObject: true,
+                            version: '2.0',
+                            type: 'void',
+                            title: '{{ t("Actions") }}',
+                            'x-action-column': 'actions',
+                            'x-decorator': 'TableV2.Column.ActionBar',
+                            'x-component': 'TableV2.Column',
+                            'x-toolbar': 'TableColumnSchemaToolbar',
+                            'x-initializer': 'table:configureItemActions',
+                            'x-settings': 'fieldSettings:TableColumn',
+                            'x-toolbar-props': {
+                              initializer: 'table:configureItemActions',
+                            },
+                            'x-app-version': '1.6.11',
+                            properties: {
+                              '153lpq30p5f': {
+                                _isJSONSchemaObject: true,
+                                version: '2.0',
+                                type: 'void',
+                                'x-decorator': 'DndContext',
+                                'x-component': 'Space',
+                                'x-component-props': {
+                                  split: '|',
+                                },
+                                'x-app-version': '1.6.11',
+                                'x-uid': '4mha1dmmyz9',
+                                'x-async': false,
+                                'x-index': 1,
+                              },
+                            },
+                            'x-uid': 'afmceivuaf0',
+                            'x-async': false,
+                            'x-index': 1,
+                          },
+                        },
+                        'x-uid': 'iu0xkmeuc5z',
+                        'x-async': false,
+                        'x-index': 2,
+                      },
+                    },
+                    'x-uid': 'ylor106s9ok',
+                    'x-async': false,
+                    'x-index': 1,
+                  },
+                },
+                'x-uid': 'rl50hidu14n',
+                'x-async': false,
+                'x-index': 1,
+              },
+            },
+            'x-uid': 'xxhug2yumqf',
+            'x-async': false,
+            'x-index': 23,
+          },
+        },
+        name: 'h63eibc46on',
+        'x-uid': 'u9g23o0ohgk',
+        'x-async': true,
+        'x-index': 1,
+      },
+    },
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
index fdcc0108e6..359e44e955 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-bulk-update",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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-custom-request/package.json b/packages/plugins/@nocobase/plugin-action-custom-request/package.json
index ec13e6ca6a..d373f2fcba 100644
--- a/packages/plugins/@nocobase/plugin-action-custom-request/package.json
+++ b/packages/plugins/@nocobase/plugin-action-custom-request/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-custom-request",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-custom-request",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-custom-request",
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/package.json b/packages/plugins/@nocobase/plugin-action-duplicate/package.json
index 57d13611ee..3538cda4c2 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/package.json
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-duplicate",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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-export/package.json b/packages/plugins/@nocobase/plugin-action-export/package.json
index 9d840b0bf5..ecc16982ff 100644
--- a/packages/plugins/@nocobase/plugin-action-export/package.json
+++ b/packages/plugins/@nocobase/plugin-action-export/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "操作：导出记录",
   "description": "Export filtered records to excel, you can configure which fields to export.",
   "description.zh-CN": "导出筛选后的记录到 Excel 中，可以配置导出哪些字段。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-export",
diff --git a/packages/plugins/@nocobase/plugin-action-import/package.json b/packages/plugins/@nocobase/plugin-action-import/package.json
index 1aa0aabc45..9ba8e5df4c 100644
--- a/packages/plugins/@nocobase/plugin-action-import/package.json
+++ b/packages/plugins/@nocobase/plugin-action-import/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "操作：导入记录",
   "description": "Import records using excel templates. You can configure which fields to import and templates will be generated automatically.",
   "description.zh-CN": "使用 Excel 模板导入数据，可以配置导入哪些字段，自动生成模板。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-import",
diff --git a/packages/plugins/@nocobase/plugin-action-print/package.json b/packages/plugins/@nocobase/plugin-action-print/package.json
index e47c9bd80c..f5df21d5bc 100644
--- a/packages/plugins/@nocobase/plugin-action-print/package.json
+++ b/packages/plugins/@nocobase/plugin-action-print/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-print",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-print",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-print",
diff --git a/packages/plugins/@nocobase/plugin-ai/package.json b/packages/plugins/@nocobase/plugin-ai/package.json
index 32170b6e2f..e33880237f 100644
--- a/packages/plugins/@nocobase/plugin-ai/package.json
+++ b/packages/plugins/@nocobase/plugin-ai/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "AI 集成",
   "description": "Support integration with AI services, providing AI-related workflow nodes to enhance business processing capabilities.",
   "description.zh-CN": "支持接入 AI 服务，提供 AI 相关的工作流节点，增强业务处理能力。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-api-doc/package.json b/packages/plugins/@nocobase/plugin-api-doc/package.json
index eac364fb15..f257f091d3 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/package.json
+++ b/packages/plugins/@nocobase/plugin-api-doc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-api-doc",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 a867ff47bd..6156e6db21 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/package.json
+++ b/packages/plugins/@nocobase/plugin-api-keys/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：API 密钥",
   "description": "Allows users to use API key to access application's HTTP API",
   "description.zh-CN": "允许用户使用 API 密钥访问应用的 HTTP API",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/api-keys",
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/package.json b/packages/plugins/@nocobase/plugin-async-task-manager/package.json
index c72954469d..bec04221b7 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "异步任务管理器",
   "description": "Manage and monitor asynchronous tasks such as data import/export. Support task progress tracking and notification.",
   "description.zh-CN": "管理和监控数据导入导出等异步任务。支持任务进度跟踪和通知。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/src/client/AsyncTaskManagerProvider.tsx b/packages/plugins/@nocobase/plugin-async-task-manager/src/client/AsyncTaskManagerProvider.tsx
index 26fd598c84..d93ce6806d 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/src/client/AsyncTaskManagerProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/src/client/AsyncTaskManagerProvider.tsx
@@ -1,176 +1,24 @@
-import { PinnedPluginListProvider, SchemaComponentOptions, useApp } from '@nocobase/client';
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { PinnedPluginListProvider, SchemaComponentOptions, useRequest } from '@nocobase/client';
+import React from 'react';
 import { AsyncTasks } from './components/AsyncTasks';
-import React, { useEffect, useState, createContext, useContext, useCallback } from 'react';
-import { message } from 'antd';
-import { useT } from './locale';
-
-export const AsyncTaskContext = createContext<any>(null);
-
-export const useAsyncTask = () => {
-  const context = useContext(AsyncTaskContext);
-  if (!context) {
-    throw new Error('useAsyncTask must be used within AsyncTaskManagerProvider');
-  }
-  return context;
-};
 
 export const AsyncTaskManagerProvider = (props) => {
-  const app = useApp();
-  const t = useT();
-  const [tasks, setTasks] = useState<any[]>([]);
-  const [popoverVisible, setPopoverVisible] = useState(false);
-  const [hasProcessingTasks, setHasProcessingTasks] = useState(false);
-  const [cancellingTasks, setCancellingTasks] = useState<Set<string>>(new Set());
-  const [modalVisible, setModalVisible] = useState(false);
-  const [currentError, setCurrentError] = useState<any>(null);
-  const [resultModalVisible, setResultModalVisible] = useState(false);
-  const [currentTask, setCurrentTask] = useState(null);
-  const [wsAuthorized, setWsAuthorized] = useState(() => app.isWsAuthorized);
-
-  useEffect(() => {
-    setHasProcessingTasks(tasks.some((task) => task.status.type !== 'success' && task.status.type !== 'failed'));
-  }, [tasks]);
-
-  const handleTaskMessage = useCallback((event: CustomEvent) => {
-    const tasks = event.detail;
-    setTasks(tasks ? tasks.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()) : []);
-  }, []);
-
-  const handleTaskCreated = useCallback((event: CustomEvent) => {
-    const taskData = event.detail;
-    setTasks((prev) => {
-      const newTasks = [taskData, ...prev];
-      return newTasks.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
-    });
-    setPopoverVisible(true);
-  }, []);
-
-  const handleTaskProgress = useCallback((event: CustomEvent) => {
-    const { taskId, progress } = event.detail;
-    setTasks((prev) => prev.map((task) => (task.taskId === taskId ? { ...task, progress } : task)));
-  }, []);
-
-  const handleTaskStatus = useCallback((event: CustomEvent) => {
-    const { taskId, status } = event.detail;
-    if (status.type === 'cancelled') {
-      setTasks((prev) => prev.filter((task) => task.taskId !== taskId));
-    } else {
-      setTasks((prev) => {
-        const newTasks = prev.map((task) => {
-          if (task.taskId === taskId) {
-            if (status.type === 'success' && task.status.type !== 'success') {
-              message.success(t('Task completed'));
-            }
-            if (status.type === 'failed' && task.status.type !== 'failed') {
-              message.error(t('Task failed'));
-            }
-            return { ...task, status };
-          }
-          return task;
-        });
-        return newTasks;
-      });
-    }
-  }, []);
-
-  const handleWsAuthorized = useCallback(() => {
-    setWsAuthorized(true);
-  }, []);
-
-  const handleTaskCancelled = useCallback((event: CustomEvent) => {
-    const { taskId } = event.detail;
-    setCancellingTasks((prev) => {
-      const newSet = new Set(prev);
-      newSet.delete(taskId);
-      return newSet;
-    });
-    message.success(t('Task cancelled'));
-  }, []);
-
-  useEffect(() => {
-    app.eventBus.addEventListener('ws:message:async-tasks', handleTaskMessage);
-    app.eventBus.addEventListener('ws:message:async-tasks:created', handleTaskCreated);
-    app.eventBus.addEventListener('ws:message:async-tasks:progress', handleTaskProgress);
-    app.eventBus.addEventListener('ws:message:async-tasks:status', handleTaskStatus);
-    app.eventBus.addEventListener('ws:message:authorized', handleWsAuthorized);
-    app.eventBus.addEventListener('ws:message:async-tasks:cancelled', handleTaskCancelled);
-
-    if (wsAuthorized) {
-      app.ws.send(
-        JSON.stringify({
-          type: 'request:async-tasks:list',
-        }),
-      );
-    }
-
-    return () => {
-      app.eventBus.removeEventListener('ws:message:async-tasks', handleTaskMessage);
-      app.eventBus.removeEventListener('ws:message:async-tasks:created', handleTaskCreated);
-      app.eventBus.removeEventListener('ws:message:async-tasks:progress', handleTaskProgress);
-      app.eventBus.removeEventListener('ws:message:async-tasks:status', handleTaskStatus);
-      app.eventBus.removeEventListener('ws:message:authorized', handleWsAuthorized);
-      app.eventBus.removeEventListener('ws:message:async-tasks:cancelled', handleTaskCancelled);
-    };
-  }, [
-    app,
-    handleTaskMessage,
-    handleTaskCreated,
-    handleTaskProgress,
-    handleTaskStatus,
-    handleWsAuthorized,
-    handleTaskCancelled,
-    wsAuthorized,
-  ]);
-
-  const handleCancelTask = async (taskId: string) => {
-    setCancellingTasks((prev) => new Set(prev).add(taskId));
-    try {
-      app.ws.send(
-        JSON.stringify({
-          type: 'request:async-tasks:cancel',
-          payload: { taskId },
-        }),
-      );
-    } catch (error) {
-      console.error('Failed to cancel task:', error);
-      setCancellingTasks((prev) => {
-        const newSet = new Set(prev);
-        newSet.delete(taskId);
-        return newSet;
-      });
-    }
-  };
-
-  const contextValue = {
-    tasks,
-    popoverVisible,
-    setPopoverVisible,
-    hasProcessingTasks,
-    cancellingTasks,
-    modalVisible,
-    setModalVisible,
-    currentError,
-    setCurrentError,
-    resultModalVisible,
-    setResultModalVisible,
-    currentTask,
-    setCurrentTask,
-    handleCancelTask,
-  };
-
   return (
-    <AsyncTaskContext.Provider value={contextValue}>
-      <PinnedPluginListProvider
-        items={
-          tasks.length > 0
-            ? {
-                asyncTasks: { order: 300, component: 'AsyncTasks', pin: true, snippet: '*' },
-              }
-            : {}
-        }
-      >
-        <SchemaComponentOptions components={{ AsyncTasks }}>{props.children}</SchemaComponentOptions>
-      </PinnedPluginListProvider>
-    </AsyncTaskContext.Provider>
+    <PinnedPluginListProvider
+      items={{
+        asyncTasks: { order: 300, component: 'AsyncTasks', pin: true, snippet: '*' },
+      }}
+    >
+      <SchemaComponentOptions components={{ AsyncTasks }}>{props.children}</SchemaComponentOptions>
+    </PinnedPluginListProvider>
   );
 };
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/src/client/components/AsyncTasks.tsx b/packages/plugins/@nocobase/plugin-async-task-manager/src/client/components/AsyncTasks.tsx
index d53b50f760..af2d5e19be 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/src/client/components/AsyncTasks.tsx
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/src/client/components/AsyncTasks.tsx
@@ -1,13 +1,31 @@
-import React, { useEffect } from 'react';
-import { Button, Popover, Table, Tag, Progress, Space, Tooltip, Popconfirm, Modal, Empty } from 'antd';
-import { createStyles, Icon, useApp, usePlugin } from '@nocobase/client';
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 
+import {
+  createStyles,
+  Icon,
+  useAPIClient,
+  useApp,
+  usePlugin,
+  useRequest,
+  useCollectionManager,
+  useCompile,
+} from '@nocobase/client';
+import { Button, Empty, Modal, Popconfirm, Popover, Progress, Space, Table, Tag, Tooltip } from 'antd';
+import React, { useCallback, useEffect, useState } from 'react';
+
+import { useCurrentAppInfo } from '@nocobase/client';
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 import relativeTime from 'dayjs/plugin/relativeTime';
 import { useT } from '../locale';
-import { useAsyncTask } from '../AsyncTaskManagerProvider';
-import { useCurrentAppInfo } from '@nocobase/client';
+
 const useStyles = createStyles(({ token }) => {
   return {
     button: {
@@ -34,93 +52,27 @@ const renderTaskResult = (status, t) => {
   );
 };
 
-export const AsyncTasks = () => {
-  const {
-    tasks,
-    popoverVisible,
-    setPopoverVisible,
-    hasProcessingTasks,
-    cancellingTasks,
-    modalVisible,
-    setModalVisible,
-    currentError,
-    setCurrentError,
-    resultModalVisible,
-    setResultModalVisible,
-    currentTask,
-    setCurrentTask,
-    handleCancelTask,
-  } = useAsyncTask();
+const useAsyncTask = () => {
+  const { data, refreshAsync, loading } = useRequest<any>({
+    url: 'asyncTasks:list',
+  });
+  return { loading, tasks: data?.data || [], refresh: refreshAsync };
+};
 
-  const plugin = usePlugin<any>('async-task-manager');
+const AsyncTasksButton = (props) => {
+  const { popoverVisible, setPopoverVisible, tasks, refresh, loading, hasProcessingTasks } = props;
   const app = useApp();
+  const api = useAPIClient();
   const appInfo = useCurrentAppInfo();
   const t = useT();
   const { styles } = useStyles();
-
-  useEffect(() => {
-    const handleClickOutside = (event: MouseEvent) => {
-      if (popoverVisible) {
-        const popoverElements = document.querySelectorAll('.ant-popover');
-        const buttonElement = document.querySelector('.sync-task-button');
-        let clickedInside = false;
-
-        popoverElements.forEach((element) => {
-          if (element.contains(event.target as Node)) {
-            clickedInside = true;
-          }
-        });
-
-        if (buttonElement?.contains(event.target as Node)) {
-          clickedInside = true;
-        }
-
-        if (!clickedInside) {
-          setPopoverVisible(false);
-        }
-      }
-    };
-
-    document.addEventListener('click', handleClickOutside);
-    return () => {
-      document.removeEventListener('click', handleClickOutside);
-    };
-  }, [popoverVisible, setPopoverVisible]);
-
+  const plugin = usePlugin<any>('async-task-manager');
+  const cm = useCollectionManager();
+  const compile = useCompile();
   const showTaskResult = (task) => {
-    setCurrentTask(task);
-    setResultModalVisible(true);
     setPopoverVisible(false);
   };
 
-  const renderTaskResultModal = () => {
-    if (!currentTask) {
-      return;
-    }
-
-    const { payload } = currentTask.status;
-    const renderer = plugin.taskResultRendererManager.get(currentTask.title.actionType);
-
-    return (
-      <Modal
-        title={t('Task result')}
-        open={resultModalVisible}
-        footer={[
-          <Button key="close" onClick={() => setResultModalVisible(false)}>
-            {t('Close')}
-          </Button>,
-        ]}
-        onCancel={() => setResultModalVisible(false)}
-      >
-        {renderer ? (
-          React.createElement(renderer, { payload, task: currentTask })
-        ) : (
-          <div>{t(`No renderer available for this task type, payload: ${payload}`)}</div>
-        )}
-      </Modal>
-    );
-  };
-
   const columns = [
     {
       title: t('Created at'),
@@ -140,7 +92,7 @@ export const AsyncTasks = () => {
         if (!title) {
           return '-';
         }
-
+        const collection = cm.getCollection(title.collection);
         const actionTypeMap = {
           export: t('Export'),
           import: t('Import'),
@@ -156,7 +108,7 @@ export const AsyncTasks = () => {
         };
 
         const taskTemplate = taskTypeMap[title.actionType] || `${actionText}`;
-        return taskTemplate.replace('{collection}', title.collection);
+        return taskTemplate.replace('{collection}', compile(collection?.title || title.collection));
       },
     },
     {
@@ -274,7 +226,7 @@ export const AsyncTasks = () => {
       width: 180,
       render: (_, record: any) => {
         const actions = [];
-        const isTaskCancelling = cancellingTasks.has(record.taskId);
+        const isTaskCancelling = false;
 
         if ((record.status.type === 'running' || record.status.type === 'pending') && record.cancelable) {
           actions.push(
@@ -282,7 +234,15 @@ export const AsyncTasks = () => {
               key="cancel"
               title={t('Confirm cancel')}
               description={t('Confirm cancel description')}
-              onConfirm={() => handleCancelTask(record.taskId)}
+              onConfirm={async () => {
+                await api.request({
+                  url: 'asyncTasks:cancel',
+                  params: {
+                    filterByTk: record.taskId,
+                  },
+                });
+                refresh();
+              }}
               okText={t('Confirm')}
               cancelText={t('Cancel')}
               disabled={isTaskCancelling}
@@ -309,8 +269,16 @@ export const AsyncTasks = () => {
                 icon={<Icon type="DownloadOutlined" />}
                 onClick={() => {
                   const token = app.apiClient.auth.token;
+                  const collection = cm.getCollection(record.title.collection);
+                  const compiledTitle = compile(collection?.title);
+                  const suffix = record?.title?.actionType === 'export-attachments' ? '-attachments.zip' : '.xlsx';
+                  const fileText = `${compiledTitle}${suffix}`;
+                  const filename =
+                    record?.title?.actionType !== 'create migration' ? encodeURIComponent(fileText) : null;
                   const url = app.getApiUrl(
-                    `asyncTasks:fetchFile/${record.taskId}?token=${token}&__appName=${appInfo?.data?.name || app.name}`,
+                    `asyncTasks:fetchFile/${record.taskId}?token=${token}&__appName=${encodeURIComponent(
+                      appInfo?.data?.name || app.name,
+                    )}${filename ? `&filename=${filename}` : ''}`,
                   );
                   window.open(url);
                 }}
@@ -325,7 +293,19 @@ export const AsyncTasks = () => {
                 type="link"
                 size="small"
                 icon={<Icon type="EyeOutlined" />}
-                onClick={() => showTaskResult(record)}
+                onClick={() => {
+                  showTaskResult(record);
+                  const { payload } = record.status;
+                  const renderer = plugin.taskResultRendererManager.get(record.title.actionType);
+                  Modal.info({
+                    title: t('Task result'),
+                    content: renderer ? (
+                      React.createElement(renderer, { payload, task: record })
+                    ) : (
+                      <div>{t(`No renderer available for this task type, payload: ${payload}`)}</div>
+                    ),
+                  });
+                }}
               >
                 {t('View result')}
               </Button>,
@@ -341,9 +321,22 @@ export const AsyncTasks = () => {
               size="small"
               icon={<Icon type="ExclamationCircleOutlined" />}
               onClick={() => {
-                setCurrentError(record.status.errors);
-                setModalVisible(true);
                 setPopoverVisible(false);
+                Modal.info({
+                  title: t('Error Details'),
+                  content: record.status.errors?.map((error, index) => (
+                    <div key={index} style={{ marginBottom: 16 }}>
+                      <div style={{ color: '#ff4d4f', marginBottom: 8 }}>{error.message}</div>
+                      {error.code && (
+                        <div style={{ color: '#999', fontSize: 12 }}>
+                          {t('Error code')}: {error.code}
+                        </div>
+                      )}
+                    </div>
+                  )),
+                  closable: true,
+                  width: 400,
+                });
               }}
             >
               {t('Error details')}
@@ -357,9 +350,9 @@ export const AsyncTasks = () => {
   ];
 
   const content = (
-    <div style={{ width: tasks.length > 0 ? 800 : 200 }}>
+    <div style={{ maxHeight: '70vh', overflow: 'auto', width: tasks.length > 0 ? 800 : 200 }}>
       {tasks.length > 0 ? (
-        <Table columns={columns} dataSource={tasks} size="small" pagination={false} rowKey="taskId" />
+        <Table loading={loading} columns={columns} dataSource={tasks} size="small" pagination={false} rowKey="taskId" />
       ) : (
         <div style={{ padding: '24px 0', display: 'flex', justifyContent: 'center' }}>
           <Empty description={t('No tasks')} image={Empty.PRESENTED_IMAGE_SIMPLE} />
@@ -383,30 +376,53 @@ export const AsyncTasks = () => {
           onClick={() => setPopoverVisible(!popoverVisible)}
         />
       </Popover>
-      {renderTaskResultModal()}
-
-      <Modal
-        title={t('Error Details')}
-        open={modalVisible}
-        onCancel={() => setModalVisible(false)}
-        footer={[
-          <Button key="ok" type="primary" onClick={() => setModalVisible(false)}>
-            {t('OK')}
-          </Button>,
-        ]}
-        width={400}
-      >
-        {currentError?.map((error, index) => (
-          <div key={index} style={{ marginBottom: 16 }}>
-            <div style={{ color: '#ff4d4f', marginBottom: 8 }}>{error.message}</div>
-            {error.code && (
-              <div style={{ color: '#999', fontSize: 12 }}>
-                {t('Error code')}: {error.code}
-              </div>
-            )}
-          </div>
-        ))}
-      </Modal>
     </>
   );
 };
+
+export const AsyncTasks = () => {
+  const { tasks, refresh, ...others } = useAsyncTask();
+  const app = useApp();
+  const [popoverVisible, setPopoverVisible] = useState(false);
+  const [hasProcessingTasks, setHasProcessingTasks] = useState(false);
+
+  useEffect(() => {
+    setHasProcessingTasks(tasks.some((task) => task.status.type !== 'success' && task.status.type !== 'failed'));
+  }, [tasks]);
+
+  const handleTaskCreated = useCallback(async () => {
+    setPopoverVisible(true);
+  }, []);
+  const handleTaskProgress = useCallback(() => {
+    refresh();
+    console.log('handleTaskProgress');
+  }, []);
+  const handleTaskStatus = useCallback(() => {
+    refresh();
+    console.log('handleTaskStatus');
+  }, []);
+  const handleTaskCancelled = useCallback(() => {
+    refresh();
+    console.log('handleTaskCancelled');
+  }, []);
+
+  useEffect(() => {
+    app.eventBus.addEventListener('ws:message:async-tasks:created', handleTaskCreated);
+    app.eventBus.addEventListener('ws:message:async-tasks:progress', handleTaskProgress);
+    app.eventBus.addEventListener('ws:message:async-tasks:status', handleTaskStatus);
+    app.eventBus.addEventListener('ws:message:async-tasks:cancelled', handleTaskCancelled);
+
+    return () => {
+      app.eventBus.removeEventListener('ws:message:async-tasks:created', handleTaskCreated);
+      app.eventBus.removeEventListener('ws:message:async-tasks:progress', handleTaskProgress);
+      app.eventBus.removeEventListener('ws:message:async-tasks:status', handleTaskStatus);
+      app.eventBus.removeEventListener('ws:message:async-tasks:cancelled', handleTaskCancelled);
+    };
+  }, [app, handleTaskCancelled, handleTaskCreated, handleTaskProgress, handleTaskStatus]);
+
+  return (
+    tasks?.length > 0 && (
+      <AsyncTasksButton {...{ tasks, refresh, popoverVisible, setPopoverVisible, hasProcessingTasks, ...others }} />
+    )
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-async-task-manager/src/server/plugin.ts
index 494d826848..76fdb0ac1d 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/src/server/plugin.ts
@@ -1,9 +1,18 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 import { Plugin } from '@nocobase/server';
-import { BaseTaskManager } from './base-task-manager';
-import { AsyncTasksManager } from './interfaces/async-task-manager';
-import { CommandTaskType } from './command-task-type';
-import asyncTasksResource from './resourcers/async-tasks';
 import { throttle } from 'lodash';
+import { BaseTaskManager } from './base-task-manager';
+import { CommandTaskType } from './command-task-type';
+import { AsyncTasksManager } from './interfaces/async-task-manager';
+import asyncTasksResource from './resourcers/async-tasks';
 
 export class PluginAsyncExportServer extends Plugin {
   private progressThrottles: Map<string, Function> = new Map();
@@ -20,7 +29,7 @@ export class PluginAsyncExportServer extends Plugin {
     });
 
     this.app.container.get<AsyncTasksManager>('AsyncTaskManager').registerTaskType(CommandTaskType);
-    this.app.acl.allow('asyncTasks', ['get', 'fetchFile'], 'loggedIn');
+    this.app.acl.allow('asyncTasks', ['list', 'get', 'fetchFile', 'cancel'], 'loggedIn');
   }
 
   getThrottledProgressEmitter(taskId: string, userId: string) {
diff --git a/packages/plugins/@nocobase/plugin-async-task-manager/src/server/resourcers/async-tasks.ts b/packages/plugins/@nocobase/plugin-async-task-manager/src/server/resourcers/async-tasks.ts
index 1733616ae3..31bece6dfe 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/src/server/resourcers/async-tasks.ts
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/src/server/resourcers/async-tasks.ts
@@ -1,8 +1,26 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 import fs from 'fs';
+import _ from 'lodash';
 import { basename } from 'path';
+
 export default {
   name: 'asyncTasks',
   actions: {
+    async list(ctx, next) {
+      const userId = ctx.auth.user.id;
+      const asyncTaskManager = ctx.app.container.get('AsyncTaskManager');
+      const tasks = await asyncTaskManager.getTasksByTag('userId', userId);
+      ctx.body = _.orderBy(tasks, 'createdAt', 'desc');
+      await next();
+    },
     async get(ctx, next) {
       const { filterByTk } = ctx.action.params;
       const taskManager = ctx.app.container.get('AsyncTaskManager');
@@ -11,8 +29,29 @@ export default {
       ctx.body = taskStatus;
       await next();
     },
-    async fetchFile(ctx, next) {
+    async cancel(ctx, next) {
       const { filterByTk } = ctx.action.params;
+      const userId = ctx.auth.user.id;
+      const asyncTaskManager = ctx.app.container.get('AsyncTaskManager');
+
+      const task = asyncTaskManager.getTask(filterByTk);
+
+      if (!task) {
+        ctx.body = 'ok';
+        await next();
+        return;
+      }
+
+      if (task.tags['userId'] != userId) {
+        ctx.throw(403);
+      }
+
+      const cancelled = await asyncTaskManager.cancelTask(filterByTk);
+      ctx.body = cancelled;
+      await next();
+    },
+    async fetchFile(ctx, next) {
+      const { filterByTk, filename } = ctx.action.params;
       const taskManager = ctx.app.container.get('AsyncTaskManager');
       const taskStatus = await taskManager.getTaskStatus(filterByTk);
       // throw error if task is not success
@@ -28,10 +67,12 @@ export default {
 
       // send file to client
       ctx.body = fs.createReadStream(filePath);
-
+      // 处理文件名
+      let finalFileName = filename ? filename : basename(filePath);
+      finalFileName = encodeURIComponent(finalFileName); // 避免中文或特殊字符问题
       ctx.set({
         'Content-Type': 'application/octet-stream',
-        'Content-Disposition': `attachment; filename=${basename(filePath)}`,
+        'Content-Disposition': `attachment; filename=${finalFileName}`,
       });
 
       await next();
diff --git a/packages/plugins/@nocobase/plugin-audit-logs/package.json b/packages/plugins/@nocobase/plugin-audit-logs/package.json
index 7480d9bc8d..5190c3d5f9 100644
--- a/packages/plugins/@nocobase/plugin-audit-logs/package.json
+++ b/packages/plugins/@nocobase/plugin-audit-logs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-audit-logs",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "displayName": "Audit logs (deprecated)",
   "displayName.zh-CN": "审计日志（废弃）",
   "description": "This plugin is deprecated. There will be a new audit log plugin in the future.",
diff --git a/packages/plugins/@nocobase/plugin-auth-sms/package.json b/packages/plugins/@nocobase/plugin-auth-sms/package.json
index 2b312b813b..54308681c8 100644
--- a/packages/plugins/@nocobase/plugin-auth-sms/package.json
+++ b/packages/plugins/@nocobase/plugin-auth-sms/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：短信",
   "description": "SMS authentication.",
   "description.zh-CN": "通过短信验证码认证身份。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/auth-sms",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/auth-sms",
diff --git a/packages/plugins/@nocobase/plugin-auth/package.json b/packages/plugins/@nocobase/plugin-auth/package.json
index 55ab41248b..bdf1b4fac1 100644
--- a/packages/plugins/@nocobase/plugin-auth/package.json
+++ b/packages/plugins/@nocobase/plugin-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-auth",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 0f416d822c..7f789b5f22 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/package.json
+++ b/packages/plugins/@nocobase/plugin-backup-restore/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "应用的备份与还原（废弃）",
   "description": "Backup and restore applications for scenarios such as application replication, migration, and upgrades.",
   "description.zh-CN": "备份和还原应用，可用于应用的复制、迁移、升级等场景。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/backup-restore",
diff --git a/packages/plugins/@nocobase/plugin-block-iframe/package.json b/packages/plugins/@nocobase/plugin-block-iframe/package.json
index 366944d5c7..e8cc026cd3 100644
--- a/packages/plugins/@nocobase/plugin-block-iframe/package.json
+++ b/packages/plugins/@nocobase/plugin-block-iframe/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "区块：iframe",
   "description": "Create an iframe block on the page to embed and display external web pages or content.",
   "description.zh-CN": "在页面上创建和管理iframe，用于嵌入和展示外部网页或内容。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/block-iframe",
diff --git a/packages/plugins/@nocobase/plugin-block-template/package.json b/packages/plugins/@nocobase/plugin-block-template/package.json
index 7c61440ad4..529d77dd75 100644
--- a/packages/plugins/@nocobase/plugin-block-template/package.json
+++ b/packages/plugins/@nocobase/plugin-block-template/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "区块：模板",
   "description": "Create and manage block templates for reuse on pages.",
   "description.zh-CN": "创建和管理区块模板，用于在页面中重复使用。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/block-template",
diff --git a/packages/plugins/@nocobase/plugin-block-workbench/package.json b/packages/plugins/@nocobase/plugin-block-workbench/package.json
index 4e53982d26..34a93d0681 100644
--- a/packages/plugins/@nocobase/plugin-block-workbench/package.json
+++ b/packages/plugins/@nocobase/plugin-block-workbench/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-block-workbench",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "displayName": "Block: Action panel",
   "displayName.zh-CN": "区块：操作面板",
   "description": "Centrally manages and displays various actions, allowing users to efficiently perform tasks. It supports extensibility, with current action types including pop-ups, links, scanning, and custom requests.",
diff --git a/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/index.tsx b/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/index.tsx
index 15c46eb4ec..9365c8ee67 100644
--- a/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/index.tsx
+++ b/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/index.tsx
@@ -9,13 +9,13 @@
 import { FileImageOutlined, LeftOutlined } from '@ant-design/icons';
 import { useActionContext } from '@nocobase/client';
 import { Html5Qrcode } from 'html5-qrcode';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ScanBox } from './ScanBox';
 import { useScanner } from './useScanner';
 
 const qrcodeEleId = 'qrcode';
-export const QRCodeScannerInner = (props) => {
+export const QRCodeScannerInner = ({ setVisible }) => {
   const containerRef = useRef<HTMLDivElement>();
   const imgUploaderRef = useRef<HTMLInputElement>();
   const { t } = useTranslation('block-workbench');
@@ -23,9 +23,17 @@ export const QRCodeScannerInner = (props) => {
   const vw = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0);
   const vh = Math.max(document.documentElement.clientHeight || 0, window.innerHeight || 0);
 
+  const onScanSuccess = useCallback(
+    (text) => {
+      setVisible(false);
+    },
+    [setVisible],
+  );
+
   const { startScanFile } = useScanner({
     onScannerSizeChanged: setOriginVideoSize,
     elementId: qrcodeEleId,
+    onScanSuccess,
   });
 
   const getBoxStyle = (): React.CSSProperties => {
@@ -174,7 +182,7 @@ export const QRCodeScanner = (props) => {
 
   return visible && cameraAvaliable ? (
     <div style={style}>
-      <QRCodeScannerInner />
+      <QRCodeScannerInner setVisible={setVisible} />
       <LeftOutlined style={backIconStyle} onClick={() => setVisible(false)} />
       <div style={titleStyle}>{t('Scan QR code')}</div>
     </div>
diff --git a/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/useScanner.ts b/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/useScanner.ts
index 7e4e5eae0b..16568498ce 100644
--- a/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/useScanner.ts
+++ b/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/useScanner.ts
@@ -20,7 +20,7 @@ function removeStringIfStartsWith(text: string, prefix: string): string {
   return text;
 }
 
-export function useScanner({ onScannerSizeChanged, elementId }) {
+export function useScanner({ onScannerSizeChanged, elementId, onScanSuccess }) {
   const app = useApp();
   const mobileManager = app.pm.get(MobileManager);
   const basename = mobileManager.mobileRouter.basename.replace(/\/+$/, '');
@@ -50,12 +50,17 @@ export function useScanner({ onScannerSizeChanged, elementId }) {
           },
         },
         (text) => {
+          if (text?.startsWith('http')) {
+            window.location.href = text;
+            return;
+          }
           navigate(removeStringIfStartsWith(text, basename));
+          onScanSuccess && onScanSuccess(text);
         },
         undefined,
       );
     },
-    [navigate, onScannerSizeChanged, viewPoint, basename],
+    [navigate, onScannerSizeChanged, viewPoint, basename, onScanSuccess],
   );
   const stopScanner = useCallback(async (scanner: Html5Qrcode) => {
     const state = scanner.getState();
@@ -69,13 +74,18 @@ export function useScanner({ onScannerSizeChanged, elementId }) {
       await stopScanner(scanner);
       try {
         const { decodedText } = await scanner.scanFileV2(file, false);
+        if (decodedText?.startsWith('http')) {
+          window.location.href = decodedText;
+          return;
+        }
         navigate(removeStringIfStartsWith(decodedText, basename));
+        onScanSuccess && onScanSuccess(decodedText);
       } catch (error) {
         alert(t('QR code recognition failed, please scan again'));
         startScanCamera(scanner);
       }
     },
-    [stopScanner, scanner, navigate, basename, t, startScanCamera],
+    [stopScanner, scanner, navigate, basename, t, startScanCamera, onScanSuccess],
   );
 
   useEffect(() => {
diff --git a/packages/plugins/@nocobase/plugin-calendar/package.json b/packages/plugins/@nocobase/plugin-calendar/package.json
index d2791430a7..4b2ba2be5e 100644
--- a/packages/plugins/@nocobase/plugin-calendar/package.json
+++ b/packages/plugins/@nocobase/plugin-calendar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-calendar",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "displayName": "Calendar",
   "displayName.zh-CN": "日历",
   "description": "Provides callendar collection template and block for managing date data, typically for date/time related information such as events, appointments, tasks, and so on.",
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx
index 0308569760..604b7de19b 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx
@@ -108,7 +108,7 @@ const useEvents = (
     title: string;
   },
   date: Date,
-  view: (typeof Weeks)[number],
+  view: (typeof Weeks)[number] | any = 'month',
 ) => {
   const parseExpression = useLazy<typeof import('cron-parser').parseExpression>(
     () => import('cron-parser'),
@@ -132,8 +132,8 @@ const useEvents = (
       const intervalTime = end.diff(start, 'millisecond', true);
 
       const dateM = dayjs(date);
-      const startDate = dateM.clone().startOf('month');
-      const endDate = startDate.clone().endOf('month');
+      const startDate = dateM.clone().startOf(view);
+      const endDate = startDate.clone().endOf(view);
 
       /**
        * view === month 时，会显示当月日程
@@ -425,7 +425,6 @@ export const Calendar: any = withDynamicSchemaProps(
         };
       };
       const BigCalendar = reactBigCalendar?.BigCalendar;
-
       return wrapSSR(
         <div className={`${hashId} ${containerClassName}`} style={{ height: height || 700 }}>
           <PopupContextProvider visible={visible} setVisible={setVisible}>
diff --git a/packages/plugins/@nocobase/plugin-charts/package.json b/packages/plugins/@nocobase/plugin-charts/package.json
index 9867a3d5d1..ede1249592 100644
--- a/packages/plugins/@nocobase/plugin-charts/package.json
+++ b/packages/plugins/@nocobase/plugin-charts/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "图表（废弃）",
   "description": "The plugin has been deprecated, please use the data visualization plugin instead.",
   "description.zh-CN": "已废弃插件，请使用数据可视化插件代替。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-client/package.json b/packages/plugins/@nocobase/plugin-client/package.json
index e5933dd0ac..2668c8c0f1 100644
--- a/packages/plugins/@nocobase/plugin-client/package.json
+++ b/packages/plugins/@nocobase/plugin-client/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "WEB 客户端",
   "description": "Provides a client interface for the NocoBase server",
   "description.zh-CN": "为 NocoBase 服务端提供客户端界面",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-client/src/server/__tests__/desktopRoutes-union-role.test.ts b/packages/plugins/@nocobase/plugin-client/src/server/__tests__/desktopRoutes-union-role.test.ts
index 2d57e70cec..cddc03e9db 100644
--- a/packages/plugins/@nocobase/plugin-client/src/server/__tests__/desktopRoutes-union-role.test.ts
+++ b/packages/plugins/@nocobase/plugin-client/src/server/__tests__/desktopRoutes-union-role.test.ts
@@ -55,6 +55,12 @@ describe('Web client desktopRoutes', async () => {
       },
     });
 
+    await rootAgent.resource('roles').setSystemRoleMode({
+      values: {
+        roleMode: SystemRoleMode.allowUseUnion,
+      },
+    });
+
     agent = await app.agent().login(user, UNION_ROLE_KEY);
   });
 
diff --git a/packages/plugins/@nocobase/plugin-collection-sql/package.json b/packages/plugins/@nocobase/plugin-collection-sql/package.json
index c7cdb9e47e..ea42133097 100644
--- a/packages/plugins/@nocobase/plugin-collection-sql/package.json
+++ b/packages/plugins/@nocobase/plugin-collection-sql/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表: SQL",
   "description": "Provides SQL collection template",
   "description.zh-CN": "提供 SQL 数据表模板",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "homepage": "https://docs-cn.nocobase.com/handbook/collection-sql",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/collection-sql",
   "main": "dist/server/index.js",
diff --git a/packages/plugins/@nocobase/plugin-collection-tree/package.json b/packages/plugins/@nocobase/plugin-collection-tree/package.json
index 899485bdaa..cf953a60b5 100644
--- a/packages/plugins/@nocobase/plugin-collection-tree/package.json
+++ b/packages/plugins/@nocobase/plugin-collection-tree/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "displayName": "Collection: Tree",
   "displayName.zh-CN": "数据表：树",
   "description": "Provides tree collection template",
diff --git a/packages/plugins/@nocobase/plugin-data-source-main/package.json b/packages/plugins/@nocobase/plugin-data-source-main/package.json
index de97fc31a0..688c6894f2 100644
--- a/packages/plugins/@nocobase/plugin-data-source-main/package.json
+++ b/packages/plugins/@nocobase/plugin-data-source-main/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/data-source-main",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/data-source-main",
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/package.json b/packages/plugins/@nocobase/plugin-data-source-manager/package.json
index b622fe377a..b650c28253 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-source-manager",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "dist/server/index.js",
   "displayName": "Data source manager",
   "displayName.zh-CN": "数据源管理",
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/package.json b/packages/plugins/@nocobase/plugin-data-visualization/package.json
index a375415cd5..039a92459e 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/package.json
+++ b/packages/plugins/@nocobase/plugin-data-visualization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 0482a47f10..3b09db1e68 100644
--- a/packages/plugins/@nocobase/plugin-disable-pm-add/package.json
+++ b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-disable-pm-add",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "./dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-environment-variables/package.json b/packages/plugins/@nocobase/plugin-environment-variables/package.json
index a5412a5e8a..4ebf6b978f 100644
--- a/packages/plugins/@nocobase/plugin-environment-variables/package.json
+++ b/packages/plugins/@nocobase/plugin-environment-variables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-environment-variables",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-error-handler/package.json b/packages/plugins/@nocobase/plugin-error-handler/package.json
index c0a8bf9fd3..b9ffdbc28a 100644
--- a/packages/plugins/@nocobase/plugin-error-handler/package.json
+++ b/packages/plugins/@nocobase/plugin-error-handler/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "错误处理器",
   "description": "Handling application errors and exceptions.",
   "description.zh-CN": "处理应用程序中的错误和异常。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-field-china-region/package.json b/packages/plugins/@nocobase/plugin-field-china-region/package.json
index 85bd9ec9f3..97fc9e1c20 100644
--- a/packages/plugins/@nocobase/plugin-field-china-region/package.json
+++ b/packages/plugins/@nocobase/plugin-field-china-region/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-field-china-region",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "displayName": "Collection field: administrative divisions of China",
   "displayName.zh-CN": "数据表字段：中国行政区划",
   "description": "Provides data and field type for administrative divisions of China.",
diff --git a/packages/plugins/@nocobase/plugin-field-formula/package.json b/packages/plugins/@nocobase/plugin-field-formula/package.json
index b5896575ac..d81164cd47 100644
--- a/packages/plugins/@nocobase/plugin-field-formula/package.json
+++ b/packages/plugins/@nocobase/plugin-field-formula/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：公式",
   "description": "Configure and store the results of calculations between multiple field values in the same record, supporting both Math.js and Excel formula functions.",
   "description.zh-CN": "可以配置并存储同一条记录的多字段值之间的计算结果，支持 Math.js 和 Excel formula functions 两种引擎",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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-m2m-array/package.json b/packages/plugins/@nocobase/plugin-field-m2m-array/package.json
index dd93f9338b..45fb4e842f 100644
--- a/packages/plugins/@nocobase/plugin-field-m2m-array/package.json
+++ b/packages/plugins/@nocobase/plugin-field-m2m-array/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：多对多 (数组)",
   "description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model.",
   "description.zh-CN": "支持通过在数组中存储目标表唯一键的方式建立多对多关系。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json b/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
index 3f957ad5df..94e70f3859 100644
--- a/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
+++ b/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：Markdown(Vditor)",
   "description": "Used to store Markdown and render it using Vditor editor, supports common Markdown syntax such as list, code, quote, etc., and supports uploading images, recordings, etc.It also allows for instant rendering, where what you see is what you get.",
   "description.zh-CN": "用于存储 Markdown，并使用 Vditor 编辑器渲染，支持常见 Markdown 语法，如列表，代码，引用等，并支持上传图片，录音等。同时可以做到即时渲染，所见即所得。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 cc1ef1fa8c..f93208658d 100644
--- a/packages/plugins/@nocobase/plugin-field-sequence/package.json
+++ b/packages/plugins/@nocobase/plugin-field-sequence/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：自动编码",
   "description": "Automatically generate codes based on configured rules, supporting combinations of dates, numbers, and text.",
   "description.zh-CN": "根据配置的规则自动生成编码，支持日期、数字、文本的组合。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-sequence",
diff --git a/packages/plugins/@nocobase/plugin-field-sort/package.json b/packages/plugins/@nocobase/plugin-field-sort/package.json
index ea01d57c67..0efeb2bf60 100644
--- a/packages/plugins/@nocobase/plugin-field-sort/package.json
+++ b/packages/plugins/@nocobase/plugin-field-sort/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-field-sort",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "displayName": "Collection field: Sort",
   "displayName.zh-CN": "数据表字段：排序",
diff --git a/packages/plugins/@nocobase/plugin-file-manager/package.json b/packages/plugins/@nocobase/plugin-file-manager/package.json
index 7bfa8eb887..5419a30054 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-file-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/utils.test.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/utils.test.ts
new file mode 100644
index 0000000000..9264ef780a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/utils.test.ts
@@ -0,0 +1,50 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { getApp } from '.';
+import PluginFileManagerServer from '../server';
+
+import { STORAGE_TYPE_LOCAL } from '../../constants';
+
+import { getFileKey } from '../utils';
+
+describe('file manager > utils', () => {
+  let app;
+  let agent;
+  let db;
+  let plugin: PluginFileManagerServer;
+  let StorageRepo;
+  let AttachmentRepo;
+  let local;
+
+  beforeEach(async () => {
+    app = await getApp();
+    agent = app.agent();
+    db = app.db;
+    plugin = app.pm.get(PluginFileManagerServer) as PluginFileManagerServer;
+
+    AttachmentRepo = db.getCollection('attachments').repository;
+    StorageRepo = db.getCollection('storages').repository;
+    local = await StorageRepo.findOne({
+      filter: {
+        type: STORAGE_TYPE_LOCAL,
+      },
+    });
+  });
+
+  afterEach(async () => {
+    await app.destroy();
+  });
+
+  describe('getFileKey', () => {
+    it('path as null should works', async () => {
+      expect(getFileKey({ path: null, filename: 'test.jpg' })).toBe('test.jpg');
+    });
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/utils.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/utils.ts
index a5d6b1334d..989aa8dd81 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/utils.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/utils.ts
@@ -28,7 +28,7 @@ export const cloudFilenameGetter = (storage) => (req, file, cb) => {
 };
 
 export function getFileKey(record) {
-  return urlJoin(record.path, record.filename).replace(/^\//, '');
+  return urlJoin(record.path || '', record.filename).replace(/^\//, '');
 }
 
 export function ensureUrlEncoded(value) {
diff --git a/packages/plugins/@nocobase/plugin-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json
index 73e015f575..562b54f06a 100644
--- a/packages/plugins/@nocobase/plugin-gantt/package.json
+++ b/packages/plugins/@nocobase/plugin-gantt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-gantt",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 1e831d0f5f..3d92a9a900 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "可视化数据表管理",
   "description": "An ER diagram-like tool. Currently only the Master database is supported.",
   "description.zh-CN": "类似 ER 图的工具，目前只支持主数据库。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 e786609456..5cea71d568 100644
--- a/packages/plugins/@nocobase/plugin-kanban/package.json
+++ b/packages/plugins/@nocobase/plugin-kanban/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-kanban",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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-locale-tester/.npmignore b/packages/plugins/@nocobase/plugin-locale-tester/.npmignore
new file mode 100644
index 0000000000..65f5e8779f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/README.md b/packages/plugins/@nocobase/plugin-locale-tester/README.md
new file mode 100644
index 0000000000..cfac872027
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/README.md
@@ -0,0 +1 @@
+# @nocobase/plugin-locale-tester
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/client.d.ts b/packages/plugins/@nocobase/plugin-locale-tester/client.d.ts
new file mode 100644
index 0000000000..6c459cbac4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/client.js b/packages/plugins/@nocobase/plugin-locale-tester/client.js
new file mode 100644
index 0000000000..b6e3be70e6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/package.json b/packages/plugins/@nocobase/plugin-locale-tester/package.json
new file mode 100644
index 0000000000..0a785241fd
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "@nocobase/plugin-locale-tester",
+  "displayName": "Locale tester",
+  "displayName.zh-CN": "翻译测试工具",
+  "version": "1.7.0-beta.12",
+  "homepage": "https://github.com/nocobase/locales",
+  "main": "dist/server/index.js",
+  "peerDependencies": {
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x"
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/server.d.ts b/packages/plugins/@nocobase/plugin-locale-tester/server.d.ts
new file mode 100644
index 0000000000..c41081ddc6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/server.js b/packages/plugins/@nocobase/plugin-locale-tester/server.js
new file mode 100644
index 0000000000..972842039a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/client/client.d.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/client/client.d.ts
new file mode 100644
index 0000000000..4e96f83fa1
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/client/client.d.ts
@@ -0,0 +1,249 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// CSS modules
+type CSSModuleClasses = { readonly [key: string]: string };
+
+declare module '*.module.css' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.scss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.sass' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.less' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.styl' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.stylus' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.pcss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.sss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+
+// CSS
+declare module '*.css' { }
+declare module '*.scss' { }
+declare module '*.sass' { }
+declare module '*.less' { }
+declare module '*.styl' { }
+declare module '*.stylus' { }
+declare module '*.pcss' { }
+declare module '*.sss' { }
+
+// Built-in asset types
+// see `src/node/constants.ts`
+
+// images
+declare module '*.apng' {
+  const src: string;
+  export default src;
+}
+declare module '*.png' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpg' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpeg' {
+  const src: string;
+  export default src;
+}
+declare module '*.jfif' {
+  const src: string;
+  export default src;
+}
+declare module '*.pjpeg' {
+  const src: string;
+  export default src;
+}
+declare module '*.pjp' {
+  const src: string;
+  export default src;
+}
+declare module '*.gif' {
+  const src: string;
+  export default src;
+}
+declare module '*.svg' {
+  const src: string;
+  export default src;
+}
+declare module '*.ico' {
+  const src: string;
+  export default src;
+}
+declare module '*.webp' {
+  const src: string;
+  export default src;
+}
+declare module '*.avif' {
+  const src: string;
+  export default src;
+}
+
+// media
+declare module '*.mp4' {
+  const src: string;
+  export default src;
+}
+declare module '*.webm' {
+  const src: string;
+  export default src;
+}
+declare module '*.ogg' {
+  const src: string;
+  export default src;
+}
+declare module '*.mp3' {
+  const src: string;
+  export default src;
+}
+declare module '*.wav' {
+  const src: string;
+  export default src;
+}
+declare module '*.flac' {
+  const src: string;
+  export default src;
+}
+declare module '*.aac' {
+  const src: string;
+  export default src;
+}
+declare module '*.opus' {
+  const src: string;
+  export default src;
+}
+declare module '*.mov' {
+  const src: string;
+  export default src;
+}
+declare module '*.m4a' {
+  const src: string;
+  export default src;
+}
+declare module '*.vtt' {
+  const src: string;
+  export default src;
+}
+
+// fonts
+declare module '*.woff' {
+  const src: string;
+  export default src;
+}
+declare module '*.woff2' {
+  const src: string;
+  export default src;
+}
+declare module '*.eot' {
+  const src: string;
+  export default src;
+}
+declare module '*.ttf' {
+  const src: string;
+  export default src;
+}
+declare module '*.otf' {
+  const src: string;
+  export default src;
+}
+
+// other
+declare module '*.webmanifest' {
+  const src: string;
+  export default src;
+}
+declare module '*.pdf' {
+  const src: string;
+  export default src;
+}
+declare module '*.txt' {
+  const src: string;
+  export default src;
+}
+
+// wasm?init
+declare module '*.wasm?init' {
+  const initWasm: (options?: WebAssembly.Imports) => Promise<WebAssembly.Instance>;
+  export default initWasm;
+}
+
+// web worker
+declare module '*?worker' {
+  const workerConstructor: {
+    new(options?: { name?: string }): Worker;
+  };
+  export default workerConstructor;
+}
+
+declare module '*?worker&inline' {
+  const workerConstructor: {
+    new(options?: { name?: string }): Worker;
+  };
+  export default workerConstructor;
+}
+
+declare module '*?worker&url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?sharedworker' {
+  const sharedWorkerConstructor: {
+    new(options?: { name?: string }): SharedWorker;
+  };
+  export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&inline' {
+  const sharedWorkerConstructor: {
+    new(options?: { name?: string }): SharedWorker;
+  };
+  export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?raw' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?inline' {
+  const src: string;
+  export default src;
+}
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/client/index.tsx b/packages/plugins/@nocobase/plugin-locale-tester/src/client/index.tsx
new file mode 100644
index 0000000000..7ecfc9a69d
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/client/index.tsx
@@ -0,0 +1,124 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { useForm } from '@formily/react';
+import { ActionProps, ISchema, Plugin, SchemaComponent, useAPIClient, useApp, useRequest } from '@nocobase/client';
+import { Alert, App as AntdApp, Card, Spin } from 'antd';
+import React from 'react';
+import { useT } from './locale';
+
+function LocaleTester() {
+  const { data, loading } = useRequest<any>({
+    url: 'localeTester:get',
+  });
+  const t = useT();
+
+  const schema: ISchema = {
+    type: 'void',
+    name: 'root',
+    properties: {
+      test: {
+        type: 'void',
+        'x-component': 'FormV2',
+        properties: {
+          locale: {
+            type: 'string',
+            'x-decorator': 'FormItem',
+            'x-component': 'Input.JSON',
+            'x-component-props': {
+              autoSize: { minRows: 20, maxRows: 30 },
+            },
+            default: data?.data?.locale,
+            title: t('Translations'),
+          },
+          button: {
+            type: 'void',
+            'x-component': 'Action',
+            title: t('Submit'),
+            'x-use-component-props': 'useSubmitActionProps',
+          },
+        },
+      },
+    },
+  };
+
+  const useSubmitActionProps = () => {
+    const form = useForm();
+    const api = useAPIClient();
+    const { message } = AntdApp.useApp();
+    const app = useApp();
+
+    return {
+      type: 'primary',
+      htmlType: 'submit',
+      async onClick() {
+        await form.submit();
+        const values = form.values;
+        await api.request({
+          url: 'localeTester:updateOrCreate',
+          method: 'post',
+          params: {
+            filterKeys: ['id'],
+          },
+          data: {
+            id: data?.data?.id,
+            locale: values.locale,
+          },
+        });
+        message.success(app.i18n.t('Saved successfully!'));
+        window.location.reload();
+      },
+    };
+  };
+
+  if (loading) {
+    return <Spin />;
+  }
+  return (
+    <Card>
+      <Alert
+        style={{ marginBottom: 12 }}
+        description={
+          <div
+            dangerouslySetInnerHTML={{
+              __html: t(
+                `Please go to <a target="_blank" href="https://github.com/nocobase/locales">nocobase/locales</a> to get the language file that needs translation, then paste it below and provide the translation.`,
+              ),
+            }}
+          ></div>
+        }
+      />
+      <SchemaComponent schema={schema} scope={{ useSubmitActionProps }} />
+    </Card>
+  );
+}
+
+export class PluginLocaleTesterClient extends Plugin {
+  async afterAdd() {
+    // await this.app.pm.add()
+  }
+
+  async beforeLoad() {}
+
+  // You can get and modify the app instance here
+  async load() {
+    this.app.pluginSettingsManager.add('locale-tester', {
+      title: this.t('Locale tester'),
+      icon: 'TranslationOutlined',
+      Component: LocaleTester,
+    });
+    // this.app.addComponents({})
+    // this.app.addScopes({})
+    // this.app.addProvider()
+    // this.app.addProviders()
+    // this.app.router.add()
+  }
+}
+
+export default PluginLocaleTesterClient;
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/client/locale.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/client/locale.ts
new file mode 100644
index 0000000000..84797b7d1b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/client/locale.ts
@@ -0,0 +1,21 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// @ts-ignore
+import pkg from './../../package.json';
+import { useApp } from '@nocobase/client';
+
+export function useT() {
+  const app = useApp();
+  return (str: string) => app.i18n.t(str, { ns: [pkg.name, 'client'] });
+}
+
+export function tStr(key: string) {
+  return `{{t(${JSON.stringify(key)}, { ns: ['${pkg.name}', 'client'], nsMode: 'fallback' })}}`;
+}
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/index.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/index.ts
new file mode 100644
index 0000000000..be99a2ff1a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/index.ts
@@ -0,0 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export * from './server';
+export { default } from './server';
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-locale-tester/src/locale/en-US.json
new file mode 100644
index 0000000000..cc8bcdd470
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/locale/en-US.json
@@ -0,0 +1,5 @@
+{
+  "Locale": "Locale",
+  "Locale tester": "Locale tester",
+  "Please go to <a target=\"_blank\" href=\"https://github.com/nocobase/locales\">nocobase/locales</a> to get the language file that needs translation, then paste it below and provide the translation.": "Please go to <a target=\"_blank\" href=\"https://github.com/nocobase/locales\">nocobase/locales</a> to get the language file that needs translation, then paste it below and provide the translation."
+}
\ No newline at end of file
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-locale-tester/src/locale/zh-CN.json
new file mode 100644
index 0000000000..d4074a2ae0
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/locale/zh-CN.json
@@ -0,0 +1,5 @@
+{
+  "Translations": "翻译",
+  "Locale tester": "翻译测试工具",
+  "Please go to <a target=\"_blank\" href=\"https://github.com/nocobase/locales\">nocobase/locales</a> to get the language file that needs translation, then paste it below and provide the translation.": "请前往 <a target=\"_blank\" href=\"https://github.com/nocobase/locales\">nocobase/locales</a> 获取需要翻译的语言文件，粘贴到下方并进行翻译。"
+}
\ No newline at end of file
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/.gitkeep b/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/localeTester.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/localeTester.ts
new file mode 100644
index 0000000000..eceb54bbbc
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/localeTester.ts
@@ -0,0 +1,21 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { defineCollection } from '@nocobase/database';
+
+export default defineCollection({
+  name: 'localeTester',
+  autoGenId: true,
+  fields: [
+    {
+      type: 'json',
+      name: 'locale',
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/server/index.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/server/index.ts
new file mode 100644
index 0000000000..be989de7c3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/server/index.ts
@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export { default } from './plugin';
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/server/plugin.ts
new file mode 100644
index 0000000000..7c9367961a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/server/plugin.ts
@@ -0,0 +1,59 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Plugin } from '@nocobase/server';
+import _ from 'lodash';
+
+export class PluginLocaleTesterServer extends Plugin {
+  async afterAdd() {}
+
+  async beforeLoad() {
+    this.app.acl.registerSnippet({
+      name: `pm.${this.name}`,
+      actions: ['localeTester:*'],
+    });
+  }
+
+  async load() {
+    this.app.resourceManager.use(async (ctx, next) => {
+      await next();
+      const { resourceName, actionName } = ctx.action;
+      if (resourceName === 'app' && actionName === 'getLang') {
+        const repository = this.db.getRepository('localeTester');
+        const record = await repository.findOne();
+        const locale = record?.locale || {};
+        if (locale['cronstrue']) {
+          _.set(ctx.body, 'cronstrue', locale['cronstrue']);
+        }
+        if (locale['react-js-cron']) {
+          _.set(ctx.body, 'cron', locale['react-js-cron']);
+        }
+        Object.keys(locale).forEach((key) => {
+          if (key === 'cronstrue' || key === 'react-js-cron') {
+            return;
+          }
+          const value = locale[key];
+          _.set(ctx.body, ['resources', key], value);
+          const k = key.replace('@nocobase/', '').replace('@nocobase/plugin-', '');
+          _.set(ctx.body, ['resources', k], value);
+        });
+      }
+    });
+  }
+
+  async install() {}
+
+  async afterEnable() {}
+
+  async afterDisable() {}
+
+  async remove() {}
+}
+
+export default PluginLocaleTesterServer;
diff --git a/packages/plugins/@nocobase/plugin-localization/package.json b/packages/plugins/@nocobase/plugin-localization/package.json
index 4c4d6f6bb6..edae322a60 100644
--- a/packages/plugins/@nocobase/plugin-localization/package.json
+++ b/packages/plugins/@nocobase/plugin-localization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-localization",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 a2710cdb24..98e51925a5 100644
--- a/packages/plugins/@nocobase/plugin-logger/package.json
+++ b/packages/plugins/@nocobase/plugin-logger/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "日志",
   "description": "Server-side logs, mainly including API request logs and system runtime logs, and allows to package and download log files.",
   "description.zh-CN": "服务端日志，主要包括接口请求日志和系统运行日志，并支持打包和下载日志文件。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 80b47b9896..89175cb90b 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": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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-map/src/client/components/Configuration.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
index ab8af6f8bb..168cdb220c 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
@@ -32,15 +32,26 @@ const BaseConfiguration: React.FC<BaseConfigurationProps> = ({ type, children })
     return apiClient.resource(MapConfigurationResourceKey);
   }, [apiClient]);
 
-  function removeInvisibleCharsFromObject(obj: Record<string, string>): Record<string, string> {
-    const cleanObj: Record<string, string> = {};
+  function removeInvisibleCharsFromObject(obj: Record<string, string>): Record<string, string | null> {
+    const cleanObj: Record<string, string | null> = {};
     for (const [key, value] of Object.entries(obj)) {
-      cleanObj[key] = typeof value === 'string' ? value.replace(/[\p{C}\p{Z}\p{Zl}\p{Zp}]+/gu, '') : value;
+      if (typeof value === 'string') {
+        // 去除不可见字符
+        const cleanedValue = value.replace(/[\p{C}\p{Z}\p{Zl}\p{Zp}]+/gu, '');
+        // 如果清理后为空字符串，则赋值为 null
+        cleanObj[key] = cleanedValue || null;
+      }
     }
+
     return cleanObj;
   }
-
   const onSubmit = async (values) => {
+    // 移除不可见字符并更新表单值
+    const result = removeInvisibleCharsFromObject(values);
+    form.setFieldsValue(result);
+
+    // 等待表单值更新完成后再校验
+    await new Promise((resolve) => setTimeout(resolve, 0));
     await form.validateFields();
     resource
       .set({
diff --git a/packages/plugins/@nocobase/plugin-mobile-client/package.json b/packages/plugins/@nocobase/plugin-mobile-client/package.json
index b6f11a0c72..e2e3b18a10 100644
--- a/packages/plugins/@nocobase/plugin-mobile-client/package.json
+++ b/packages/plugins/@nocobase/plugin-mobile-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-mobile-client",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/mobile-client",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/mobile-client",
diff --git a/packages/plugins/@nocobase/plugin-mobile/package.json b/packages/plugins/@nocobase/plugin-mobile/package.json
index eb151c133f..c1fd3a3152 100644
--- a/packages/plugins/@nocobase/plugin-mobile/package.json
+++ b/packages/plugins/@nocobase/plugin-mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-mobile",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/mobile",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/mobile",
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/server/__tests__/union-role-mobileRoutes.test.ts b/packages/plugins/@nocobase/plugin-mobile/src/server/__tests__/union-role-mobileRoutes.test.ts
index b1930b8629..a66cbc73a4 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/server/__tests__/union-role-mobileRoutes.test.ts
+++ b/packages/plugins/@nocobase/plugin-mobile/src/server/__tests__/union-role-mobileRoutes.test.ts
@@ -54,7 +54,11 @@ describe('union role mobileRoutes', async () => {
         roles: [role1.name, role2.name],
       },
     });
-
+    await rootAgent.resource('roles').setSystemRoleMode({
+      values: {
+        roleMode: SystemRoleMode.allowUseUnion,
+      },
+    });
     agent = await app.agent().login(user, UNION_ROLE_KEY);
   });
 
diff --git a/packages/plugins/@nocobase/plugin-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json
index 9918d91a92..5d52fd6eda 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/package.json
+++ b/packages/plugins/@nocobase/plugin-mock-collections/package.json
@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-mock-collections",
   "displayName": "mock-collections",
   "description": "mock-collections",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 c8e9c56eb8..69fd2d211b 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用管理器",
   "description": "Dynamically create multiple apps without separate deployments.",
   "description.zh-CN": "无需单独部署即可动态创建多个应用。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 90f030c47e..87c6283194 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用数据表共享",
   "description": "",
   "description.zh-CN": "",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "./dist/server/index.js",
   "devDependencies": {
     "@formily/react": "2.x",
diff --git a/packages/plugins/@nocobase/plugin-notification-email/package.json b/packages/plugins/@nocobase/plugin-notification-email/package.json
index 5e6ca8f425..fa9d4b5561 100644
--- a/packages/plugins/@nocobase/plugin-notification-email/package.json
+++ b/packages/plugins/@nocobase/plugin-notification-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-email",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "displayName": "Notification: Email",
   "displayName.zh-CN": "通知：电子邮件",
   "description": "Used for sending email notifications with built-in SMTP transport.",
diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json b/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json
index 71bd3e924a..a8e1ec7af9 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-in-app-message",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "displayName": "Notification: In-app message",
   "displayName.zh-CN": "通知：站内信",
   "description": "It supports users in receiving real-time message notifications within the NocoBase application.",
diff --git a/packages/plugins/@nocobase/plugin-notification-manager/package.json b/packages/plugins/@nocobase/plugin-notification-manager/package.json
index 51ed238a0c..dcad30212c 100644
--- a/packages/plugins/@nocobase/plugin-notification-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-notification-manager/package.json
@@ -4,7 +4,7 @@
   "description": "Provides a unified management service that includes channel configuration, logging, and other features, supporting the configuration of various notification channels, including in-app message and email.",
   "displayName.zh-CN": "通知管理",
   "description.zh-CN": "提供统一的管理服务，涵盖渠道配置、日志记录等功能，支持多种通知渠道的配置，包括站内信和电子邮件等。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "homepage": "https://docs.nocobase.com/handbook/notification-manager",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/notification-manager",
   "main": "dist/server/index.js",
diff --git a/packages/plugins/@nocobase/plugin-notifications/package.json b/packages/plugins/@nocobase/plugin-notifications/package.json
index 318a01cd4e..0d3bc22d78 100644
--- a/packages/plugins/@nocobase/plugin-notifications/package.json
+++ b/packages/plugins/@nocobase/plugin-notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notifications",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
diff --git a/packages/plugins/@nocobase/plugin-public-forms/package.json b/packages/plugins/@nocobase/plugin-public-forms/package.json
index 81e2eef56f..c657029a8a 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/package.json
+++ b/packages/plugins/@nocobase/plugin-public-forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-public-forms",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "dist/server/index.js",
   "displayName": "Public forms",
   "displayName.zh-CN": "公开表单",
diff --git a/packages/plugins/@nocobase/plugin-sample-hello/package.json b/packages/plugins/@nocobase/plugin-sample-hello/package.json
index 15a20d7c91..2e361e1e10 100644
--- a/packages/plugins/@nocobase/plugin-sample-hello/package.json
+++ b/packages/plugins/@nocobase/plugin-sample-hello/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-sample-hello",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 ca7bc28649..901238cb10 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/package.json
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：关系快照",
   "description": "When adding a new record, create a snapshot for its relational record and save in the new record. The snapshot will not be updated when the relational record is updated.",
   "description.zh-CN": "在添加数据时，为它的关系数据创建快照，并保存在当前的数据中。关系数据更新时，快照不会更新。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 ad60e21376..148d55aafa 100644
--- a/packages/plugins/@nocobase/plugin-system-settings/package.json
+++ b/packages/plugins/@nocobase/plugin-system-settings/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "系统设置",
   "description": "Used to adjust the system title, logo, language, etc.",
   "description.zh-CN": "用于调整系统的标题、LOGO、语言等。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 94bb6035d6..c1e64c1e14 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/package.json
+++ b/packages/plugins/@nocobase/plugin-theme-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-theme-editor",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 124e215ce3..787632b589 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "UI schema 存储服务",
   "description": "Provides centralized UI schema storage service.",
   "description.zh-CN": "提供中心化的 UI schema 存储服务。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/ui-schema-storage",
diff --git a/packages/plugins/@nocobase/plugin-user-data-sync/package.json b/packages/plugins/@nocobase/plugin-user-data-sync/package.json
index 16a069d4af..6fc8853ca3 100644
--- a/packages/plugins/@nocobase/plugin-user-data-sync/package.json
+++ b/packages/plugins/@nocobase/plugin-user-data-sync/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "用户数据同步",
   "description": "Reigster and manage extensible user data synchronization sources, with HTTP API provided by default. Support for synchronizing data to resources such as users and departments.",
   "description.zh-CN": "注册和管理可扩展的用户数据同步来源，默认提供 HTTP API。支持向用户和部门等资源同步数据。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-users/package.json b/packages/plugins/@nocobase/plugin-users/package.json
index 2ca8701a19..5a917490c2 100644
--- a/packages/plugins/@nocobase/plugin-users/package.json
+++ b/packages/plugins/@nocobase/plugin-users/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "用户",
   "description": "Provides basic user model, as well as created by and updated by fields.",
   "description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 41915f3791..9ac936cb71 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": "User identity verification management, including SMS, TOTP authenticator, with extensibility.",
   "description.zh-CN": "用户身份验证管理，包含短信、TOTP 认证器等，可扩展。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 320a0b5057..0258b75cb6 100644
--- a/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：操作后事件",
   "description": "Triggered after the completion of a request initiated through an action button or API, such as after adding, updating, deleting data, or \"submit to workflow\". Suitable for data processing, sending notifications, etc., after actions are completed.",
   "description.zh-CN": "通过操作按钮或 API 发起请求并在执行完成后触发，比如新增、更新、删除数据或者“提交至工作流”之后。适用于在操作完成后进行数据处理、发送通知等。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 2d2e90370e..6c0f8b5d27 100644
--- a/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：聚合查询节点",
   "description": "Used to aggregate data against the database in workflow, such as: statistics, sum, average, etc.",
   "description.zh-CN": "可用于在工作流中对数据库进行聚合查询，如：统计数量、求和、平均值等。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 1e31b8d49a..a943a6ba8f 100644
--- a/packages/plugins/@nocobase/plugin-workflow-delay/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-delay/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：延时节点",
   "description": "Could be used in workflow parallel branch for waiting other branches.",
   "description.zh-CN": "可用于工作流并行分支中等待其他分支执行完成。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 1f2521e12e..b969ec1e9e 100644
--- a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：动态表达式计算节点",
   "description": "Useful plugin for doing dynamic calculation based on expression collection records in workflow.",
   "description.zh-CN": "用于在工作流中进行基于数据行的动态表达式计算。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 09ec5c99b8..ef8a6e460d 100644
--- a/packages/plugins/@nocobase/plugin-workflow-loop/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-loop/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：循环节点",
   "description": "Used to repeat the sub-process processing of each value in an array, and can also be used for fixed times of sub-process processing.",
   "description.zh-CN": "用于对一个数组中的每个值进行重复的子流程处理，也可用于固定次数的重复子流程处理。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 7d434c4a70..e875485b76 100644
--- a/packages/plugins/@nocobase/plugin-workflow-mailer/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-mailer/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：邮件发送节点",
   "description": "Send email in workflow.",
   "description.zh-CN": "可用于在工作流中发送电子邮件。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 f42e1f8041..769822a5ce 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：人工处理节点",
   "description": "Could be used for workflows which some of decisions are made by users.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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-notification/package.json b/packages/plugins/@nocobase/plugin-workflow-notification/package.json
index 3495c2b05d..322fc5b1d1 100644
--- a/packages/plugins/@nocobase/plugin-workflow-notification/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-notification/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：通知节点",
   "description": "Send notification in workflow.",
   "description.zh-CN": "可用于在工作流中发送各类通知。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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-parallel/package.json b/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
index 7698723168..c24733a399 100644
--- a/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：并行分支节点",
   "description": "Could be used for parallel execution of branch processes in the workflow.",
   "description.zh-CN": "用于在工作流中需要并行执行的分支流程。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 c8fb351e9b..1f9f9254de 100644
--- a/packages/plugins/@nocobase/plugin-workflow-request/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-request/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：HTTP 请求节点",
   "description": "Send HTTP requests to any HTTP service for data interaction in workflow.",
   "description.zh-CN": "可用于在工作流中向任意 HTTP 服务发送请求，进行数据交互。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 0952913283..3e4b1c5e2a 100644
--- a/packages/plugins/@nocobase/plugin-workflow-sql/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-sql/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：SQL 节点",
   "description": "Execute SQL statements in workflow.",
   "description.zh-CN": "可用于在工作流中对数据库执行任意 SQL 语句。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 c6ff0c3bc9..2802d01fa5 100644
--- a/packages/plugins/@nocobase/plugin-workflow-test/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-test/package.json
@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-workflow-test",
   "displayName": "Workflow: test kit",
   "displayName.zh-CN": "工作流：测试工具包",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "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 ece246da0e..ec043b284e 100644
--- a/packages/plugins/@nocobase/plugin-workflow/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow/package.json
@@ -4,13 +4,13 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
   "description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow",
   "dependencies": {
-    "@nocobase/plugin-workflow-test": "1.7.0-beta.9"
+    "@nocobase/plugin-workflow-test": "1.7.0-beta.12"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json
index 208a462dab..ef9297071e 100644
--- a/packages/presets/nocobase/package.json
+++ b/packages/presets/nocobase/package.json
@@ -1,81 +1,82 @@
 {
   "name": "@nocobase/preset-nocobase",
-  "version": "1.7.0-beta.9",
+  "version": "1.7.0-beta.12",
   "license": "AGPL-3.0",
   "main": "./lib/server/index.js",
   "dependencies": {
     "@formily/json-schema": "2.x",
-    "@nocobase/plugin-acl": "1.7.0-beta.9",
-    "@nocobase/plugin-action-bulk-edit": "1.7.0-beta.9",
-    "@nocobase/plugin-action-bulk-update": "1.7.0-beta.9",
-    "@nocobase/plugin-action-custom-request": "1.7.0-beta.9",
-    "@nocobase/plugin-action-duplicate": "1.7.0-beta.9",
-    "@nocobase/plugin-action-export": "1.7.0-beta.9",
-    "@nocobase/plugin-action-import": "1.7.0-beta.9",
-    "@nocobase/plugin-action-print": "1.7.0-beta.9",
-    "@nocobase/plugin-ai": "1.7.0-beta.9",
-    "@nocobase/plugin-api-doc": "1.7.0-beta.9",
-    "@nocobase/plugin-api-keys": "1.7.0-beta.9",
-    "@nocobase/plugin-async-task-manager": "1.7.0-beta.9",
-    "@nocobase/plugin-audit-logs": "1.7.0-beta.9",
-    "@nocobase/plugin-auth": "1.7.0-beta.9",
-    "@nocobase/plugin-auth-sms": "1.7.0-beta.9",
-    "@nocobase/plugin-backup-restore": "1.7.0-beta.9",
-    "@nocobase/plugin-block-iframe": "1.7.0-beta.9",
-    "@nocobase/plugin-block-template": "1.7.0-beta.9",
-    "@nocobase/plugin-block-workbench": "1.7.0-beta.9",
-    "@nocobase/plugin-calendar": "1.7.0-beta.9",
-    "@nocobase/plugin-charts": "1.7.0-beta.9",
-    "@nocobase/plugin-client": "1.7.0-beta.9",
-    "@nocobase/plugin-collection-sql": "1.7.0-beta.9",
-    "@nocobase/plugin-collection-tree": "1.7.0-beta.9",
-    "@nocobase/plugin-data-source-main": "1.7.0-beta.9",
-    "@nocobase/plugin-data-source-manager": "1.7.0-beta.9",
-    "@nocobase/plugin-data-visualization": "1.7.0-beta.9",
-    "@nocobase/plugin-environment-variables": "1.7.0-beta.9",
-    "@nocobase/plugin-error-handler": "1.7.0-beta.9",
-    "@nocobase/plugin-field-china-region": "1.7.0-beta.9",
-    "@nocobase/plugin-field-formula": "1.7.0-beta.9",
-    "@nocobase/plugin-field-m2m-array": "1.7.0-beta.9",
-    "@nocobase/plugin-field-markdown-vditor": "1.7.0-beta.9",
-    "@nocobase/plugin-field-sequence": "1.7.0-beta.9",
-    "@nocobase/plugin-field-sort": "1.7.0-beta.9",
-    "@nocobase/plugin-file-manager": "1.7.0-beta.9",
-    "@nocobase/plugin-gantt": "1.7.0-beta.9",
-    "@nocobase/plugin-graph-collection-manager": "1.7.0-beta.9",
-    "@nocobase/plugin-kanban": "1.7.0-beta.9",
-    "@nocobase/plugin-localization": "1.7.0-beta.9",
-    "@nocobase/plugin-logger": "1.7.0-beta.9",
-    "@nocobase/plugin-map": "1.7.0-beta.9",
-    "@nocobase/plugin-mobile": "1.7.0-beta.9",
-    "@nocobase/plugin-mobile-client": "1.7.0-beta.9",
-    "@nocobase/plugin-mock-collections": "1.7.0-beta.9",
-    "@nocobase/plugin-multi-app-manager": "1.7.0-beta.9",
-    "@nocobase/plugin-multi-app-share-collection": "1.7.0-beta.9",
-    "@nocobase/plugin-notification-email": "1.7.0-beta.9",
-    "@nocobase/plugin-notification-in-app-message": "1.7.0-beta.9",
-    "@nocobase/plugin-notification-manager": "1.7.0-beta.9",
-    "@nocobase/plugin-public-forms": "1.7.0-beta.9",
-    "@nocobase/plugin-snapshot-field": "1.7.0-beta.9",
-    "@nocobase/plugin-system-settings": "1.7.0-beta.9",
-    "@nocobase/plugin-theme-editor": "1.7.0-beta.9",
-    "@nocobase/plugin-ui-schema-storage": "1.7.0-beta.9",
-    "@nocobase/plugin-user-data-sync": "1.7.0-beta.9",
-    "@nocobase/plugin-users": "1.7.0-beta.9",
-    "@nocobase/plugin-verification": "1.7.0-beta.9",
-    "@nocobase/plugin-workflow": "1.7.0-beta.9",
-    "@nocobase/plugin-workflow-action-trigger": "1.7.0-beta.9",
-    "@nocobase/plugin-workflow-aggregate": "1.7.0-beta.9",
-    "@nocobase/plugin-workflow-delay": "1.7.0-beta.9",
-    "@nocobase/plugin-workflow-dynamic-calculation": "1.7.0-beta.9",
-    "@nocobase/plugin-workflow-loop": "1.7.0-beta.9",
-    "@nocobase/plugin-workflow-mailer": "1.7.0-beta.9",
-    "@nocobase/plugin-workflow-manual": "1.7.0-beta.9",
-    "@nocobase/plugin-workflow-notification": "1.7.0-beta.9",
-    "@nocobase/plugin-workflow-parallel": "1.7.0-beta.9",
-    "@nocobase/plugin-workflow-request": "1.7.0-beta.9",
-    "@nocobase/plugin-workflow-sql": "1.7.0-beta.9",
-    "@nocobase/server": "1.7.0-beta.9",
+    "@nocobase/plugin-acl": "1.7.0-beta.12",
+    "@nocobase/plugin-action-bulk-edit": "1.7.0-beta.12",
+    "@nocobase/plugin-action-bulk-update": "1.7.0-beta.12",
+    "@nocobase/plugin-action-custom-request": "1.7.0-beta.12",
+    "@nocobase/plugin-action-duplicate": "1.7.0-beta.12",
+    "@nocobase/plugin-action-export": "1.7.0-beta.12",
+    "@nocobase/plugin-action-import": "1.7.0-beta.12",
+    "@nocobase/plugin-action-print": "1.7.0-beta.12",
+    "@nocobase/plugin-ai": "1.7.0-beta.12",
+    "@nocobase/plugin-api-doc": "1.7.0-beta.12",
+    "@nocobase/plugin-api-keys": "1.7.0-beta.12",
+    "@nocobase/plugin-async-task-manager": "1.7.0-beta.12",
+    "@nocobase/plugin-audit-logs": "1.7.0-beta.12",
+    "@nocobase/plugin-auth": "1.7.0-beta.12",
+    "@nocobase/plugin-auth-sms": "1.7.0-beta.12",
+    "@nocobase/plugin-backup-restore": "1.7.0-beta.12",
+    "@nocobase/plugin-block-iframe": "1.7.0-beta.12",
+    "@nocobase/plugin-block-template": "1.7.0-beta.12",
+    "@nocobase/plugin-block-workbench": "1.7.0-beta.12",
+    "@nocobase/plugin-calendar": "1.7.0-beta.12",
+    "@nocobase/plugin-charts": "1.7.0-beta.12",
+    "@nocobase/plugin-client": "1.7.0-beta.12",
+    "@nocobase/plugin-collection-sql": "1.7.0-beta.12",
+    "@nocobase/plugin-collection-tree": "1.7.0-beta.12",
+    "@nocobase/plugin-data-source-main": "1.7.0-beta.12",
+    "@nocobase/plugin-data-source-manager": "1.7.0-beta.12",
+    "@nocobase/plugin-data-visualization": "1.7.0-beta.12",
+    "@nocobase/plugin-environment-variables": "1.7.0-beta.12",
+    "@nocobase/plugin-error-handler": "1.7.0-beta.12",
+    "@nocobase/plugin-field-china-region": "1.7.0-beta.12",
+    "@nocobase/plugin-field-formula": "1.7.0-beta.12",
+    "@nocobase/plugin-field-m2m-array": "1.7.0-beta.12",
+    "@nocobase/plugin-field-markdown-vditor": "1.7.0-beta.12",
+    "@nocobase/plugin-field-sequence": "1.7.0-beta.12",
+    "@nocobase/plugin-field-sort": "1.7.0-beta.12",
+    "@nocobase/plugin-file-manager": "1.7.0-beta.12",
+    "@nocobase/plugin-gantt": "1.7.0-beta.12",
+    "@nocobase/plugin-graph-collection-manager": "1.7.0-beta.12",
+    "@nocobase/plugin-kanban": "1.7.0-beta.12",
+    "@nocobase/plugin-locale-tester": "1.7.0-beta.12",
+    "@nocobase/plugin-localization": "1.7.0-beta.12",
+    "@nocobase/plugin-logger": "1.7.0-beta.12",
+    "@nocobase/plugin-map": "1.7.0-beta.12",
+    "@nocobase/plugin-mobile": "1.7.0-beta.12",
+    "@nocobase/plugin-mobile-client": "1.7.0-beta.12",
+    "@nocobase/plugin-mock-collections": "1.7.0-beta.12",
+    "@nocobase/plugin-multi-app-manager": "1.7.0-beta.12",
+    "@nocobase/plugin-multi-app-share-collection": "1.7.0-beta.12",
+    "@nocobase/plugin-notification-email": "1.7.0-beta.12",
+    "@nocobase/plugin-notification-in-app-message": "1.7.0-beta.12",
+    "@nocobase/plugin-notification-manager": "1.7.0-beta.12",
+    "@nocobase/plugin-public-forms": "1.7.0-beta.12",
+    "@nocobase/plugin-snapshot-field": "1.7.0-beta.12",
+    "@nocobase/plugin-system-settings": "1.7.0-beta.12",
+    "@nocobase/plugin-theme-editor": "1.7.0-beta.12",
+    "@nocobase/plugin-ui-schema-storage": "1.7.0-beta.12",
+    "@nocobase/plugin-user-data-sync": "1.7.0-beta.12",
+    "@nocobase/plugin-users": "1.7.0-beta.12",
+    "@nocobase/plugin-verification": "1.7.0-beta.12",
+    "@nocobase/plugin-workflow": "1.7.0-beta.12",
+    "@nocobase/plugin-workflow-action-trigger": "1.7.0-beta.12",
+    "@nocobase/plugin-workflow-aggregate": "1.7.0-beta.12",
+    "@nocobase/plugin-workflow-delay": "1.7.0-beta.12",
+    "@nocobase/plugin-workflow-dynamic-calculation": "1.7.0-beta.12",
+    "@nocobase/plugin-workflow-loop": "1.7.0-beta.12",
+    "@nocobase/plugin-workflow-mailer": "1.7.0-beta.12",
+    "@nocobase/plugin-workflow-manual": "1.7.0-beta.12",
+    "@nocobase/plugin-workflow-notification": "1.7.0-beta.12",
+    "@nocobase/plugin-workflow-parallel": "1.7.0-beta.12",
+    "@nocobase/plugin-workflow-request": "1.7.0-beta.12",
+    "@nocobase/plugin-workflow-sql": "1.7.0-beta.12",
+    "@nocobase/server": "1.7.0-beta.12",
     "cronstrue": "^2.11.0",
     "fs-extra": "^11.1.1"
   },