From 9f8fb0e3625024aa932f56701c325b0df783e06c Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Fri, 11 Apr 2025 19:54:01 +0800
Subject: [PATCH 01/22] fix: workflow node edit drawer title shows [object
 Object] (#6648)

---
 .../client/src/schema-component/antd/action/Action.Drawer.tsx  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx b/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx
index 7ee5fa3a9a..fa8e7442a9 100644
--- a/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx
+++ b/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx
@@ -121,7 +121,6 @@ export const InternalActionDrawer: React.FC<ActionDrawerProps> = observer(
       },
       [footerNodeName],
     );
-
     return (
       <ActionContextNoRerender>
         <zIndexContext.Provider value={zIndex}>
@@ -129,7 +128,7 @@ export const InternalActionDrawer: React.FC<ActionDrawerProps> = observer(
             <Drawer
               zIndex={zIndex}
               width={openSizeWidthMap.get(openSize)}
-              title={t(field.title, { ns: NAMESPACE_UI_SCHEMA })}
+              title={typeof field.title === 'string' ? t(field.title, { ns: NAMESPACE_UI_SCHEMA }) : field.title}
               {...others}
               {...drawerProps}
               rootStyle={rootStyle}

From b20c8b05bd7d874c541facfb25c88e34f702fadf Mon Sep 17 00:00:00 2001
From: gchust <gchust@qq.com>
Date: Fri, 11 Apr 2025 20:46:31 +0800
Subject: [PATCH 02/22] fix: incorrect variable input style (#6645)

* fix: textarea variable style issue

* fix: variable input border radius not correct

* fix: unit tests error
---
 .../schema-component/antd/variable/Input.tsx  | 190 +++++++++---------
 .../antd/variable/TextArea.tsx                | 168 ++++++++--------
 2 files changed, 182 insertions(+), 176 deletions(-)

diff --git a/packages/core/client/src/schema-component/antd/variable/Input.tsx b/packages/core/client/src/schema-component/antd/variable/Input.tsx
index 9a95ae2ded..23993aad16 100644
--- a/packages/core/client/src/schema-component/antd/variable/Input.tsx
+++ b/packages/core/client/src/schema-component/antd/variable/Input.tsx
@@ -398,105 +398,107 @@ export function Input(props: VariableInputProps) {
   const disabled = props.disabled || form.disabled;
 
   return wrapSSR(
-    <Space.Compact style={style} className={classNames(componentCls, hashId, className)}>
-      {/* 确保所有ant input样式都已加载 */}
-      <AntInput style={{ display: 'none' }} />
-      {variable ? (
-        <div
-          className={cx(
-            'variable',
-            css`
-              position: relative;
-              line-height: 0;
-
-              &:hover {
-                .clear-button {
-                  display: inline-block;
-                }
-              }
-
-              .ant-input {
-                overflow: auto;
-                white-space: nowrap;
-                ${disabled ? '' : 'padding-right: 28px;'}
-
-                .ant-tag {
-                  display: inline;
-                  line-height: 19px;
-                  margin: 0;
-                  padding: 2px 7px;
-                  border-radius: 10px;
-                }
-              }
-            `,
-          )}
-        >
+    <>
+      <Space.Compact style={style} className={classNames(componentCls, hashId, className)}>
+        {variable ? (
           <div
-            role="button"
-            aria-label="variable-tag"
-            style={{ overflow: 'hidden' }}
-            className={cx('ant-input ant-input-outlined', { 'ant-input-disabled': disabled }, hashId)}
+            className={cx(
+              'variable',
+              css`
+                position: relative;
+                line-height: 0;
+
+                &:hover {
+                  .clear-button {
+                    display: inline-block;
+                  }
+                }
+
+                .ant-input {
+                  overflow: auto;
+                  white-space: nowrap;
+                  ${disabled ? '' : 'padding-right: 28px;'}
+
+                  .ant-tag {
+                    display: inline;
+                    line-height: 19px;
+                    margin: 0;
+                    padding: 2px 7px;
+                    border-radius: 10px;
+                  }
+                }
+              `,
+            )}
           >
-            <Tag color="blue">
-              {variableText.map((item, index) => {
-                return (
-                  <React.Fragment key={item}>
-                    {index ? ' / ' : ''}
-                    {item}
-                  </React.Fragment>
-                );
-              })}
-            </Tag>
-          </div>
-          {!disabled ? (
-            <span
+            <div
               role="button"
-              aria-label="icon-close"
-              className={cx('clear-button')}
-              // eslint-disable-next-line react/no-unknown-property
-              unselectable="on"
-              onClick={onClearVariable}
+              aria-label="variable-tag"
+              style={{ overflow: 'hidden' }}
+              className={cx('ant-input ant-input-outlined', { 'ant-input-disabled': disabled }, hashId)}
             >
-              <CloseCircleFilled />
-            </span>
-          ) : null}
-        </div>
-      ) : (
-        <div style={{ flex: 1 }}>
-          {children && (isFieldValue || !nullable) ? (
-            children
-          ) : ConstantComponent ? (
-            <ConstantComponent
-              role="button"
-              aria-label="variable-constant"
-              {...constantComponentProps}
-              value={value}
-              onChange={onChange}
-            />
-          ) : null}
-        </div>
-      )}
-      {hideVariableButton ? null : (
-        <Cascader
-          options={options}
-          value={variable ?? cValue}
-          onChange={onSwitch}
-          loadData={loadData as any}
-          changeOnSelect={changeOnSelect}
-          fieldNames={fieldNames}
-          disabled={disabled}
-        >
-          {button ?? (
-            <XButton
-              className={css(`
+              <Tag color="blue">
+                {variableText.map((item, index) => {
+                  return (
+                    <React.Fragment key={item}>
+                      {index ? ' / ' : ''}
+                      {item}
+                    </React.Fragment>
+                  );
+                })}
+              </Tag>
+            </div>
+            {!disabled ? (
+              <span
+                role="button"
+                aria-label="icon-close"
+                className={cx('clear-button')}
+                // eslint-disable-next-line react/no-unknown-property
+                unselectable="on"
+                onClick={onClearVariable}
+              >
+                <CloseCircleFilled />
+              </span>
+            ) : null}
+          </div>
+        ) : (
+          <div style={{ flex: 1 }}>
+            {children && (isFieldValue || !nullable) ? (
+              children
+            ) : ConstantComponent ? (
+              <ConstantComponent
+                role="button"
+                aria-label="variable-constant"
+                {...constantComponentProps}
+                value={value}
+                onChange={onChange}
+              />
+            ) : null}
+          </div>
+        )}
+        {hideVariableButton ? null : (
+          <Cascader
+            options={options}
+            value={variable ?? cValue}
+            onChange={onSwitch}
+            loadData={loadData as any}
+            changeOnSelect={changeOnSelect}
+            fieldNames={fieldNames}
+            disabled={disabled}
+          >
+            {button ?? (
+              <XButton
+                className={css(`
               margin-left: -1px;
             `)}
-              type={variable ? 'primary' : 'default'}
-              disabled={disabled}
-            />
-          )}
-        </Cascader>
-      )}
-    </Space.Compact>,
+                type={variable ? 'primary' : 'default'}
+                disabled={disabled}
+              />
+            )}
+          </Cascader>
+        )}
+      </Space.Compact>
+      {/* 确保所有ant input样式都已加载, 放到Compact中会导致Compact中的Input样式不对 */}
+      <AntInput style={{ display: 'none' }} />
+    </>,
   );
 }
diff --git a/packages/core/client/src/schema-component/antd/variable/TextArea.tsx b/packages/core/client/src/schema-component/antd/variable/TextArea.tsx
index 1a43e849b4..8669c8a3b6 100644
--- a/packages/core/client/src/schema-component/antd/variable/TextArea.tsx
+++ b/packages/core/client/src/schema-component/antd/variable/TextArea.tsx
@@ -9,7 +9,7 @@
 
 import { css, cx } from '@emotion/css';
 import { useForm } from '@formily/react';
-import { Space, theme } from 'antd';
+import { Input as AntInput, Space, theme } from 'antd';
 import type { CascaderProps, DefaultOptionType } from 'antd/lib/cascader';
 import useInputStyle from 'antd/es/input/style';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
@@ -422,95 +422,99 @@ export function TextArea(props: TextAreaProps) {
   );
   const disabled = props.disabled || form.disabled;
   return wrapSSR(
-    <Space.Compact
-      className={cx(
-        componentCls,
-        hashId,
-        css`
-          display: flex;
-          .ant-input {
-            flex-grow: 1;
-            min-width: 200px;
-            word-break: break-all;
-            border-top-left-radius: ${addonBefore ? '0px' : '6px'};
-            border-bottom-left-radius: ${addonBefore ? '0px' : '6px'};
-          }
-          .ant-input-disabled {
-            .ant-tag {
-              color: #bfbfbf;
-              border-color: #d9d9d9;
-            }
-          }
-
-          > .x-button {
-            height: min-content;
-          }
-        `,
-      )}
-    >
-      {addonBefore && (
-        <div
-          className={css`
-            background: rgba(0, 0, 0, 0.02);
-            border: 1px solid rgb(217, 217, 217);
-            padding: 0px 11px;
-            border-radius: 6px 0px 0px 6px;
-            border-right: 0px;
-          `}
-        >
-          {addonBefore}
-        </div>
-      )}
-      <div
-        role="button"
-        aria-label="textbox"
-        onInput={onInput}
-        onBlur={onBlur}
-        onKeyDown={onKeyDown}
-        onPaste={onPaste}
-        onCompositionStart={onCompositionStart}
-        onCompositionEnd={onCompositionEnd}
-        // should use data-placeholder here, but not sure if it is safe to make the change, so add ignore here
-        // @ts-ignore
-        placeholder={props.placeholder}
-        style={style}
+    <>
+      <Space.Compact
         className={cx(
+          componentCls,
           hashId,
-          'ant-input ant-input-outlined',
-          { 'ant-input-disabled': disabled },
-          // NOTE: `pre-wrap` here for avoid the `&nbsp;` (\x160) issue when paste content, we need normal space (\x32).
           css`
-            min-height: ${token.controlHeight}px;
-            overflow: auto;
-            white-space: pre-wrap;
-
-            &[placeholder]:empty::before {
-              content: attr(placeholder);
-              color: #ccc;
+            display: flex;
+            .ant-input {
+              flex-grow: 1;
+              min-width: 200px;
+              word-break: break-all;
+              border-top-left-radius: ${addonBefore ? '0px' : '6px'};
+              border-bottom-left-radius: ${addonBefore ? '0px' : '6px'};
+            }
+            .ant-input-disabled {
+              .ant-tag {
+                color: #bfbfbf;
+                border-color: #d9d9d9;
+              }
             }
 
-            .ant-tag {
-              display: inline;
-              line-height: 19px;
-              margin: 0 0.5em;
-              padding: 2px 7px;
-              border-radius: 10px;
+            > .x-button {
+              height: min-content;
             }
           `,
         )}
-        ref={inputRef}
-        contentEditable={!disabled}
-        dangerouslySetInnerHTML={{ __html: html }}
-      />
-      <VariableSelect
-        options={options}
-        setOptions={setOptions}
-        onInsert={onInsert}
-        changeOnSelect={changeOnSelect}
-        fieldNames={fieldNames || defaultFieldNames}
-        disabled={disabled}
-      />
-    </Space.Compact>,
+      >
+        {addonBefore && (
+          <div
+            className={css`
+              background: rgba(0, 0, 0, 0.02);
+              border: 1px solid rgb(217, 217, 217);
+              padding: 0px 11px;
+              border-radius: 6px 0px 0px 6px;
+              border-right: 0px;
+            `}
+          >
+            {addonBefore}
+          </div>
+        )}
+        <div
+          role="button"
+          aria-label="textbox"
+          onInput={onInput}
+          onBlur={onBlur}
+          onKeyDown={onKeyDown}
+          onPaste={onPaste}
+          onCompositionStart={onCompositionStart}
+          onCompositionEnd={onCompositionEnd}
+          // should use data-placeholder here, but not sure if it is safe to make the change, so add ignore here
+          // @ts-ignore
+          placeholder={props.placeholder}
+          style={style}
+          className={cx(
+            hashId,
+            'ant-input ant-input-outlined',
+            { 'ant-input-disabled': disabled },
+            // NOTE: `pre-wrap` here for avoid the `&nbsp;` (\x160) issue when paste content, we need normal space (\x32).
+            css`
+              min-height: ${token.controlHeight}px;
+              overflow: auto;
+              white-space: pre-wrap;
+
+              &[placeholder]:empty::before {
+                content: attr(placeholder);
+                color: #ccc;
+              }
+
+              .ant-tag {
+                display: inline;
+                line-height: 19px;
+                margin: 0 0.5em;
+                padding: 2px 7px;
+                border-radius: 10px;
+              }
+            `,
+          )}
+          ref={inputRef}
+          contentEditable={!disabled}
+          dangerouslySetInnerHTML={{ __html: html }}
+        />
+        <VariableSelect
+          options={options}
+          setOptions={setOptions}
+          onInsert={onInsert}
+          changeOnSelect={changeOnSelect}
+          fieldNames={fieldNames || defaultFieldNames}
+          disabled={disabled}
+        />
+      </Space.Compact>
+      {/* 确保所有ant input样式都已加载, 放到Compact中会导致Compact中的Input样式不对 */}
+      <AntInput style={{ display: 'none' }} />
+    </>,
   );
 }
 

From 8b983f8913b1f8364853e33dbafb0478646e949f Mon Sep 17 00:00:00 2001
From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com>
Date: Fri, 11 Apr 2025 13:05:40 +0000
Subject: [PATCH 03/22] =?UTF-8?q?chore(versions):=20=F0=9F=98=8A=20publish?=
 =?UTF-8?q?=20v1.6.18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lerna.json                                    |   2 +-
 packages/core/acl/package.json                |   6 +-
 packages/core/actions/package.json            |   8 +-
 packages/core/app/package.json                |  10 +-
 packages/core/auth/package.json               |  12 +-
 packages/core/build/package.json              |   2 +-
 packages/core/cache/package.json              |   2 +-
 packages/core/cli/package.json                |   6 +-
 packages/core/client/package.json             |   8 +-
 .../core/create-nocobase-app/package.json     |   2 +-
 .../core/data-source-manager/package.json     |  12 +-
 packages/core/database/package.json           |   6 +-
 packages/core/devtools/package.json           |   8 +-
 packages/core/evaluators/package.json         |   4 +-
 packages/core/lock-manager/package.json       |   4 +-
 packages/core/logger/package.json             |   2 +-
 packages/core/resourcer/package.json          |   4 +-
 packages/core/sdk/package.json                |   2 +-
 packages/core/server/package.json             |  28 ++--
 packages/core/telemetry/package.json          |   4 +-
 packages/core/test/package.json               |   4 +-
 packages/core/utils/package.json              |   2 +-
 .../plugins/@nocobase/plugin-acl/package.json |   2 +-
 .../plugin-action-bulk-edit/package.json      |   2 +-
 .../plugin-action-bulk-update/package.json    |   2 +-
 .../plugin-action-custom-request/package.json |   2 +-
 .../plugin-action-duplicate/package.json      |   2 +-
 .../plugin-action-export/package.json         |   2 +-
 .../plugin-action-import/package.json         |   2 +-
 .../plugin-action-print/package.json          |   2 +-
 .../plugins/@nocobase/plugin-ai/package.json  |   2 +-
 .../@nocobase/plugin-api-doc/package.json     |   2 +-
 .../@nocobase/plugin-api-keys/package.json    |   2 +-
 .../plugin-async-task-manager/package.json    |   2 +-
 .../@nocobase/plugin-audit-logs/package.json  |   2 +-
 .../@nocobase/plugin-auth-sms/package.json    |   2 +-
 .../@nocobase/plugin-auth/package.json        |   2 +-
 .../plugin-backup-restore/package.json        |   2 +-
 .../plugin-block-iframe/package.json          |   2 +-
 .../plugin-block-workbench/package.json       |   2 +-
 .../@nocobase/plugin-calendar/package.json    |   2 +-
 .../@nocobase/plugin-charts/package.json      |   2 +-
 .../@nocobase/plugin-client/package.json      |   2 +-
 .../plugin-collection-sql/package.json        |   2 +-
 .../plugin-collection-tree/package.json       |   2 +-
 .../plugin-data-source-main/package.json      |   2 +-
 .../plugin-data-source-manager/package.json   |   2 +-
 .../plugin-data-visualization/package.json    |   2 +-
 .../plugin-disable-pm-add/package.json        |   2 +-
 .../plugin-environment-variables/package.json |   2 +-
 .../plugin-error-handler/package.json         |   2 +-
 .../plugin-field-china-region/package.json    |   2 +-
 .../plugin-field-formula/package.json         |   2 +-
 .../plugin-field-m2m-array/package.json       |   2 +-
 .../plugin-field-markdown-vditor/package.json |   2 +-
 .../plugin-field-sequence/package.json        |   2 +-
 .../@nocobase/plugin-field-sort/package.json  |   2 +-
 .../plugin-file-manager/package.json          |   2 +-
 .../@nocobase/plugin-gantt/package.json       |   2 +-
 .../package.json                              |   2 +-
 .../@nocobase/plugin-kanban/package.json      |   2 +-
 .../plugin-locale-tester/package.json         |   2 +-
 .../plugin-localization/package.json          |   2 +-
 .../@nocobase/plugin-logger/package.json      |   2 +-
 .../plugins/@nocobase/plugin-map/package.json |   2 +-
 .../plugin-mobile-client/package.json         |   2 +-
 .../@nocobase/plugin-mobile/package.json      |   2 +-
 .../plugin-mock-collections/package.json      |   2 +-
 .../plugin-multi-app-manager/package.json     |   2 +-
 .../package.json                              |   2 +-
 .../plugin-notification-email/package.json    |   2 +-
 .../package.json                              |   2 +-
 .../plugin-notification-manager/package.json  |   2 +-
 .../plugin-notifications/package.json         |   2 +-
 .../plugin-public-forms/package.json          |   2 +-
 .../plugin-sample-hello/package.json          |   2 +-
 .../plugin-snapshot-field/package.json        |   2 +-
 .../plugin-system-settings/package.json       |   2 +-
 .../plugin-theme-editor/package.json          |   2 +-
 .../plugin-ui-schema-storage/package.json     |   2 +-
 .../plugin-user-data-sync/package.json        |   2 +-
 .../@nocobase/plugin-users/package.json       |   2 +-
 .../plugin-verification/package.json          |   2 +-
 .../package.json                              |   2 +-
 .../plugin-workflow-aggregate/package.json    |   2 +-
 .../plugin-workflow-delay/package.json        |   2 +-
 .../package.json                              |   2 +-
 .../plugin-workflow-loop/package.json         |   2 +-
 .../plugin-workflow-mailer/package.json       |   2 +-
 .../plugin-workflow-manual/package.json       |   2 +-
 .../plugin-workflow-notification/package.json |   2 +-
 .../plugin-workflow-parallel/package.json     |   2 +-
 .../plugin-workflow-request/package.json      |   2 +-
 .../plugin-workflow-sql/package.json          |   2 +-
 .../plugin-workflow-test/package.json         |   2 +-
 .../@nocobase/plugin-workflow/package.json    |   4 +-
 packages/presets/nocobase/package.json        | 144 +++++++++---------
 97 files changed, 216 insertions(+), 216 deletions(-)

diff --git a/lerna.json b/lerna.json
index 7033200cda..839cc4ad83 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.6.17",
+  "version": "1.6.18",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "npmClientArgs": ["--ignore-engines"],
diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json
index 8cae3c4a85..75c2ec6007 100644
--- a/packages/core/acl/package.json
+++ b/packages/core/acl/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "1.6.17",
-    "@nocobase/utils": "1.6.17",
+    "@nocobase/resourcer": "1.6.18",
+    "@nocobase/utils": "1.6.18",
     "minimatch": "^5.1.1"
   },
   "repository": {
diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json
index f92f616922..3292018e85 100644
--- a/packages/core/actions/package.json
+++ b/packages/core/actions/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@nocobase/actions",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cache": "1.6.17",
-    "@nocobase/database": "1.6.17",
-    "@nocobase/resourcer": "1.6.17"
+    "@nocobase/cache": "1.6.18",
+    "@nocobase/database": "1.6.18",
+    "@nocobase/resourcer": "1.6.18"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/app/package.json b/packages/core/app/package.json
index 53f35c624e..2878aeff67 100644
--- a/packages/core/app/package.json
+++ b/packages/core/app/package.json
@@ -1,17 +1,17 @@
 {
   "name": "@nocobase/app",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/database": "1.6.17",
-    "@nocobase/preset-nocobase": "1.6.17",
-    "@nocobase/server": "1.6.17"
+    "@nocobase/database": "1.6.18",
+    "@nocobase/preset-nocobase": "1.6.18",
+    "@nocobase/server": "1.6.18"
   },
   "devDependencies": {
-    "@nocobase/client": "1.6.17"
+    "@nocobase/client": "1.6.18"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json
index 99dabdd862..f75eea1fcd 100644
--- a/packages/core/auth/package.json
+++ b/packages/core/auth/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.6.17",
-    "@nocobase/cache": "1.6.17",
-    "@nocobase/database": "1.6.17",
-    "@nocobase/resourcer": "1.6.17",
-    "@nocobase/utils": "1.6.17",
+    "@nocobase/actions": "1.6.18",
+    "@nocobase/cache": "1.6.18",
+    "@nocobase/database": "1.6.18",
+    "@nocobase/resourcer": "1.6.18",
+    "@nocobase/utils": "1.6.18",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
diff --git a/packages/core/build/package.json b/packages/core/build/package.json
index 465df45d1c..cc19a756c8 100644
--- a/packages/core/build/package.json
+++ b/packages/core/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 dedd15c897..49fd9908ca 100644
--- a/packages/core/cache/package.json
+++ b/packages/core/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cache",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json
index 7d1b7184bf..ebc416cfc4 100644
--- a/packages/core/cli/package.json
+++ b/packages/core/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.6.17",
+    "@nocobase/app": "1.6.18",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,7 +25,7 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "1.6.17"
+    "@nocobase/devtools": "1.6.18"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/client/package.json b/packages/core/client/package.json
index e13ddc4f83..a36993bb0d 100644
--- a/packages/core/client/package.json
+++ b/packages/core/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "license": "AGPL-3.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -27,9 +27,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "1.6.17",
-    "@nocobase/sdk": "1.6.17",
-    "@nocobase/utils": "1.6.17",
+    "@nocobase/evaluators": "1.6.18",
+    "@nocobase/sdk": "1.6.18",
+    "@nocobase/utils": "1.6.18",
     "ahooks": "^3.7.2",
     "antd": "5.12.8",
     "antd-style": "3.7.1",
diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json
index 252dcc6467..d18340592e 100755
--- a/packages/core/create-nocobase-app/package.json
+++ b/packages/core/create-nocobase-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-nocobase-app",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 7f2a44e5ba..357b923760 100644
--- a/packages/core/data-source-manager/package.json
+++ b/packages/core/data-source-manager/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.6.17",
-    "@nocobase/cache": "1.6.17",
-    "@nocobase/database": "1.6.17",
-    "@nocobase/resourcer": "1.6.17",
-    "@nocobase/utils": "1.6.17",
+    "@nocobase/actions": "1.6.18",
+    "@nocobase/cache": "1.6.18",
+    "@nocobase/database": "1.6.18",
+    "@nocobase/resourcer": "1.6.18",
+    "@nocobase/utils": "1.6.18",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
diff --git a/packages/core/database/package.json b/packages/core/database/package.json
index 84505bbd9b..1a0eb64fe6 100644
--- a/packages/core/database/package.json
+++ b/packages/core/database/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.6.17",
-    "@nocobase/utils": "1.6.17",
+    "@nocobase/logger": "1.6.18",
+    "@nocobase/utils": "1.6.18",
     "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 f5a5712efe..e25648c011 100644
--- a/packages/core/devtools/package.json
+++ b/packages/core/devtools/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/devtools",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "1.6.17",
-    "@nocobase/client": "1.6.17",
-    "@nocobase/test": "1.6.17",
+    "@nocobase/build": "1.6.18",
+    "@nocobase/client": "1.6.18",
+    "@nocobase/test": "1.6.18",
     "@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 62e3a5ecfd..23f38a437f 100644
--- a/packages/core/evaluators/package.json
+++ b/packages/core/evaluators/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/evaluators",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
     "@formulajs/formulajs": "4.4.9",
-    "@nocobase/utils": "1.6.17",
+    "@nocobase/utils": "1.6.18",
     "mathjs": "^10.6.0"
   },
   "repository": {
diff --git a/packages/core/lock-manager/package.json b/packages/core/lock-manager/package.json
index 790af01b1f..1bd8bcbb01 100644
--- a/packages/core/lock-manager/package.json
+++ b/packages/core/lock-manager/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nocobase/lock-manager",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "main": "lib/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@nocobase/utils": "1.6.17",
+    "@nocobase/utils": "1.6.18",
     "async-mutex": "^0.5.0"
   }
 }
diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json
index b59fec9be5..6e20157a99 100644
--- a/packages/core/logger/package.json
+++ b/packages/core/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 1c528b30af..12c91594bc 100644
--- a/packages/core/resourcer/package.json
+++ b/packages/core/resourcer/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/utils": "1.6.17",
+    "@nocobase/utils": "1.6.18",
     "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 599d6e9c96..06a72fd60f 100644
--- a/packages/core/sdk/package.json
+++ b/packages/core/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/sdk",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 6c718ad9bd..9b7833e17d 100644
--- a/packages/core/server/package.json
+++ b/packages/core/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,19 +10,19 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.0.2",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "1.6.17",
-    "@nocobase/actions": "1.6.17",
-    "@nocobase/auth": "1.6.17",
-    "@nocobase/cache": "1.6.17",
-    "@nocobase/data-source-manager": "1.6.17",
-    "@nocobase/database": "1.6.17",
-    "@nocobase/evaluators": "1.6.17",
-    "@nocobase/lock-manager": "1.6.17",
-    "@nocobase/logger": "1.6.17",
-    "@nocobase/resourcer": "1.6.17",
-    "@nocobase/sdk": "1.6.17",
-    "@nocobase/telemetry": "1.6.17",
-    "@nocobase/utils": "1.6.17",
+    "@nocobase/acl": "1.6.18",
+    "@nocobase/actions": "1.6.18",
+    "@nocobase/auth": "1.6.18",
+    "@nocobase/cache": "1.6.18",
+    "@nocobase/data-source-manager": "1.6.18",
+    "@nocobase/database": "1.6.18",
+    "@nocobase/evaluators": "1.6.18",
+    "@nocobase/lock-manager": "1.6.18",
+    "@nocobase/logger": "1.6.18",
+    "@nocobase/resourcer": "1.6.18",
+    "@nocobase/sdk": "1.6.18",
+    "@nocobase/telemetry": "1.6.18",
+    "@nocobase/utils": "1.6.18",
     "@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 abb7918f54..4fece03722 100644
--- a/packages/core/telemetry/package.json
+++ b/packages/core/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/telemetry",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "nocobase telemetry library",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
@@ -11,7 +11,7 @@
     "directory": "packages/telemetry"
   },
   "dependencies": {
-    "@nocobase/utils": "1.6.17",
+    "@nocobase/utils": "1.6.18",
     "@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 2b6cb64b55..01a6227f1c 100644
--- a/packages/core/test/package.json
+++ b/packages/core/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "1.6.17",
+    "@nocobase/server": "1.6.18",
     "@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 4e00f7fc80..63eac9d5db 100644
--- a/packages/core/utils/package.json
+++ b/packages/core/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 219bca3625..f06236ac70 100644
--- a/packages/plugins/@nocobase/plugin-acl/package.json
+++ b/packages/plugins/@nocobase/plugin-acl/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "权限控制",
   "description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
index 18322852d7..c4740f5faf 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-bulk-edit",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-bulk-edit",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-bulk-edit",
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
index 2fe34fb54a..0f856245b5 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-bulk-update",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 afd6b69173..725a41a595 100644
--- a/packages/plugins/@nocobase/plugin-action-custom-request/package.json
+++ b/packages/plugins/@nocobase/plugin-action-custom-request/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-custom-request",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 e00aa022c0..72bbe39cb5 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/package.json
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-duplicate",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 f21f9790e1..a0cfd81e4d 100644
--- a/packages/plugins/@nocobase/plugin-action-export/package.json
+++ b/packages/plugins/@nocobase/plugin-action-export/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "操作：导出记录",
   "description": "Export filtered records to excel, you can configure which fields to export.",
   "description.zh-CN": "导出筛选后的记录到 Excel 中，可以配置导出哪些字段。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 36270f4054..380870a6b1 100644
--- a/packages/plugins/@nocobase/plugin-action-import/package.json
+++ b/packages/plugins/@nocobase/plugin-action-import/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "操作：导入记录",
   "description": "Import records using excel templates. You can configure which fields to import and templates will be generated automatically.",
   "description.zh-CN": "使用 Excel 模板导入数据，可以配置导入哪些字段，自动生成模板。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 ad9708d247..405176a0a8 100644
--- a/packages/plugins/@nocobase/plugin-action-print/package.json
+++ b/packages/plugins/@nocobase/plugin-action-print/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-print",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 51b7b1db9e..a65b1d6a69 100644
--- a/packages/plugins/@nocobase/plugin-ai/package.json
+++ b/packages/plugins/@nocobase/plugin-ai/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "AI 集成",
   "description": "Support integration with AI services, providing AI-related workflow nodes to enhance business processing capabilities.",
   "description.zh-CN": "支持接入 AI 服务，提供 AI 相关的工作流节点，增强业务处理能力。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 fb5cd02f06..7e969a4f1c 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/package.json
+++ b/packages/plugins/@nocobase/plugin-api-doc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-api-doc",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 2ccc131eeb..63cc45baa1 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/package.json
+++ b/packages/plugins/@nocobase/plugin-api-keys/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：API 密钥",
   "description": "Allows users to use API key to access application's HTTP API",
   "description.zh-CN": "允许用户使用 API 密钥访问应用的 HTTP API",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 cb37a7c8e2..90cea80e5d 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "异步任务管理器",
   "description": "Manage and monitor asynchronous tasks such as data import/export. Support task progress tracking and notification.",
   "description.zh-CN": "管理和监控数据导入导出等异步任务。支持任务进度跟踪和通知。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-audit-logs/package.json b/packages/plugins/@nocobase/plugin-audit-logs/package.json
index 68d79d3504..31387769dc 100644
--- a/packages/plugins/@nocobase/plugin-audit-logs/package.json
+++ b/packages/plugins/@nocobase/plugin-audit-logs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-audit-logs",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 ba881cf058..bc8c9446b2 100644
--- a/packages/plugins/@nocobase/plugin-auth-sms/package.json
+++ b/packages/plugins/@nocobase/plugin-auth-sms/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：短信",
   "description": "SMS authentication.",
   "description.zh-CN": "通过短信验证码认证身份。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 906d0e5f11..e82704fa2f 100644
--- a/packages/plugins/@nocobase/plugin-auth/package.json
+++ b/packages/plugins/@nocobase/plugin-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-auth",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 3449752f9c..e06f23a4aa 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/package.json
+++ b/packages/plugins/@nocobase/plugin-backup-restore/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "应用的备份与还原（废弃）",
   "description": "Backup and restore applications for scenarios such as application replication, migration, and upgrades.",
   "description.zh-CN": "备份和还原应用，可用于应用的复制、迁移、升级等场景。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 27f58b48fd..3a245a0eda 100644
--- a/packages/plugins/@nocobase/plugin-block-iframe/package.json
+++ b/packages/plugins/@nocobase/plugin-block-iframe/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "区块：iframe",
   "description": "Create an iframe block on the page to embed and display external web pages or content.",
   "description.zh-CN": "在页面上创建和管理iframe，用于嵌入和展示外部网页或内容。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/block-iframe",
diff --git a/packages/plugins/@nocobase/plugin-block-workbench/package.json b/packages/plugins/@nocobase/plugin-block-workbench/package.json
index 03ba448216..7b5d0f2e30 100644
--- a/packages/plugins/@nocobase/plugin-block-workbench/package.json
+++ b/packages/plugins/@nocobase/plugin-block-workbench/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-block-workbench",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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-calendar/package.json b/packages/plugins/@nocobase/plugin-calendar/package.json
index c2ed1ab4c8..86122f9019 100644
--- a/packages/plugins/@nocobase/plugin-calendar/package.json
+++ b/packages/plugins/@nocobase/plugin-calendar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-calendar",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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-charts/package.json b/packages/plugins/@nocobase/plugin-charts/package.json
index e3c832908b..6efa2a2a5c 100644
--- a/packages/plugins/@nocobase/plugin-charts/package.json
+++ b/packages/plugins/@nocobase/plugin-charts/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "图表（废弃）",
   "description": "The plugin has been deprecated, please use the data visualization plugin instead.",
   "description.zh-CN": "已废弃插件，请使用数据可视化插件代替。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 ae39a17560..681ffd2dd6 100644
--- a/packages/plugins/@nocobase/plugin-client/package.json
+++ b/packages/plugins/@nocobase/plugin-client/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "WEB 客户端",
   "description": "Provides a client interface for the NocoBase server",
   "description.zh-CN": "为 NocoBase 服务端提供客户端界面",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-collection-sql/package.json b/packages/plugins/@nocobase/plugin-collection-sql/package.json
index ec155c771c..9fbe1ebf79 100644
--- a/packages/plugins/@nocobase/plugin-collection-sql/package.json
+++ b/packages/plugins/@nocobase/plugin-collection-sql/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表: SQL",
   "description": "Provides SQL collection template",
   "description.zh-CN": "提供 SQL 数据表模板",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 5fe2c3c8ba..3a8c755ba6 100644
--- a/packages/plugins/@nocobase/plugin-collection-tree/package.json
+++ b/packages/plugins/@nocobase/plugin-collection-tree/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 0db5a3c73c..5915bdc438 100644
--- a/packages/plugins/@nocobase/plugin-data-source-main/package.json
+++ b/packages/plugins/@nocobase/plugin-data-source-main/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 6060bf0f09..36a9e9c460 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-source-manager",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 243b84c41b..5ad8673ee1 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/package.json
+++ b/packages/plugins/@nocobase/plugin-data-visualization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 8114065bd8..55b397b83d 100644
--- a/packages/plugins/@nocobase/plugin-disable-pm-add/package.json
+++ b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-disable-pm-add",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 5143251ca9..8f26ee577e 100644
--- a/packages/plugins/@nocobase/plugin-environment-variables/package.json
+++ b/packages/plugins/@nocobase/plugin-environment-variables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-environment-variables",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 f9e6ca0c06..b3c4e7a91f 100644
--- a/packages/plugins/@nocobase/plugin-error-handler/package.json
+++ b/packages/plugins/@nocobase/plugin-error-handler/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "错误处理器",
   "description": "Handling application errors and exceptions.",
   "description.zh-CN": "处理应用程序中的错误和异常。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 c7b21fe127..8dd971f583 100644
--- a/packages/plugins/@nocobase/plugin-field-china-region/package.json
+++ b/packages/plugins/@nocobase/plugin-field-china-region/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-field-china-region",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 bfcc8d4de4..43dd6ce1ad 100644
--- a/packages/plugins/@nocobase/plugin-field-formula/package.json
+++ b/packages/plugins/@nocobase/plugin-field-formula/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：公式",
   "description": "Configure and store the results of calculations between multiple field values in the same record, supporting both Math.js and Excel formula functions.",
   "description.zh-CN": "可以配置并存储同一条记录的多字段值之间的计算结果，支持 Math.js 和 Excel formula functions 两种引擎",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 f55aa96636..84aa0cf600 100644
--- a/packages/plugins/@nocobase/plugin-field-m2m-array/package.json
+++ b/packages/plugins/@nocobase/plugin-field-m2m-array/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：多对多 (数组)",
   "description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model.",
   "description.zh-CN": "支持通过在数组中存储目标表唯一键的方式建立多对多关系。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 5d260b3313..645ba6f10f 100644
--- a/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
+++ b/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：Markdown(Vditor)",
   "description": "Used to store Markdown and render it using Vditor editor, supports common Markdown syntax such as list, code, quote, etc., and supports uploading images, recordings, etc.It also allows for instant rendering, where what you see is what you get.",
   "description.zh-CN": "用于存储 Markdown，并使用 Vditor 编辑器渲染，支持常见 Markdown 语法，如列表，代码，引用等，并支持上传图片，录音等。同时可以做到即时渲染，所见即所得。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 70fef97a11..3e58048b16 100644
--- a/packages/plugins/@nocobase/plugin-field-sequence/package.json
+++ b/packages/plugins/@nocobase/plugin-field-sequence/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：自动编码",
   "description": "Automatically generate codes based on configured rules, supporting combinations of dates, numbers, and text.",
   "description.zh-CN": "根据配置的规则自动生成编码，支持日期、数字、文本的组合。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 93849133e7..1a9e89648e 100644
--- a/packages/plugins/@nocobase/plugin-field-sort/package.json
+++ b/packages/plugins/@nocobase/plugin-field-sort/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-field-sort",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 1f61bb960e..c336bee746 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-file-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
diff --git a/packages/plugins/@nocobase/plugin-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json
index af533c544f..87279097c2 100644
--- a/packages/plugins/@nocobase/plugin-gantt/package.json
+++ b/packages/plugins/@nocobase/plugin-gantt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-gantt",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 baf8b76e7e..ff72787e33 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "可视化数据表管理",
   "description": "An ER diagram-like tool. Currently only the Master database is supported.",
   "description.zh-CN": "类似 ER 图的工具，目前只支持主数据库。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 6643f153ff..83008b05c5 100644
--- a/packages/plugins/@nocobase/plugin-kanban/package.json
+++ b/packages/plugins/@nocobase/plugin-kanban/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-kanban",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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/package.json b/packages/plugins/@nocobase/plugin-locale-tester/package.json
index 327916fca5..a4384e0b78 100644
--- a/packages/plugins/@nocobase/plugin-locale-tester/package.json
+++ b/packages/plugins/@nocobase/plugin-locale-tester/package.json
@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-locale-tester",
   "displayName": "Locale tester",
   "displayName.zh-CN": "翻译测试工具",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "homepage": "https://github.com/nocobase/locales",
   "main": "dist/server/index.js",
   "peerDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-localization/package.json b/packages/plugins/@nocobase/plugin-localization/package.json
index 6d90026652..d8e56e5a6a 100644
--- a/packages/plugins/@nocobase/plugin-localization/package.json
+++ b/packages/plugins/@nocobase/plugin-localization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-localization",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 c9bb6d7082..933c8dcc4c 100644
--- a/packages/plugins/@nocobase/plugin-logger/package.json
+++ b/packages/plugins/@nocobase/plugin-logger/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "日志",
   "description": "Server-side logs, mainly including API request logs and system runtime logs, and allows to package and download log files.",
   "description.zh-CN": "服务端日志，主要包括接口请求日志和系统运行日志，并支持打包和下载日志文件。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 505ae4dbe1..ade2f04c7a 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.6.17",
+  "version": "1.6.18",
   "description": "Map block, support Gaode map and Google map, you can also extend more map types.",
   "description.zh-CN": "地图区块，支持高德地图和 Google 地图，你也可以扩展更多地图类型。",
   "license": "AGPL-3.0",
diff --git a/packages/plugins/@nocobase/plugin-mobile-client/package.json b/packages/plugins/@nocobase/plugin-mobile-client/package.json
index 1f1291bc76..33c8e27c13 100644
--- a/packages/plugins/@nocobase/plugin-mobile-client/package.json
+++ b/packages/plugins/@nocobase/plugin-mobile-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-mobile-client",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 2ed40c2882..87c6885f17 100644
--- a/packages/plugins/@nocobase/plugin-mobile/package.json
+++ b/packages/plugins/@nocobase/plugin-mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-mobile",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json
index 330f83c4bb..aaedd39af2 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/package.json
+++ b/packages/plugins/@nocobase/plugin-mock-collections/package.json
@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-mock-collections",
   "displayName": "mock-collections",
   "description": "mock-collections",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 24e27f954d..320e1a9185 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用管理器",
   "description": "Dynamically create multiple apps without separate deployments.",
   "description.zh-CN": "无需单独部署即可动态创建多个应用。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 0733881314..389092c88c 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用数据表共享",
   "description": "",
   "description.zh-CN": "",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 b30ba17adf..4ef0b5e20f 100644
--- a/packages/plugins/@nocobase/plugin-notification-email/package.json
+++ b/packages/plugins/@nocobase/plugin-notification-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-email",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 0c93e75ed2..a41e03716c 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-in-app-message",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 b23366638f..3b31084461 100644
--- a/packages/plugins/@nocobase/plugin-notification-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-notification-manager/package.json
@@ -4,7 +4,7 @@
   "description": "Provides a unified management service that includes channel configuration, logging, and other features, supporting the configuration of various notification channels, including in-app message and email.",
   "displayName.zh-CN": "通知管理",
   "description.zh-CN": "提供统一的管理服务，涵盖渠道配置、日志记录等功能，支持多种通知渠道的配置，包括站内信和电子邮件等。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 52664bab62..8093ab0bbf 100644
--- a/packages/plugins/@nocobase/plugin-notifications/package.json
+++ b/packages/plugins/@nocobase/plugin-notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notifications",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 6cd0163220..7f70a879e6 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/package.json
+++ b/packages/plugins/@nocobase/plugin-public-forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-public-forms",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 604f34af0e..7965e5604e 100644
--- a/packages/plugins/@nocobase/plugin-sample-hello/package.json
+++ b/packages/plugins/@nocobase/plugin-sample-hello/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-sample-hello",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 e188488ba2..e71da42f99 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/package.json
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：关系快照",
   "description": "When adding a new record, create a snapshot for its relational record and save in the new record. The snapshot will not be updated when the relational record is updated.",
   "description.zh-CN": "在添加数据时，为它的关系数据创建快照，并保存在当前的数据中。关系数据更新时，快照不会更新。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 83309b947b..5f5ee89ad5 100644
--- a/packages/plugins/@nocobase/plugin-system-settings/package.json
+++ b/packages/plugins/@nocobase/plugin-system-settings/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "系统设置",
   "description": "Used to adjust the system title, logo, language, etc.",
   "description.zh-CN": "用于调整系统的标题、LOGO、语言等。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 953e77abc9..f42af10078 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/package.json
+++ b/packages/plugins/@nocobase/plugin-theme-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-theme-editor",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 51db172d49..9679ab1a9d 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "UI schema 存储服务",
   "description": "Provides centralized UI schema storage service.",
   "description.zh-CN": "提供中心化的 UI schema 存储服务。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 d55e0e3f9a..03cb20970e 100644
--- a/packages/plugins/@nocobase/plugin-user-data-sync/package.json
+++ b/packages/plugins/@nocobase/plugin-user-data-sync/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "用户数据同步",
   "description": "Reigster and manage extensible user data synchronization sources, with HTTP API provided by default. Support for synchronizing data to resources such as users and departments.",
   "description.zh-CN": "注册和管理可扩展的用户数据同步来源，默认提供 HTTP API。支持向用户和部门等资源同步数据。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 d1dc0f3484..2fb21d7032 100644
--- a/packages/plugins/@nocobase/plugin-users/package.json
+++ b/packages/plugins/@nocobase/plugin-users/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "用户",
   "description": "Provides basic user model, as well as created by and updated by fields.",
   "description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 6ba0775d55..33b6cb96bb 100644
--- a/packages/plugins/@nocobase/plugin-verification/package.json
+++ b/packages/plugins/@nocobase/plugin-verification/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "验证码",
   "description": "verification setting.",
   "description.zh-CN": "验证码配置。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 fde70f1458..127a9e742c 100644
--- a/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：操作后事件",
   "description": "Triggered after the completion of a request initiated through an action button or API, such as after adding, updating, deleting data, or \"submit to workflow\". Suitable for data processing, sending notifications, etc., after actions are completed.",
   "description.zh-CN": "通过操作按钮或 API 发起请求并在执行完成后触发，比如新增、更新、删除数据或者“提交至工作流”之后。适用于在操作完成后进行数据处理、发送通知等。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 2be6e91c4b..f3f2229cd1 100644
--- a/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：聚合查询节点",
   "description": "Used to aggregate data against the database in workflow, such as: statistics, sum, average, etc.",
   "description.zh-CN": "可用于在工作流中对数据库进行聚合查询，如：统计数量、求和、平均值等。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 51817e9229..6613f935fa 100644
--- a/packages/plugins/@nocobase/plugin-workflow-delay/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-delay/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：延时节点",
   "description": "Could be used in workflow parallel branch for waiting other branches.",
   "description.zh-CN": "可用于工作流并行分支中等待其他分支执行完成。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 31633ef31f..a945d7c9a4 100644
--- a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：动态表达式计算节点",
   "description": "Useful plugin for doing dynamic calculation based on expression collection records in workflow.",
   "description.zh-CN": "用于在工作流中进行基于数据行的动态表达式计算。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 2919c03cf5..570d83f19c 100644
--- a/packages/plugins/@nocobase/plugin-workflow-loop/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-loop/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：循环节点",
   "description": "Used to repeat the sub-process processing of each value in an array, and can also be used for fixed times of sub-process processing.",
   "description.zh-CN": "用于对一个数组中的每个值进行重复的子流程处理，也可用于固定次数的重复子流程处理。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 cd44562e75..7a2ce623e2 100644
--- a/packages/plugins/@nocobase/plugin-workflow-mailer/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-mailer/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：邮件发送节点",
   "description": "Send email in workflow.",
   "description.zh-CN": "可用于在工作流中发送电子邮件。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 e0d71bb062..e8b8d57737 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：人工处理节点",
   "description": "Could be used for workflows which some of decisions are made by users.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 b22c4ac7b8..3df41ce945 100644
--- a/packages/plugins/@nocobase/plugin-workflow-notification/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-notification/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：通知节点",
   "description": "Send notification in workflow.",
   "description.zh-CN": "可用于在工作流中发送各类通知。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 aa934dbf85..9e9536b659 100644
--- a/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：并行分支节点",
   "description": "Could be used for parallel execution of branch processes in the workflow.",
   "description.zh-CN": "用于在工作流中需要并行执行的分支流程。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 4838b107ed..4c98a636e6 100644
--- a/packages/plugins/@nocobase/plugin-workflow-request/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-request/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：HTTP 请求节点",
   "description": "Send HTTP requests to any HTTP service for data interaction in workflow.",
   "description.zh-CN": "可用于在工作流中向任意 HTTP 服务发送请求，进行数据交互。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 861170f91b..99a08424fb 100644
--- a/packages/plugins/@nocobase/plugin-workflow-sql/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-sql/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：SQL 节点",
   "description": "Execute SQL statements in workflow.",
   "description.zh-CN": "可用于在工作流中对数据库执行任意 SQL 语句。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 e2cae2170e..c5cc8d6d72 100644
--- a/packages/plugins/@nocobase/plugin-workflow-test/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-test/package.json
@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-workflow-test",
   "displayName": "Workflow: test kit",
   "displayName.zh-CN": "工作流：测试工具包",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "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 eea83bcaef..6382594960 100644
--- a/packages/plugins/@nocobase/plugin-workflow/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow/package.json
@@ -4,13 +4,13 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
   "description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow",
   "dependencies": {
-    "@nocobase/plugin-workflow-test": "1.6.17"
+    "@nocobase/plugin-workflow-test": "1.6.18"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json
index ec5c439304..742bab8386 100644
--- a/packages/presets/nocobase/package.json
+++ b/packages/presets/nocobase/package.json
@@ -1,81 +1,81 @@
 {
   "name": "@nocobase/preset-nocobase",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "license": "AGPL-3.0",
   "main": "./lib/server/index.js",
   "dependencies": {
     "@formily/json-schema": "2.x",
-    "@nocobase/plugin-acl": "1.6.17",
-    "@nocobase/plugin-action-bulk-edit": "1.6.17",
-    "@nocobase/plugin-action-bulk-update": "1.6.17",
-    "@nocobase/plugin-action-custom-request": "1.6.17",
-    "@nocobase/plugin-action-duplicate": "1.6.17",
-    "@nocobase/plugin-action-export": "1.6.17",
-    "@nocobase/plugin-action-import": "1.6.17",
-    "@nocobase/plugin-action-print": "1.6.17",
-    "@nocobase/plugin-ai": "1.6.17",
-    "@nocobase/plugin-api-doc": "1.6.17",
-    "@nocobase/plugin-api-keys": "1.6.17",
-    "@nocobase/plugin-async-task-manager": "1.6.17",
-    "@nocobase/plugin-audit-logs": "1.6.17",
-    "@nocobase/plugin-auth": "1.6.17",
-    "@nocobase/plugin-auth-sms": "1.6.17",
-    "@nocobase/plugin-backup-restore": "1.6.17",
-    "@nocobase/plugin-block-iframe": "1.6.17",
-    "@nocobase/plugin-block-workbench": "1.6.17",
-    "@nocobase/plugin-calendar": "1.6.17",
-    "@nocobase/plugin-charts": "1.6.17",
-    "@nocobase/plugin-client": "1.6.17",
-    "@nocobase/plugin-collection-sql": "1.6.17",
-    "@nocobase/plugin-collection-tree": "1.6.17",
-    "@nocobase/plugin-data-source-main": "1.6.17",
-    "@nocobase/plugin-data-source-manager": "1.6.17",
-    "@nocobase/plugin-data-visualization": "1.6.17",
-    "@nocobase/plugin-environment-variables": "1.6.17",
-    "@nocobase/plugin-error-handler": "1.6.17",
-    "@nocobase/plugin-field-china-region": "1.6.17",
-    "@nocobase/plugin-field-formula": "1.6.17",
-    "@nocobase/plugin-field-m2m-array": "1.6.17",
-    "@nocobase/plugin-field-markdown-vditor": "1.6.17",
-    "@nocobase/plugin-field-sequence": "1.6.17",
-    "@nocobase/plugin-field-sort": "1.6.17",
-    "@nocobase/plugin-file-manager": "1.6.17",
-    "@nocobase/plugin-gantt": "1.6.17",
-    "@nocobase/plugin-graph-collection-manager": "1.6.17",
-    "@nocobase/plugin-kanban": "1.6.17",
-    "@nocobase/plugin-locale-tester": "1.6.17",
-    "@nocobase/plugin-localization": "1.6.17",
-    "@nocobase/plugin-logger": "1.6.17",
-    "@nocobase/plugin-map": "1.6.17",
-    "@nocobase/plugin-mobile": "1.6.17",
-    "@nocobase/plugin-mobile-client": "1.6.17",
-    "@nocobase/plugin-mock-collections": "1.6.17",
-    "@nocobase/plugin-multi-app-manager": "1.6.17",
-    "@nocobase/plugin-multi-app-share-collection": "1.6.17",
-    "@nocobase/plugin-notification-email": "1.6.17",
-    "@nocobase/plugin-notification-in-app-message": "1.6.17",
-    "@nocobase/plugin-notification-manager": "1.6.17",
-    "@nocobase/plugin-public-forms": "1.6.17",
-    "@nocobase/plugin-snapshot-field": "1.6.17",
-    "@nocobase/plugin-system-settings": "1.6.17",
-    "@nocobase/plugin-theme-editor": "1.6.17",
-    "@nocobase/plugin-ui-schema-storage": "1.6.17",
-    "@nocobase/plugin-user-data-sync": "1.6.17",
-    "@nocobase/plugin-users": "1.6.17",
-    "@nocobase/plugin-verification": "1.6.17",
-    "@nocobase/plugin-workflow": "1.6.17",
-    "@nocobase/plugin-workflow-action-trigger": "1.6.17",
-    "@nocobase/plugin-workflow-aggregate": "1.6.17",
-    "@nocobase/plugin-workflow-delay": "1.6.17",
-    "@nocobase/plugin-workflow-dynamic-calculation": "1.6.17",
-    "@nocobase/plugin-workflow-loop": "1.6.17",
-    "@nocobase/plugin-workflow-mailer": "1.6.17",
-    "@nocobase/plugin-workflow-manual": "1.6.17",
-    "@nocobase/plugin-workflow-notification": "1.6.17",
-    "@nocobase/plugin-workflow-parallel": "1.6.17",
-    "@nocobase/plugin-workflow-request": "1.6.17",
-    "@nocobase/plugin-workflow-sql": "1.6.17",
-    "@nocobase/server": "1.6.17",
+    "@nocobase/plugin-acl": "1.6.18",
+    "@nocobase/plugin-action-bulk-edit": "1.6.18",
+    "@nocobase/plugin-action-bulk-update": "1.6.18",
+    "@nocobase/plugin-action-custom-request": "1.6.18",
+    "@nocobase/plugin-action-duplicate": "1.6.18",
+    "@nocobase/plugin-action-export": "1.6.18",
+    "@nocobase/plugin-action-import": "1.6.18",
+    "@nocobase/plugin-action-print": "1.6.18",
+    "@nocobase/plugin-ai": "1.6.18",
+    "@nocobase/plugin-api-doc": "1.6.18",
+    "@nocobase/plugin-api-keys": "1.6.18",
+    "@nocobase/plugin-async-task-manager": "1.6.18",
+    "@nocobase/plugin-audit-logs": "1.6.18",
+    "@nocobase/plugin-auth": "1.6.18",
+    "@nocobase/plugin-auth-sms": "1.6.18",
+    "@nocobase/plugin-backup-restore": "1.6.18",
+    "@nocobase/plugin-block-iframe": "1.6.18",
+    "@nocobase/plugin-block-workbench": "1.6.18",
+    "@nocobase/plugin-calendar": "1.6.18",
+    "@nocobase/plugin-charts": "1.6.18",
+    "@nocobase/plugin-client": "1.6.18",
+    "@nocobase/plugin-collection-sql": "1.6.18",
+    "@nocobase/plugin-collection-tree": "1.6.18",
+    "@nocobase/plugin-data-source-main": "1.6.18",
+    "@nocobase/plugin-data-source-manager": "1.6.18",
+    "@nocobase/plugin-data-visualization": "1.6.18",
+    "@nocobase/plugin-environment-variables": "1.6.18",
+    "@nocobase/plugin-error-handler": "1.6.18",
+    "@nocobase/plugin-field-china-region": "1.6.18",
+    "@nocobase/plugin-field-formula": "1.6.18",
+    "@nocobase/plugin-field-m2m-array": "1.6.18",
+    "@nocobase/plugin-field-markdown-vditor": "1.6.18",
+    "@nocobase/plugin-field-sequence": "1.6.18",
+    "@nocobase/plugin-field-sort": "1.6.18",
+    "@nocobase/plugin-file-manager": "1.6.18",
+    "@nocobase/plugin-gantt": "1.6.18",
+    "@nocobase/plugin-graph-collection-manager": "1.6.18",
+    "@nocobase/plugin-kanban": "1.6.18",
+    "@nocobase/plugin-locale-tester": "1.6.18",
+    "@nocobase/plugin-localization": "1.6.18",
+    "@nocobase/plugin-logger": "1.6.18",
+    "@nocobase/plugin-map": "1.6.18",
+    "@nocobase/plugin-mobile": "1.6.18",
+    "@nocobase/plugin-mobile-client": "1.6.18",
+    "@nocobase/plugin-mock-collections": "1.6.18",
+    "@nocobase/plugin-multi-app-manager": "1.6.18",
+    "@nocobase/plugin-multi-app-share-collection": "1.6.18",
+    "@nocobase/plugin-notification-email": "1.6.18",
+    "@nocobase/plugin-notification-in-app-message": "1.6.18",
+    "@nocobase/plugin-notification-manager": "1.6.18",
+    "@nocobase/plugin-public-forms": "1.6.18",
+    "@nocobase/plugin-snapshot-field": "1.6.18",
+    "@nocobase/plugin-system-settings": "1.6.18",
+    "@nocobase/plugin-theme-editor": "1.6.18",
+    "@nocobase/plugin-ui-schema-storage": "1.6.18",
+    "@nocobase/plugin-user-data-sync": "1.6.18",
+    "@nocobase/plugin-users": "1.6.18",
+    "@nocobase/plugin-verification": "1.6.18",
+    "@nocobase/plugin-workflow": "1.6.18",
+    "@nocobase/plugin-workflow-action-trigger": "1.6.18",
+    "@nocobase/plugin-workflow-aggregate": "1.6.18",
+    "@nocobase/plugin-workflow-delay": "1.6.18",
+    "@nocobase/plugin-workflow-dynamic-calculation": "1.6.18",
+    "@nocobase/plugin-workflow-loop": "1.6.18",
+    "@nocobase/plugin-workflow-mailer": "1.6.18",
+    "@nocobase/plugin-workflow-manual": "1.6.18",
+    "@nocobase/plugin-workflow-notification": "1.6.18",
+    "@nocobase/plugin-workflow-parallel": "1.6.18",
+    "@nocobase/plugin-workflow-request": "1.6.18",
+    "@nocobase/plugin-workflow-sql": "1.6.18",
+    "@nocobase/server": "1.6.18",
     "cronstrue": "^2.11.0",
     "fs-extra": "^11.1.1"
   },

From d69fbfeb1b0efd5ccadcf3297b07de849ee0fbe1 Mon Sep 17 00:00:00 2001
From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com>
Date: Fri, 11 Apr 2025 13:39:50 +0000
Subject: [PATCH 04/22] docs: update changelogs

---
 CHANGELOG.md       | 24 ++++++++++++++++++++++++
 CHANGELOG.zh-CN.md | 24 ++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e16271476..400e2153da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,30 @@ 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.18](https://github.com/nocobase/nocobase/compare/v1.6.17...v1.6.18) - 2025-04-11
+
+### 🚀 Improvements
+
+- **[client]**
+  - Add default type fallback API for `Variable.Input` ([#6644](https://github.com/nocobase/nocobase/pull/6644)) by @mytharcher
+
+  - Optimize prompts for unconfigured pages ([#6641](https://github.com/nocobase/nocobase/pull/6641)) by @zhangzhonghe
+
+- **[Workflow: Delay node]** Support to use variable for duration ([#6621](https://github.com/nocobase/nocobase/pull/6621)) by @mytharcher
+
+- **[Workflow: Custom action event]** Add refresh settings for trigger workflow button by @mytharcher
+
+### 🐛 Bug Fixes
+
+- **[client]**
+  - subtable description overlapping with add new button ([#6646](https://github.com/nocobase/nocobase/pull/6646)) by @katherinehhh
+
+  - dashed underline caused by horizontal form layout in modal ([#6639](https://github.com/nocobase/nocobase/pull/6639)) by @katherinehhh
+
+- **[File storage: S3(Pro)]** Fix missing await for next call. by @jiannx
+
+- **[Email manager]** Fix missing await for next call. by @jiannx
+
 ## [v1.6.17](https://github.com/nocobase/nocobase/compare/v1.6.16...v1.6.17) - 2025-04-09
 
 ### 🚀 Improvements
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 8ab0be9a2f..4dd3bb169d 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -5,6 +5,30 @@
 格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/),
 并且本项目遵循 [语义化版本](https://semver.org/spec/v2.0.0.html)。
 
+## [v1.6.18](https://github.com/nocobase/nocobase/compare/v1.6.17...v1.6.18) - 2025-04-11
+
+### 🚀 优化
+
+- **[client]**
+  - 为 `Variable.Input` 组件增加默认退避类型的 API ([#6644](https://github.com/nocobase/nocobase/pull/6644)) by @mytharcher
+
+  - 优化未配置页面时的提示 ([#6641](https://github.com/nocobase/nocobase/pull/6641)) by @zhangzhonghe
+
+- **[工作流：延时节点]** 支持延迟时间使用变量 ([#6621](https://github.com/nocobase/nocobase/pull/6621)) by @mytharcher
+
+- **[工作流：自定义操作事件]** 为触发工作流按钮增加刷新配置项 by @mytharcher
+
+### 🐛 修复
+
+- **[client]**
+  - 子表格中描述信息与操作按钮遮挡 ([#6646](https://github.com/nocobase/nocobase/pull/6646)) by @katherinehhh
+
+  - 弹窗表单在 horizontal 布局下初始宽度计算错误，导致出现提示和 下划虚线 ([#6639](https://github.com/nocobase/nocobase/pull/6639)) by @katherinehhh
+
+- **[文件存储：S3 (Pro)]** 修复next调用缺少await by @jiannx
+
+- **[邮件管理]** 修复next调用缺少await by @jiannx
+
 ## [v1.6.17](https://github.com/nocobase/nocobase/compare/v1.6.16...v1.6.17) - 2025-04-09
 
 ### 🚀 优化

From cec36c849f502994bfc7cb5b18a0976421113d6f Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Fri, 11 Apr 2025 23:39:20 +0800
Subject: [PATCH 05/22] fix: await addNewTexts

---
 .../plugins/@nocobase/plugin-localization/src/server/plugin.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugins/@nocobase/plugin-localization/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-localization/src/server/plugin.ts
index 7bac0fcf63..8d04cac1b3 100644
--- a/packages/plugins/@nocobase/plugin-localization/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-localization/src/server/plugin.ts
@@ -25,7 +25,7 @@ export class PluginLocalizationServer extends Plugin {
 
   addNewTexts = async (texts: { text: string; module: string }[], options?: any) => {
     texts = await this.resources.filterExists(texts, options?.transaction);
-    this.db
+    await this.db
       .getModel('localizationTexts')
       .bulkCreate(
         texts.map(({ text, module }) => ({

From 62d857b1bcfdd70d98b77cbfe5df337be885a3db Mon Sep 17 00:00:00 2001
From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com>
Date: Fri, 11 Apr 2025 16:42:25 +0000
Subject: [PATCH 06/22] =?UTF-8?q?chore(versions):=20=F0=9F=98=8A=20publish?=
 =?UTF-8?q?=20v1.7.0-beta.16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lerna.json                                    |   2 +-
 packages/core/acl/package.json                |   6 +-
 packages/core/actions/package.json            |   8 +-
 packages/core/app/package.json                |  10 +-
 packages/core/auth/package.json               |  12 +-
 packages/core/build/package.json              |   2 +-
 packages/core/cache/package.json              |   4 +-
 packages/core/cli/package.json                |   6 +-
 packages/core/client/package.json             |   8 +-
 .../core/create-nocobase-app/package.json     |   2 +-
 .../core/data-source-manager/package.json     |  12 +-
 packages/core/database/package.json           |   6 +-
 packages/core/devtools/package.json           |   8 +-
 packages/core/evaluators/package.json         |   4 +-
 packages/core/lock-manager/package.json       |   4 +-
 packages/core/logger/package.json             |   2 +-
 packages/core/resourcer/package.json          |   4 +-
 packages/core/sdk/package.json                |   2 +-
 packages/core/server/package.json             |  28 ++--
 packages/core/telemetry/package.json          |   4 +-
 packages/core/test/package.json               |   4 +-
 packages/core/utils/package.json              |   2 +-
 .../plugins/@nocobase/plugin-acl/package.json |   2 +-
 .../plugin-action-bulk-edit/package.json      |   2 +-
 .../plugin-action-bulk-update/package.json    |   2 +-
 .../plugin-action-custom-request/package.json |   2 +-
 .../plugin-action-duplicate/package.json      |   2 +-
 .../plugin-action-export/package.json         |   2 +-
 .../plugin-action-import/package.json         |   2 +-
 .../plugin-action-print/package.json          |   2 +-
 .../plugins/@nocobase/plugin-ai/package.json  |   2 +-
 .../@nocobase/plugin-api-doc/package.json     |   2 +-
 .../@nocobase/plugin-api-keys/package.json    |   2 +-
 .../plugin-async-task-manager/package.json    |   2 +-
 .../@nocobase/plugin-audit-logs/package.json  |   2 +-
 .../@nocobase/plugin-auth-sms/package.json    |   2 +-
 .../@nocobase/plugin-auth/package.json        |   2 +-
 .../plugin-backup-restore/package.json        |   2 +-
 .../plugin-block-iframe/package.json          |   2 +-
 .../plugin-block-template/package.json        |   2 +-
 .../plugin-block-workbench/package.json       |   2 +-
 .../@nocobase/plugin-calendar/package.json    |   2 +-
 .../@nocobase/plugin-charts/package.json      |   2 +-
 .../@nocobase/plugin-client/package.json      |   2 +-
 .../plugin-collection-sql/package.json        |   2 +-
 .../plugin-collection-tree/package.json       |   2 +-
 .../plugin-data-source-main/package.json      |   2 +-
 .../plugin-data-source-manager/package.json   |   2 +-
 .../plugin-data-visualization/package.json    |   2 +-
 .../plugin-disable-pm-add/package.json        |   2 +-
 .../plugin-environment-variables/package.json |   2 +-
 .../plugin-error-handler/package.json         |   2 +-
 .../plugin-field-china-region/package.json    |   2 +-
 .../plugin-field-formula/package.json         |   2 +-
 .../plugin-field-m2m-array/package.json       |   2 +-
 .../plugin-field-markdown-vditor/package.json |   2 +-
 .../plugin-field-sequence/package.json        |   2 +-
 .../@nocobase/plugin-field-sort/package.json  |   2 +-
 .../plugin-file-manager/package.json          |   2 +-
 .../@nocobase/plugin-gantt/package.json       |   2 +-
 .../package.json                              |   2 +-
 .../@nocobase/plugin-kanban/package.json      |   2 +-
 .../plugin-locale-tester/package.json         |   2 +-
 .../plugin-localization/package.json          |   2 +-
 .../@nocobase/plugin-logger/package.json      |   2 +-
 .../plugins/@nocobase/plugin-map/package.json |   2 +-
 .../plugin-mobile-client/package.json         |   2 +-
 .../@nocobase/plugin-mobile/package.json      |   2 +-
 .../plugin-mock-collections/package.json      |   2 +-
 .../plugin-multi-app-manager/package.json     |   2 +-
 .../package.json                              |   2 +-
 .../plugin-notification-email/package.json    |   2 +-
 .../package.json                              |   2 +-
 .../plugin-notification-manager/package.json  |   2 +-
 .../plugin-notifications/package.json         |   2 +-
 .../plugin-public-forms/package.json          |   2 +-
 .../plugin-sample-hello/package.json          |   2 +-
 .../plugin-snapshot-field/package.json        |   2 +-
 .../plugin-system-settings/package.json       |   2 +-
 .../plugin-theme-editor/package.json          |   2 +-
 .../plugin-ui-schema-storage/package.json     |   2 +-
 .../plugin-user-data-sync/package.json        |   2 +-
 .../@nocobase/plugin-users/package.json       |   2 +-
 .../plugin-verification/package.json          |   2 +-
 .../package.json                              |   2 +-
 .../plugin-workflow-aggregate/package.json    |   2 +-
 .../plugin-workflow-delay/package.json        |   2 +-
 .../package.json                              |   2 +-
 .../plugin-workflow-loop/package.json         |   2 +-
 .../plugin-workflow-mailer/package.json       |   2 +-
 .../plugin-workflow-manual/package.json       |   2 +-
 .../plugin-workflow-notification/package.json |   2 +-
 .../plugin-workflow-parallel/package.json     |   2 +-
 .../plugin-workflow-request/package.json      |   2 +-
 .../plugin-workflow-sql/package.json          |   2 +-
 .../plugin-workflow-test/package.json         |   2 +-
 .../@nocobase/plugin-workflow/package.json    |   4 +-
 packages/presets/nocobase/package.json        | 146 +++++++++---------
 98 files changed, 219 insertions(+), 219 deletions(-)

diff --git a/lerna.json b/lerna.json
index a2c4996206..c8bf5a4ca6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.7.0-beta.15",
+  "version": "1.7.0-beta.16",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "npmClientArgs": ["--ignore-engines"],
diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json
index fe0b8f68e3..d9f7aa3c5b 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.15",
+  "version": "1.7.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "1.7.0-beta.15",
-    "@nocobase/utils": "1.7.0-beta.15",
+    "@nocobase/resourcer": "1.7.0-beta.16",
+    "@nocobase/utils": "1.7.0-beta.16",
     "minimatch": "^5.1.1"
   },
   "repository": {
diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json
index 56cd2d5653..351a6ff2c1 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.15",
+  "version": "1.7.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cache": "1.7.0-beta.15",
-    "@nocobase/database": "1.7.0-beta.15",
-    "@nocobase/resourcer": "1.7.0-beta.15"
+    "@nocobase/cache": "1.7.0-beta.16",
+    "@nocobase/database": "1.7.0-beta.16",
+    "@nocobase/resourcer": "1.7.0-beta.16"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/app/package.json b/packages/core/app/package.json
index 5a89d43045..4fa74d2f60 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.15",
+  "version": "1.7.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/database": "1.7.0-beta.15",
-    "@nocobase/preset-nocobase": "1.7.0-beta.15",
-    "@nocobase/server": "1.7.0-beta.15"
+    "@nocobase/database": "1.7.0-beta.16",
+    "@nocobase/preset-nocobase": "1.7.0-beta.16",
+    "@nocobase/server": "1.7.0-beta.16"
   },
   "devDependencies": {
-    "@nocobase/client": "1.7.0-beta.15"
+    "@nocobase/client": "1.7.0-beta.16"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json
index cd79b29a38..17abe7e5ca 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.15",
+  "version": "1.7.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.7.0-beta.15",
-    "@nocobase/cache": "1.7.0-beta.15",
-    "@nocobase/database": "1.7.0-beta.15",
-    "@nocobase/resourcer": "1.7.0-beta.15",
-    "@nocobase/utils": "1.7.0-beta.15",
+    "@nocobase/actions": "1.7.0-beta.16",
+    "@nocobase/cache": "1.7.0-beta.16",
+    "@nocobase/database": "1.7.0-beta.16",
+    "@nocobase/resourcer": "1.7.0-beta.16",
+    "@nocobase/utils": "1.7.0-beta.16",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
diff --git a/packages/core/build/package.json b/packages/core/build/package.json
index bb5d5d732f..b27f603065 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.15",
+  "version": "1.7.0-beta.16",
   "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 0f0e5dc05b..55c0b2dda2 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.15",
+  "version": "1.7.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/lock-manager": "1.7.0-beta.15",
+    "@nocobase/lock-manager": "1.7.0-beta.16",
     "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 74d46fa135..ac74694593 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.15",
+  "version": "1.7.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.7.0-beta.15",
+    "@nocobase/app": "1.7.0-beta.16",
     "@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.15"
+    "@nocobase/devtools": "1.7.0-beta.16"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/client/package.json b/packages/core/client/package.json
index 24d2ed0f0e..792f210811 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.15",
+  "version": "1.7.0-beta.16",
   "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.15",
-    "@nocobase/sdk": "1.7.0-beta.15",
-    "@nocobase/utils": "1.7.0-beta.15",
+    "@nocobase/evaluators": "1.7.0-beta.16",
+    "@nocobase/sdk": "1.7.0-beta.16",
+    "@nocobase/utils": "1.7.0-beta.16",
     "ahooks": "^3.7.2",
     "antd": "5.24.2",
     "antd-style": "3.7.1",
diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json
index 277413f53c..a4d2118149 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.15",
+  "version": "1.7.0-beta.16",
   "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 b4fbd7d3cd..46bb863423 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.15",
+  "version": "1.7.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.7.0-beta.15",
-    "@nocobase/cache": "1.7.0-beta.15",
-    "@nocobase/database": "1.7.0-beta.15",
-    "@nocobase/resourcer": "1.7.0-beta.15",
-    "@nocobase/utils": "1.7.0-beta.15",
+    "@nocobase/actions": "1.7.0-beta.16",
+    "@nocobase/cache": "1.7.0-beta.16",
+    "@nocobase/database": "1.7.0-beta.16",
+    "@nocobase/resourcer": "1.7.0-beta.16",
+    "@nocobase/utils": "1.7.0-beta.16",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
diff --git a/packages/core/database/package.json b/packages/core/database/package.json
index 3f5bc033b8..7f36984bfe 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.15",
+  "version": "1.7.0-beta.16",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.7.0-beta.15",
-    "@nocobase/utils": "1.7.0-beta.15",
+    "@nocobase/logger": "1.7.0-beta.16",
+    "@nocobase/utils": "1.7.0-beta.16",
     "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 16c1473fdd..0a70d980f0 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.15",
+  "version": "1.7.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "1.7.0-beta.15",
-    "@nocobase/client": "1.7.0-beta.15",
-    "@nocobase/test": "1.7.0-beta.15",
+    "@nocobase/build": "1.7.0-beta.16",
+    "@nocobase/client": "1.7.0-beta.16",
+    "@nocobase/test": "1.7.0-beta.16",
     "@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 ecbfd1a158..73d9cf3f92 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.15",
+  "version": "1.7.0-beta.16",
   "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.15",
+    "@nocobase/utils": "1.7.0-beta.16",
     "mathjs": "^10.6.0"
   },
   "repository": {
diff --git a/packages/core/lock-manager/package.json b/packages/core/lock-manager/package.json
index b1596ad465..07cae242a1 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.15",
+  "version": "1.7.0-beta.16",
   "main": "lib/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@nocobase/utils": "1.7.0-beta.15",
+    "@nocobase/utils": "1.7.0-beta.16",
     "async-mutex": "^0.5.0"
   }
 }
diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json
index 9a0b449921..d1c7132fe8 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.15",
+  "version": "1.7.0-beta.16",
   "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 59ac7fbc0a..b695b16c64 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.15",
+  "version": "1.7.0-beta.16",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/utils": "1.7.0-beta.15",
+    "@nocobase/utils": "1.7.0-beta.16",
     "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 77938a67bc..e49ea31027 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.15",
+  "version": "1.7.0-beta.16",
   "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 9dba1df575..6579e38b63 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.15",
+  "version": "1.7.0-beta.16",
   "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.15",
-    "@nocobase/actions": "1.7.0-beta.15",
-    "@nocobase/auth": "1.7.0-beta.15",
-    "@nocobase/cache": "1.7.0-beta.15",
-    "@nocobase/data-source-manager": "1.7.0-beta.15",
-    "@nocobase/database": "1.7.0-beta.15",
-    "@nocobase/evaluators": "1.7.0-beta.15",
-    "@nocobase/lock-manager": "1.7.0-beta.15",
-    "@nocobase/logger": "1.7.0-beta.15",
-    "@nocobase/resourcer": "1.7.0-beta.15",
-    "@nocobase/sdk": "1.7.0-beta.15",
-    "@nocobase/telemetry": "1.7.0-beta.15",
-    "@nocobase/utils": "1.7.0-beta.15",
+    "@nocobase/acl": "1.7.0-beta.16",
+    "@nocobase/actions": "1.7.0-beta.16",
+    "@nocobase/auth": "1.7.0-beta.16",
+    "@nocobase/cache": "1.7.0-beta.16",
+    "@nocobase/data-source-manager": "1.7.0-beta.16",
+    "@nocobase/database": "1.7.0-beta.16",
+    "@nocobase/evaluators": "1.7.0-beta.16",
+    "@nocobase/lock-manager": "1.7.0-beta.16",
+    "@nocobase/logger": "1.7.0-beta.16",
+    "@nocobase/resourcer": "1.7.0-beta.16",
+    "@nocobase/sdk": "1.7.0-beta.16",
+    "@nocobase/telemetry": "1.7.0-beta.16",
+    "@nocobase/utils": "1.7.0-beta.16",
     "@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 a93234f562..43877a5f99 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.15",
+  "version": "1.7.0-beta.16",
   "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.15",
+    "@nocobase/utils": "1.7.0-beta.16",
     "@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 0e4c214f1f..cf97f76b34 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.15",
+  "version": "1.7.0-beta.16",
   "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.15",
+    "@nocobase/server": "1.7.0-beta.16",
     "@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 04d5346019..e69f65aa96 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.15",
+  "version": "1.7.0-beta.16",
   "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 04ad09e688..ab054c3083 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.15",
+  "version": "1.7.0-beta.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
index ca9bb5b549..f1001796b9 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.15",
+  "version": "1.7.0-beta.16",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-bulk-edit",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-bulk-edit",
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
index a2f179fab5..bf88c92864 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.15",
+  "version": "1.7.0-beta.16",
   "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 6c6d343a70..d3330578cc 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.15",
+  "version": "1.7.0-beta.16",
   "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 b5ec7b95da..e8327ee090 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.15",
+  "version": "1.7.0-beta.16",
   "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 a6a12c097e..abf26de107 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.15",
+  "version": "1.7.0-beta.16",
   "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 f6a555fb8f..e03746c618 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.15",
+  "version": "1.7.0-beta.16",
   "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 76f2a4bdcc..9712ff390d 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.15",
+  "version": "1.7.0-beta.16",
   "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 e040ff027f..3d3604f7e1 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.15",
+  "version": "1.7.0-beta.16",
   "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 b8cca82f5b..e0d5659d26 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.15",
+  "version": "1.7.0-beta.16",
   "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 d719ba8b43..d2cc7c37a2 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.15",
+  "version": "1.7.0-beta.16",
   "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 2e76e664d7..f6fbe7530e 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.15",
+  "version": "1.7.0-beta.16",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-audit-logs/package.json b/packages/plugins/@nocobase/plugin-audit-logs/package.json
index 260274108e..ffbef68261 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.15",
+  "version": "1.7.0-beta.16",
   "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 e1754409cb..e0e70cc751 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.15",
+  "version": "1.7.0-beta.16",
   "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 daef40997e..d010cff83b 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.15",
+  "version": "1.7.0-beta.16",
   "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 d3a048495b..79f6f95fa1 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.15",
+  "version": "1.7.0-beta.16",
   "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 19e7d98657..16d9bd7f19 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.15",
+  "version": "1.7.0-beta.16",
   "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 e5ac07c135..9055a88dea 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.15",
+  "version": "1.7.0-beta.16",
   "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 f063b21036..a94bb75f45 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.15",
+  "version": "1.7.0-beta.16",
   "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-calendar/package.json b/packages/plugins/@nocobase/plugin-calendar/package.json
index c5bcd3e40d..7154b17090 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.15",
+  "version": "1.7.0-beta.16",
   "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-charts/package.json b/packages/plugins/@nocobase/plugin-charts/package.json
index f923a21d9b..af1539526e 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.15",
+  "version": "1.7.0-beta.16",
   "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 cca8ac98ad..71d3657172 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.15",
+  "version": "1.7.0-beta.16",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-collection-sql/package.json b/packages/plugins/@nocobase/plugin-collection-sql/package.json
index 4fdca0f57c..6513bb7a5a 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.15",
+  "version": "1.7.0-beta.16",
   "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 fa7ca50e90..b832b62a8b 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.15",
+  "version": "1.7.0-beta.16",
   "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 7930d1ec3b..a7034f5c6a 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.15",
+  "version": "1.7.0-beta.16",
   "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 c43b4a2b17..31427fce14 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.15",
+  "version": "1.7.0-beta.16",
   "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 563004db20..c4c94cdb7c 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.15",
+  "version": "1.7.0-beta.16",
   "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 ede8e4f374..d99aedbe09 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.15",
+  "version": "1.7.0-beta.16",
   "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 c64921aac5..8084933602 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.15",
+  "version": "1.7.0-beta.16",
   "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 29f087c0e8..cca0ee086d 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.15",
+  "version": "1.7.0-beta.16",
   "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 e56a80898a..f0b8aa841c 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.15",
+  "version": "1.7.0-beta.16",
   "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 3a6ad26ac3..b532259e66 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.15",
+  "version": "1.7.0-beta.16",
   "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 cf7505de75..f96493a20b 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.15",
+  "version": "1.7.0-beta.16",
   "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 1508547b3a..9df462c4c7 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.15",
+  "version": "1.7.0-beta.16",
   "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 4eaf2b10d3..2ba9ce3019 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.15",
+  "version": "1.7.0-beta.16",
   "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 c7b02ade7c..c012d48c5b 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.15",
+  "version": "1.7.0-beta.16",
   "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 48145b4bb5..125bb52be2 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.15",
+  "version": "1.7.0-beta.16",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
diff --git a/packages/plugins/@nocobase/plugin-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json
index ba02ae8b81..1dd1192248 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.15",
+  "version": "1.7.0-beta.16",
   "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 15cf95fc55..95aa918447 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.15",
+  "version": "1.7.0-beta.16",
   "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 2194e2bc24..b51f79751a 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.15",
+  "version": "1.7.0-beta.16",
   "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/package.json b/packages/plugins/@nocobase/plugin-locale-tester/package.json
index dbc031e524..121bf658fd 100644
--- a/packages/plugins/@nocobase/plugin-locale-tester/package.json
+++ b/packages/plugins/@nocobase/plugin-locale-tester/package.json
@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-locale-tester",
   "displayName": "Locale tester",
   "displayName.zh-CN": "翻译测试工具",
-  "version": "1.7.0-beta.15",
+  "version": "1.7.0-beta.16",
   "homepage": "https://github.com/nocobase/locales",
   "main": "dist/server/index.js",
   "peerDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-localization/package.json b/packages/plugins/@nocobase/plugin-localization/package.json
index 91c61957aa..53334aea2d 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.15",
+  "version": "1.7.0-beta.16",
   "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 4075a7d6b7..d8eedd3331 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.15",
+  "version": "1.7.0-beta.16",
   "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 b2fa070509..054e550cd9 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.15",
+  "version": "1.7.0-beta.16",
   "description": "Map block, support Gaode map and Google map, you can also extend more map types.",
   "description.zh-CN": "地图区块，支持高德地图和 Google 地图，你也可以扩展更多地图类型。",
   "license": "AGPL-3.0",
diff --git a/packages/plugins/@nocobase/plugin-mobile-client/package.json b/packages/plugins/@nocobase/plugin-mobile-client/package.json
index f28c98f6f6..c324768cf7 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.15",
+  "version": "1.7.0-beta.16",
   "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 ee2327a72b..439d9503ee 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.15",
+  "version": "1.7.0-beta.16",
   "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-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json
index 6580aaf878..0d9ac2da3a 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.15",
+  "version": "1.7.0-beta.16",
   "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 98025c7aa1..4aaaa5db1c 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.15",
+  "version": "1.7.0-beta.16",
   "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 d1746eb4ac..896fe1e549 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.15",
+  "version": "1.7.0-beta.16",
   "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 c808134d93..b106c11297 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.15",
+  "version": "1.7.0-beta.16",
   "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 ec301f89c6..60bd3bf354 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.15",
+  "version": "1.7.0-beta.16",
   "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 5680f8994d..76363b247a 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.15",
+  "version": "1.7.0-beta.16",
   "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 9b43c6468b..d0a589ff0a 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.15",
+  "version": "1.7.0-beta.16",
   "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 1096c37861..fe2fbeef6f 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.15",
+  "version": "1.7.0-beta.16",
   "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 63d7f341e3..bd9b3a25c8 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.15",
+  "version": "1.7.0-beta.16",
   "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 a70f2e8379..04a794532c 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.15",
+  "version": "1.7.0-beta.16",
   "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 b9530b5beb..5652a03386 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.15",
+  "version": "1.7.0-beta.16",
   "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 3ddacd3d68..e472a6f91c 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.15",
+  "version": "1.7.0-beta.16",
   "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 450521f701..0ef150b764 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.15",
+  "version": "1.7.0-beta.16",
   "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 9a7d6909e7..7770c0a029 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.15",
+  "version": "1.7.0-beta.16",
   "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 07500ac627..5112a2f47b 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.15",
+  "version": "1.7.0-beta.16",
   "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 7d6790ac22..46ab970edd 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.15",
+  "version": "1.7.0-beta.16",
   "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 1a9d120dd6..df946e5dc6 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.15",
+  "version": "1.7.0-beta.16",
   "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 1342d80ddb..106797c329 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.15",
+  "version": "1.7.0-beta.16",
   "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 9fe14ab823..6bc367aa5f 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.15",
+  "version": "1.7.0-beta.16",
   "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 c85e47a79a..08a326862d 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.15",
+  "version": "1.7.0-beta.16",
   "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 4c2b895323..59832fd8fa 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.15",
+  "version": "1.7.0-beta.16",
   "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 47b82a8210..5bceecf17a 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.15",
+  "version": "1.7.0-beta.16",
   "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 ab6836d54c..2fe7fef96e 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.15",
+  "version": "1.7.0-beta.16",
   "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 9c711a9a4c..ac1953a8d9 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.15",
+  "version": "1.7.0-beta.16",
   "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 ccf8063990..2f52b3b231 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.15",
+  "version": "1.7.0-beta.16",
   "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 ffea77a100..2eed33cda4 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.15",
+  "version": "1.7.0-beta.16",
   "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 b6fd2ba923..cbae9075bd 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.15",
+  "version": "1.7.0-beta.16",
   "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 2c956d1a43..ad39019b0b 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.15",
+  "version": "1.7.0-beta.16",
   "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 1f20c0fecc..e2f563137d 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.15",
+  "version": "1.7.0-beta.16",
   "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.15"
+    "@nocobase/plugin-workflow-test": "1.7.0-beta.16"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json
index 30e59c5f90..ff91f042f3 100644
--- a/packages/presets/nocobase/package.json
+++ b/packages/presets/nocobase/package.json
@@ -1,82 +1,82 @@
 {
   "name": "@nocobase/preset-nocobase",
-  "version": "1.7.0-beta.15",
+  "version": "1.7.0-beta.16",
   "license": "AGPL-3.0",
   "main": "./lib/server/index.js",
   "dependencies": {
     "@formily/json-schema": "2.x",
-    "@nocobase/plugin-acl": "1.7.0-beta.15",
-    "@nocobase/plugin-action-bulk-edit": "1.7.0-beta.15",
-    "@nocobase/plugin-action-bulk-update": "1.7.0-beta.15",
-    "@nocobase/plugin-action-custom-request": "1.7.0-beta.15",
-    "@nocobase/plugin-action-duplicate": "1.7.0-beta.15",
-    "@nocobase/plugin-action-export": "1.7.0-beta.15",
-    "@nocobase/plugin-action-import": "1.7.0-beta.15",
-    "@nocobase/plugin-action-print": "1.7.0-beta.15",
-    "@nocobase/plugin-ai": "1.7.0-beta.15",
-    "@nocobase/plugin-api-doc": "1.7.0-beta.15",
-    "@nocobase/plugin-api-keys": "1.7.0-beta.15",
-    "@nocobase/plugin-async-task-manager": "1.7.0-beta.15",
-    "@nocobase/plugin-audit-logs": "1.7.0-beta.15",
-    "@nocobase/plugin-auth": "1.7.0-beta.15",
-    "@nocobase/plugin-auth-sms": "1.7.0-beta.15",
-    "@nocobase/plugin-backup-restore": "1.7.0-beta.15",
-    "@nocobase/plugin-block-iframe": "1.7.0-beta.15",
-    "@nocobase/plugin-block-template": "1.7.0-beta.15",
-    "@nocobase/plugin-block-workbench": "1.7.0-beta.15",
-    "@nocobase/plugin-calendar": "1.7.0-beta.15",
-    "@nocobase/plugin-charts": "1.7.0-beta.15",
-    "@nocobase/plugin-client": "1.7.0-beta.15",
-    "@nocobase/plugin-collection-sql": "1.7.0-beta.15",
-    "@nocobase/plugin-collection-tree": "1.7.0-beta.15",
-    "@nocobase/plugin-data-source-main": "1.7.0-beta.15",
-    "@nocobase/plugin-data-source-manager": "1.7.0-beta.15",
-    "@nocobase/plugin-data-visualization": "1.7.0-beta.15",
-    "@nocobase/plugin-environment-variables": "1.7.0-beta.15",
-    "@nocobase/plugin-error-handler": "1.7.0-beta.15",
-    "@nocobase/plugin-field-china-region": "1.7.0-beta.15",
-    "@nocobase/plugin-field-formula": "1.7.0-beta.15",
-    "@nocobase/plugin-field-m2m-array": "1.7.0-beta.15",
-    "@nocobase/plugin-field-markdown-vditor": "1.7.0-beta.15",
-    "@nocobase/plugin-field-sequence": "1.7.0-beta.15",
-    "@nocobase/plugin-field-sort": "1.7.0-beta.15",
-    "@nocobase/plugin-file-manager": "1.7.0-beta.15",
-    "@nocobase/plugin-gantt": "1.7.0-beta.15",
-    "@nocobase/plugin-graph-collection-manager": "1.7.0-beta.15",
-    "@nocobase/plugin-kanban": "1.7.0-beta.15",
-    "@nocobase/plugin-locale-tester": "1.7.0-beta.15",
-    "@nocobase/plugin-localization": "1.7.0-beta.15",
-    "@nocobase/plugin-logger": "1.7.0-beta.15",
-    "@nocobase/plugin-map": "1.7.0-beta.15",
-    "@nocobase/plugin-mobile": "1.7.0-beta.15",
-    "@nocobase/plugin-mobile-client": "1.7.0-beta.15",
-    "@nocobase/plugin-mock-collections": "1.7.0-beta.15",
-    "@nocobase/plugin-multi-app-manager": "1.7.0-beta.15",
-    "@nocobase/plugin-multi-app-share-collection": "1.7.0-beta.15",
-    "@nocobase/plugin-notification-email": "1.7.0-beta.15",
-    "@nocobase/plugin-notification-in-app-message": "1.7.0-beta.15",
-    "@nocobase/plugin-notification-manager": "1.7.0-beta.15",
-    "@nocobase/plugin-public-forms": "1.7.0-beta.15",
-    "@nocobase/plugin-snapshot-field": "1.7.0-beta.15",
-    "@nocobase/plugin-system-settings": "1.7.0-beta.15",
-    "@nocobase/plugin-theme-editor": "1.7.0-beta.15",
-    "@nocobase/plugin-ui-schema-storage": "1.7.0-beta.15",
-    "@nocobase/plugin-user-data-sync": "1.7.0-beta.15",
-    "@nocobase/plugin-users": "1.7.0-beta.15",
-    "@nocobase/plugin-verification": "1.7.0-beta.15",
-    "@nocobase/plugin-workflow": "1.7.0-beta.15",
-    "@nocobase/plugin-workflow-action-trigger": "1.7.0-beta.15",
-    "@nocobase/plugin-workflow-aggregate": "1.7.0-beta.15",
-    "@nocobase/plugin-workflow-delay": "1.7.0-beta.15",
-    "@nocobase/plugin-workflow-dynamic-calculation": "1.7.0-beta.15",
-    "@nocobase/plugin-workflow-loop": "1.7.0-beta.15",
-    "@nocobase/plugin-workflow-mailer": "1.7.0-beta.15",
-    "@nocobase/plugin-workflow-manual": "1.7.0-beta.15",
-    "@nocobase/plugin-workflow-notification": "1.7.0-beta.15",
-    "@nocobase/plugin-workflow-parallel": "1.7.0-beta.15",
-    "@nocobase/plugin-workflow-request": "1.7.0-beta.15",
-    "@nocobase/plugin-workflow-sql": "1.7.0-beta.15",
-    "@nocobase/server": "1.7.0-beta.15",
+    "@nocobase/plugin-acl": "1.7.0-beta.16",
+    "@nocobase/plugin-action-bulk-edit": "1.7.0-beta.16",
+    "@nocobase/plugin-action-bulk-update": "1.7.0-beta.16",
+    "@nocobase/plugin-action-custom-request": "1.7.0-beta.16",
+    "@nocobase/plugin-action-duplicate": "1.7.0-beta.16",
+    "@nocobase/plugin-action-export": "1.7.0-beta.16",
+    "@nocobase/plugin-action-import": "1.7.0-beta.16",
+    "@nocobase/plugin-action-print": "1.7.0-beta.16",
+    "@nocobase/plugin-ai": "1.7.0-beta.16",
+    "@nocobase/plugin-api-doc": "1.7.0-beta.16",
+    "@nocobase/plugin-api-keys": "1.7.0-beta.16",
+    "@nocobase/plugin-async-task-manager": "1.7.0-beta.16",
+    "@nocobase/plugin-audit-logs": "1.7.0-beta.16",
+    "@nocobase/plugin-auth": "1.7.0-beta.16",
+    "@nocobase/plugin-auth-sms": "1.7.0-beta.16",
+    "@nocobase/plugin-backup-restore": "1.7.0-beta.16",
+    "@nocobase/plugin-block-iframe": "1.7.0-beta.16",
+    "@nocobase/plugin-block-template": "1.7.0-beta.16",
+    "@nocobase/plugin-block-workbench": "1.7.0-beta.16",
+    "@nocobase/plugin-calendar": "1.7.0-beta.16",
+    "@nocobase/plugin-charts": "1.7.0-beta.16",
+    "@nocobase/plugin-client": "1.7.0-beta.16",
+    "@nocobase/plugin-collection-sql": "1.7.0-beta.16",
+    "@nocobase/plugin-collection-tree": "1.7.0-beta.16",
+    "@nocobase/plugin-data-source-main": "1.7.0-beta.16",
+    "@nocobase/plugin-data-source-manager": "1.7.0-beta.16",
+    "@nocobase/plugin-data-visualization": "1.7.0-beta.16",
+    "@nocobase/plugin-environment-variables": "1.7.0-beta.16",
+    "@nocobase/plugin-error-handler": "1.7.0-beta.16",
+    "@nocobase/plugin-field-china-region": "1.7.0-beta.16",
+    "@nocobase/plugin-field-formula": "1.7.0-beta.16",
+    "@nocobase/plugin-field-m2m-array": "1.7.0-beta.16",
+    "@nocobase/plugin-field-markdown-vditor": "1.7.0-beta.16",
+    "@nocobase/plugin-field-sequence": "1.7.0-beta.16",
+    "@nocobase/plugin-field-sort": "1.7.0-beta.16",
+    "@nocobase/plugin-file-manager": "1.7.0-beta.16",
+    "@nocobase/plugin-gantt": "1.7.0-beta.16",
+    "@nocobase/plugin-graph-collection-manager": "1.7.0-beta.16",
+    "@nocobase/plugin-kanban": "1.7.0-beta.16",
+    "@nocobase/plugin-locale-tester": "1.7.0-beta.16",
+    "@nocobase/plugin-localization": "1.7.0-beta.16",
+    "@nocobase/plugin-logger": "1.7.0-beta.16",
+    "@nocobase/plugin-map": "1.7.0-beta.16",
+    "@nocobase/plugin-mobile": "1.7.0-beta.16",
+    "@nocobase/plugin-mobile-client": "1.7.0-beta.16",
+    "@nocobase/plugin-mock-collections": "1.7.0-beta.16",
+    "@nocobase/plugin-multi-app-manager": "1.7.0-beta.16",
+    "@nocobase/plugin-multi-app-share-collection": "1.7.0-beta.16",
+    "@nocobase/plugin-notification-email": "1.7.0-beta.16",
+    "@nocobase/plugin-notification-in-app-message": "1.7.0-beta.16",
+    "@nocobase/plugin-notification-manager": "1.7.0-beta.16",
+    "@nocobase/plugin-public-forms": "1.7.0-beta.16",
+    "@nocobase/plugin-snapshot-field": "1.7.0-beta.16",
+    "@nocobase/plugin-system-settings": "1.7.0-beta.16",
+    "@nocobase/plugin-theme-editor": "1.7.0-beta.16",
+    "@nocobase/plugin-ui-schema-storage": "1.7.0-beta.16",
+    "@nocobase/plugin-user-data-sync": "1.7.0-beta.16",
+    "@nocobase/plugin-users": "1.7.0-beta.16",
+    "@nocobase/plugin-verification": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow-action-trigger": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow-aggregate": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow-delay": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow-dynamic-calculation": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow-loop": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow-mailer": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow-manual": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow-notification": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow-parallel": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow-request": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow-sql": "1.7.0-beta.16",
+    "@nocobase/server": "1.7.0-beta.16",
     "cronstrue": "^2.11.0",
     "fs-extra": "^11.1.1"
   },

From 4bc16e52f21f8cce637c02ca9b31581a0902eaf9 Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Sun, 13 Apr 2025 14:03:51 +0800
Subject: [PATCH 07/22] fix(defaultValue): avoid directly displaying variable
 strings (#6649)

---
 .../data-source/collection-field/CollectionField.tsx   | 10 +++++++++-
 .../antd/form-item/hooks/useParseDefaultValue.ts       |  5 -----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/core/client/src/data-source/collection-field/CollectionField.tsx b/packages/core/client/src/data-source/collection-field/CollectionField.tsx
index 4b00af3a79..e7cfaa4e04 100644
--- a/packages/core/client/src/data-source/collection-field/CollectionField.tsx
+++ b/packages/core/client/src/data-source/collection-field/CollectionField.tsx
@@ -18,6 +18,7 @@ import { useCollectionFieldUISchema, useIsInNocoBaseRecursionFieldContext } from
 import { useDynamicComponentProps } from '../../hoc/withDynamicSchemaProps';
 import { useCompile, useComponent } from '../../schema-component';
 import { useIsAllowToSetDefaultValue } from '../../schema-settings/hooks/useIsAllowToSetDefaultValue';
+import { isVariable } from '../../variables/utils/isVariable';
 import { CollectionFieldProvider, useCollectionField } from './CollectionFieldProvider';
 
 type Props = {
@@ -131,7 +132,14 @@ const CollectionFieldInternalField = (props) => {
 
   if (!uiSchema) return null;
 
-  return <Component {...props} {...dynamicProps} />;
+  const mergedProps = { ...props, ...dynamicProps };
+
+  // Prevent displaying the variable string first, then the variable value
+  if (isVariable(mergedProps.value) && mergedProps.value === fieldSchema.default) {
+    mergedProps.value = undefined;
+  }
+
+  return <Component {...mergedProps} />;
 };
 
 export const CollectionField = connect((props) => {
diff --git a/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts b/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts
index cda06cd3c0..f663975902 100644
--- a/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts
+++ b/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts
@@ -86,11 +86,6 @@ const useParseDefaultValue = () => {
         field &&
         ((isVariable(fieldSchema.default) && field.value == null) || field.value === fieldSchema.default || forceUpdate)
       ) {
-        // 一个变量字符串如果显示出来会比较奇怪
-        if (isVariable(field.value)) {
-          await field.reset({ forceClear: true });
-        }
-
         field.loading = true;
         const collectionField = !fieldSchema.name.toString().includes('.') && collection?.getField(fieldSchema.name);
 

From c9b1c893e40dc0d09586a74f4f7053704e4c7c6f Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Sun, 13 Apr 2025 14:05:24 +0800
Subject: [PATCH 08/22] fix: add global style for LightBox to prevent image
 overlay issues (#6651)

---
 .../schema-component/antd/upload/Upload.tsx   | 56 +++++++++++--------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/packages/core/client/src/schema-component/antd/upload/Upload.tsx b/packages/core/client/src/schema-component/antd/upload/Upload.tsx
index 6a1893ce3e..6c42d7bd68 100644
--- a/packages/core/client/src/schema-component/antd/upload/Upload.tsx
+++ b/packages/core/client/src/schema-component/antd/upload/Upload.tsx
@@ -11,6 +11,7 @@ import { DeleteOutlined, DownloadOutlined, InboxOutlined, LoadingOutlined, PlusO
 import { Field } from '@formily/core';
 import { connect, mapProps, mapReadPretty, useField } from '@formily/react';
 import { Alert, Upload as AntdUpload, Button, Modal, Progress, Space, Tooltip } from 'antd';
+import { createGlobalStyle } from 'antd-style';
 import useUploadStyle from 'antd/es/upload/style';
 import cls from 'classnames';
 import { saveAs } from 'file-saver';
@@ -36,6 +37,12 @@ import {
 import { useStyles } from './style';
 import type { ComposedUpload, DraggerProps, DraggerV2Props, UploadProps } from './type';
 
+const LightBoxGlobalStyle = createGlobalStyle`
+  .ReactModal__Overlay.ReactModal__Overlay--after-open {
+    z-index: 3000 !important; // 避免预览图片时被遮挡
+  }
+`;
+
 attachmentFileTypes.add({
   match(file) {
     return matchMimetype(file, 'image/*');
@@ -62,29 +69,32 @@ attachmentFileTypes.add({
       [index, list],
     );
     return (
-      <LightBox
-        // discourageDownloads={true}
-        mainSrc={list[index]?.url}
-        nextSrc={list[(index + 1) % list.length]?.url}
-        prevSrc={list[(index + list.length - 1) % list.length]?.url}
-        onCloseRequest={() => onSwitchIndex(null)}
-        onMovePrevRequest={() => onSwitchIndex((index + list.length - 1) % list.length)}
-        onMoveNextRequest={() => onSwitchIndex((index + 1) % list.length)}
-        imageTitle={list[index]?.title}
-        toolbarButtons={[
-          <button
-            key={'preview-img'}
-            style={{ fontSize: 22, background: 'none', lineHeight: 1 }}
-            type="button"
-            aria-label="Download"
-            title="Download"
-            className="ril-zoom-in ril__toolbarItemChild ril__builtinButton"
-            onClick={onDownload}
-          >
-            <DownloadOutlined />
-          </button>,
-        ]}
-      />
+      <>
+        <LightBoxGlobalStyle />
+        <LightBox
+          // discourageDownloads={true}
+          mainSrc={list[index]?.url}
+          nextSrc={list[(index + 1) % list.length]?.url}
+          prevSrc={list[(index + list.length - 1) % list.length]?.url}
+          onCloseRequest={() => onSwitchIndex(null)}
+          onMovePrevRequest={() => onSwitchIndex((index + list.length - 1) % list.length)}
+          onMoveNextRequest={() => onSwitchIndex((index + 1) % list.length)}
+          imageTitle={list[index]?.title}
+          toolbarButtons={[
+            <button
+              key={'preview-img'}
+              style={{ fontSize: 22, background: 'none', lineHeight: 1 }}
+              type="button"
+              aria-label="Download"
+              title="Download"
+              className="ril-zoom-in ril__toolbarItemChild ril__builtinButton"
+              onClick={onDownload}
+            >
+              <DownloadOutlined />
+            </button>,
+          ]}
+        />
+      </>
     );
   },
 });

From 659e98039ab5106cd4de99cb0fe5ca085f5ed709 Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Sun, 13 Apr 2025 21:34:03 +0800
Subject: [PATCH 09/22] fix: label cutoff issue in horizontal layout with colon
 (#6655)

* fix: label cutoff issue in horizontal layout with colon

* fix: test

* fix: test

* fix: test
---
 .../__tests__/collection-select.test.tsx           |  4 ++--
 .../schema-component/antd/form-item/FormItem.tsx   | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx b/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx
index 3958aff649..54f4849a7f 100644
--- a/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx
+++ b/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx
@@ -54,7 +54,7 @@ describe('CollectionSelect', () => {
             role="button"
           >
             <div
-              class="css-9mlexe ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o"
+              class="css-a7w9kk ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o"
             >
               <div
                 class="ant-formily-item-label"
@@ -191,7 +191,7 @@ describe('CollectionSelect', () => {
             role="button"
           >
             <div
-              class="css-9mlexe ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o"
+              class="css-a7w9kk ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o"
             >
               <div
                 class="ant-formily-item-label"
diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
index ca2b0a215f..7af69ad89b 100644
--- a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
+++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
@@ -37,13 +37,15 @@ const formItemWrapCss = css`
   .ant-description-textarea img {
     max-width: 100%;
   }
-  &.ant-formily-item-layout-vertical .ant-formily-item-label {
-    display: inline;
-    .ant-formily-item-label-tooltip-icon {
-      display: inline;
-    }
-    .ant-formily-item-label-content {
+  &.ant-formily-item-layout-horizontal.ant-formily-item-label-wrap {
+    .ant-formily-item-label {
       display: inline;
+      padding-right: 5px;
+
+      .ant-formily-item-label-tooltip-icon,
+      .ant-formily-item-label-content {
+        display: inline;
+      }
     }
   }
 `;

From 72828200b9acf6971a2648709be3e1d43d53450e Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Mon, 14 Apr 2025 13:59:19 +0800
Subject: [PATCH 10/22] fix: error: ENOTEMPTY: directory not empty (#6660)

---
 packages/core/cli/src/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/cli/src/util.js b/packages/core/cli/src/util.js
index 742c60cb41..35b496db1f 100644
--- a/packages/core/cli/src/util.js
+++ b/packages/core/cli/src/util.js
@@ -461,7 +461,7 @@ exports.initEnv = function initEnv() {
   fs.mkdirpSync(dirname(process.env.SOCKET_PATH), { force: true, recursive: true });
   fs.mkdirpSync(process.env.PM2_HOME, { force: true, recursive: true });
   const pkgDir = resolve(process.cwd(), 'storage/plugins', '@nocobase/plugin-multi-app-manager');
-  fs.existsSync(pkgDir) && fs.rmdirSync(pkgDir, { force: true });
+  fs.existsSync(pkgDir) && fs.rmdirSync(pkgDir, { recursive: true, force: true });
 };
 
 exports.generatePlugins = function () {

From 1af62daf9f5095f31df0d4056ce6a7072ef035c7 Mon Sep 17 00:00:00 2001
From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com>
Date: Mon, 14 Apr 2025 06:26:27 +0000
Subject: [PATCH 11/22] =?UTF-8?q?chore(versions):=20=F0=9F=98=8A=20publish?=
 =?UTF-8?q?=20v1.6.19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lerna.json                                    |   2 +-
 packages/core/acl/package.json                |   6 +-
 packages/core/actions/package.json            |   8 +-
 packages/core/app/package.json                |  10 +-
 packages/core/auth/package.json               |  12 +-
 packages/core/build/package.json              |   2 +-
 packages/core/cache/package.json              |   2 +-
 packages/core/cli/package.json                |   6 +-
 packages/core/client/package.json             |   8 +-
 .../core/create-nocobase-app/package.json     |   2 +-
 .../core/data-source-manager/package.json     |  12 +-
 packages/core/database/package.json           |   6 +-
 packages/core/devtools/package.json           |   8 +-
 packages/core/evaluators/package.json         |   4 +-
 packages/core/lock-manager/package.json       |   4 +-
 packages/core/logger/package.json             |   2 +-
 packages/core/resourcer/package.json          |   4 +-
 packages/core/sdk/package.json                |   2 +-
 packages/core/server/package.json             |  28 ++--
 packages/core/telemetry/package.json          |   4 +-
 packages/core/test/package.json               |   4 +-
 packages/core/utils/package.json              |   2 +-
 .../plugins/@nocobase/plugin-acl/package.json |   2 +-
 .../plugin-action-bulk-edit/package.json      |   2 +-
 .../plugin-action-bulk-update/package.json    |   2 +-
 .../plugin-action-custom-request/package.json |   2 +-
 .../plugin-action-duplicate/package.json      |   2 +-
 .../plugin-action-export/package.json         |   2 +-
 .../plugin-action-import/package.json         |   2 +-
 .../plugin-action-print/package.json          |   2 +-
 .../plugins/@nocobase/plugin-ai/package.json  |   2 +-
 .../@nocobase/plugin-api-doc/package.json     |   2 +-
 .../@nocobase/plugin-api-keys/package.json    |   2 +-
 .../plugin-async-task-manager/package.json    |   2 +-
 .../@nocobase/plugin-audit-logs/package.json  |   2 +-
 .../@nocobase/plugin-auth-sms/package.json    |   2 +-
 .../@nocobase/plugin-auth/package.json        |   2 +-
 .../plugin-backup-restore/package.json        |   2 +-
 .../plugin-block-iframe/package.json          |   2 +-
 .../plugin-block-workbench/package.json       |   2 +-
 .../@nocobase/plugin-calendar/package.json    |   2 +-
 .../@nocobase/plugin-charts/package.json      |   2 +-
 .../@nocobase/plugin-client/package.json      |   2 +-
 .../plugin-collection-sql/package.json        |   2 +-
 .../plugin-collection-tree/package.json       |   2 +-
 .../plugin-data-source-main/package.json      |   2 +-
 .../plugin-data-source-manager/package.json   |   2 +-
 .../plugin-data-visualization/package.json    |   2 +-
 .../plugin-disable-pm-add/package.json        |   2 +-
 .../plugin-environment-variables/package.json |   2 +-
 .../plugin-error-handler/package.json         |   2 +-
 .../plugin-field-china-region/package.json    |   2 +-
 .../plugin-field-formula/package.json         |   2 +-
 .../plugin-field-m2m-array/package.json       |   2 +-
 .../plugin-field-markdown-vditor/package.json |   2 +-
 .../plugin-field-sequence/package.json        |   2 +-
 .../@nocobase/plugin-field-sort/package.json  |   2 +-
 .../plugin-file-manager/package.json          |   2 +-
 .../@nocobase/plugin-gantt/package.json       |   2 +-
 .../package.json                              |   2 +-
 .../@nocobase/plugin-kanban/package.json      |   2 +-
 .../plugin-locale-tester/package.json         |   2 +-
 .../plugin-localization/package.json          |   2 +-
 .../@nocobase/plugin-logger/package.json      |   2 +-
 .../plugins/@nocobase/plugin-map/package.json |   2 +-
 .../plugin-mobile-client/package.json         |   2 +-
 .../@nocobase/plugin-mobile/package.json      |   2 +-
 .../plugin-mock-collections/package.json      |   2 +-
 .../plugin-multi-app-manager/package.json     |   2 +-
 .../package.json                              |   2 +-
 .../plugin-notification-email/package.json    |   2 +-
 .../package.json                              |   2 +-
 .../plugin-notification-manager/package.json  |   2 +-
 .../plugin-notifications/package.json         |   2 +-
 .../plugin-public-forms/package.json          |   2 +-
 .../plugin-sample-hello/package.json          |   2 +-
 .../plugin-snapshot-field/package.json        |   2 +-
 .../plugin-system-settings/package.json       |   2 +-
 .../plugin-theme-editor/package.json          |   2 +-
 .../plugin-ui-schema-storage/package.json     |   2 +-
 .../plugin-user-data-sync/package.json        |   2 +-
 .../@nocobase/plugin-users/package.json       |   2 +-
 .../plugin-verification/package.json          |   2 +-
 .../package.json                              |   2 +-
 .../plugin-workflow-aggregate/package.json    |   2 +-
 .../plugin-workflow-delay/package.json        |   2 +-
 .../package.json                              |   2 +-
 .../plugin-workflow-loop/package.json         |   2 +-
 .../plugin-workflow-mailer/package.json       |   2 +-
 .../plugin-workflow-manual/package.json       |   2 +-
 .../plugin-workflow-notification/package.json |   2 +-
 .../plugin-workflow-parallel/package.json     |   2 +-
 .../plugin-workflow-request/package.json      |   2 +-
 .../plugin-workflow-sql/package.json          |   2 +-
 .../plugin-workflow-test/package.json         |   2 +-
 .../@nocobase/plugin-workflow/package.json    |   4 +-
 packages/presets/nocobase/package.json        | 144 +++++++++---------
 97 files changed, 216 insertions(+), 216 deletions(-)

diff --git a/lerna.json b/lerna.json
index 839cc4ad83..02cab62090 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.6.18",
+  "version": "1.6.19",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "npmClientArgs": ["--ignore-engines"],
diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json
index 75c2ec6007..df3c1e9597 100644
--- a/packages/core/acl/package.json
+++ b/packages/core/acl/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "1.6.18",
-    "@nocobase/utils": "1.6.18",
+    "@nocobase/resourcer": "1.6.19",
+    "@nocobase/utils": "1.6.19",
     "minimatch": "^5.1.1"
   },
   "repository": {
diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json
index 3292018e85..dc4fc5a9f7 100644
--- a/packages/core/actions/package.json
+++ b/packages/core/actions/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@nocobase/actions",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cache": "1.6.18",
-    "@nocobase/database": "1.6.18",
-    "@nocobase/resourcer": "1.6.18"
+    "@nocobase/cache": "1.6.19",
+    "@nocobase/database": "1.6.19",
+    "@nocobase/resourcer": "1.6.19"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/app/package.json b/packages/core/app/package.json
index 2878aeff67..eb9981cb2d 100644
--- a/packages/core/app/package.json
+++ b/packages/core/app/package.json
@@ -1,17 +1,17 @@
 {
   "name": "@nocobase/app",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/database": "1.6.18",
-    "@nocobase/preset-nocobase": "1.6.18",
-    "@nocobase/server": "1.6.18"
+    "@nocobase/database": "1.6.19",
+    "@nocobase/preset-nocobase": "1.6.19",
+    "@nocobase/server": "1.6.19"
   },
   "devDependencies": {
-    "@nocobase/client": "1.6.18"
+    "@nocobase/client": "1.6.19"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json
index f75eea1fcd..2bd7edfe55 100644
--- a/packages/core/auth/package.json
+++ b/packages/core/auth/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.6.18",
-    "@nocobase/cache": "1.6.18",
-    "@nocobase/database": "1.6.18",
-    "@nocobase/resourcer": "1.6.18",
-    "@nocobase/utils": "1.6.18",
+    "@nocobase/actions": "1.6.19",
+    "@nocobase/cache": "1.6.19",
+    "@nocobase/database": "1.6.19",
+    "@nocobase/resourcer": "1.6.19",
+    "@nocobase/utils": "1.6.19",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
diff --git a/packages/core/build/package.json b/packages/core/build/package.json
index cc19a756c8..4b41e5a590 100644
--- a/packages/core/build/package.json
+++ b/packages/core/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 49fd9908ca..d6e59dbebd 100644
--- a/packages/core/cache/package.json
+++ b/packages/core/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cache",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json
index ebc416cfc4..c6deb946cb 100644
--- a/packages/core/cli/package.json
+++ b/packages/core/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.6.18",
+    "@nocobase/app": "1.6.19",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,7 +25,7 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "1.6.18"
+    "@nocobase/devtools": "1.6.19"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/client/package.json b/packages/core/client/package.json
index a36993bb0d..c12da1d49d 100644
--- a/packages/core/client/package.json
+++ b/packages/core/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "license": "AGPL-3.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -27,9 +27,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "1.6.18",
-    "@nocobase/sdk": "1.6.18",
-    "@nocobase/utils": "1.6.18",
+    "@nocobase/evaluators": "1.6.19",
+    "@nocobase/sdk": "1.6.19",
+    "@nocobase/utils": "1.6.19",
     "ahooks": "^3.7.2",
     "antd": "5.12.8",
     "antd-style": "3.7.1",
diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json
index d18340592e..93c7d82142 100755
--- a/packages/core/create-nocobase-app/package.json
+++ b/packages/core/create-nocobase-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-nocobase-app",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 357b923760..2a04b6a6e0 100644
--- a/packages/core/data-source-manager/package.json
+++ b/packages/core/data-source-manager/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.6.18",
-    "@nocobase/cache": "1.6.18",
-    "@nocobase/database": "1.6.18",
-    "@nocobase/resourcer": "1.6.18",
-    "@nocobase/utils": "1.6.18",
+    "@nocobase/actions": "1.6.19",
+    "@nocobase/cache": "1.6.19",
+    "@nocobase/database": "1.6.19",
+    "@nocobase/resourcer": "1.6.19",
+    "@nocobase/utils": "1.6.19",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
diff --git a/packages/core/database/package.json b/packages/core/database/package.json
index 1a0eb64fe6..a59f7d52eb 100644
--- a/packages/core/database/package.json
+++ b/packages/core/database/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.6.18",
-    "@nocobase/utils": "1.6.18",
+    "@nocobase/logger": "1.6.19",
+    "@nocobase/utils": "1.6.19",
     "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 e25648c011..b36ac7f857 100644
--- a/packages/core/devtools/package.json
+++ b/packages/core/devtools/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/devtools",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "1.6.18",
-    "@nocobase/client": "1.6.18",
-    "@nocobase/test": "1.6.18",
+    "@nocobase/build": "1.6.19",
+    "@nocobase/client": "1.6.19",
+    "@nocobase/test": "1.6.19",
     "@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 23f38a437f..0d2768cd9e 100644
--- a/packages/core/evaluators/package.json
+++ b/packages/core/evaluators/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/evaluators",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
     "@formulajs/formulajs": "4.4.9",
-    "@nocobase/utils": "1.6.18",
+    "@nocobase/utils": "1.6.19",
     "mathjs": "^10.6.0"
   },
   "repository": {
diff --git a/packages/core/lock-manager/package.json b/packages/core/lock-manager/package.json
index 1bd8bcbb01..22372973ab 100644
--- a/packages/core/lock-manager/package.json
+++ b/packages/core/lock-manager/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nocobase/lock-manager",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "main": "lib/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@nocobase/utils": "1.6.18",
+    "@nocobase/utils": "1.6.19",
     "async-mutex": "^0.5.0"
   }
 }
diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json
index 6e20157a99..2099db4c0c 100644
--- a/packages/core/logger/package.json
+++ b/packages/core/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 12c91594bc..e278996713 100644
--- a/packages/core/resourcer/package.json
+++ b/packages/core/resourcer/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/utils": "1.6.18",
+    "@nocobase/utils": "1.6.19",
     "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 06a72fd60f..a2a63e8528 100644
--- a/packages/core/sdk/package.json
+++ b/packages/core/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/sdk",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 9b7833e17d..5af8fca57b 100644
--- a/packages/core/server/package.json
+++ b/packages/core/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,19 +10,19 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.0.2",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "1.6.18",
-    "@nocobase/actions": "1.6.18",
-    "@nocobase/auth": "1.6.18",
-    "@nocobase/cache": "1.6.18",
-    "@nocobase/data-source-manager": "1.6.18",
-    "@nocobase/database": "1.6.18",
-    "@nocobase/evaluators": "1.6.18",
-    "@nocobase/lock-manager": "1.6.18",
-    "@nocobase/logger": "1.6.18",
-    "@nocobase/resourcer": "1.6.18",
-    "@nocobase/sdk": "1.6.18",
-    "@nocobase/telemetry": "1.6.18",
-    "@nocobase/utils": "1.6.18",
+    "@nocobase/acl": "1.6.19",
+    "@nocobase/actions": "1.6.19",
+    "@nocobase/auth": "1.6.19",
+    "@nocobase/cache": "1.6.19",
+    "@nocobase/data-source-manager": "1.6.19",
+    "@nocobase/database": "1.6.19",
+    "@nocobase/evaluators": "1.6.19",
+    "@nocobase/lock-manager": "1.6.19",
+    "@nocobase/logger": "1.6.19",
+    "@nocobase/resourcer": "1.6.19",
+    "@nocobase/sdk": "1.6.19",
+    "@nocobase/telemetry": "1.6.19",
+    "@nocobase/utils": "1.6.19",
     "@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 4fece03722..37127464ea 100644
--- a/packages/core/telemetry/package.json
+++ b/packages/core/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/telemetry",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "description": "nocobase telemetry library",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
@@ -11,7 +11,7 @@
     "directory": "packages/telemetry"
   },
   "dependencies": {
-    "@nocobase/utils": "1.6.18",
+    "@nocobase/utils": "1.6.19",
     "@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 01a6227f1c..db2eaafdff 100644
--- a/packages/core/test/package.json
+++ b/packages/core/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "1.6.18",
+    "@nocobase/server": "1.6.19",
     "@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 63eac9d5db..63424231e0 100644
--- a/packages/core/utils/package.json
+++ b/packages/core/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 f06236ac70..5394a01af8 100644
--- a/packages/plugins/@nocobase/plugin-acl/package.json
+++ b/packages/plugins/@nocobase/plugin-acl/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "权限控制",
   "description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
index c4740f5faf..c5517031c8 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-bulk-edit",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-bulk-edit",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-bulk-edit",
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
index 0f856245b5..13ae383dc6 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-bulk-update",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 725a41a595..2bf17c3b01 100644
--- a/packages/plugins/@nocobase/plugin-action-custom-request/package.json
+++ b/packages/plugins/@nocobase/plugin-action-custom-request/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-custom-request",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 72bbe39cb5..ec60202b31 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/package.json
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-duplicate",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 a0cfd81e4d..bef1f7589b 100644
--- a/packages/plugins/@nocobase/plugin-action-export/package.json
+++ b/packages/plugins/@nocobase/plugin-action-export/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "操作：导出记录",
   "description": "Export filtered records to excel, you can configure which fields to export.",
   "description.zh-CN": "导出筛选后的记录到 Excel 中，可以配置导出哪些字段。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 380870a6b1..fefc0587b0 100644
--- a/packages/plugins/@nocobase/plugin-action-import/package.json
+++ b/packages/plugins/@nocobase/plugin-action-import/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "操作：导入记录",
   "description": "Import records using excel templates. You can configure which fields to import and templates will be generated automatically.",
   "description.zh-CN": "使用 Excel 模板导入数据，可以配置导入哪些字段，自动生成模板。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 405176a0a8..5b6c13b3e5 100644
--- a/packages/plugins/@nocobase/plugin-action-print/package.json
+++ b/packages/plugins/@nocobase/plugin-action-print/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-print",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 a65b1d6a69..fda2c341a6 100644
--- a/packages/plugins/@nocobase/plugin-ai/package.json
+++ b/packages/plugins/@nocobase/plugin-ai/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "AI 集成",
   "description": "Support integration with AI services, providing AI-related workflow nodes to enhance business processing capabilities.",
   "description.zh-CN": "支持接入 AI 服务，提供 AI 相关的工作流节点，增强业务处理能力。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 7e969a4f1c..f9ef5eab83 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/package.json
+++ b/packages/plugins/@nocobase/plugin-api-doc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-api-doc",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 63cc45baa1..388d536f78 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/package.json
+++ b/packages/plugins/@nocobase/plugin-api-keys/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：API 密钥",
   "description": "Allows users to use API key to access application's HTTP API",
   "description.zh-CN": "允许用户使用 API 密钥访问应用的 HTTP API",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 90cea80e5d..29172e1940 100644
--- a/packages/plugins/@nocobase/plugin-async-task-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-async-task-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "异步任务管理器",
   "description": "Manage and monitor asynchronous tasks such as data import/export. Support task progress tracking and notification.",
   "description.zh-CN": "管理和监控数据导入导出等异步任务。支持任务进度跟踪和通知。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
diff --git a/packages/plugins/@nocobase/plugin-audit-logs/package.json b/packages/plugins/@nocobase/plugin-audit-logs/package.json
index 31387769dc..52e580a34f 100644
--- a/packages/plugins/@nocobase/plugin-audit-logs/package.json
+++ b/packages/plugins/@nocobase/plugin-audit-logs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-audit-logs",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 bc8c9446b2..1de4a97926 100644
--- a/packages/plugins/@nocobase/plugin-auth-sms/package.json
+++ b/packages/plugins/@nocobase/plugin-auth-sms/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：短信",
   "description": "SMS authentication.",
   "description.zh-CN": "通过短信验证码认证身份。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 e82704fa2f..9227d61279 100644
--- a/packages/plugins/@nocobase/plugin-auth/package.json
+++ b/packages/plugins/@nocobase/plugin-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-auth",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 e06f23a4aa..457d4d2017 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/package.json
+++ b/packages/plugins/@nocobase/plugin-backup-restore/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "应用的备份与还原（废弃）",
   "description": "Backup and restore applications for scenarios such as application replication, migration, and upgrades.",
   "description.zh-CN": "备份和还原应用，可用于应用的复制、迁移、升级等场景。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 3a245a0eda..90812ceb60 100644
--- a/packages/plugins/@nocobase/plugin-block-iframe/package.json
+++ b/packages/plugins/@nocobase/plugin-block-iframe/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "区块：iframe",
   "description": "Create an iframe block on the page to embed and display external web pages or content.",
   "description.zh-CN": "在页面上创建和管理iframe，用于嵌入和展示外部网页或内容。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/block-iframe",
diff --git a/packages/plugins/@nocobase/plugin-block-workbench/package.json b/packages/plugins/@nocobase/plugin-block-workbench/package.json
index 7b5d0f2e30..cb76fdcbd1 100644
--- a/packages/plugins/@nocobase/plugin-block-workbench/package.json
+++ b/packages/plugins/@nocobase/plugin-block-workbench/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-block-workbench",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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-calendar/package.json b/packages/plugins/@nocobase/plugin-calendar/package.json
index 86122f9019..7ae4d8d373 100644
--- a/packages/plugins/@nocobase/plugin-calendar/package.json
+++ b/packages/plugins/@nocobase/plugin-calendar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-calendar",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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-charts/package.json b/packages/plugins/@nocobase/plugin-charts/package.json
index 6efa2a2a5c..b90eb69874 100644
--- a/packages/plugins/@nocobase/plugin-charts/package.json
+++ b/packages/plugins/@nocobase/plugin-charts/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "图表（废弃）",
   "description": "The plugin has been deprecated, please use the data visualization plugin instead.",
   "description.zh-CN": "已废弃插件，请使用数据可视化插件代替。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 681ffd2dd6..90aebf2f55 100644
--- a/packages/plugins/@nocobase/plugin-client/package.json
+++ b/packages/plugins/@nocobase/plugin-client/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "WEB 客户端",
   "description": "Provides a client interface for the NocoBase server",
   "description.zh-CN": "为 NocoBase 服务端提供客户端界面",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-collection-sql/package.json b/packages/plugins/@nocobase/plugin-collection-sql/package.json
index 9fbe1ebf79..b847ccef75 100644
--- a/packages/plugins/@nocobase/plugin-collection-sql/package.json
+++ b/packages/plugins/@nocobase/plugin-collection-sql/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表: SQL",
   "description": "Provides SQL collection template",
   "description.zh-CN": "提供 SQL 数据表模板",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 3a8c755ba6..5f805b2163 100644
--- a/packages/plugins/@nocobase/plugin-collection-tree/package.json
+++ b/packages/plugins/@nocobase/plugin-collection-tree/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 5915bdc438..9da66e8199 100644
--- a/packages/plugins/@nocobase/plugin-data-source-main/package.json
+++ b/packages/plugins/@nocobase/plugin-data-source-main/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 36a9e9c460..d2921a30d6 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-source-manager",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 5ad8673ee1..3eca8d15be 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/package.json
+++ b/packages/plugins/@nocobase/plugin-data-visualization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 55b397b83d..f1734bb1bf 100644
--- a/packages/plugins/@nocobase/plugin-disable-pm-add/package.json
+++ b/packages/plugins/@nocobase/plugin-disable-pm-add/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-disable-pm-add",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 8f26ee577e..50a005595b 100644
--- a/packages/plugins/@nocobase/plugin-environment-variables/package.json
+++ b/packages/plugins/@nocobase/plugin-environment-variables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-environment-variables",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 b3c4e7a91f..e714c871ca 100644
--- a/packages/plugins/@nocobase/plugin-error-handler/package.json
+++ b/packages/plugins/@nocobase/plugin-error-handler/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "错误处理器",
   "description": "Handling application errors and exceptions.",
   "description.zh-CN": "处理应用程序中的错误和异常。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 8dd971f583..671c795878 100644
--- a/packages/plugins/@nocobase/plugin-field-china-region/package.json
+++ b/packages/plugins/@nocobase/plugin-field-china-region/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-field-china-region",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 43dd6ce1ad..845f23e773 100644
--- a/packages/plugins/@nocobase/plugin-field-formula/package.json
+++ b/packages/plugins/@nocobase/plugin-field-formula/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：公式",
   "description": "Configure and store the results of calculations between multiple field values in the same record, supporting both Math.js and Excel formula functions.",
   "description.zh-CN": "可以配置并存储同一条记录的多字段值之间的计算结果，支持 Math.js 和 Excel formula functions 两种引擎",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 84aa0cf600..9304bfcf76 100644
--- a/packages/plugins/@nocobase/plugin-field-m2m-array/package.json
+++ b/packages/plugins/@nocobase/plugin-field-m2m-array/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：多对多 (数组)",
   "description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model.",
   "description.zh-CN": "支持通过在数组中存储目标表唯一键的方式建立多对多关系。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 645ba6f10f..6963471cdd 100644
--- a/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
+++ b/packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：Markdown(Vditor)",
   "description": "Used to store Markdown and render it using Vditor editor, supports common Markdown syntax such as list, code, quote, etc., and supports uploading images, recordings, etc.It also allows for instant rendering, where what you see is what you get.",
   "description.zh-CN": "用于存储 Markdown，并使用 Vditor 编辑器渲染，支持常见 Markdown 语法，如列表，代码，引用等，并支持上传图片，录音等。同时可以做到即时渲染，所见即所得。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 3e58048b16..2eac9aa02f 100644
--- a/packages/plugins/@nocobase/plugin-field-sequence/package.json
+++ b/packages/plugins/@nocobase/plugin-field-sequence/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：自动编码",
   "description": "Automatically generate codes based on configured rules, supporting combinations of dates, numbers, and text.",
   "description.zh-CN": "根据配置的规则自动生成编码，支持日期、数字、文本的组合。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 1a9e89648e..67ebfd810b 100644
--- a/packages/plugins/@nocobase/plugin-field-sort/package.json
+++ b/packages/plugins/@nocobase/plugin-field-sort/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-field-sort",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 c336bee746..c2c707630d 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-file-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
diff --git a/packages/plugins/@nocobase/plugin-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json
index 87279097c2..7fe989aec1 100644
--- a/packages/plugins/@nocobase/plugin-gantt/package.json
+++ b/packages/plugins/@nocobase/plugin-gantt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-gantt",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 ff72787e33..def9baa469 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "可视化数据表管理",
   "description": "An ER diagram-like tool. Currently only the Master database is supported.",
   "description.zh-CN": "类似 ER 图的工具，目前只支持主数据库。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 83008b05c5..693297bf4f 100644
--- a/packages/plugins/@nocobase/plugin-kanban/package.json
+++ b/packages/plugins/@nocobase/plugin-kanban/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-kanban",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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/package.json b/packages/plugins/@nocobase/plugin-locale-tester/package.json
index a4384e0b78..730e1ba07f 100644
--- a/packages/plugins/@nocobase/plugin-locale-tester/package.json
+++ b/packages/plugins/@nocobase/plugin-locale-tester/package.json
@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-locale-tester",
   "displayName": "Locale tester",
   "displayName.zh-CN": "翻译测试工具",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "homepage": "https://github.com/nocobase/locales",
   "main": "dist/server/index.js",
   "peerDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-localization/package.json b/packages/plugins/@nocobase/plugin-localization/package.json
index d8e56e5a6a..e726545fc7 100644
--- a/packages/plugins/@nocobase/plugin-localization/package.json
+++ b/packages/plugins/@nocobase/plugin-localization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-localization",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 933c8dcc4c..27d0f14b0a 100644
--- a/packages/plugins/@nocobase/plugin-logger/package.json
+++ b/packages/plugins/@nocobase/plugin-logger/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "日志",
   "description": "Server-side logs, mainly including API request logs and system runtime logs, and allows to package and download log files.",
   "description.zh-CN": "服务端日志，主要包括接口请求日志和系统运行日志，并支持打包和下载日志文件。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 ade2f04c7a..be250c8a33 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.6.18",
+  "version": "1.6.19",
   "description": "Map block, support Gaode map and Google map, you can also extend more map types.",
   "description.zh-CN": "地图区块，支持高德地图和 Google 地图，你也可以扩展更多地图类型。",
   "license": "AGPL-3.0",
diff --git a/packages/plugins/@nocobase/plugin-mobile-client/package.json b/packages/plugins/@nocobase/plugin-mobile-client/package.json
index 33c8e27c13..f04d164658 100644
--- a/packages/plugins/@nocobase/plugin-mobile-client/package.json
+++ b/packages/plugins/@nocobase/plugin-mobile-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-mobile-client",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 87c6885f17..41fc2ac569 100644
--- a/packages/plugins/@nocobase/plugin-mobile/package.json
+++ b/packages/plugins/@nocobase/plugin-mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-mobile",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json
index aaedd39af2..64da12a37b 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/package.json
+++ b/packages/plugins/@nocobase/plugin-mock-collections/package.json
@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-mock-collections",
   "displayName": "mock-collections",
   "description": "mock-collections",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 320e1a9185..eacf999518 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用管理器",
   "description": "Dynamically create multiple apps without separate deployments.",
   "description.zh-CN": "无需单独部署即可动态创建多个应用。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 389092c88c..b53a55f5ac 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用数据表共享",
   "description": "",
   "description.zh-CN": "",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 4ef0b5e20f..b227ddc079 100644
--- a/packages/plugins/@nocobase/plugin-notification-email/package.json
+++ b/packages/plugins/@nocobase/plugin-notification-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-email",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 a41e03716c..8c5cb00e0d 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-in-app-message",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 3b31084461..434c236f4c 100644
--- a/packages/plugins/@nocobase/plugin-notification-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-notification-manager/package.json
@@ -4,7 +4,7 @@
   "description": "Provides a unified management service that includes channel configuration, logging, and other features, supporting the configuration of various notification channels, including in-app message and email.",
   "displayName.zh-CN": "通知管理",
   "description.zh-CN": "提供统一的管理服务，涵盖渠道配置、日志记录等功能，支持多种通知渠道的配置，包括站内信和电子邮件等。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 8093ab0bbf..d3f8a98894 100644
--- a/packages/plugins/@nocobase/plugin-notifications/package.json
+++ b/packages/plugins/@nocobase/plugin-notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notifications",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 7f70a879e6..1fd2fe47e8 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/package.json
+++ b/packages/plugins/@nocobase/plugin-public-forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-public-forms",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 7965e5604e..dc2be5f884 100644
--- a/packages/plugins/@nocobase/plugin-sample-hello/package.json
+++ b/packages/plugins/@nocobase/plugin-sample-hello/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-sample-hello",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 e71da42f99..bba928f72f 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/package.json
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：关系快照",
   "description": "When adding a new record, create a snapshot for its relational record and save in the new record. The snapshot will not be updated when the relational record is updated.",
   "description.zh-CN": "在添加数据时，为它的关系数据创建快照，并保存在当前的数据中。关系数据更新时，快照不会更新。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 5f5ee89ad5..72b3e37de7 100644
--- a/packages/plugins/@nocobase/plugin-system-settings/package.json
+++ b/packages/plugins/@nocobase/plugin-system-settings/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "系统设置",
   "description": "Used to adjust the system title, logo, language, etc.",
   "description.zh-CN": "用于调整系统的标题、LOGO、语言等。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 f42af10078..fa16892253 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/package.json
+++ b/packages/plugins/@nocobase/plugin-theme-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-theme-editor",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 9679ab1a9d..9fa0be5a50 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "UI schema 存储服务",
   "description": "Provides centralized UI schema storage service.",
   "description.zh-CN": "提供中心化的 UI schema 存储服务。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 03cb20970e..6e86be07a7 100644
--- a/packages/plugins/@nocobase/plugin-user-data-sync/package.json
+++ b/packages/plugins/@nocobase/plugin-user-data-sync/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "用户数据同步",
   "description": "Reigster and manage extensible user data synchronization sources, with HTTP API provided by default. Support for synchronizing data to resources such as users and departments.",
   "description.zh-CN": "注册和管理可扩展的用户数据同步来源，默认提供 HTTP API。支持向用户和部门等资源同步数据。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 2fb21d7032..1da37e6655 100644
--- a/packages/plugins/@nocobase/plugin-users/package.json
+++ b/packages/plugins/@nocobase/plugin-users/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "用户",
   "description": "Provides basic user model, as well as created by and updated by fields.",
   "description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 33b6cb96bb..d0cebba6fb 100644
--- a/packages/plugins/@nocobase/plugin-verification/package.json
+++ b/packages/plugins/@nocobase/plugin-verification/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "验证码",
   "description": "verification setting.",
   "description.zh-CN": "验证码配置。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 127a9e742c..da8b224ffc 100644
--- a/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：操作后事件",
   "description": "Triggered after the completion of a request initiated through an action button or API, such as after adding, updating, deleting data, or \"submit to workflow\". Suitable for data processing, sending notifications, etc., after actions are completed.",
   "description.zh-CN": "通过操作按钮或 API 发起请求并在执行完成后触发，比如新增、更新、删除数据或者“提交至工作流”之后。适用于在操作完成后进行数据处理、发送通知等。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 f3f2229cd1..bd1d7e3732 100644
--- a/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：聚合查询节点",
   "description": "Used to aggregate data against the database in workflow, such as: statistics, sum, average, etc.",
   "description.zh-CN": "可用于在工作流中对数据库进行聚合查询，如：统计数量、求和、平均值等。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 6613f935fa..14744e5fe2 100644
--- a/packages/plugins/@nocobase/plugin-workflow-delay/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-delay/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：延时节点",
   "description": "Could be used in workflow parallel branch for waiting other branches.",
   "description.zh-CN": "可用于工作流并行分支中等待其他分支执行完成。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 a945d7c9a4..1bd4dd647f 100644
--- a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：动态表达式计算节点",
   "description": "Useful plugin for doing dynamic calculation based on expression collection records in workflow.",
   "description.zh-CN": "用于在工作流中进行基于数据行的动态表达式计算。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 570d83f19c..c01242a1cf 100644
--- a/packages/plugins/@nocobase/plugin-workflow-loop/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-loop/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：循环节点",
   "description": "Used to repeat the sub-process processing of each value in an array, and can also be used for fixed times of sub-process processing.",
   "description.zh-CN": "用于对一个数组中的每个值进行重复的子流程处理，也可用于固定次数的重复子流程处理。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 7a2ce623e2..d37ab629a0 100644
--- a/packages/plugins/@nocobase/plugin-workflow-mailer/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-mailer/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：邮件发送节点",
   "description": "Send email in workflow.",
   "description.zh-CN": "可用于在工作流中发送电子邮件。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 e8b8d57737..8352dc5af9 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：人工处理节点",
   "description": "Could be used for workflows which some of decisions are made by users.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 3df41ce945..0eda4122d4 100644
--- a/packages/plugins/@nocobase/plugin-workflow-notification/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-notification/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：通知节点",
   "description": "Send notification in workflow.",
   "description.zh-CN": "可用于在工作流中发送各类通知。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 9e9536b659..3d93a398e1 100644
--- a/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-parallel/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：并行分支节点",
   "description": "Could be used for parallel execution of branch processes in the workflow.",
   "description.zh-CN": "用于在工作流中需要并行执行的分支流程。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 4c98a636e6..37193ceeb6 100644
--- a/packages/plugins/@nocobase/plugin-workflow-request/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-request/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：HTTP 请求节点",
   "description": "Send HTTP requests to any HTTP service for data interaction in workflow.",
   "description.zh-CN": "可用于在工作流中向任意 HTTP 服务发送请求，进行数据交互。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 99a08424fb..3bfca77aa1 100644
--- a/packages/plugins/@nocobase/plugin-workflow-sql/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-sql/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：SQL 节点",
   "description": "Execute SQL statements in workflow.",
   "description.zh-CN": "可用于在工作流中对数据库执行任意 SQL 语句。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 c5cc8d6d72..a63078e749 100644
--- a/packages/plugins/@nocobase/plugin-workflow-test/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow-test/package.json
@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-workflow-test",
   "displayName": "Workflow: test kit",
   "displayName.zh-CN": "工作流：测试工具包",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "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 6382594960..ff86a4f98f 100644
--- a/packages/plugins/@nocobase/plugin-workflow/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow/package.json
@@ -4,13 +4,13 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
   "description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow",
   "dependencies": {
-    "@nocobase/plugin-workflow-test": "1.6.18"
+    "@nocobase/plugin-workflow-test": "1.6.19"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json
index 742bab8386..d91c789ac8 100644
--- a/packages/presets/nocobase/package.json
+++ b/packages/presets/nocobase/package.json
@@ -1,81 +1,81 @@
 {
   "name": "@nocobase/preset-nocobase",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "license": "AGPL-3.0",
   "main": "./lib/server/index.js",
   "dependencies": {
     "@formily/json-schema": "2.x",
-    "@nocobase/plugin-acl": "1.6.18",
-    "@nocobase/plugin-action-bulk-edit": "1.6.18",
-    "@nocobase/plugin-action-bulk-update": "1.6.18",
-    "@nocobase/plugin-action-custom-request": "1.6.18",
-    "@nocobase/plugin-action-duplicate": "1.6.18",
-    "@nocobase/plugin-action-export": "1.6.18",
-    "@nocobase/plugin-action-import": "1.6.18",
-    "@nocobase/plugin-action-print": "1.6.18",
-    "@nocobase/plugin-ai": "1.6.18",
-    "@nocobase/plugin-api-doc": "1.6.18",
-    "@nocobase/plugin-api-keys": "1.6.18",
-    "@nocobase/plugin-async-task-manager": "1.6.18",
-    "@nocobase/plugin-audit-logs": "1.6.18",
-    "@nocobase/plugin-auth": "1.6.18",
-    "@nocobase/plugin-auth-sms": "1.6.18",
-    "@nocobase/plugin-backup-restore": "1.6.18",
-    "@nocobase/plugin-block-iframe": "1.6.18",
-    "@nocobase/plugin-block-workbench": "1.6.18",
-    "@nocobase/plugin-calendar": "1.6.18",
-    "@nocobase/plugin-charts": "1.6.18",
-    "@nocobase/plugin-client": "1.6.18",
-    "@nocobase/plugin-collection-sql": "1.6.18",
-    "@nocobase/plugin-collection-tree": "1.6.18",
-    "@nocobase/plugin-data-source-main": "1.6.18",
-    "@nocobase/plugin-data-source-manager": "1.6.18",
-    "@nocobase/plugin-data-visualization": "1.6.18",
-    "@nocobase/plugin-environment-variables": "1.6.18",
-    "@nocobase/plugin-error-handler": "1.6.18",
-    "@nocobase/plugin-field-china-region": "1.6.18",
-    "@nocobase/plugin-field-formula": "1.6.18",
-    "@nocobase/plugin-field-m2m-array": "1.6.18",
-    "@nocobase/plugin-field-markdown-vditor": "1.6.18",
-    "@nocobase/plugin-field-sequence": "1.6.18",
-    "@nocobase/plugin-field-sort": "1.6.18",
-    "@nocobase/plugin-file-manager": "1.6.18",
-    "@nocobase/plugin-gantt": "1.6.18",
-    "@nocobase/plugin-graph-collection-manager": "1.6.18",
-    "@nocobase/plugin-kanban": "1.6.18",
-    "@nocobase/plugin-locale-tester": "1.6.18",
-    "@nocobase/plugin-localization": "1.6.18",
-    "@nocobase/plugin-logger": "1.6.18",
-    "@nocobase/plugin-map": "1.6.18",
-    "@nocobase/plugin-mobile": "1.6.18",
-    "@nocobase/plugin-mobile-client": "1.6.18",
-    "@nocobase/plugin-mock-collections": "1.6.18",
-    "@nocobase/plugin-multi-app-manager": "1.6.18",
-    "@nocobase/plugin-multi-app-share-collection": "1.6.18",
-    "@nocobase/plugin-notification-email": "1.6.18",
-    "@nocobase/plugin-notification-in-app-message": "1.6.18",
-    "@nocobase/plugin-notification-manager": "1.6.18",
-    "@nocobase/plugin-public-forms": "1.6.18",
-    "@nocobase/plugin-snapshot-field": "1.6.18",
-    "@nocobase/plugin-system-settings": "1.6.18",
-    "@nocobase/plugin-theme-editor": "1.6.18",
-    "@nocobase/plugin-ui-schema-storage": "1.6.18",
-    "@nocobase/plugin-user-data-sync": "1.6.18",
-    "@nocobase/plugin-users": "1.6.18",
-    "@nocobase/plugin-verification": "1.6.18",
-    "@nocobase/plugin-workflow": "1.6.18",
-    "@nocobase/plugin-workflow-action-trigger": "1.6.18",
-    "@nocobase/plugin-workflow-aggregate": "1.6.18",
-    "@nocobase/plugin-workflow-delay": "1.6.18",
-    "@nocobase/plugin-workflow-dynamic-calculation": "1.6.18",
-    "@nocobase/plugin-workflow-loop": "1.6.18",
-    "@nocobase/plugin-workflow-mailer": "1.6.18",
-    "@nocobase/plugin-workflow-manual": "1.6.18",
-    "@nocobase/plugin-workflow-notification": "1.6.18",
-    "@nocobase/plugin-workflow-parallel": "1.6.18",
-    "@nocobase/plugin-workflow-request": "1.6.18",
-    "@nocobase/plugin-workflow-sql": "1.6.18",
-    "@nocobase/server": "1.6.18",
+    "@nocobase/plugin-acl": "1.6.19",
+    "@nocobase/plugin-action-bulk-edit": "1.6.19",
+    "@nocobase/plugin-action-bulk-update": "1.6.19",
+    "@nocobase/plugin-action-custom-request": "1.6.19",
+    "@nocobase/plugin-action-duplicate": "1.6.19",
+    "@nocobase/plugin-action-export": "1.6.19",
+    "@nocobase/plugin-action-import": "1.6.19",
+    "@nocobase/plugin-action-print": "1.6.19",
+    "@nocobase/plugin-ai": "1.6.19",
+    "@nocobase/plugin-api-doc": "1.6.19",
+    "@nocobase/plugin-api-keys": "1.6.19",
+    "@nocobase/plugin-async-task-manager": "1.6.19",
+    "@nocobase/plugin-audit-logs": "1.6.19",
+    "@nocobase/plugin-auth": "1.6.19",
+    "@nocobase/plugin-auth-sms": "1.6.19",
+    "@nocobase/plugin-backup-restore": "1.6.19",
+    "@nocobase/plugin-block-iframe": "1.6.19",
+    "@nocobase/plugin-block-workbench": "1.6.19",
+    "@nocobase/plugin-calendar": "1.6.19",
+    "@nocobase/plugin-charts": "1.6.19",
+    "@nocobase/plugin-client": "1.6.19",
+    "@nocobase/plugin-collection-sql": "1.6.19",
+    "@nocobase/plugin-collection-tree": "1.6.19",
+    "@nocobase/plugin-data-source-main": "1.6.19",
+    "@nocobase/plugin-data-source-manager": "1.6.19",
+    "@nocobase/plugin-data-visualization": "1.6.19",
+    "@nocobase/plugin-environment-variables": "1.6.19",
+    "@nocobase/plugin-error-handler": "1.6.19",
+    "@nocobase/plugin-field-china-region": "1.6.19",
+    "@nocobase/plugin-field-formula": "1.6.19",
+    "@nocobase/plugin-field-m2m-array": "1.6.19",
+    "@nocobase/plugin-field-markdown-vditor": "1.6.19",
+    "@nocobase/plugin-field-sequence": "1.6.19",
+    "@nocobase/plugin-field-sort": "1.6.19",
+    "@nocobase/plugin-file-manager": "1.6.19",
+    "@nocobase/plugin-gantt": "1.6.19",
+    "@nocobase/plugin-graph-collection-manager": "1.6.19",
+    "@nocobase/plugin-kanban": "1.6.19",
+    "@nocobase/plugin-locale-tester": "1.6.19",
+    "@nocobase/plugin-localization": "1.6.19",
+    "@nocobase/plugin-logger": "1.6.19",
+    "@nocobase/plugin-map": "1.6.19",
+    "@nocobase/plugin-mobile": "1.6.19",
+    "@nocobase/plugin-mobile-client": "1.6.19",
+    "@nocobase/plugin-mock-collections": "1.6.19",
+    "@nocobase/plugin-multi-app-manager": "1.6.19",
+    "@nocobase/plugin-multi-app-share-collection": "1.6.19",
+    "@nocobase/plugin-notification-email": "1.6.19",
+    "@nocobase/plugin-notification-in-app-message": "1.6.19",
+    "@nocobase/plugin-notification-manager": "1.6.19",
+    "@nocobase/plugin-public-forms": "1.6.19",
+    "@nocobase/plugin-snapshot-field": "1.6.19",
+    "@nocobase/plugin-system-settings": "1.6.19",
+    "@nocobase/plugin-theme-editor": "1.6.19",
+    "@nocobase/plugin-ui-schema-storage": "1.6.19",
+    "@nocobase/plugin-user-data-sync": "1.6.19",
+    "@nocobase/plugin-users": "1.6.19",
+    "@nocobase/plugin-verification": "1.6.19",
+    "@nocobase/plugin-workflow": "1.6.19",
+    "@nocobase/plugin-workflow-action-trigger": "1.6.19",
+    "@nocobase/plugin-workflow-aggregate": "1.6.19",
+    "@nocobase/plugin-workflow-delay": "1.6.19",
+    "@nocobase/plugin-workflow-dynamic-calculation": "1.6.19",
+    "@nocobase/plugin-workflow-loop": "1.6.19",
+    "@nocobase/plugin-workflow-mailer": "1.6.19",
+    "@nocobase/plugin-workflow-manual": "1.6.19",
+    "@nocobase/plugin-workflow-notification": "1.6.19",
+    "@nocobase/plugin-workflow-parallel": "1.6.19",
+    "@nocobase/plugin-workflow-request": "1.6.19",
+    "@nocobase/plugin-workflow-sql": "1.6.19",
+    "@nocobase/server": "1.6.19",
     "cronstrue": "^2.11.0",
     "fs-extra": "^11.1.1"
   },

From 9a0c6446503247af7bd9ae74f93d808b6c8ec06b Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Mon, 14 Apr 2025 14:39:29 +0800
Subject: [PATCH 12/22] fix: enable multi-select not working (#6661)

---
 .../modules/blocks/filter-blocks/FilterCollectionField.tsx  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/core/client/src/modules/blocks/filter-blocks/FilterCollectionField.tsx b/packages/core/client/src/modules/blocks/filter-blocks/FilterCollectionField.tsx
index a3e45281d1..3a8d26d7ef 100644
--- a/packages/core/client/src/modules/blocks/filter-blocks/FilterCollectionField.tsx
+++ b/packages/core/client/src/modules/blocks/filter-blocks/FilterCollectionField.tsx
@@ -94,7 +94,11 @@ export const FilterCollectionFieldInternalField: React.FC = (props: Props) => {
     // @ts-ignore
     field.dataSource = uiSchema.enum;
     const originalProps =
-      compile({ ...(operator?.schema?.['x-component-props'] || {}), ...(uiSchema['x-component-props'] || {}) }) || {};
+      compile({
+        ...(operator?.schema?.['x-component-props'] || {}),
+        ...(uiSchema['x-component-props'] || {}),
+        ...(fieldSchema?.['x-component-props'] || {}),
+      }) || {};
 
     field.componentProps = merge(field.componentProps || {}, originalProps, dynamicProps || {});
   }, [uiSchemaOrigin]);

From db669422b3bfe68675a3419a0be533527f1625a0 Mon Sep 17 00:00:00 2001
From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com>
Date: Mon, 14 Apr 2025 07:08:27 +0000
Subject: [PATCH 13/22] docs: update changelogs

---
 CHANGELOG.md       | 9 +++++++++
 CHANGELOG.zh-CN.md | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 400e2153da..958e0d3e98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,15 @@ 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.19](https://github.com/nocobase/nocobase/compare/v1.6.18...v1.6.19) - 2025-04-14
+
+### 🐛 Bug Fixes
+
+- **[client]**
+  - Fix the issue of preview images being obscured ([#6651](https://github.com/nocobase/nocobase/pull/6651)) by @zhangzhonghe
+
+  - In the form block, the default value of the field configuration will first be displayed as the original variable string and then disappear ([#6649](https://github.com/nocobase/nocobase/pull/6649)) by @zhangzhonghe
+
 ## [v1.6.18](https://github.com/nocobase/nocobase/compare/v1.6.17...v1.6.18) - 2025-04-11
 
 ### 🚀 Improvements
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 4dd3bb169d..933a774f55 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -5,6 +5,15 @@
 格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/),
 并且本项目遵循 [语义化版本](https://semver.org/spec/v2.0.0.html)。
 
+## [v1.6.19](https://github.com/nocobase/nocobase/compare/v1.6.18...v1.6.19) - 2025-04-14
+
+### 🐛 修复
+
+- **[client]**
+  - 修复预览图片被遮挡的问题 ([#6651](https://github.com/nocobase/nocobase/pull/6651)) by @zhangzhonghe
+
+  - 表单区块中，字段配置的默认值会先显示为原始变量字符串然后再消失 ([#6649](https://github.com/nocobase/nocobase/pull/6649)) by @zhangzhonghe
+
 ## [v1.6.18](https://github.com/nocobase/nocobase/compare/v1.6.17...v1.6.18) - 2025-04-11
 
 ### 🚀 优化

From c10579e57f9334e0750e5a40c2a85b5f98477da7 Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Mon, 14 Apr 2025 16:12:04 +0800
Subject: [PATCH 14/22] chore: add disabled prop to VariableSelect in
 RawTextArea

---
 .../client/src/schema-component/antd/variable/RawTextArea.tsx  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/client/src/schema-component/antd/variable/RawTextArea.tsx b/packages/core/client/src/schema-component/antd/variable/RawTextArea.tsx
index f37165bef8..f75c91e6d5 100644
--- a/packages/core/client/src/schema-component/antd/variable/RawTextArea.tsx
+++ b/packages/core/client/src/schema-component/antd/variable/RawTextArea.tsx
@@ -7,9 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import React, { useRef, useState } from 'react';
 import { css } from '@emotion/css';
 import { Button, Input } from 'antd';
+import React, { useRef, useState } from 'react';
 import { VariableSelect } from './VariableSelect';
 
 // NOTE: https://stackoverflow.com/questions/23892547/what-is-the-best-way-to-trigger-onchange-event-in-react-js/46012210#46012210
@@ -80,6 +80,7 @@ export function RawTextArea(props): JSX.Element {
           setOptions={setOptions}
           onInsert={onInsert}
           changeOnSelect={changeOnSelect}
+          disabled={others.disabled}
         />
       </Button.Group>
     </div>

From 23d7e09fa5e639aad7d3510f278cf25db86f8eba Mon Sep 17 00:00:00 2001
From: Junyi <mytharcher@users.noreply.github.com>
Date: Mon, 14 Apr 2025 18:27:28 +0800
Subject: [PATCH 15/22] refactor(plugin-workflow): change tasks api (#6640)

* refactor(plugin-workflow): change tasks api

* refactor(plugin-workflow): change task center popup logic

* refactor(preset): remove some builtin plugins
---
 .../antd/action/ActionBar.tsx                 |   2 +-
 .../src/schema-component/antd/list/List.tsx   |   2 +-
 .../src/schema-component/antd/list/index.ts   |   1 +
 .../src/client/WorkflowTodo.tsx               |  93 ++++---
 .../src/server/Plugin.ts                      |  26 +-
 .../src/server/actions.ts                     |  23 +-
 .../src/client/WorkflowTasks.tsx              | 229 +++++++++++-------
 .../plugin-workflow/src/client/index.tsx      |   8 +-
 .../plugin-workflow/src/server/Plugin.ts      |  16 +-
 packages/presets/nocobase/package.json        |   2 -
 10 files changed, 239 insertions(+), 163 deletions(-)

diff --git a/packages/core/client/src/schema-component/antd/action/ActionBar.tsx b/packages/core/client/src/schema-component/antd/action/ActionBar.tsx
index 09adfde89d..a1dfc5ecea 100644
--- a/packages/core/client/src/schema-component/antd/action/ActionBar.tsx
+++ b/packages/core/client/src/schema-component/antd/action/ActionBar.tsx
@@ -72,7 +72,7 @@ const InternalActionBar: FC = (props: any) => {
       <Portal>
         <DndContext>
           <div
-            style={{ display: 'flex', alignItems: 'center', gap: 8, ...style, marginTop: 0 }}
+            style={{ display: 'flex', alignItems: 'center', gap: 8, marginTop: 0, ...style }}
             {...others}
             className={cx(others.className, 'nb-action-bar')}
           >
diff --git a/packages/core/client/src/schema-component/antd/list/List.tsx b/packages/core/client/src/schema-component/antd/list/List.tsx
index d6197f27bd..4f6db0faea 100644
--- a/packages/core/client/src/schema-component/antd/list/List.tsx
+++ b/packages/core/client/src/schema-component/antd/list/List.tsx
@@ -158,7 +158,7 @@ const InternalList = withSkeletonComponent(
             >
               <AntdList
                 {...props}
-                pagination={!meta || !field.value?.length ? false : paginationProps}
+                pagination={!meta || !field.value?.length || count <= field.value?.length ? false : paginationProps}
                 loading={service?.loading}
               >
                 {field.value?.length
diff --git a/packages/core/client/src/schema-component/antd/list/index.ts b/packages/core/client/src/schema-component/antd/list/index.ts
index 5e8ff290de..afe657ed04 100644
--- a/packages/core/client/src/schema-component/antd/list/index.ts
+++ b/packages/core/client/src/schema-component/antd/list/index.ts
@@ -8,3 +8,4 @@
  */
 
 export * from './List';
+export { useListBlockContext } from './List.Decorator';
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/WorkflowTodo.tsx b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/WorkflowTodo.tsx
index beeae222c4..491a82d89c 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/WorkflowTodo.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/WorkflowTodo.tsx
@@ -33,9 +33,12 @@ import {
   useActionContext,
   useCurrentUserContext,
   useFormBlockContext,
-  useTableBlockContext,
+  useListBlockContext,
   List,
   OpenModeProvider,
+  ActionContextProvider,
+  useRequest,
+  CollectionRecordProvider,
 } from '@nocobase/client';
 import WorkflowPlugin, {
   DetailsBlockProvider,
@@ -46,12 +49,15 @@ import WorkflowPlugin, {
   EXECUTION_STATUS,
   JOB_STATUS,
   WorkflowTitle,
+  TASK_STATUS,
+  usePopupRecordContext,
 } from '@nocobase/plugin-workflow/client';
 
 import { NAMESPACE, useLang } from '../locale';
 import { FormBlockProvider } from './instruction/FormBlockProvider';
 import { ManualFormType, manualFormTypes } from './instruction/SchemaConfig';
 import { TaskStatusOptionsMap } from '../common/constants';
+import { useNavigate, useParams } from 'react-router-dom';
 
 function TaskStatusColumn(props) {
   const recordData = useCollectionRecordData();
@@ -291,11 +297,12 @@ function useSubmit() {
   const { values, submit } = useForm();
   const field = useField();
   const buttonSchema = useFieldSchema();
-  const { service } = useTableBlockContext();
+  const { service } = useListBlockContext();
   const { userJob, execution } = useFlowContext();
   const { name: actionKey } = buttonSchema;
   const { name: formKey } = buttonSchema.parent.parent;
   const { assignedValues = {} } = buttonSchema?.['x-action-settings'] ?? {};
+
   return {
     async run() {
       if (execution.status || userJob.status) {
@@ -611,57 +618,37 @@ function ContentDetailWithTitle(props) {
 
 function TaskItem() {
   const token = useAntdToken();
-  const [visible, setVisible] = useState(false);
   const record = useCollectionRecordData();
-  const { t } = useTranslation();
-  // const { defaultOpenMode } = useOpenModeContext();
-  // const { openPopup } = usePopupUtils();
-  // const { isPopupVisibleControlledByURL } = usePopupSettings();
-  const onOpen = useCallback((e: React.MouseEvent) => {
-    const targetElement = e.target as Element; // 将事件目标转换为Element类型
-    const currentTargetElement = e.currentTarget as Element;
-    if (currentTargetElement.contains(targetElement)) {
-      setVisible(true);
-      // if (!isPopupVisibleControlledByURL()) {
-      // } else {
-      //   openPopup({
-      //     // popupUidUsedInURL: 'job',
-      //     customActionSchema: {
-      //       type: 'void',
-      //       'x-uid': 'job-view',
-      //       'x-action-context': {
-      //         dataSource: 'main',
-      //         collection: 'workflowManualTasks',
-      //         doNotUpdateContext: true,
-      //       },
-      //       properties: {},
-      //     },
-      //   });
-      // }
-    }
-    e.stopPropagation();
-  }, []);
+  const navigate = useNavigate();
+  const { setRecord } = usePopupRecordContext();
+  const onOpen = useCallback(
+    (e: React.MouseEvent) => {
+      const targetElement = e.target as Element; // 将事件目标转换为Element类型
+      const currentTargetElement = e.currentTarget as Element;
+      if (currentTargetElement.contains(targetElement)) {
+        setRecord(record);
+        navigate(`./${record.id}`);
+      }
+      e.stopPropagation();
+    },
+    [navigate, record.id],
+  );
 
   return (
-    <>
-      <Card
-        onClick={onOpen}
-        hoverable
-        size="small"
-        title={record.title}
-        extra={<WorkflowTitle {...record.workflow} />}
-        className={css`
-          .ant-card-extra {
-            color: ${token.colorTextDescription};
-          }
-        `}
-      >
-        <ContentDetail />
-      </Card>
-      <PopupContextProvider visible={visible} setVisible={setVisible} openMode="modal">
-        <Drawer />
-      </PopupContextProvider>
-    </>
+    <Card
+      onClick={onOpen}
+      hoverable
+      size="small"
+      title={record.title}
+      extra={<WorkflowTitle {...record.workflow} />}
+      className={css`
+        .ant-card-extra {
+          color: ${token.colorTextDescription};
+        }
+      `}
+    >
+      <ContentDetail />
+    </Card>
   );
 }
 
@@ -734,7 +721,9 @@ function TodoExtraActions() {
 export const manualTodo = {
   title: `{{t("My manual tasks", { ns: "${NAMESPACE}" })}}`,
   collection: 'workflowManualTasks',
+  action: 'listMine',
   useActionParams: useTodoActionParams,
-  component: TaskItem,
-  extraActions: TodoExtraActions,
+  Actions: TodoExtraActions,
+  Item: TaskItem,
+  Detail: Drawer,
 };
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/server/Plugin.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/server/Plugin.ts
index 7338d0958e..a63b5aba87 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/server/Plugin.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/server/Plugin.ts
@@ -16,13 +16,14 @@ import * as jobActions from './actions';
 
 import ManualInstruction from './ManualInstruction';
 import { MANUAL_TASK_TYPE } from '../common/constants';
+import { Model } from '@nocobase/database';
 
-interface WorkflowManualTaskModel {
-  id: number;
-  userId: number;
-  workflowId: number;
-  executionId: number;
-  status: number;
+class WorkflowManualTaskModel extends Model {
+  declare id: number;
+  declare userId: number;
+  declare workflowId: number;
+  declare executionId: number;
+  declare status: number;
 }
 
 export default class extends Plugin {
@@ -55,7 +56,13 @@ export default class extends Plugin {
     const workflowPlugin = this.app.pm.get(WorkflowPlugin) as WorkflowPlugin;
     workflowPlugin.registerInstruction('manual', ManualInstruction);
 
-    this.db.on('workflowManualTasks.afterSave', async (task: WorkflowManualTaskModel, options) => {
+    this.db.on('workflowManualTasks.afterSave', async (task: WorkflowManualTaskModel, { transaction }) => {
+      // const allCount = await (task.constructor as typeof WorkflowManualTaskModel).count({
+      //   where: {
+      //     userId: task.userId,
+      //   },
+      //   transaction,
+      // });
       await workflowPlugin.toggleTaskStatus(
         {
           type: MANUAL_TASK_TYPE,
@@ -63,8 +70,9 @@ export default class extends Plugin {
           userId: task.userId,
           workflowId: task.workflowId,
         },
-        Boolean(task.status),
-        options,
+        task.status === JOB_STATUS.PENDING,
+        // allCount,
+        { transaction },
       );
     });
   }
diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/server/actions.ts b/packages/plugins/@nocobase/plugin-workflow-manual/src/server/actions.ts
index 33dccdbeb5..a9ac4c9768 100644
--- a/packages/plugins/@nocobase/plugin-workflow-manual/src/server/actions.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/server/actions.ts
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Context, utils } from '@nocobase/actions';
+import actions, { Context, utils } from '@nocobase/actions';
 import WorkflowPlugin, { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
 
 import ManualInstruction from './ManualInstruction';
@@ -111,3 +111,24 @@ export async function submit(context: Context, next) {
 
   plugin.resume(task.job);
 }
+
+export async function listMine(context, next) {
+  context.action.mergeParams({
+    filter: {
+      userId: context.state.currentUser.id,
+      $or: [
+        {
+          'workflow.enabled': true,
+        },
+        {
+          'workflow.enabled': false,
+          status: {
+            $ne: JOB_STATUS.PENDING,
+          },
+        },
+      ],
+    },
+  });
+
+  return actions.list(context, next);
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx
index 6d0f60a1a0..17d435fa26 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx
@@ -11,14 +11,17 @@ import { PageHeader } from '@ant-design/pro-layout';
 import { Badge, Button, Layout, Menu, Tabs, Tooltip } from 'antd';
 import classnames from 'classnames';
 import React, { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { Link, Outlet, useNavigate, useParams } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router-dom';
 
 import {
+  ActionContextProvider,
+  CollectionRecordProvider,
   css,
   PinnedPluginListProvider,
   SchemaComponent,
   SchemaComponentContext,
   SchemaComponentOptions,
+  useAPIClient,
   useApp,
   useCompile,
   useDocumentTitle,
@@ -44,9 +47,11 @@ const contentClass = css`
 export interface TaskTypeOptions {
   title: string;
   collection: string;
+  action: string;
   useActionParams: Function;
-  component: React.ComponentType;
-  extraActions?: React.ComponentType;
+  Actions?: React.ComponentType;
+  Item: React.ComponentType;
+  Detail: React.ComponentType;
   // children?: TaskTypeOptions[];
 }
 
@@ -65,7 +70,7 @@ function MenuLink({ type }: any) {
 
   return (
     <Link
-      to={`/admin/workflow/tasks/${type}`}
+      to={`/admin/workflow/tasks/${type}/${TASK_STATUS.PENDING}`}
       className={css`
         display: flex;
         align-items: center;
@@ -85,7 +90,7 @@ function MenuLink({ type }: any) {
   );
 }
 
-const TASK_STATUS = {
+export const TASK_STATUS = {
   ALL: 'all',
   PENDING: 'pending',
   COMPLETED: 'completed',
@@ -95,7 +100,7 @@ function StatusTabs() {
   const navigate = useNavigate();
   const { taskType, status = TASK_STATUS.PENDING } = useParams();
   const type = useCurrentTaskType();
-  const { extraActions: ExtraActions } = type;
+  const { Actions } = type;
   return (
     <Tabs
       activeKey={status}
@@ -122,9 +127,9 @@ function StatusTabs() {
         },
       ]}
       tabBarExtraContent={
-        ExtraActions
+        Actions
           ? {
-              right: <ExtraActions />,
+              right: <Actions />,
             }
           : {}
       }
@@ -157,16 +162,45 @@ function useCurrentTaskType() {
   );
 }
 
+function PopupContext(props: any) {
+  const { popupId } = useParams();
+  const { record } = usePopupRecordContext();
+  const navigate = useNavigate();
+  if (!popupId) {
+    return null;
+  }
+  return (
+    <ActionContextProvider
+      visible={Boolean(popupId)}
+      setVisible={(visible) => {
+        if (!visible) {
+          navigate(-1);
+        }
+      }}
+      openMode="modal"
+    >
+      <CollectionRecordProvider record={record}>{props.children}</CollectionRecordProvider>
+    </ActionContextProvider>
+  );
+}
+
+const PopupRecordContext = createContext<any>({ record: null, setRecord: (record) => {} });
+export function usePopupRecordContext() {
+  return useContext(PopupRecordContext);
+}
+
 export function WorkflowTasks() {
   const compile = useCompile();
   const { setTitle } = useDocumentTitle();
   const navigate = useNavigate();
-  const { taskType, status = TASK_STATUS.PENDING } = useParams();
+  const apiClient = useAPIClient();
+  const { taskType, status = TASK_STATUS.PENDING, popupId } = useParams();
   const { token } = useToken();
+  const [currentRecord, setCurrentRecord] = useState<any>(null);
 
   const items = useTaskTypeItems();
 
-  const { title, collection, useActionParams, component: Component } = useCurrentTaskType();
+  const { title, collection, action = 'list', useActionParams, Item, Detail } = useCurrentTaskType();
 
   const params = useActionParams(status);
 
@@ -180,6 +214,24 @@ export function WorkflowTasks() {
     }
   }, [items, navigate, status, taskType]);
 
+  useEffect(() => {
+    if (popupId && !currentRecord) {
+      apiClient
+        .resource(collection)
+        .get({
+          filterByTk: popupId,
+        })
+        .then((res) => {
+          if (res.data?.data) {
+            setCurrentRecord(res.data.data);
+          }
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    }
+  }, [popupId, collection, currentRecord, apiClient]);
+
   const typeKey = taskType ?? items[0].key;
 
   return (
@@ -205,84 +257,95 @@ export function WorkflowTasks() {
           }
         `}
       >
-        <SchemaComponentContext.Provider value={{ designable: false }}>
-          <SchemaComponent
-            components={{
-              Layout,
-              PageHeader,
-              StatusTabs,
-            }}
-            schema={{
-              name: `${taskType}-${status}`,
-              type: 'void',
-              'x-decorator': 'List.Decorator',
-              'x-decorator-props': {
-                collection,
-                action: 'list',
-                params: {
-                  pageSize: 20,
-                  sort: ['-createdAt'],
-                  ...params,
-                },
-              },
-              properties: {
-                header: {
-                  type: 'void',
-                  'x-component': 'PageHeader',
-                  'x-component-props': {
-                    className: classnames('pageHeaderCss'),
-                    style: {
-                      background: token.colorBgContainer,
-                      padding: '12px 24px 0 24px',
-                    },
-                    title,
-                  },
-                  properties: {
-                    tabs: {
-                      type: 'void',
-                      'x-component': 'StatusTabs',
-                    },
+        <PopupRecordContext.Provider
+          value={{
+            record: currentRecord,
+            setRecord: setCurrentRecord,
+          }}
+        >
+          <SchemaComponentContext.Provider value={{ designable: false }}>
+            <SchemaComponent
+              components={{
+                Layout,
+                PageHeader,
+                StatusTabs,
+              }}
+              schema={{
+                name: `${taskType}-${status}`,
+                type: 'void',
+                'x-decorator': 'List.Decorator',
+                'x-decorator-props': {
+                  collection,
+                  action,
+                  params: {
+                    pageSize: 20,
+                    sort: ['-createdAt'],
+                    ...params,
                   },
                 },
-                content: {
-                  type: 'void',
-                  'x-component': 'Layout.Content',
-                  'x-component-props': {
-                    className: contentClass,
-                    style: {
-                      padding: `${token.paddingPageVertical}px ${token.paddingPageHorizontal}px`,
-                    },
-                  },
-                  properties: {
-                    list: {
-                      type: 'array',
-                      'x-component': 'List',
-                      'x-component-props': {
-                        className: css`
-                          > .itemCss:not(:last-child) {
-                            border-bottom: none;
-                          }
-                        `,
-                        locale: {
-                          emptyText: `{{ t("No data yet", { ns: "${NAMESPACE}" }) }}`,
-                        },
+                properties: {
+                  header: {
+                    type: 'void',
+                    'x-component': 'PageHeader',
+                    'x-component-props': {
+                      className: classnames('pageHeaderCss'),
+                      style: {
+                        background: token.colorBgContainer,
+                        padding: '12px 24px 0 24px',
                       },
-                      properties: {
-                        item: {
-                          type: 'object',
-                          'x-decorator': 'List.Item',
-                          'x-component': Component,
-                          'x-read-pretty': true,
+                      title,
+                    },
+                    properties: {
+                      tabs: {
+                        type: 'void',
+                        'x-component': 'StatusTabs',
+                      },
+                    },
+                  },
+                  content: {
+                    type: 'void',
+                    'x-component': 'Layout.Content',
+                    'x-component-props': {
+                      className: contentClass,
+                      style: {
+                        padding: `${token.paddingPageVertical}px ${token.paddingPageHorizontal}px`,
+                      },
+                    },
+                    properties: {
+                      list: {
+                        type: 'array',
+                        'x-component': 'List',
+                        'x-component-props': {
+                          className: css`
+                            > .itemCss:not(:last-child) {
+                              border-bottom: none;
+                            }
+                          `,
+                          locale: {
+                            emptyText: `{{ t("No data yet", { ns: "${NAMESPACE}" }) }}`,
+                          },
+                        },
+                        properties: {
+                          item: {
+                            type: 'object',
+                            'x-decorator': 'List.Item',
+                            'x-component': Item,
+                            'x-read-pretty': true,
+                          },
                         },
                       },
                     },
                   },
+                  popup: {
+                    type: 'void',
+                    'x-decorator': PopupContext,
+                    'x-component': Detail,
+                  },
                 },
-              },
-            }}
-          />
-          <Outlet />
-        </SchemaComponentContext.Provider>
+              }}
+            />
+          </SchemaComponentContext.Provider>
+        </PopupRecordContext.Provider>
       </Layout>
     </Layout>
   );
@@ -296,7 +359,7 @@ function WorkflowTasksLink() {
   return types.length ? (
     <Tooltip title={lang('Workflow todos')}>
       <Button>
-        <Link to={`/admin/workflow/tasks/${types[0]}`} onClick={reload}>
+        <Link to={`/admin/workflow/tasks/${types[0]}/${TASK_STATUS.PENDING}`} onClick={reload}>
           <Badge count={total} size="small">
             <CheckCircleOutlined />
           </Badge>
@@ -357,7 +420,7 @@ function TasksCountsProvider(props: any) {
   return <TasksCountsContext.Provider value={{ reload, total, counts }}>{props.children}</TasksCountsContext.Provider>;
 }
 
-export const TasksProvider = (props: any) => {
+export function TasksProvider(props: any) {
   const isLoggedIn = useIsLoggedIn();
 
   const content = (
@@ -377,4 +440,4 @@ export const TasksProvider = (props: any) => {
   );
 
   return isLoggedIn ? <TasksCountsProvider>{content}</TasksCountsProvider> : content;
-};
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/index.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/index.tsx
index f17a548b3a..893f493509 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow/src/client/index.tsx
@@ -120,15 +120,10 @@ export default class PluginWorkflowClient extends Plugin {
     });
 
     this.router.add('admin.workflow.tasks', {
-      path: '/admin/workflow/tasks/:taskType/:status?',
+      path: '/admin/workflow/tasks/:taskType/:status/:popupId?',
       Component: WorkflowTasks,
     });
 
-    this.router.add('admin.workflow.tasks.popup', {
-      path: '/admin/workflow/tasks/:taskType/:status/popups/*',
-      Component: PagePopups,
-    });
-
     this.app.pluginSettingsManager.add(NAMESPACE, {
       icon: 'PartitionOutlined',
       title: `{{t("Workflow", { ns: "${NAMESPACE}" })}}`,
@@ -193,3 +188,4 @@ export { default as useStyles } from './style';
 export { Trigger, useTrigger } from './triggers';
 export * from './utils';
 export * from './variable';
+export { TASK_STATUS, usePopupRecordContext } from './WorkflowTasks';
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
index 698e2e7389..658054b29f 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
@@ -793,10 +793,16 @@ export default class PluginWorkflowServer extends Plugin {
   /**
    * @experimental
    */
-  public async toggleTaskStatus(task: WorkflowTaskModel, done: boolean, { transaction }: Transactionable) {
+  public async toggleTaskStatus(task: WorkflowTaskModel, on: boolean, { transaction }: Transactionable) {
     const { db } = this.app;
     const repository = db.getRepository('workflowTasks') as WorkflowTasksRepository;
-    if (done) {
+    if (on) {
+      await repository.updateOrCreate({
+        filterKeys: ['key', 'type'],
+        values: task,
+        transaction,
+      });
+    } else {
       await repository.destroy({
         filter: {
           type: task.type,
@@ -804,12 +810,6 @@ export default class PluginWorkflowServer extends Plugin {
         },
         transaction,
       });
-    } else {
-      await repository.updateOrCreate({
-        filterKeys: ['key', 'type'],
-        values: task,
-        transaction,
-      });
     }
 
     // NOTE:
diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json
index ff91f042f3..e5bc84504b 100644
--- a/packages/presets/nocobase/package.json
+++ b/packages/presets/nocobase/package.json
@@ -128,9 +128,7 @@
     "@nocobase/plugin-workflow-action-trigger",
     "@nocobase/plugin-workflow-aggregate",
     "@nocobase/plugin-workflow-delay",
-    "@nocobase/plugin-workflow-dynamic-calculation",
     "@nocobase/plugin-workflow-loop",
-    "@nocobase/plugin-workflow-manual",
     "@nocobase/plugin-workflow-parallel",
     "@nocobase/plugin-workflow-request",
     "@nocobase/plugin-workflow-sql",

From ba83b2b1be0032f73fe3053bb259576bde580d13 Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Mon, 14 Apr 2025 18:34:21 +0800
Subject: [PATCH 16/22] feat: support automatic data block refresh (#6591)
 (#6658)

* fix: update FilterContext to allow null parent value

* fix: refactor context usage from FilterContext to DataBlocksContext in FilterProvider and SchemaSettings

* feat: add highlight and unhighlight functionality for data blocks in SchemaSettings

* Revert "fix: refactor context usage from FilterContext to DataBlocksContext in FilterProvider and SchemaSettings"

This reverts commit a75c7002010785f1cfd2e78c4f5998d0194366bc.

* Revert "fix: update FilterContext to allow null parent value"

This reverts commit 6eb0b1989e20be8310f8dbce4e875e862123f2b3.

* feat: add AllDataBlocksProvider and integrate it into SchemaSettings and Page components

* feat: add BlocksSelector component and integrate data block refresh functionality in Action and SchemaSettings

* feat: optimize handleClick to use useMemo for better performance and refresh data blocks after onClick

* feat: add dialog visibility control in BlocksSelector for improved user experience

* fix: avoid error

* feat: add highlight and scroll tracking functionality for data blocks

* feat: add transition

* feat: add tootip

* fix: prevent closed dialog blocks from appearing in the BlocksSelector options

* fix: handle errors during block refresh to prevent crashes

* chore: fix build

* feat: add AllDataBlocksProvider to BlockTemplatePage and export from index

* feat: set width for AfterSuccess dialog to 700

* feat: wrap MobileRouter with AllDataBlocksProvider for improved data handling

* feat: export BlocksSelector component and integrate into AfterSuccess settings

* fix: ensure container visibility is managed correctly in highlightBlock and unhighlightBlock functions

* fix: remove unnecessary display property manipulation in highlightBlock and simplify unhighlightBlock logic

* chore: hide data refresh after sucess option from block template configure page

* fix: revert code format

---------

Co-authored-by: gchust <gchust@qq.com>
---
 .../src/filter-provider/FilterProvider.tsx    |  38 +++-
 .../src/filter-provider/highlightBlock.ts     |  47 +++++
 packages/core/client/src/locale/de-DE.json    |   5 +-
 packages/core/client/src/locale/en-US.json    |   6 +-
 packages/core/client/src/locale/es-ES.json    |   5 +-
 packages/core/client/src/locale/fr-FR.json    |   5 +-
 packages/core/client/src/locale/it-IT.json    |   5 +-
 packages/core/client/src/locale/ja-JP.json    |   5 +-
 packages/core/client/src/locale/ko-KR.json    |   5 +-
 packages/core/client/src/locale/nl-NL.json    |   9 +-
 packages/core/client/src/locale/pt-BR.json    |   5 +-
 packages/core/client/src/locale/ru-RU.json    |   5 +-
 packages/core/client/src/locale/tr-TR.json    |   5 +-
 packages/core/client/src/locale/uk-UA.json    |   5 +-
 packages/core/client/src/locale/zh-CN.json    |   5 +-
 packages/core/client/src/locale/zh-TW.json    |   5 +-
 .../antd/action/Action.Designer.tsx           | 118 ++++++++++--
 .../schema-component/antd/action/Action.tsx   |  27 ++-
 .../antd/page/AllDataBlocksProvider.tsx       |  81 ++++++++
 .../src/schema-component/antd/page/Page.tsx   |  17 +-
 .../src/schema-component/antd/page/index.ts   |   1 +
 .../src/schema-settings/SchemaSettings.tsx    | 146 +++++++-------
 .../SchemaSettingsConnectDataBlocks.tsx       |  18 +-
 .../src/client/BulkUpdateAction.Settings.tsx  |  20 ++
 .../src/client/utils.tsx                      | 180 +++++++++---------
 .../client/components/BlockTemplatePage.tsx   |   6 +-
 .../src/client/mobile/Mobile.tsx              |   5 +-
 27 files changed, 563 insertions(+), 216 deletions(-)
 create mode 100644 packages/core/client/src/filter-provider/highlightBlock.ts
 create mode 100644 packages/core/client/src/schema-component/antd/page/AllDataBlocksProvider.tsx

diff --git a/packages/core/client/src/filter-provider/FilterProvider.tsx b/packages/core/client/src/filter-provider/FilterProvider.tsx
index 6d1d9231ce..9b5e821195 100644
--- a/packages/core/client/src/filter-provider/FilterProvider.tsx
+++ b/packages/core/client/src/filter-provider/FilterProvider.tsx
@@ -19,6 +19,7 @@ import { mergeFilter, useAssociatedFields } from './utils';
 
 // @ts-ignore
 import React, { createContext, useCallback, useEffect, useMemo, useRef } from 'react';
+import { useAllDataBlocks } from '../schema-component/antd/page/AllDataBlocksProvider';
 
 enum FILTER_OPERATOR {
   AND = '$and',
@@ -71,6 +72,10 @@ export interface DataBlock {
    * manual: 只有当点击了筛选按钮，才会请求数据
    */
   dataLoadingMode?: 'auto' | 'manual';
+  /** 让整个区块悬浮起来 */
+  highlightBlock: () => void;
+  /** 取消悬浮 */
+  unhighlightBlock: () => void;
 }
 
 interface FilterContextValue {
@@ -124,7 +129,7 @@ export const DataBlockCollector = ({
   const field = useField();
   const fieldSchema = useFieldSchema();
   const associatedFields = useAssociatedFields();
-  const container = useRef(null);
+  const container = useRef<HTMLDivElement | null>(null);
   const dataLoadingMode = useDataLoadingMode();
 
   const shouldApplyFilter =
@@ -172,6 +177,34 @@ export const DataBlockCollector = ({
           field.data?.clearSelectedRowKeys?.();
         }
       },
+      highlightBlock() {
+        const dom = container.current;
+
+        if (!dom) return;
+
+        const designer = dom.querySelector('.ant-nb-schema-toolbar');
+        if (designer) {
+          designer.classList.remove(process.env.__E2E__ ? 'hidden-e2e' : 'hidden');
+        }
+        dom.style.boxShadow = '0 3px 12px rgba(0, 0, 0, 0.15)';
+        dom.style.transition = 'box-shadow 0.3s ease, transform 0.2s ease';
+        dom.scrollIntoView?.({
+          behavior: 'smooth',
+          block: 'start',
+        });
+      },
+      unhighlightBlock() {
+        const dom = container.current;
+
+        if (!dom) return;
+
+        const designer = dom.querySelector('.ant-nb-schema-toolbar');
+        if (designer) {
+          designer.classList.add(process.env.__E2E__ ? 'hidden-e2e' : 'hidden');
+        }
+        dom.style.boxShadow = 'none';
+        dom.style.transition = 'box-shadow 0.3s ease, transform 0.2s ease';
+      }
     });
   }, [
     associatedFields,
@@ -197,12 +230,14 @@ export const DataBlockCollector = ({
  */
 export const useFilterBlock = () => {
   const ctx = React.useContext(FilterContext);
+  const allDataBlocksCtx = useAllDataBlocks();
 
   // 有可能存在页面没有提供 FilterBlockProvider 的情况，比如内部使用的数据表管理页面
   const getDataBlocks = useCallback<() => DataBlock[]>(() => ctx?.getDataBlocks() || [], [ctx]);
 
   const recordDataBlocks = useCallback(
     (block: DataBlock) => {
+      allDataBlocksCtx.recordDataBlocks(block);
       const existingBlock = ctx?.getDataBlocks().find((item) => item.uid === block.uid);
 
       if (existingBlock) {
@@ -218,6 +253,7 @@ export const useFilterBlock = () => {
 
   const removeDataBlock = useCallback(
     (uid: string) => {
+      allDataBlocksCtx.removeDataBlock(uid);
       if (ctx?.getDataBlocks().every((item) => item.uid !== uid)) return;
       ctx?.setDataBlocks((prev) => prev.filter((item) => item.uid !== uid));
     },
diff --git a/packages/core/client/src/filter-provider/highlightBlock.ts b/packages/core/client/src/filter-provider/highlightBlock.ts
new file mode 100644
index 0000000000..1e02301461
--- /dev/null
+++ b/packages/core/client/src/filter-provider/highlightBlock.ts
@@ -0,0 +1,47 @@
+let container: HTMLElement | null = null;
+
+export const highlightBlock = (clonedBlockDom: HTMLElement, boxRect: DOMRect) => {
+  if (!container) {
+    container = document.createElement('div');
+    document.body.appendChild(container);
+    container.style.position = 'absolute';
+    container.style.transition = 'opacity 0.3s ease';
+    container.style.pointerEvents = 'none';
+  }
+
+  container.appendChild(clonedBlockDom);
+  container.style.opacity = '1';
+  container.style.width = `${boxRect.width}px`;
+  container.style.height = `${boxRect.height}px`;
+  container.style.top = `${boxRect.top}px`;
+  container.style.left = `${boxRect.left}px`;
+  container.style.zIndex = '2000';
+}
+
+export const unhighlightBlock = () => {
+  if (container) {
+    container.style.opacity = '0';
+    container.innerHTML = '';
+  }
+}
+
+export const startScrollEndTracking = (dom: HTMLElement & { _prevRect?: DOMRect; _timer?: any }, callback: () => void) => {
+  dom._timer = setInterval(() => {
+    const prevRect = dom._prevRect;
+    const currentRect = dom.getBoundingClientRect();
+
+    if (!prevRect || currentRect.top !== prevRect.top) {
+      dom._prevRect = currentRect;
+    } else {
+      clearInterval(dom._timer);
+      callback();
+    }
+  }, 100)
+}
+
+export const stopScrollEndTracking = (dom: HTMLElement & { _timer?: any }) => {
+  if (dom._timer) {
+    clearInterval(dom._timer);
+    dom._timer = null;
+  }
+}
diff --git a/packages/core/client/src/locale/de-DE.json b/packages/core/client/src/locale/de-DE.json
index 6ba834ee1b..fe9b43dd49 100644
--- a/packages/core/client/src/locale/de-DE.json
+++ b/packages/core/client/src/locale/de-DE.json
@@ -886,5 +886,8 @@
   "Are you sure you want to hide this tab?": "Sind Sie sicher, dass Sie diesen Tab ausblenden möchten?",
   "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Nach dem Ausblenden wird dieser Tab nicht mehr in der Tableiste angezeigt. Um ihn wieder anzuzeigen, müssen Sie zur Routenverwaltungsseite gehen, um ihn einzustellen.",
   "No pages yet, please configure first": "Noch keine Seiten, bitte zuerst konfigurieren",
-  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Klicken Sie auf das \"UI-Editor\"-Symbol in der oberen rechten Ecke, um den UI-Editor-Modus zu betreten"
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Klicken Sie auf das \"UI-Editor\"-Symbol in der oberen rechten Ecke, um den UI-Editor-Modus zu betreten",
+  "Refresh data blocks": "Aktualisieren Sie die Datenblöcke",
+  "Select data blocks to refresh": "Wählen Sie die Datenblöcke aus, die aktualisiert werden sollen.",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "Nach erfolgreicher Übermittlung werden die ausgewählten Datenblöcke automatisch aktualisiert."
 }
diff --git a/packages/core/client/src/locale/en-US.json b/packages/core/client/src/locale/en-US.json
index a6a79589d7..01eb15ae86 100644
--- a/packages/core/client/src/locale/en-US.json
+++ b/packages/core/client/src/locale/en-US.json
@@ -890,5 +890,9 @@
   "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode",
   "Deprecated": "Deprecated",
   "The following old template features have been deprecated and will be removed in next version.": "The following old template features have been deprecated and will be removed in next version.",
-  "Full permissions": "Full permissions"
+  "Full permissions": "Full permissions",
+  "Refresh data blocks": "Refresh data blocks",
+  "Select data blocks to refresh": "Select data blocks to refresh",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "After successful submission, the selected data blocks will be automatically refreshed."
+
 }
diff --git a/packages/core/client/src/locale/es-ES.json b/packages/core/client/src/locale/es-ES.json
index 249f150243..06e30c4dfa 100644
--- a/packages/core/client/src/locale/es-ES.json
+++ b/packages/core/client/src/locale/es-ES.json
@@ -807,5 +807,8 @@
   "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Haga clic en el icono \"Editor de UI\" en la esquina superior derecha para entrar en el modo de Editor de UI.",
   "Deprecated": "Obsoleto",
   "The following old template features have been deprecated and will be removed in next version.": "Las siguientes características de plantilla antigua han quedado obsoletas y se eliminarán en la próxima versión.",
-  "Full permissions": "Todos los derechos"
+  "Full permissions": "Todos los derechos",
+  "Refresh data blocks": "Actualizar bloques de datos",
+  "Select data blocks to refresh": "Actualizar bloques de datos",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "Después de enviar correctamente, los bloques de datos seleccionados se actualizarán automáticamente."
 }
diff --git a/packages/core/client/src/locale/fr-FR.json b/packages/core/client/src/locale/fr-FR.json
index 90ea8c5fb4..ab2c5fb444 100644
--- a/packages/core/client/src/locale/fr-FR.json
+++ b/packages/core/client/src/locale/fr-FR.json
@@ -827,5 +827,8 @@
   "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Cliquez sur l'icône \"Éditeur d'interface utilisateur\" dans le coin supérieur droit pour entrer en mode Éditeur d'interface utilisateur",
   "Deprecated": "Déprécié",
   "The following old template features have been deprecated and will be removed in next version.": "Les fonctionnalités des anciens modèles ont été dépréciées et seront supprimées dans la prochaine version.",
-  "Full permissions": "Tous les droits"
+  "Full permissions": "Tous les droits",
+  "Refresh data blocks": "Actualiser les blocs de données",
+  "Select data blocks to refresh": "Actualiser les blocs de données",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "Après une soumission réussie, les blocs de données sélectionnés seront automatiquement actualisés."
 }
diff --git a/packages/core/client/src/locale/it-IT.json b/packages/core/client/src/locale/it-IT.json
index 74b1d739f8..05a64aba8e 100644
--- a/packages/core/client/src/locale/it-IT.json
+++ b/packages/core/client/src/locale/it-IT.json
@@ -1082,5 +1082,8 @@
   "Are you sure you want to hide this tab?": "Sei sicuro di voler nascondere questa scheda?",
   "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it.": "Dopo averla nascosta, questa scheda non apparirà più nella barra delle schede. Per mostrarla di nuovo, devi andare alla pagina di gestione dei percorsi per configurarlo.",
   "No pages yet, please configure first": "Nessuna pagina ancora, si prega di configurare prima",
-  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Cliquez sur l'icône \"Éditeur d'interface utilisateur\" dans le coin supérieur droit pour entrer en mode Éditeur d'interface utilisateur"
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Cliquez sur l'icône \"Éditeur d'interface utilisateur\" dans le coin supérieur droit pour entrer en mode Éditeur d'interface utilisateur",
+  "Refresh data blocks": "Aggiorna blocchi di dati",
+  "Select data blocks to refresh": "Aggiorna blocchi di dati",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "Dopo una soumission réussie, les blocs de données sélectionnés seront automatiquement actualisés."
 }
diff --git a/packages/core/client/src/locale/ja-JP.json b/packages/core/client/src/locale/ja-JP.json
index 91e8b63b41..1918d9968f 100644
--- a/packages/core/client/src/locale/ja-JP.json
+++ b/packages/core/client/src/locale/ja-JP.json
@@ -1045,5 +1045,8 @@
   "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "ユーザーインターフェースエディターモードに入るには、右上隅の「UIエディタ」アイコンをクリックしてください",
   "Deprecated": "非推奨",
   "The following old template features have been deprecated and will be removed in next version.": "次の古いテンプレート機能は非推奨になり、次のバージョンで削除されます。",
-  "Full permissions": "すべての権限"
+  "Full permissions": "すべての権限",
+  "Refresh data blocks": "データブロックを更新",
+  "Select data blocks to refresh": "データブロックを選択して更新",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "送信後、選択したデータブロックが自動的に更新されます。"
 }
diff --git a/packages/core/client/src/locale/ko-KR.json b/packages/core/client/src/locale/ko-KR.json
index 4efe35e20f..e007ae97f7 100644
--- a/packages/core/client/src/locale/ko-KR.json
+++ b/packages/core/client/src/locale/ko-KR.json
@@ -918,5 +918,8 @@
   "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "사용자 인터페이스 편집기 모드에 들어가려면 오른쪽 상단의 \"UI 편집기\" 아이콘을 클릭하십시오",
   "Deprecated": "사용 중단됨",
   "The following old template features have been deprecated and will be removed in next version.": "다음 오래된 템플릿 기능은 사용 중단되었으며 다음 버전에서 제거될 것입니다.",
-  "Full permissions": "모든 권한"
+  "Full permissions": "모든 권한",
+  "Refresh data blocks": "데이터 블록 새로 고침",
+  "Select data blocks to refresh": "데이터 블록을 선택하여 새로 고침",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "전송 후, 선택한 데이터 블록이 자동으로 새로 고쳐집니다."
 }
diff --git a/packages/core/client/src/locale/nl-NL.json b/packages/core/client/src/locale/nl-NL.json
index 9a945ea0bb..1e58c0bd68 100644
--- a/packages/core/client/src/locale/nl-NL.json
+++ b/packages/core/client/src/locale/nl-NL.json
@@ -1,7 +1,7 @@
 {
     "Display <1><0>10</0><1>20</1><2>50</2><3>100</3></1> items per page": "Toon <1><0>10</0><1>20</1><2>50</2><3>100</3></1> items per pagina",
     "Page number": "Paginanummer",
-    "Page size": "Paginagrootte",   
+    "Page size": "Paginagrootte",
     "Meet <1><0>All</0><1>Any</1></1> conditions in the group": "Voldoe aan <1><0>Alle</0><1>Een</1></1> voorwaarde(n) in de groep",
     "Open in<1><0>Modal</0><1>Drawer</1><2>Window</2></1>": "Open in<1><0>Modal</0><1>Drawer</1><2>Venster</2></1>",
     "{{count}} filter items": "{{count}} filter items",
@@ -1054,5 +1054,8 @@
     "Font Size（px）": "Lettergrootte（px）",
     "Font Weight": "Letterdikte",
     "Font Style": "Letterstijl",
-    "Italic": "Cursief"
-}
\ No newline at end of file
+    "Italic": "Cursief",
+    "Refresh data blocks": "Vernieuw gegevensblokken",
+    "Select data blocks to refresh": "Selecteer gegevensblokken om te vernieuwen",
+    "After successful submission, the selected data blocks will be automatically refreshed.": "Na succesvolle indiening worden de geselecteerde gegevensblokken automatisch vernieuwd."
+}
diff --git a/packages/core/client/src/locale/pt-BR.json b/packages/core/client/src/locale/pt-BR.json
index 2b07be5950..1909aaaa92 100644
--- a/packages/core/client/src/locale/pt-BR.json
+++ b/packages/core/client/src/locale/pt-BR.json
@@ -784,5 +784,8 @@
   "The following old template features have been deprecated and will be removed in next version.": "As seguintes funcionalidades de modelo antigo foram descontinuadas e serão removidas na próxima versão.",
   "Full permissions": "Todas as permissões",
   "No pages yet, please configure first": "Ainda não há páginas, por favor configure primeiro",
-  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Cliquez sur l'icône \"Éditeur d'interface utilisateur\" dans le coin supérieur droit pour entrer en mode Éditeur d'interface utilisateur"
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Cliquez sur l'icône \"Éditeur d'interface utilisateur\" dans le coin supérieur droit pour entrer en mode Éditeur d'interface utilisateur",
+  "Refresh data blocks": "Atualizar blocos de dados",
+  "Select data blocks to refresh": "Selecionar blocos de dados para atualizar",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "Após a atualização em massa bem sucedida."
 }
diff --git a/packages/core/client/src/locale/ru-RU.json b/packages/core/client/src/locale/ru-RU.json
index ec108187f0..22c864ac35 100644
--- a/packages/core/client/src/locale/ru-RU.json
+++ b/packages/core/client/src/locale/ru-RU.json
@@ -613,5 +613,8 @@
   "The following old template features have been deprecated and will be removed in next version.": "Следующие старые функции шаблонов устарели и будут удалены в следующей версии.",
   "Full permissions": "Полные права",
   "No pages yet, please configure first": "Пока нет страниц, пожалуйста, настройте сначала",
-  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Нажмите на значок \"Редактор пользовательского интерфейса\" в правом верхнем углу, чтобы войти в режим редактора пользовательского интерфейса"
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Нажмите на значок \"Редактор пользовательского интерфейса\" в правом верхнем углу, чтобы войти в режим редактора пользовательского интерфейса",
+  "Refresh data blocks": "Обновить блоки данных",
+  "Select data blocks to refresh": "Выберите блоки данных для обновления",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "После успешной отправки выбранные блоки данных будут автоматически обновлены."
 }
diff --git a/packages/core/client/src/locale/tr-TR.json b/packages/core/client/src/locale/tr-TR.json
index 9a8d090dec..390c4ca0f2 100644
--- a/packages/core/client/src/locale/tr-TR.json
+++ b/packages/core/client/src/locale/tr-TR.json
@@ -611,5 +611,8 @@
   "The following old template features have been deprecated and will be removed in next version.": "Aşağıdaki eski şablon özellikleri kullanımdan kaldırıldı ve gelecek sürümlerde kaldırılacaktır.",
   "Full permissions": "Tüm izinler",
   "No pages yet, please configure first": "Henüz sayfa yok, lütfen önce yapılandırın",
-  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Kullanıcı arayüzü düzenleyici moduna girmek için sağ üst köşedeki \"Kullanıcı Arayüzü Düzenleyici\" simgesine tıklayın"
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Kullanıcı arayüzü düzenleyici moduna girmek için sağ üst köşedeki \"Kullanıcı Arayüzü Düzenleyici\" simgesine tıklayın",
+  "Refresh data blocks": "Yenile veri blokları",
+  "Select data blocks to refresh": "Veri bloklarını yenilemek için seçin",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "Başarılı bir şekilde gönderildikten sonra, seçilen veri blokları otomatik olarak yenilenecektir."
 }
diff --git a/packages/core/client/src/locale/uk-UA.json b/packages/core/client/src/locale/uk-UA.json
index 6d1d8c7ad5..91bf069e1d 100644
--- a/packages/core/client/src/locale/uk-UA.json
+++ b/packages/core/client/src/locale/uk-UA.json
@@ -827,5 +827,8 @@
   "The following old template features have been deprecated and will be removed in next version.": "Наступні старі функції шаблонів були застарілі і будуть видалені в наступній версії.",
   "Full permissions": "Повні права",
   "No pages yet, please configure first": "Ще немає сторінок, будь ласка, спочатку налаштуйте",
-  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Натисніть на значок \"Редактор користувацького інтерфейсу\" в правому верхньому куті, щоб увійти в режим редактора користувацького інтерфейсу."
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "Натисніть на значок \"Редактор користувацького інтерфейсу\" в правому верхньому куті, щоб увійти в режим редактора користувацького інтерфейсу.",
+  "Refresh data blocks": "Оновити дані блоків",
+  "Select data blocks to refresh": "Виберіть блоки даних для оновлення",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "Після успішної подачі вибрані блоки даних будуть автоматично оновлені."
 }
diff --git a/packages/core/client/src/locale/zh-CN.json b/packages/core/client/src/locale/zh-CN.json
index ccfd6649a2..8e27dc701d 100644
--- a/packages/core/client/src/locale/zh-CN.json
+++ b/packages/core/client/src/locale/zh-CN.json
@@ -167,6 +167,8 @@
   "Year": "年",
   "QuarterYear": "季度",
   "Select grouping field": "选择分组字段",
+  "Refresh data blocks": "刷新数据区块",
+  "Select data blocks to refresh": "选择要刷新的数据区块",
   "Media": "多媒体",
   "Markdown": "Markdown",
   "Wysiwyg": "富文本",
@@ -1099,5 +1101,6 @@
   "Response record":"响应结果记录",
   "Colon":"冒号",
   "No pages yet, please configure first": "暂无页面，请先配置",
-  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "点击右上角的“界面配置”图标，进入界面配置模式"
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "点击右上角的“界面配置”图标，进入界面配置模式",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "提交成功后，会自动刷新这里选中的数据区块。"
 }
diff --git a/packages/core/client/src/locale/zh-TW.json b/packages/core/client/src/locale/zh-TW.json
index a7b342631e..77a012fe3f 100644
--- a/packages/core/client/src/locale/zh-TW.json
+++ b/packages/core/client/src/locale/zh-TW.json
@@ -918,5 +918,8 @@
   "The following old template features have been deprecated and will be removed in next version.": "以下舊的模板功能已棄用，將在下個版本移除。",
   "Full permissions": "完全權限",
   "No pages yet, please configure first": "尚未配置頁面，請先配置",
-  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "點擊右上角的 \"介面設定\" 圖示進入介面設定模式"
+  "Click the \"UI Editor\" icon in the upper right corner to enter the UI Editor mode": "點擊右上角的 \"介面設定\" 圖示進入介面設定模式",
+  "Refresh data blocks": "刷新數據區塊",
+  "Select data blocks to refresh": "選擇要刷新的數據區塊",
+  "After successful submission, the selected data blocks will be automatically refreshed.": "提交成功後，選中的數據區塊將自動刷新。"
 }
diff --git a/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx b/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx
index cc37a46860..0f24cf6b72 100644
--- a/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx
+++ b/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx
@@ -9,14 +9,16 @@
 
 import { ISchema, useField, useFieldSchema } from '@formily/react';
 import { isValid, uid } from '@formily/shared';
-import { ModalProps } from 'antd';
-import React, { useCallback } from 'react';
+import { ModalProps, Select } from 'antd';
+import React, { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCompile, useDesignable } from '../..';
-import { isInitializersSame, useApp } from '../../../application';
+import { isInitializersSame, useApp, usePlugin } from '../../../application';
+import { useGlobalVariable } from '../../../application/hooks/useGlobalVariable';
 import { SchemaSettingOptions, SchemaSettings } from '../../../application/schema-settings';
 import { useSchemaToolbar } from '../../../application/schema-toolbar';
 import { useCollectionManager_deprecated, useCollection_deprecated } from '../../../collection-manager';
+import { highlightBlock, startScrollEndTracking, stopScrollEndTracking, unhighlightBlock } from '../../../filter-provider/highlightBlock';
 import { FlagProvider } from '../../../flag-provider';
 import { SaveMode } from '../../../modules/actions/submit/createSubmitActionSettings';
 import { useOpenModeContext } from '../../../modules/popup/OpenModeProvider';
@@ -32,10 +34,10 @@ import {
   SchemaSettingsSwitchItem,
 } from '../../../schema-settings/SchemaSettings';
 import { DefaultValueProvider } from '../../../schema-settings/hooks/useIsAllowToSetDefaultValue';
+import { useAllDataBlocks } from '../page/AllDataBlocksProvider';
 import { useLinkageAction } from './hooks';
-import { requestSettingsSchema } from './utils';
 import { useAfterSuccessOptions } from './hooks/useGetAfterSuccessVariablesOptions';
-import { useGlobalVariable } from '../../../application/hooks/useGlobalVariable';
+import { requestSettingsSchema } from './utils';
 
 const MenuGroup = (props) => {
   return props.children;
@@ -294,27 +296,105 @@ const useVariableProps = (environmentVariables) => {
   };
 };
 
+const hideDialog = (dialogClassName: string) => {
+  const dialogMask = document.querySelector<HTMLElement>(`.${dialogClassName} > .ant-modal-mask`);
+  const dialogWrap = document.querySelector<HTMLElement>(`.${dialogClassName} > .ant-modal-wrap`);
+  if (dialogMask) {
+    dialogMask.style.opacity = '0';
+    dialogMask.style.transition = 'opacity 0.5s ease';
+  }
+  if (dialogWrap) {
+    dialogWrap.style.opacity = '0';
+    dialogWrap.style.transition = 'opacity 0.5s ease';
+  }
+}
+
+const showDialog = (dialogClassName: string) => {
+  const dialogMask = document.querySelector<HTMLElement>(`.${dialogClassName} > .ant-modal-mask`);
+  const dialogWrap = document.querySelector<HTMLElement>(`.${dialogClassName} > .ant-modal-wrap`);
+  if (dialogMask) {
+    dialogMask.style.opacity = '1';
+    dialogMask.style.transition = 'opacity 0.5s ease';
+  }
+  if (dialogWrap) {
+    dialogWrap.style.opacity = '1';
+    dialogWrap.style.transition = 'opacity 0.5s ease';
+  }
+}
+
+export const BlocksSelector = (props) => {
+  const { getAllDataBlocks } = useAllDataBlocks();
+  const allDataBlocks = getAllDataBlocks();
+  const compile = useCompile();
+  const { t } = useTranslation();
+
+  // 转换 allDataBlocks 为 Select 选项
+  const options = useMemo(() => {
+    return allDataBlocks.map(block => {
+      // 防止列表中出现已关闭的弹窗中的区块
+      if (!block.dom?.isConnected) {
+        return null;
+      }
+
+      const title = `${compile(block.collection.title)} #${block.uid.slice(0, 4)}`;
+      return {
+        label: title,
+        value: block.uid,
+        onMouseEnter() {
+          block.highlightBlock();
+          hideDialog('dialog-after-successful-submission');
+          startScrollEndTracking(block.dom, () => {
+            highlightBlock(block.dom.cloneNode(true) as HTMLElement, block.dom.getBoundingClientRect());
+          });
+        },
+        onMouseLeave() {
+          block.unhighlightBlock();
+          showDialog('dialog-after-successful-submission');
+          stopScrollEndTracking(block.dom);
+          unhighlightBlock();
+        }
+      }
+    }).filter(Boolean);
+  }, [allDataBlocks, t]);
+
+  return (
+    <Select
+      value={props.value}
+      mode="multiple"
+      allowClear
+      placeholder={t('Select data blocks to refresh')}
+      options={options}
+      onChange={props.onChange}
+    />
+  );
+}
+
 export function AfterSuccess() {
   const { dn } = useDesignable();
   const { t } = useTranslation();
   const fieldSchema = useFieldSchema();
   const { onSuccess } = fieldSchema?.['x-action-settings'] || {};
   const environmentVariables = useGlobalVariable('$env');
+  const templatePlugin: any = usePlugin('@nocobase/plugin-block-template');
+  const isInBlockTemplateConfigPage = templatePlugin?.isInBlockTemplateConfigPage?.();
+
   return (
     <SchemaSettingsModalItem
+      dialogRootClassName='dialog-after-successful-submission'
+      width={700}
       title={t('After successful submission')}
       initialValues={
         onSuccess
           ? {
-              actionAfterSuccess: onSuccess?.redirecting ? 'redirect' : 'previous',
-              ...onSuccess,
-            }
+            actionAfterSuccess: onSuccess?.redirecting ? 'redirect' : 'previous',
+            ...onSuccess,
+          }
           : {
-              manualClose: false,
-              redirecting: false,
-              successMessage: '{{t("Saved successfully")}}',
-              actionAfterSuccess: 'previous',
-            }
+            manualClose: false,
+            redirecting: false,
+            successMessage: '{{t("Saved successfully")}}',
+            actionAfterSuccess: 'previous',
+          }
       }
       schema={
         {
@@ -382,6 +462,18 @@ export function AfterSuccess() {
               // eslint-disable-next-line react-hooks/rules-of-hooks
               'x-use-component-props': () => useVariableProps(environmentVariables),
             },
+            blocksToRefresh: {
+              type: 'array',
+              title: t('Refresh data blocks'),
+              'x-decorator': 'FormItem',
+              'x-use-decorator-props': () => {
+                return {
+                  tooltip: t('After successful submission, the selected data blocks will be automatically refreshed.'),
+                };
+              },
+              'x-component': BlocksSelector,
+              'x-hidden': isInBlockTemplateConfigPage, // 模板配置页面暂不支持该配置
+            },
           },
         } as ISchema
       }
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 3f5c7df1e7..53c0f11b22 100644
--- a/packages/core/client/src/schema-component/antd/action/Action.tsx
+++ b/packages/core/client/src/schema-component/antd/action/Action.tsx
@@ -52,10 +52,11 @@ import { NAMESPACE_UI_SCHEMA } from '../../../i18n/constant';
 
 // 这个要放到最下面，否则会导致前端单测失败
 import { useApp } from '../../../application';
+import { useAllDataBlocks } from '../page/AllDataBlocksProvider';
 
 const useA = () => {
   return {
-    async run() {},
+    async run() { },
   };
 };
 
@@ -101,6 +102,8 @@ export const Action: ComposedAction = withDynamicSchemaProps(
     const { getAriaLabel } = useGetAriaLabelOfAction(title);
     const parentRecordData = useCollectionParentRecordData();
     const app = useApp();
+    const { getAllDataBlocks } = useAllDataBlocks();
+
     useEffect(() => {
       if (field.stateOfLinkageRules) {
         setInitialActionState(field);
@@ -131,6 +134,26 @@ export const Action: ComposedAction = withDynamicSchemaProps(
       [onMouseEnter],
     );
 
+    const handleClick = useMemo(() => {
+      return onClick && (async (e, callback) => {
+        await onClick?.(e, callback);
+
+        // 执行完 onClick 之后，刷新数据区块
+        const blocksToRefresh = fieldSchema['x-action-settings']?.onSuccess?.blocksToRefresh || []
+        if (blocksToRefresh.length > 0) {
+          getAllDataBlocks().forEach((block) => {
+            if (blocksToRefresh.includes(block.uid)) {
+              try {
+                block.service?.refresh();
+              } catch (error) {
+                console.error('Failed to refresh block:', block.uid, error);
+              }
+            }
+          });
+        }
+      });
+    }, [onClick, fieldSchema, getAllDataBlocks]);
+
     return (
       <InternalAction
         containerRefKey={containerRefKey}
@@ -144,7 +167,7 @@ export const Action: ComposedAction = withDynamicSchemaProps(
         className={className}
         type={props.type}
         Designer={Designer}
-        onClick={onClick}
+        onClick={handleClick}
         confirm={confirm}
         confirmTitle={confirmTitle}
         popover={popover}
diff --git a/packages/core/client/src/schema-component/antd/page/AllDataBlocksProvider.tsx b/packages/core/client/src/schema-component/antd/page/AllDataBlocksProvider.tsx
new file mode 100644
index 0000000000..a17c163e13
--- /dev/null
+++ b/packages/core/client/src/schema-component/antd/page/AllDataBlocksProvider.tsx
@@ -0,0 +1,81 @@
+import _ from "lodash";
+import React, { useCallback } from "react";
+import { DataBlock } from "../../../filter-provider/FilterProvider";
+
+export const AllDataBlocksContext = React.createContext<{
+  getAllDataBlocks: () => DataBlock[];
+  setAllDataBlocks: (
+    value: DataBlock[] | ((prev: DataBlock[]) => DataBlock[])
+  ) => void;
+}>({
+  getAllDataBlocks: () => [],
+  setAllDataBlocks: () => { },
+});
+
+/**
+ * 保存当前页面中所有数据区块的信息（包括弹窗中的）
+ * @param props
+ * @returns
+ */
+export const AllDataBlocksProvider: React.FC = (props) => {
+  const dataBlocksRef = React.useRef<DataBlock[]>([]);
+  const setAllDataBlocks = React.useCallback((value) => {
+    if (typeof value === "function") {
+      dataBlocksRef.current = value(dataBlocksRef.current);
+    } else {
+      dataBlocksRef.current = value;
+    }
+  }, []);
+  const getAllDataBlocks = React.useCallback(
+    () => dataBlocksRef.current,
+    []
+  );
+  const value = React.useMemo(
+    () => ({ getAllDataBlocks, setAllDataBlocks }),
+    [getAllDataBlocks, setAllDataBlocks]
+  );
+  return <AllDataBlocksContext.Provider value={value}>{props.children}</AllDataBlocksContext.Provider>;
+}
+
+export const useAllDataBlocks = () => {
+  const ctx = React.useContext(AllDataBlocksContext);
+
+  const getAllDataBlocks = useCallback<() => DataBlock[]>(() => ctx?.getAllDataBlocks() || [], [ctx]);
+
+  const recordDataBlocks = useCallback(
+    (block: DataBlock) => {
+      const existingBlock = ctx?.getAllDataBlocks().find((item) => item.uid === block.uid);
+
+      if (existingBlock) {
+        // 这里的值有可能会变化，所以需要更新
+        Object.assign(existingBlock, block);
+        return;
+      }
+
+      ctx?.setAllDataBlocks((prev) => [...prev, block]);
+    },
+    [ctx],
+  );
+
+  const removeDataBlock = useCallback(
+    (uid: string) => {
+      if (ctx?.getAllDataBlocks().every((item) => item.uid !== uid)) return;
+      ctx?.setAllDataBlocks((prev) => prev.filter((item) => item.uid !== uid));
+    },
+    [ctx],
+  );
+
+  if (!ctx) {
+    return {
+      recordDataBlocks: _.noop,
+      removeDataBlock: _.noop,
+      getAllDataBlocks,
+    };
+  }
+
+  return {
+    recordDataBlocks,
+    removeDataBlock,
+    getAllDataBlocks,
+  };
+};
diff --git a/packages/core/client/src/schema-component/antd/page/Page.tsx b/packages/core/client/src/schema-component/antd/page/Page.tsx
index dfad51a71e..374997c7f2 100644
--- a/packages/core/client/src/schema-component/antd/page/Page.tsx
+++ b/packages/core/client/src/schema-component/antd/page/Page.tsx
@@ -13,6 +13,7 @@ import { css } from '@emotion/css';
 import { FormLayout } from '@formily/antd-v5';
 import { SchemaOptionsContext, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
+import { transformMultiColumnToSingleColumn } from '@nocobase/utils/client';
 import { Button, Tabs } from 'antd';
 import classNames from 'classnames';
 import React, { FC, memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
@@ -48,10 +49,10 @@ import { useCompile, useDesignable } from '../../hooks';
 import { useToken } from '../__builtins__';
 import { ErrorFallback } from '../error-fallback';
 import { useMenuDragEnd, useNocoBaseRoutes } from '../menu/Menu';
+import { AllDataBlocksProvider } from './AllDataBlocksProvider';
 import { useStyles } from './Page.style';
 import { PageDesigner, PageTabDesigner } from './PageTabDesigner';
 import { PopupRouteContextResetter } from './PopupRouteContextResetter';
-import { transformMultiColumnToSingleColumn } from '@nocobase/utils/client';
 import { NAMESPACE_UI_SCHEMA } from '../../../i18n/constant';
 
 interface PageProps {
@@ -128,12 +129,14 @@ export const Page = React.memo((props: PageProps) => {
   }
 
   return (
-    <div className={`${componentCls} ${hashId} ${antTableCell}`} style={pageActive ? null : hiddenStyle}>
-      {/* Avoid passing values down to improve rendering performance */}
-      <CurrentTabUidContext.Provider value={''}>
-        <InternalPage currentTabUid={tabUidRef.current} className={props.className} />
-      </CurrentTabUidContext.Provider>
-    </div>
+    <AllDataBlocksProvider>
+      <div className={`${componentCls} ${hashId} ${antTableCell}`} style={pageActive ? null : hiddenStyle}>
+        {/* Avoid passing values down to improve rendering performance */}
+        <CurrentTabUidContext.Provider value={''}>
+          <InternalPage currentTabUid={tabUidRef.current} className={props.className} />
+        </CurrentTabUidContext.Provider>
+      </div>
+    </AllDataBlocksProvider>
   );
 });
 
diff --git a/packages/core/client/src/schema-component/antd/page/index.ts b/packages/core/client/src/schema-component/antd/page/index.ts
index 5f26f7ed9d..d9b27c01a1 100644
--- a/packages/core/client/src/schema-component/antd/page/index.ts
+++ b/packages/core/client/src/schema-component/antd/page/index.ts
@@ -14,3 +14,4 @@ export { PagePopups, useCurrentPopupContext } from './PagePopups';
 export { getPopupPathFromParams, getStoredPopupContext, storePopupContext, withSearchParams } from './pagePopupUtils';
 export * from './PageTab.Settings';
 export { PopupSettingsProvider, usePopupSettings } from './PopupSettingsProvider';
+export * from './AllDataBlocksProvider';
diff --git a/packages/core/client/src/schema-settings/SchemaSettings.tsx b/packages/core/client/src/schema-settings/SchemaSettings.tsx
index ed058d67c0..84e1ec4271 100644
--- a/packages/core/client/src/schema-settings/SchemaSettings.tsx
+++ b/packages/core/client/src/schema-settings/SchemaSettings.tsx
@@ -96,6 +96,7 @@ import { useRecord } from '../record-provider';
 import { ActionContextProvider } from '../schema-component/antd/action/context';
 import { SubFormProvider, useSubFormValue } from '../schema-component/antd/association-field/hooks';
 import { FormDialog } from '../schema-component/antd/form-dialog';
+import { AllDataBlocksContext } from '../schema-component/antd/page/AllDataBlocksProvider';
 import { SchemaComponentContext } from '../schema-component/context';
 import { FormProvider } from '../schema-component/core/FormProvider';
 import { RemoteSchemaComponent } from '../schema-component/core/RemoteSchemaComponent';
@@ -364,8 +365,8 @@ export const SchemaSettingsFormItemTemplate = function FormItemTemplate(props) {
                         required: true,
                         default: collection
                           ? `${compile(collection?.title || collection?.name)}_${t(
-                              componentTitle[componentName] || componentName,
-                            )}`
+                            componentTitle[componentName] || componentName,
+                          )}`
                           : t(componentTitle[componentName] || componentName),
                         'x-decorator': 'FormItem',
                         'x-component': 'Input',
@@ -566,7 +567,7 @@ export const SchemaSettingsRemove: FC<SchemaSettingsRemoveProps> = (props) => {
 
 export interface SchemaSettingsSelectItemProps
   extends Omit<SchemaSettingsItemProps, 'onChange' | 'onClick'>,
-    Omit<SelectWithTitleProps, 'title' | 'defaultValue'> {
+  Omit<SelectWithTitleProps, 'title' | 'defaultValue'> {
   value?: SelectWithTitleProps['defaultValue'];
   optionRender?: (option: any, info: { index: number }) => React.ReactNode;
 }
@@ -816,6 +817,7 @@ export interface SchemaSettingsModalItemProps {
   noRecord?: boolean;
   /** 自定义 Modal 上下文 */
   ModalContextProvider?: React.FC;
+  dialogRootClassName?: string;
 }
 export const SchemaSettingsModalItem: FC<SchemaSettingsModalItemProps> = (props) => {
   const {
@@ -830,6 +832,7 @@ export const SchemaSettingsModalItem: FC<SchemaSettingsModalItemProps> = (props)
     width = 'fit-content',
     noRecord = false,
     ModalContextProvider = (props) => <>{props.children}</>,
+    dialogRootClassName,
     ...others
   } = props;
   const options = useContext(SchemaOptionsContext);
@@ -850,6 +853,7 @@ export const SchemaSettingsModalItem: FC<SchemaSettingsModalItemProps> = (props)
   const { getOperators } = useOperators();
   const locationSearch = useLocationSearch();
   const variableOptions = useVariables();
+  const allDataBlocks = useContext(AllDataBlocksContext);
 
   // 解决变量`当前对象`值在弹窗中丢失的问题
   const { formValue: subFormValue, collection: subFormCollection, parent } = useSubFormValue();
@@ -870,41 +874,42 @@ export const SchemaSettingsModalItem: FC<SchemaSettingsModalItemProps> = (props)
         const values = asyncGetInitialValues ? await asyncGetInitialValues() : initialValues;
         const schema = _.isFunction(props.schema) ? props.schema() : props.schema;
         FormDialog(
-          { title: schema.title || title, width },
+          { title: schema.title || title, width, rootClassName: dialogRootClassName },
           () => {
             return (
-              <ModalContextProvider>
-                <CollectOperators defaultOperators={getOperators()}>
-                  <VariablesContext.Provider value={variableOptions}>
-                    <BlockContext.Provider value={blockOptions}>
-                      <VariablePopupRecordProvider
-                        recordData={popupRecordVariable?.value}
-                        collection={popupRecordVariable?.collection}
-                        parent={{
-                          recordData: parentPopupRecordVariable?.value,
-                          collection: parentPopupRecordVariable?.collection,
-                        }}
-                      >
-                        <CollectionRecordProvider record={noRecord ? null : record}>
-                          <CurrentRecordContextProvider {...currentRecordCtx}>
-                            <FormBlockContext.Provider value={formCtx}>
-                              <SubFormProvider value={{ value: subFormValue, collection: subFormCollection, parent }}>
-                                <FormActiveFieldsProvider
-                                  name="form"
-                                  getActiveFieldsName={upLevelActiveFields?.getActiveFieldsName}
-                                >
-                                  <LocationSearchContext.Provider value={locationSearch}>
-                                    <BlockRequestContext_deprecated.Provider value={ctx}>
-                                      <DataSourceApplicationProvider dataSourceManager={dm} dataSource={dataSourceKey}>
-                                        <AssociationOrCollectionProvider
-                                          allowNull
-                                          collection={collection?.name}
-                                          association={association}
-                                        >
-                                          <SchemaComponentOptions scope={options.scope} components={options.components}>
-                                            <FormLayout
-                                              layout={'vertical'}
-                                              className={css`
+              <AllDataBlocksContext.Provider value={allDataBlocks}>
+                <ModalContextProvider>
+                  <CollectOperators defaultOperators={getOperators()}>
+                    <VariablesContext.Provider value={variableOptions}>
+                      <BlockContext.Provider value={blockOptions}>
+                        <VariablePopupRecordProvider
+                          recordData={popupRecordVariable?.value}
+                          collection={popupRecordVariable?.collection}
+                          parent={{
+                            recordData: parentPopupRecordVariable?.value,
+                            collection: parentPopupRecordVariable?.collection,
+                          }}
+                        >
+                          <CollectionRecordProvider record={noRecord ? null : record}>
+                            <CurrentRecordContextProvider {...currentRecordCtx}>
+                              <FormBlockContext.Provider value={formCtx}>
+                                <SubFormProvider value={{ value: subFormValue, collection: subFormCollection, parent }}>
+                                  <FormActiveFieldsProvider
+                                    name="form"
+                                    getActiveFieldsName={upLevelActiveFields?.getActiveFieldsName}
+                                  >
+                                    <LocationSearchContext.Provider value={locationSearch}>
+                                      <BlockRequestContext_deprecated.Provider value={ctx}>
+                                        <DataSourceApplicationProvider dataSourceManager={dm} dataSource={dataSourceKey}>
+                                          <AssociationOrCollectionProvider
+                                            allowNull
+                                            collection={collection?.name}
+                                            association={association}
+                                          >
+                                            <SchemaComponentOptions scope={options.scope} components={options.components}>
+                                              <FormLayout
+                                                layout={'vertical'}
+                                                className={css`
                                                 // screen > 576px
                                                 @media (min-width: 576px) {
                                                   min-width: 520px;
@@ -915,34 +920,35 @@ export const SchemaSettingsModalItem: FC<SchemaSettingsModalItemProps> = (props)
                                                   min-width: 320px;
                                                 }
                                               `}
-                                            >
-                                              <ApplicationContext.Provider value={app}>
-                                                <APIClientProvider apiClient={apiClient}>
-                                                  <ConfigProvider locale={locale}>
-                                                    <SchemaComponent
-                                                      components={components}
-                                                      scope={scope}
-                                                      schema={schema}
-                                                    />
-                                                  </ConfigProvider>
-                                                </APIClientProvider>
-                                              </ApplicationContext.Provider>
-                                            </FormLayout>
-                                          </SchemaComponentOptions>
-                                        </AssociationOrCollectionProvider>
-                                      </DataSourceApplicationProvider>
-                                    </BlockRequestContext_deprecated.Provider>
-                                  </LocationSearchContext.Provider>
-                                </FormActiveFieldsProvider>
-                              </SubFormProvider>
-                            </FormBlockContext.Provider>
-                          </CurrentRecordContextProvider>
-                        </CollectionRecordProvider>
-                      </VariablePopupRecordProvider>
-                    </BlockContext.Provider>
-                  </VariablesContext.Provider>
-                </CollectOperators>
-              </ModalContextProvider>
+                                              >
+                                                <ApplicationContext.Provider value={app}>
+                                                  <APIClientProvider apiClient={apiClient}>
+                                                    <ConfigProvider locale={locale}>
+                                                      <SchemaComponent
+                                                        components={components}
+                                                        scope={scope}
+                                                        schema={schema}
+                                                      />
+                                                    </ConfigProvider>
+                                                  </APIClientProvider>
+                                                </ApplicationContext.Provider>
+                                              </FormLayout>
+                                            </SchemaComponentOptions>
+                                          </AssociationOrCollectionProvider>
+                                        </DataSourceApplicationProvider>
+                                      </BlockRequestContext_deprecated.Provider>
+                                    </LocationSearchContext.Provider>
+                                  </FormActiveFieldsProvider>
+                                </SubFormProvider>
+                              </FormBlockContext.Provider>
+                            </CurrentRecordContextProvider>
+                          </CollectionRecordProvider>
+                        </VariablePopupRecordProvider>
+                      </BlockContext.Provider>
+                    </VariablesContext.Provider>
+                  </CollectOperators>
+                </ModalContextProvider>
+              </AllDataBlocksContext.Provider>
             );
           },
           theme,
@@ -978,13 +984,13 @@ export const SchemaSettingsDefaultSortingRules = function DefaultSortingRules(pr
   const sort = defaultSort?.map((item: string) => {
     return item.startsWith('-')
       ? {
-          field: item.substring(1),
-          direction: 'desc',
-        }
+        field: item.substring(1),
+        direction: 'desc',
+      }
       : {
-          field: item,
-          direction: 'asc',
-        };
+        field: item,
+        direction: 'asc',
+      };
   });
   const sortFields = useSortFields(props.name || collection?.name);
 
diff --git a/packages/core/client/src/schema-settings/SchemaSettingsConnectDataBlocks.tsx b/packages/core/client/src/schema-settings/SchemaSettingsConnectDataBlocks.tsx
index c0a28ac786..463e78bef8 100644
--- a/packages/core/client/src/schema-settings/SchemaSettingsConnectDataBlocks.tsx
+++ b/packages/core/client/src/schema-settings/SchemaSettingsConnectDataBlocks.tsx
@@ -52,24 +52,10 @@ export function SchemaSettingsConnectDataBlocks(props) {
   const Content = dataBlocks.map((block) => {
     const title = `${compile(block.collection.title)} #${block.uid.slice(0, 4)}`;
     const onHover = () => {
-      const dom = block.dom;
-      const designer = dom.querySelector('.general-schema-designer') as HTMLElement;
-      if (designer) {
-        designer.style.display = 'block';
-      }
-      dom.style.boxShadow = '0 0 10px rgba(0, 0, 0, 0.2)';
-      dom.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center',
-      });
+      block.highlightBlock();
     };
     const onLeave = () => {
-      const dom = block.dom;
-      const designer = dom.querySelector('.general-schema-designer') as HTMLElement;
-      if (designer) {
-        designer.style.display = null;
-      }
-      dom.style.boxShadow = 'none';
+      block.unhighlightBlock();
     };
     if (isSameCollection(block.collection, collection)) {
       return (
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateAction.Settings.tsx b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateAction.Settings.tsx
index 894faaaf7d..eada045700 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateAction.Settings.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateAction.Settings.tsx
@@ -20,6 +20,8 @@ import {
   RefreshDataBlockRequest,
   useAfterSuccessOptions,
   useGlobalVariable,
+  BlocksSelector,
+  usePlugin,
 } from '@nocobase/client';
 import { useTranslation } from 'react-i18next';
 import React from 'react';
@@ -61,13 +63,19 @@ const useVariableProps = (environmentVariables) => {
     fieldNames,
   };
 };
+
 function AfterSuccess() {
   const { dn } = useDesignable();
   const { t } = useTranslation();
   const fieldSchema = useFieldSchema();
   const environmentVariables = useGlobalVariable('$env');
+  const templatePlugin: any = usePlugin('@nocobase/plugin-block-template');
+  const isInBlockTemplateConfigPage = templatePlugin?.isInBlockTemplateConfigPage?.();
+
   return (
     <SchemaSettingsModalItem
+      dialogRootClassName='dialog-after-successful-submission'
+      width={700}
       title={t('After successful submission')}
       initialValues={fieldSchema?.['x-action-settings']?.['onSuccess']}
       schema={
@@ -116,6 +124,18 @@ function AfterSuccess() {
               // eslint-disable-next-line react-hooks/rules-of-hooks
               'x-use-component-props': () => useVariableProps(environmentVariables),
             },
+            blocksToRefresh: {
+              type: 'array',
+              title: t('Refresh data blocks'),
+              'x-decorator': 'FormItem',
+              'x-use-decorator-props': () => {
+                return {
+                  tooltip: t('After successful submission, the selected data blocks will be automatically refreshed.'),
+                };
+              },
+              'x-component': BlocksSelector,
+              'x-hidden': isInBlockTemplateConfigPage, // 模板配置页面暂不支持该配置
+            },
           },
         } as ISchema
       }
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx
index ac7253f2d0..c2bd868699 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx
@@ -42,107 +42,113 @@ export const useCustomizeBulkUpdateActionProps = () => {
   const localVariables = useLocalVariables();
   return {
     async onClick(e, callBack) {
-      const {
-        assignedValues: originalAssignedValues = {},
-        onSuccess,
-        updateMode,
-      } = actionSchema?.['x-action-settings'] ?? {};
-      actionField.data = field.data || {};
-      actionField.data.loading = true;
-      const selectedRecordKeys =
-        tableBlockContext.field?.data?.selectedRowKeys ?? expressionScope?.selectedRecordKeys ?? {};
+      return new Promise<void>(async (resolve) => {
+        const {
+          assignedValues: originalAssignedValues = {},
+          onSuccess,
+          updateMode,
+        } = actionSchema?.['x-action-settings'] ?? {};
+        actionField.data = field.data || {};
+        actionField.data.loading = true;
+        const selectedRecordKeys =
+          tableBlockContext.field?.data?.selectedRowKeys ?? expressionScope?.selectedRecordKeys ?? {};
 
-      const assignedValues = {};
-      const waitList = Object.keys(originalAssignedValues).map(async (key) => {
-        const value = originalAssignedValues[key];
-        const collectionField = getField(key);
+        const assignedValues = {};
+        const waitList = Object.keys(originalAssignedValues).map(async (key) => {
+          const value = originalAssignedValues[key];
+          const collectionField = getField(key);
 
-        if (process.env.NODE_ENV !== 'production') {
-          if (!collectionField) {
-            throw new Error(`useCustomizeBulkUpdateActionProps: field "${key}" not found in collection "${name}"`);
+          if (process.env.NODE_ENV !== 'production') {
+            if (!collectionField) {
+              throw new Error(`useCustomizeBulkUpdateActionProps: field "${key}" not found in collection "${name}"`);
+            }
           }
-        }
 
-        if (isVariable(value)) {
-          const result = await variables?.parseVariable(value, localVariables).then(({ value }) => value);
-          if (result) {
-            assignedValues[key] = transformVariableValue(result, { targetCollectionField: collectionField });
+          if (isVariable(value)) {
+            const result = await variables?.parseVariable(value, localVariables).then(({ value }) => value);
+            if (result) {
+              assignedValues[key] = transformVariableValue(result, { targetCollectionField: collectionField });
+            }
+          } else if (value !== '') {
+            assignedValues[key] = value;
           }
-        } else if (value !== '') {
-          assignedValues[key] = value;
-        }
-      });
-      await Promise.all(waitList);
+        });
+        await Promise.all(waitList);
 
-      modal.confirm({
-        title: t('Bulk update', { ns: 'client' }),
-        content:
-          updateMode === 'selected'
-            ? t('Update selected data?', { ns: 'client' })
-            : t('Update all data?', { ns: 'client' }),
-        async onOk() {
-          const { filter } = service.params?.[0] ?? {};
-          const updateData: { filter?: any; values: any; forceUpdate: boolean } = {
-            values: { ...assignedValues },
-            filter,
-            forceUpdate: false,
-          };
-          if (updateMode === 'selected') {
-            if (!selectedRecordKeys?.length) {
-              message.error(t('Please select the records to be updated'));
+        modal.confirm({
+          title: t('Bulk update', { ns: 'client' }),
+          content:
+            updateMode === 'selected'
+              ? t('Update selected data?', { ns: 'client' })
+              : t('Update all data?', { ns: 'client' }),
+          async onOk() {
+            const { filter } = service.params?.[0] ?? {};
+            const updateData: { filter?: any; values: any; forceUpdate: boolean } = {
+              values: { ...assignedValues },
+              filter,
+              forceUpdate: false,
+            };
+            if (updateMode === 'selected') {
+              if (!selectedRecordKeys?.length) {
+                message.error(t('Please select the records to be updated'));
+                actionField.data.loading = false;
+                return;
+              }
+              updateData.filter = { $and: [{ [rowKey || 'id']: { $in: selectedRecordKeys } }] };
+            }
+            if (!updateData.filter) {
+              updateData.forceUpdate = true;
+            }
+            try {
+              await resource.update(updateData);
+            } catch (error) {
+              /* empty */
+            } finally {
               actionField.data.loading = false;
+            }
+            if (callBack) {
+              callBack?.();
+            }
+            // service?.refresh?.();
+            if (!(resource instanceof TableFieldResource)) {
+              __parent?.service?.refresh?.();
+            }
+            if (!onSuccess?.successMessage) {
               return;
             }
-            updateData.filter = { $and: [{ [rowKey || 'id']: { $in: selectedRecordKeys } }] };
-          }
-          if (!updateData.filter) {
-            updateData.forceUpdate = true;
-          }
-          try {
-            await resource.update(updateData);
-          } catch (error) {
-            /* empty */
-          } finally {
-            actionField.data.loading = false;
-          }
-          if (callBack) {
-            callBack?.();
-          }
-          // service?.refresh?.();
-          if (!(resource instanceof TableFieldResource)) {
-            __parent?.service?.refresh?.();
-          }
-          if (!onSuccess?.successMessage) {
-            return;
-          }
-          if (onSuccess?.manualClose) {
-            modal.success({
-              title: compile(onSuccess?.successMessage),
-              onOk: async () => {
-                if (onSuccess?.redirecting && onSuccess?.redirectTo) {
-                  if (isURL(onSuccess.redirectTo)) {
-                    window.location.href = onSuccess.redirectTo;
-                  } else {
-                    navigate(onSuccess.redirectTo);
+            if (onSuccess?.manualClose) {
+              modal.success({
+                title: compile(onSuccess?.successMessage),
+                onOk: async () => {
+                  if (onSuccess?.redirecting && onSuccess?.redirectTo) {
+                    if (isURL(onSuccess.redirectTo)) {
+                      window.location.href = onSuccess.redirectTo;
+                    } else {
+                      navigate(onSuccess.redirectTo);
+                    }
                   }
+                },
+              });
+            } else {
+              message.success(compile(onSuccess?.successMessage));
+              if (onSuccess?.redirecting && onSuccess?.redirectTo) {
+                if (isURL(onSuccess.redirectTo)) {
+                  window.location.href = onSuccess.redirectTo;
+                } else {
+                  navigate(onSuccess.redirectTo);
                 }
-              },
-            });
-          } else {
-            message.success(compile(onSuccess?.successMessage));
-            if (onSuccess?.redirecting && onSuccess?.redirectTo) {
-              if (isURL(onSuccess.redirectTo)) {
-                window.location.href = onSuccess.redirectTo;
-              } else {
-                navigate(onSuccess.redirectTo);
               }
             }
-          }
-        },
-        async onCancel() {
-          actionField.data.loading = false;
-        },
+
+            resolve();
+          },
+          async onCancel() {
+            actionField.data.loading = false;
+            resolve();
+          },
+        });
       });
+
     },
   };
 };
diff --git a/packages/plugins/@nocobase/plugin-block-template/src/client/components/BlockTemplatePage.tsx b/packages/plugins/@nocobase/plugin-block-template/src/client/components/BlockTemplatePage.tsx
index 38bb7e09ae..7fc01839b4 100644
--- a/packages/plugins/@nocobase/plugin-block-template/src/client/components/BlockTemplatePage.tsx
+++ b/packages/plugins/@nocobase/plugin-block-template/src/client/components/BlockTemplatePage.tsx
@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { useRequest, RemoteSchemaComponent } from '@nocobase/client';
+import { useRequest, RemoteSchemaComponent, AllDataBlocksProvider } from '@nocobase/client';
 import React from 'react';
 import { useT } from '../locale';
 import { useParams } from 'react-router';
@@ -31,7 +31,7 @@ export const BlockTemplatePage = () => {
   const schemaUid = data?.data?.uid;
 
   return (
-    <div>
+    <AllDataBlocksProvider>
       <div
         style={{
           marginTop: -token.marginXXL,
@@ -68,6 +68,6 @@ export const BlockTemplatePage = () => {
           <RemoteSchemaComponent uid={schemaUid} />
         </BlockTemplateInfoContext.Provider>
       </div>
-    </div>
+    </AllDataBlocksProvider>
   );
 };
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/mobile/Mobile.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/mobile/Mobile.tsx
index 8f08e1fddf..0c1e1630a4 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/mobile/Mobile.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/mobile/Mobile.tsx
@@ -9,6 +9,7 @@
 
 import {
   AdminProvider,
+  AllDataBlocksProvider,
   AntdAppProvider,
   AssociationFieldMode,
   AssociationFieldModeProvider,
@@ -126,7 +127,9 @@ export const Mobile = () => {
                     <AssociationFieldModeProvider modeToComponent={modeToComponent}>
                       {/* the z-index of all popups and subpages will be based on this value */}
                       <zIndexContext.Provider value={100}>
-                        <MobileRouter />
+                        <AllDataBlocksProvider>
+                          <MobileRouter />
+                        </AllDataBlocksProvider>
                       </zIndexContext.Provider>
                     </AssociationFieldModeProvider>
                   </ResetSchemaOptionsProvider>

From 6d50f7e9b1c4c104606c18c097d70bcf771d3173 Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Mon, 14 Apr 2025 18:35:59 +0800
Subject: [PATCH 17/22] fix(FilterForm): do not trigger filtering when
 validation fails (#6659)

---
 packages/core/client/src/block-provider/hooks/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/core/client/src/block-provider/hooks/index.ts b/packages/core/client/src/block-provider/hooks/index.ts
index 612064ece0..1b82601e71 100644
--- a/packages/core/client/src/block-provider/hooks/index.ts
+++ b/packages/core/client/src/block-provider/hooks/index.ts
@@ -522,9 +522,11 @@ export const useFilterBlockActionProps = () => {
   const { doFilter } = useDoFilter();
   const actionField = useField();
   actionField.data = actionField.data || {};
+  const form = useForm();
 
   return {
     async onClick() {
+      await form.submit();
       actionField.data.loading = true;
       await doFilter();
       actionField.data.loading = false;

From 3c9b99d812358b9d909c6b9bf36bf23b7c188d50 Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Mon, 14 Apr 2025 18:38:55 +0800
Subject: [PATCH 18/22] fix: no prompt popup should be displayed after
 modifying the filter form (#6657)

---
 .../block-provider/FilterFormBlockProvider.tsx   |  6 +++---
 .../src/schema-component/antd/form-v2/Form.tsx   | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx b/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx
index f6eacc4ede..1a46420a4b 100644
--- a/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx
+++ b/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx
@@ -10,11 +10,11 @@
 import { useFieldSchema } from '@formily/react';
 import React from 'react';
 import { withDynamicSchemaProps } from '../hoc/withDynamicSchemaProps';
-import { DatePickerProvider, ActionBarProvider, SchemaComponentOptions } from '../schema-component';
+import { FilterCollectionField } from '../modules/blocks/filter-blocks/FilterCollectionField';
+import { ActionBarProvider, DatePickerProvider, SchemaComponentOptions } from '../schema-component';
 import { DefaultValueProvider } from '../schema-settings';
 import { CollectOperators } from './CollectOperators';
 import { FormBlockProvider } from './FormBlockProvider';
-import { FilterCollectionField } from '../modules/blocks/filter-blocks/FilterCollectionField';
 
 export const FilterFormBlockProvider = withDynamicSchemaProps((props) => {
   const filedSchema = useFieldSchema();
@@ -35,7 +35,7 @@ export const FilterFormBlockProvider = withDynamicSchemaProps((props) => {
             }}
           >
             <DefaultValueProvider isAllowToSetDefaultValue={() => false}>
-              <FormBlockProvider name="filter-form" {...props}></FormBlockProvider>
+              <FormBlockProvider name="filter-form" {...props} confirmBeforeClose={false}></FormBlockProvider>
             </DefaultValueProvider>
           </ActionBarProvider>
         </DatePickerProvider>
diff --git a/packages/core/client/src/schema-component/antd/form-v2/Form.tsx b/packages/core/client/src/schema-component/antd/form-v2/Form.tsx
index f099766a90..4721db9aae 100644
--- a/packages/core/client/src/schema-component/antd/form-v2/Form.tsx
+++ b/packages/core/client/src/schema-component/antd/form-v2/Form.tsx
@@ -16,8 +16,10 @@ import { ConfigProvider, theme } from 'antd';
 import React, { useEffect, useMemo } from 'react';
 import { useActionContext } from '..';
 import { useAttach, useComponent } from '../..';
+import { useApp } from '../../../application';
 import { getCardItemSchema } from '../../../block-provider';
 import { useTemplateBlockContext } from '../../../block-provider/TemplateBlockProvider';
+import { useDataBlockProps } from '../../../data-source';
 import { useDataBlockRequest } from '../../../data-source/data-block/DataBlockRequestProvider';
 import { NocoBaseRecursionField } from '../../../formily/NocoBaseRecursionField';
 import { withDynamicSchemaProps } from '../../../hoc/withDynamicSchemaProps';
@@ -27,7 +29,6 @@ import { useToken } from '../../../style';
 import { useLocalVariables, useVariables } from '../../../variables';
 import { useProps } from '../../hooks/useProps';
 import { useFormBlockHeight } from './hook';
-import { useApp } from '../../../application';
 
 export interface FormProps extends IFormLayoutProps {
   form?: FormilyForm;
@@ -141,12 +142,15 @@ const WithForm = (props: WithFormProps) => {
   const linkageRules: any[] =
     (getLinkageRules(fieldSchema) || fieldSchema.parent?.['x-linkage-rules'])?.filter((k) => !k.disabled) || [];
 
+  // 关闭弹窗之前，如果有未保存的数据，是否要二次确认
+  const { confirmBeforeClose = true } = useDataBlockProps() || ({} as any);
+
   useEffect(() => {
     const id = uid();
 
     form.addEffects(id, () => {
       onFormInputChange(() => {
-        setFormValueChanged?.(true);
+        setFormValueChanged?.(confirmBeforeClose);
       });
     });
 
@@ -157,7 +161,7 @@ const WithForm = (props: WithFormProps) => {
     return () => {
       form.removeEffects(id);
     };
-  }, [form, props.disabled, setFormValueChanged]);
+  }, [form, props.disabled, setFormValueChanged, confirmBeforeClose]);
 
   useEffect(() => {
     if (loading) {
@@ -210,17 +214,19 @@ const WithForm = (props: WithFormProps) => {
 const WithoutForm = (props) => {
   const fieldSchema = useFieldSchema();
   const { setFormValueChanged } = useActionContext();
+  // 关闭弹窗之前，如果有未保存的数据，是否要二次确认
+  const { confirmBeforeClose = true } = useDataBlockProps() || ({} as any);
   const form = useMemo(
     () =>
       createForm({
         disabled: props.disabled,
         effects() {
           onFormInputChange((form) => {
-            setFormValueChanged?.(true);
+            setFormValueChanged?.(confirmBeforeClose);
           });
         },
       }),
-    [],
+    [confirmBeforeClose],
   );
   return fieldSchema['x-decorator'] === 'FormV2' ? (
     <FormDecorator form={form} {...props} />

From 7c1ccc73f68c0e923a3a8a707cc6494f5cb14267 Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Mon, 14 Apr 2025 18:40:10 +0800
Subject: [PATCH 19/22] fix: should not automatically redirect to hidden pages
 (#6654)

* fix: should not automatically redirect to hidden pages

* fix: replace getDefaultPageUid with findFirstPageRoute for improved readability
---
 .../__tests__/findFirstPageRoute.test.tsx     | 212 ++++++++++++++++++
 .../route-switch/antd/admin-layout/index.tsx  |  57 +----
 2 files changed, 218 insertions(+), 51 deletions(-)
 create mode 100644 packages/core/client/src/route-switch/antd/admin-layout/__tests__/findFirstPageRoute.test.tsx

diff --git a/packages/core/client/src/route-switch/antd/admin-layout/__tests__/findFirstPageRoute.test.tsx b/packages/core/client/src/route-switch/antd/admin-layout/__tests__/findFirstPageRoute.test.tsx
new file mode 100644
index 0000000000..5bfd4554d1
--- /dev/null
+++ b/packages/core/client/src/route-switch/antd/admin-layout/__tests__/findFirstPageRoute.test.tsx
@@ -0,0 +1,212 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { findFirstPageRoute, NocoBaseDesktopRouteType } from '..';
+import { NocoBaseDesktopRoute } from '../convertRoutesToSchema';
+
+describe('findFirstPageRoute', () => {
+  // 基本测试：空路由数组
+  it('should return undefined for empty routes array', () => {
+    const result = findFirstPageRoute([]);
+    expect(result).toBeUndefined();
+  });
+
+  // 基本测试：undefined 路由数组
+  it('should return undefined for undefined routes', () => {
+    const result = findFirstPageRoute(undefined);
+    expect(result).toBeUndefined();
+  });
+
+  // 测试：只有一个页面路由
+  it('should find the first page route when there is only one page', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        schemaUid: 'page1',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 1',
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[0]);
+  });
+
+  // 测试：多个页面路由
+  it('should find the first page route when there are multiple pages', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        schemaUid: 'page1',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 1',
+      },
+      {
+        id: 2,
+        schemaUid: 'page2',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 2',
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[0]);
+  });
+
+  // 测试：不同类型的路由混合
+  it('should find the first page route among mixed route types', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        schemaUid: 'link1',
+        type: NocoBaseDesktopRouteType.link,
+        title: 'Link 1',
+      },
+      {
+        id: 2,
+        schemaUid: 'page1',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 1',
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[1]);
+  });
+
+  // 测试：隐藏的菜单项
+  it('should ignore hidden menu items', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        schemaUid: 'page1',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 1',
+        hideInMenu: true,
+      },
+      {
+        id: 2,
+        schemaUid: 'page2',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 2',
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[1]);
+  });
+
+  // 测试：嵌套路由
+  it('should find page route in nested group', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        type: NocoBaseDesktopRouteType.group,
+        title: 'Group 1',
+        children: [
+          {
+            id: 11,
+            schemaUid: 'page1',
+            type: NocoBaseDesktopRouteType.page,
+            title: 'Page 1',
+          },
+        ],
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[0].children[0]);
+  });
+
+  // 测试：多层嵌套路由
+  it('should find page route in deeply nested groups', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        type: NocoBaseDesktopRouteType.group,
+        title: 'Group 1',
+        children: [
+          {
+            id: 11,
+            type: NocoBaseDesktopRouteType.group,
+            title: 'Group 1-1',
+            children: [
+              {
+                id: 111,
+                schemaUid: 'page1',
+                type: NocoBaseDesktopRouteType.page,
+                title: 'Page 1',
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[0].children[0].children[0]);
+  });
+
+  // 测试：复杂路由结构
+  it('should find the first visible page in a complex route structure', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        type: NocoBaseDesktopRouteType.group,
+        title: 'Group 1',
+        hideInMenu: true,
+        children: [
+          {
+            id: 11,
+            schemaUid: 'page1',
+            type: NocoBaseDesktopRouteType.page,
+            title: 'Page 1',
+          },
+        ],
+      },
+      {
+        id: 2,
+        type: NocoBaseDesktopRouteType.group,
+        title: 'Group 2',
+        children: [
+          {
+            id: 21,
+            schemaUid: 'page2',
+            type: NocoBaseDesktopRouteType.page,
+            title: 'Page 2',
+          },
+        ],
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[1].children[0]);
+  });
+
+  // 测试：空组
+  it('should skip empty groups and find page in next group', () => {
+    const routes: NocoBaseDesktopRoute[] = [
+      {
+        id: 1,
+        type: NocoBaseDesktopRouteType.group,
+        title: 'Empty Group',
+        children: [],
+      },
+      {
+        id: 2,
+        schemaUid: 'page1',
+        type: NocoBaseDesktopRouteType.page,
+        title: 'Page 1',
+      },
+    ];
+
+    const result = findFirstPageRoute(routes);
+    expect(result).toEqual(routes[1]);
+  });
+});
diff --git a/packages/core/client/src/route-switch/antd/admin-layout/index.tsx b/packages/core/client/src/route-switch/antd/admin-layout/index.tsx
index 0273e6b3b4..bc3fe20fb4 100644
--- a/packages/core/client/src/route-switch/antd/admin-layout/index.tsx
+++ b/packages/core/client/src/route-switch/antd/admin-layout/index.tsx
@@ -611,27 +611,11 @@ export const InternalAdminLayout = () => {
   );
 };
 
-function getDefaultPageUid(routes: NocoBaseDesktopRoute[]) {
-  // Find the first route of type "page"
-  for (const route of routes) {
-    if (route.type === NocoBaseDesktopRouteType.page) {
-      return route.schemaUid;
-    }
-
-    if (route.children?.length) {
-      const result = getDefaultPageUid(route.children);
-      if (result) {
-        return result;
-      }
-    }
-  }
-}
-
 const NavigateToDefaultPage: FC = (props) => {
   const { allAccessRoutes } = useAllAccessDesktopRoutes();
   const location = useLocationNoUpdate();
 
-  const defaultPageUid = getDefaultPageUid(allAccessRoutes);
+  const defaultPageUid = findFirstPageRoute(allAccessRoutes)?.schemaUid;
 
   return (
     <>
@@ -741,36 +725,6 @@ export function findRouteBySchemaUid(schemaUid: string, treeArray: any[]) {
   return null;
 }
 
-const MenuItemIcon: FC<{ icon: string; title: string }> = (props) => {
-  const { inHeader } = useContext(headerContext);
-
-  return (
-    <RouteContext.Consumer>
-      {(value: RouteContextType) => {
-        const { collapsed } = value;
-
-        if (collapsed && !inHeader) {
-          return props.icon ? (
-            <Icon type={props.icon} />
-          ) : (
-            <span
-              style={{
-                display: 'inline-block',
-                width: '100%',
-                textAlign: 'center',
-              }}
-            >
-              {props.title.charAt(0)}
-            </span>
-          );
-        }
-
-        return props.icon ? <Icon type={props.icon} /> : null;
-      }}
-    </RouteContext.Consumer>
-  );
-};
-
 const MenuDesignerButton: FC<{ testId: string }> = (props) => {
   const { render: renderInitializer } = useSchemaInitializerRender(menuItemInitializer);
 
@@ -892,16 +846,17 @@ function findRouteById(id: string, treeArray: any[]) {
   return null;
 }
 
-function findFirstPageRoute(routes: NocoBaseDesktopRoute[]) {
+export function findFirstPageRoute(routes: NocoBaseDesktopRoute[]) {
   if (!routes) return;
 
-  for (const route of routes) {
+  for (const route of routes.filter((item) => !item.hideInMenu)) {
     if (route.type === NocoBaseDesktopRouteType.page) {
       return route;
     }
 
-    if (route.children?.length) {
-      return findFirstPageRoute(route.children);
+    if (route.type === NocoBaseDesktopRouteType.group && route.children?.length) {
+      const result = findFirstPageRoute(route.children);
+      if (result) return result;
     }
   }
 }

From d9206ab148cb6ac7ac2f4b6561e9f1a9df878344 Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Mon, 14 Apr 2025 18:54:17 +0800
Subject: [PATCH 20/22] feat: make commercial plugins free

---
 .../@nocobase/plugin-departments/.npmignore   |   2 +
 .../@nocobase/plugin-departments/README.md    |   1 +
 .../@nocobase/plugin-departments/client.d.ts  |   2 +
 .../@nocobase/plugin-departments/client.js    |   1 +
 .../@nocobase/plugin-departments/package.json |  19 +
 .../@nocobase/plugin-departments/server.d.ts  |   2 +
 .../@nocobase/plugin-departments/server.js    |   1 +
 .../src/client/ResourcesProvider.tsx          | 110 +++++
 .../src/client/collections/departments.ts     | 115 +++++
 .../src/client/collections/users.ts           | 142 ++++++
 .../components/DepartmentOwnersField.tsx      |  35 ++
 .../components/ReadOnlyAssociationField.tsx   |  27 +
 .../components/UserDepartmentsField.tsx       |  35 ++
 .../components/UserMainDepartmentField.tsx    |  35 ++
 .../src/client/components/fieldSettings.ts    | 185 +++++++
 .../src/client/components/index.ts            |  22 +
 .../client/departments/AggregateSearch.tsx    | 216 ++++++++
 .../src/client/departments/Department.tsx     | 149 ++++++
 .../client/departments/DepartmentBlock.tsx    |  40 ++
 .../client/departments/DepartmentField.tsx    |  48 ++
 .../departments/DepartmentManagement.tsx      |  44 ++
 .../departments/DepartmentOwnersField.tsx     | 115 +++++
 .../client/departments/DepartmentTable.tsx    | 263 ++++++++++
 .../src/client/departments/DepartmentTree.tsx | 181 +++++++
 .../departments/DepartmentTreeSelect.tsx      | 136 +++++
 .../src/client/departments/IsOwnerField.tsx   |  30 ++
 .../src/client/departments/Member.tsx         | 235 +++++++++
 .../src/client/departments/NewDepartment.tsx  |  97 ++++
 .../departments/UserDepartmentsField.tsx      | 273 +++++++++++
 .../client/departments/schemas/departments.ts | 291 +++++++++++
 .../src/client/departments/schemas/users.ts   | 464 ++++++++++++++++++
 .../src/client/hooks/departments-manager.ts   |  75 +++
 .../src/client/hooks/index.ts                 |  68 +++
 .../src/client/hooks/tree-manager.ts          | 142 ++++++
 .../src/client/hooks/useTableBlockProps.ts    | 175 +++++++
 .../plugin-departments/src/client/index.tsx   |  76 +++
 .../plugin-departments/src/client/locale.ts   |  23 +
 .../client/roles/RoleDepartmentsManager.tsx   | 178 +++++++
 .../src/client/roles/schemas/departments.ts   | 171 +++++++
 .../plugin-departments/src/client/utils.ts    |  26 +
 .../@nocobase/plugin-departments/src/index.ts |  20 +
 .../plugin-departments/src/locale/en-US.json  |  35 ++
 .../plugin-departments/src/locale/zh-CN.json  |  35 ++
 .../src/server/__tests__/actions.test.ts      | 125 +++++
 .../src/server/__tests__/data-sync.test.ts    | 281 +++++++++++
 .../destroy-department-check.test.ts          |  72 +++
 .../__tests__/set-department-owners.test.ts   |  91 ++++
 .../__tests__/set-departments-info.test.ts    |  73 +++
 .../__tests__/set-main-department.test.ts     | 183 +++++++
 .../update-department-is-leaf.test.ts         | 102 ++++
 .../src/server/actions/departments.ts         |  97 ++++
 .../src/server/actions/users.ts               | 133 +++++
 .../src/server/collections/.gitkeep           |   0
 .../src/server/collections/departmentRoles.ts |  25 +
 .../src/server/collections/departments.ts     | 156 ++++++
 .../server/collections/departmentsUsers.ts    |  39 ++
 .../src/server/collections/roles.ts           |  36 ++
 .../src/server/collections/users.ts           |  79 +++
 .../server/department-data-sync-resource.ts   | 333 +++++++++++++
 .../plugin-departments/src/server/index.ts    |  19 +
 .../middlewares/destroy-department-check.ts   |  48 ++
 .../src/server/middlewares/index.ts           |  24 +
 .../reset-user-departments-cache.ts           |  41 ++
 .../middlewares/set-department-owners.ts      |  59 +++
 .../middlewares/set-departments-roles.ts      |  60 +++
 .../server/middlewares/set-main-department.ts | 101 ++++
 .../middlewares/update-department-isleaf.ts   |  88 ++++
 .../update-field-uischemas-20240307124823.ts  |  96 ++++
 .../src/server/models/department.ts           |  31 ++
 .../plugin-departments/src/server/plugin.ts   | 156 ++++++
 .../plugin-field-attachment-url/.npmignore    |   2 +
 .../plugin-field-attachment-url/README.md     |   1 +
 .../plugin-field-attachment-url/client.d.ts   |   2 +
 .../plugin-field-attachment-url/client.js     |   1 +
 .../plugin-field-attachment-url/package.json  |  17 +
 .../plugin-field-attachment-url/server.d.ts   |   2 +
 .../plugin-field-attachment-url/server.js     |   1 +
 .../src/client/__e2e__/createField.test.ts    |  28 ++
 .../src/client/client.d.ts                    | 249 ++++++++++
 .../src/client/component/AttachmentUrl.tsx    | 184 +++++++
 .../src/client/hook/index.ts                  | 106 ++++
 .../src/client/index.tsx                      |  38 ++
 .../src/client/interfaces/attachment-url.tsx  |  79 +++
 .../src/client/locale.ts                      |  30 ++
 .../src/client/schema.ts                      |  53 ++
 .../src/client/settings/index.ts              | 171 +++++++
 .../plugin-field-attachment-url/src/index.ts  |  11 +
 .../src/locale/en-US.json                     |   1 +
 .../src/locale/zh-CN.json                     |   4 +
 .../src/server/collections/.gitkeep           |   0
 .../src/server/index.ts                       |  10 +
 .../src/server/plugin.ts                      |  28 ++
 .../.npmignore                                |   2 +
 .../README.md                                 |   1 +
 .../client.d.ts                               |   2 +
 .../client.js                                 |   1 +
 .../package.json                              |  21 +
 .../server.d.ts                               |   2 +
 .../server.js                                 |   1 +
 .../src/client/ResponseMessageInstruction.tsx |  87 ++++
 .../src/client/index.tsx                      |  31 ++
 .../src/index.ts                              |  20 +
 .../src/locale/en-US.json                     |   6 +
 .../src/locale/index.ts                       |  25 +
 .../src/locale/zh-CN.json                     |   8 +
 .../src/server/Plugin.ts                      |  31 ++
 .../src/server/ResponseMessageInstruction.ts  |  55 +++
 .../src/server/__tests__/instruction.test.ts  | 346 +++++++++++++
 .../src/server/__tests__/multiple.test.ts     | 185 +++++++
 .../src/server/index.ts                       |  19 +
 110 files changed, 8749 insertions(+)
 create mode 100644 packages/plugins/@nocobase/plugin-departments/.npmignore
 create mode 100644 packages/plugins/@nocobase/plugin-departments/README.md
 create mode 100644 packages/plugins/@nocobase/plugin-departments/client.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/client.js
 create mode 100644 packages/plugins/@nocobase/plugin-departments/package.json
 create mode 100644 packages/plugins/@nocobase/plugin-departments/server.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/server.js
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/ResourcesProvider.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/collections/departments.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/collections/users.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/components/DepartmentOwnersField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/components/ReadOnlyAssociationField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/components/UserDepartmentsField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/components/UserMainDepartmentField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/components/fieldSettings.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/components/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/AggregateSearch.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/Department.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentBlock.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentManagement.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentOwnersField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTree.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTreeSelect.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/IsOwnerField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/Member.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/NewDepartment.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/UserDepartmentsField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/departments.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/users.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/hooks/departments-manager.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/hooks/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/hooks/tree-manager.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/hooks/useTableBlockProps.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/index.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/locale.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/roles/RoleDepartmentsManager.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/roles/schemas/departments.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/utils.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/locale/en-US.json
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/locale/zh-CN.json
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/actions/departments.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/actions/users.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/collections/.gitkeep
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentRoles.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/collections/departments.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentsUsers.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/collections/roles.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/collections/users.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/department-data-sync-resource.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/destroy-department-check.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/reset-user-departments-cache.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-department-owners.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-departments-roles.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-main-department.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/update-department-isleaf.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/migrations/update-field-uischemas-20240307124823.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/models/department.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/plugin.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/.npmignore
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/README.md
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/client.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/client.js
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/package.json
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/server.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/server.js
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/__e2e__/createField.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/client.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/index.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/locale.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/schema.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/settings/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/en-US.json
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/zh-CN.json
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/server/collections/.gitkeep
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/server/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/.npmignore
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/README.md
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/client.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/client.js
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/package.json
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/server.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/server.js
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/client/ResponseMessageInstruction.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/client/index.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/en-US.json
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/zh-CN.json
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/server/Plugin.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/server/ResponseMessageInstruction.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/server/index.ts

diff --git a/packages/plugins/@nocobase/plugin-departments/.npmignore b/packages/plugins/@nocobase/plugin-departments/.npmignore
new file mode 100644
index 0000000000..65f5e8779f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-departments/README.md b/packages/plugins/@nocobase/plugin-departments/README.md
new file mode 100644
index 0000000000..cb4fb63505
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/README.md
@@ -0,0 +1 @@
+# @nocobase/plugin-department
diff --git a/packages/plugins/@nocobase/plugin-departments/client.d.ts b/packages/plugins/@nocobase/plugin-departments/client.d.ts
new file mode 100644
index 0000000000..6c459cbac4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-departments/client.js b/packages/plugins/@nocobase/plugin-departments/client.js
new file mode 100644
index 0000000000..b6e3be70e6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-departments/package.json b/packages/plugins/@nocobase/plugin-departments/package.json
new file mode 100644
index 0000000000..2a52252569
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@nocobase/plugin-departments",
+  "displayName": "Departments",
+  "displayName.zh-CN": "部门",
+  "description": "Organize users by departments, set hierarchical relationships, link roles to control permissions, and use departments as variables in workflows and expressions.",
+  "description.zh-CN": "以部门来组织用户，设定上下级关系，绑定角色控制权限，并支持作为变量用于工作流和表达式。",
+  "version": "1.7.0-alpha.16",
+  "main": "dist/server/index.js",
+  "peerDependencies": {
+    "@nocobase/actions": "1.x",
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x"
+  },
+  "keywords": [
+    "Users & permissions"
+  ],
+  "gitHead": "ce89d10eec858c413f60e001e83c7c8cf2645f5e"
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/server.d.ts b/packages/plugins/@nocobase/plugin-departments/server.d.ts
new file mode 100644
index 0000000000..c41081ddc6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-departments/server.js b/packages/plugins/@nocobase/plugin-departments/server.js
new file mode 100644
index 0000000000..972842039a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/ResourcesProvider.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/ResourcesProvider.tsx
new file mode 100644
index 0000000000..2ad0daac83
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/ResourcesProvider.tsx
@@ -0,0 +1,110 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { CollectionProvider_deprecated, ResourceActionContext, TableBlockContext, useRequest } from '@nocobase/client';
+import React, { useContext, useEffect, useMemo } from 'react';
+import { departmentCollection } from './collections/departments';
+import { userCollection } from './collections/users';
+import { FormContext } from '@formily/react';
+import { createForm } from '@formily/core';
+
+export const ResourcesContext = React.createContext<{
+  user: any;
+  setUser?: (user: any) => void;
+  department: any; // department name
+  setDepartment?: (department: any) => void;
+  departmentsResource?: any;
+  usersResource?: any;
+}>({
+  user: {},
+  department: {},
+});
+
+export const ResourcesProvider: React.FC = (props) => {
+  const [user, setUser] = React.useState(null);
+  const [department, setDepartment] = React.useState(null);
+
+  const userService = useRequest({
+    resource: 'users',
+    action: 'list',
+    params: {
+      appends: ['departments', 'departments.parent(recursively=true)'],
+      filter: department
+        ? {
+            'departments.id': department.id,
+          }
+        : {},
+      pageSize: 20,
+    },
+  });
+
+  useEffect(() => {
+    userService.run();
+  }, [department]);
+
+  const departmentRequest = {
+    resource: 'departments',
+    action: 'list',
+    params: {
+      paginate: false,
+      filter: {
+        parentId: null,
+      },
+    },
+  };
+  const departmentService = useRequest(departmentRequest);
+
+  return (
+    <ResourcesContext.Provider
+      value={{
+        user,
+        setUser,
+        department,
+        setDepartment,
+        usersResource: { service: userService },
+        departmentsResource: { service: departmentService },
+      }}
+    >
+      {props.children}
+    </ResourcesContext.Provider>
+  );
+};
+
+export const DepartmentsListProvider: React.FC = (props) => {
+  const { departmentsResource } = useContext(ResourcesContext);
+  const { service } = departmentsResource || {};
+  return (
+    <ResourceActionContext.Provider value={{ ...service }}>
+      <CollectionProvider_deprecated collection={departmentCollection}>{props.children}</CollectionProvider_deprecated>
+    </ResourceActionContext.Provider>
+  );
+};
+
+export const UsersListProvider: React.FC = (props) => {
+  const { usersResource } = useContext(ResourcesContext);
+  const { service } = usersResource || {};
+  const form = useMemo(() => createForm(), []);
+  const field = form.createField({ name: 'table' });
+  return (
+    <FormContext.Provider value={form}>
+      <TableBlockContext.Provider value={{ service, field }}>
+        <CollectionProvider_deprecated collection={userCollection}>{props.children}</CollectionProvider_deprecated>
+      </TableBlockContext.Provider>
+    </FormContext.Provider>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/collections/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/client/collections/departments.ts
new file mode 100644
index 0000000000..38105c0b2b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/collections/departments.ts
@@ -0,0 +1,115 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export const departmentCollection = {
+  name: 'departments',
+  fields: [
+    {
+      type: 'bigInt',
+      name: 'id',
+      primaryKey: true,
+      autoIncrement: true,
+      interface: 'id',
+      uiSchema: {
+        type: 'id',
+        title: '{{t("ID")}}',
+      },
+    },
+    {
+      name: 'title',
+      type: 'string',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Department name")}}',
+        'x-component': 'Input',
+        required: true,
+      },
+    },
+    {
+      name: 'parent',
+      type: 'belongsTo',
+      interface: 'm2o',
+      collectionName: 'departments',
+      foreignKey: 'parentId',
+      target: 'departments',
+      targetKey: 'id',
+      treeParent: true,
+      uiSchema: {
+        title: '{{t("Superior department")}}',
+        'x-component': 'DepartmentSelect',
+        // 'x-component-props': {
+        //   multiple: false,
+        //   fieldNames: {
+        //     label: 'title',
+        //     value: 'id',
+        //   },
+        // },
+      },
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'roles',
+      target: 'roles',
+      collectionName: 'departments',
+      through: 'departmentsRoles',
+      foreignKey: 'departmentId',
+      otherKey: 'roleName',
+      targetKey: 'name',
+      sourceKey: 'id',
+      uiSchema: {
+        title: '{{t("Roles")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            label: 'title',
+            value: 'name',
+          },
+        },
+      },
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'owners',
+      collectionName: 'departments',
+      target: 'users',
+      through: 'departmentsUsers',
+      foreignKey: 'departmentId',
+      otherKey: 'userId',
+      targetKey: 'id',
+      sourceKey: 'id',
+      scope: {
+        isOwner: true,
+      },
+      uiSchema: {
+        title: '{{t("Owners")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            label: 'nickname',
+            value: 'id',
+          },
+        },
+      },
+    },
+  ],
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/collections/users.ts b/packages/plugins/@nocobase/plugin-departments/src/client/collections/users.ts
new file mode 100644
index 0000000000..ba309455a7
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/collections/users.ts
@@ -0,0 +1,142 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export const userCollection = {
+  name: 'users',
+  fields: [
+    {
+      name: 'id',
+      type: 'bigInt',
+      autoIncrement: true,
+      primaryKey: true,
+      allowNull: false,
+      uiSchema: { type: 'number', title: '{{t("ID")}}', 'x-component': 'InputNumber', 'x-read-pretty': true },
+      interface: 'id',
+    },
+    {
+      interface: 'input',
+      type: 'string',
+      name: 'nickname',
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Nickname")}}',
+        'x-component': 'Input',
+      },
+    },
+    {
+      interface: 'input',
+      type: 'string',
+      name: 'username',
+      unique: true,
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Username")}}',
+        'x-component': 'Input',
+        'x-validator': { username: true },
+        required: true,
+      },
+    },
+    {
+      interface: 'email',
+      type: 'string',
+      name: 'email',
+      unique: true,
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Email")}}',
+        'x-component': 'Input',
+        'x-validator': 'email',
+        required: true,
+      },
+    },
+    {
+      interface: 'phone',
+      type: 'string',
+      name: 'phone',
+      unique: true,
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Phone")}}',
+        'x-component': 'Input',
+        'x-validator': 'phone',
+        required: true,
+      },
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'roles',
+      target: 'roles',
+      foreignKey: 'userId',
+      otherKey: 'roleName',
+      onDelete: 'CASCADE',
+      sourceKey: 'id',
+      targetKey: 'name',
+      through: 'rolesUsers',
+      uiSchema: {
+        type: 'array',
+        title: '{{t("Roles")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            label: 'title',
+            value: 'name',
+          },
+        },
+      },
+    },
+    {
+      name: 'departments',
+      type: 'belongsToMany',
+      interface: 'm2m',
+      target: 'departments',
+      foreignKey: 'userId',
+      otherKey: 'departmentId',
+      onDelete: 'CASCADE',
+      sourceKey: 'id',
+      targetKey: 'id',
+      through: 'departmentsUsers',
+      uiSchema: {
+        type: 'array',
+        title: '{{t("Departments")}}',
+        'x-component': 'DepartmentField',
+      },
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'mainDepartment',
+      target: 'departments',
+      foreignKey: 'userId',
+      otherKey: 'departmentId',
+      onDelete: 'CASCADE',
+      sourceKey: 'id',
+      targetKey: 'id',
+      through: 'departmentsUsers',
+      throughScope: {
+        isMain: true,
+      },
+      uiSchema: {
+        type: 'array',
+        title: '{{t("Main department")}}',
+        'x-component': 'DepartmentField',
+      },
+    },
+  ],
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/DepartmentOwnersField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/components/DepartmentOwnersField.tsx
new file mode 100644
index 0000000000..afcb651250
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/DepartmentOwnersField.tsx
@@ -0,0 +1,35 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { SchemaSettings } from '@nocobase/client';
+import { enableLink, fieldComponent, titleField } from './fieldSettings';
+
+export const DepartmentOwnersFieldSettings = new SchemaSettings({
+  name: 'fieldSettings:component:DepartmentOwnersField',
+  items: [
+    {
+      ...fieldComponent,
+    },
+    {
+      ...titleField,
+    },
+    {
+      ...enableLink,
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/ReadOnlyAssociationField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/components/ReadOnlyAssociationField.tsx
new file mode 100644
index 0000000000..d843d62847
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/ReadOnlyAssociationField.tsx
@@ -0,0 +1,27 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React from 'react';
+import { useDepartmentTranslation } from '../locale';
+import { AssociationField } from '@nocobase/client';
+import { connect, mapReadPretty } from '@formily/react';
+
+export const ReadOnlyAssociationField = connect(() => {
+  const { t } = useDepartmentTranslation();
+  return <div style={{ color: '#ccc' }}>{t('This field is currently not supported for use in form blocks.')} </div>;
+}, mapReadPretty(AssociationField.ReadPretty));
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/UserDepartmentsField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/components/UserDepartmentsField.tsx
new file mode 100644
index 0000000000..e866411db2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/UserDepartmentsField.tsx
@@ -0,0 +1,35 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { SchemaSettings } from '@nocobase/client';
+import { enableLink, fieldComponent, titleField } from './fieldSettings';
+
+export const UserDepartmentsFieldSettings = new SchemaSettings({
+  name: 'fieldSettings:component:UserDepartmentsField',
+  items: [
+    {
+      ...fieldComponent,
+    },
+    {
+      ...titleField,
+    },
+    {
+      ...enableLink,
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/UserMainDepartmentField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/components/UserMainDepartmentField.tsx
new file mode 100644
index 0000000000..0e8355e408
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/UserMainDepartmentField.tsx
@@ -0,0 +1,35 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { SchemaSettings } from '@nocobase/client';
+import { enableLink, fieldComponent, titleField } from './fieldSettings';
+
+export const UserMainDepartmentFieldSettings = new SchemaSettings({
+  name: 'fieldSettings:component:UserMainDepartmentField',
+  items: [
+    {
+      ...fieldComponent,
+    },
+    {
+      ...titleField,
+    },
+    {
+      ...enableLink,
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/fieldSettings.ts b/packages/plugins/@nocobase/plugin-departments/src/client/components/fieldSettings.ts
new file mode 100644
index 0000000000..bc637afa40
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/fieldSettings.ts
@@ -0,0 +1,185 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  useCollectionField,
+  useCollectionManager_deprecated,
+  useCollection_deprecated,
+  useCompile,
+  useDesignable,
+  useFieldComponentName,
+  useFieldModeOptions,
+  useIsAddNewForm,
+  useTitleFieldOptions,
+} from '@nocobase/client';
+import { useDepartmentTranslation } from '../locale';
+import { Field } from '@formily/core';
+import { useField, useFieldSchema, ISchema } from '@formily/react';
+
+export const titleField: any = {
+  name: 'titleField',
+  type: 'select',
+  useComponentProps() {
+    const { t } = useDepartmentTranslation();
+    const field = useField<Field>();
+    const { dn } = useDesignable();
+    const options = useTitleFieldOptions();
+    const { uiSchema, fieldSchema: tableColumnSchema, collectionField: tableColumnField } = useColumnSchema();
+    const schema = useFieldSchema();
+    const fieldSchema = tableColumnSchema || schema;
+    const targetCollectionField = useCollectionField();
+    const collectionField = tableColumnField || targetCollectionField;
+    const fieldNames = {
+      ...collectionField?.uiSchema?.['x-component-props']?.['fieldNames'],
+      ...field?.componentProps?.fieldNames,
+      ...fieldSchema?.['x-component-props']?.['fieldNames'],
+    };
+    return {
+      title: t('Title field'),
+      options,
+      value: fieldNames?.label,
+      onChange(label) {
+        const schema = {
+          ['x-uid']: fieldSchema['x-uid'],
+        };
+        const newFieldNames = {
+          ...collectionField?.uiSchema?.['x-component-props']?.['fieldNames'],
+          ...fieldSchema['x-component-props']?.['fieldNames'],
+          label,
+        };
+        fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+        fieldSchema['x-component-props']['fieldNames'] = newFieldNames;
+        schema['x-component-props'] = fieldSchema['x-component-props'];
+        field.componentProps.fieldNames = fieldSchema['x-component-props']?.fieldNames;
+        const path = field.path?.splice(field.path?.length - 1, 1);
+        field.form.query(`${path.concat(`*.` + fieldSchema.name)}`).forEach((f) => {
+          f.componentProps.fieldNames = fieldNames;
+        });
+        dn.emit('patch', {
+          schema,
+        });
+        dn.refresh();
+      },
+    };
+  },
+};
+
+export const isCollectionFieldComponent = (schema: ISchema) => {
+  return schema['x-component'] === 'CollectionField';
+};
+
+const useColumnSchema = () => {
+  const { getField } = useCollection_deprecated();
+  const compile = useCompile();
+  const columnSchema = useFieldSchema();
+  const { getCollectionJoinField } = useCollectionManager_deprecated();
+  const fieldSchema = columnSchema.reduceProperties((buf, s) => {
+    if (isCollectionFieldComponent(s)) {
+      return s;
+    }
+    return buf;
+  }, null);
+  if (!fieldSchema) {
+    return {};
+  }
+
+  const collectionField = getField(fieldSchema.name) || getCollectionJoinField(fieldSchema?.['x-collection-field']);
+  return { columnSchema, fieldSchema, collectionField, uiSchema: compile(collectionField?.uiSchema) };
+};
+
+export const enableLink = {
+  name: 'enableLink',
+  type: 'switch',
+  useVisible() {
+    const field = useField();
+    return field.readPretty;
+  },
+  useComponentProps() {
+    const { t } = useDepartmentTranslation();
+    const field = useField<Field>();
+    const { fieldSchema: tableColumnSchema } = useColumnSchema();
+    const schema = useFieldSchema();
+    const fieldSchema = tableColumnSchema || schema;
+    const { dn } = useDesignable();
+    return {
+      title: t('Enable link'),
+      checked: fieldSchema['x-component-props']?.enableLink !== false,
+      onChange(flag) {
+        fieldSchema['x-component-props'] = {
+          ...fieldSchema?.['x-component-props'],
+          enableLink: flag,
+        };
+        field.componentProps['enableLink'] = flag;
+        dn.emit('patch', {
+          schema: {
+            'x-uid': fieldSchema['x-uid'],
+            'x-component-props': {
+              ...fieldSchema?.['x-component-props'],
+            },
+          },
+        });
+        dn.refresh();
+      },
+    };
+  },
+};
+
+export const fieldComponent: any = {
+  name: 'fieldComponent',
+  type: 'select',
+  useComponentProps() {
+    const { t } = useDepartmentTranslation();
+    const field = useField<Field>();
+    const { fieldSchema: tableColumnSchema, collectionField } = useColumnSchema();
+    const schema = useFieldSchema();
+    const fieldSchema = tableColumnSchema || schema;
+    const fieldModeOptions = useFieldModeOptions({ fieldSchema: tableColumnSchema, collectionField });
+    // const isAddNewForm = useIsAddNewForm();
+    // const fieldMode = useFieldComponentName();
+    const { dn } = useDesignable();
+    return {
+      title: t('Field component'),
+      options: fieldModeOptions,
+      value: 'Select',
+      onChange(mode) {
+        const schema = {
+          ['x-uid']: fieldSchema['x-uid'],
+        };
+        fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+        fieldSchema['x-component-props']['mode'] = mode;
+        schema['x-component-props'] = fieldSchema['x-component-props'];
+        field.componentProps = field.componentProps || {};
+        field.componentProps.mode = mode;
+
+        // 子表单状态不允许设置默认值
+        // if (isSubMode(fieldSchema) && isAddNewForm) {
+        //   // @ts-ignore
+        //   schema.default = null;
+        //   fieldSchema.default = null;
+        //   field?.setInitialValue?.(null);
+        //   field?.setValue?.(null);
+        // }
+
+        void dn.emit('patch', {
+          schema,
+        });
+        dn.refresh();
+      },
+    };
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/index.ts b/packages/plugins/@nocobase/plugin-departments/src/client/components/index.ts
new file mode 100644
index 0000000000..a9a4c4c641
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/index.ts
@@ -0,0 +1,22 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export * from './ReadOnlyAssociationField';
+export * from './UserDepartmentsField';
+export * from './UserMainDepartmentField';
+export * from './DepartmentOwnersField';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/AggregateSearch.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/AggregateSearch.tsx
new file mode 100644
index 0000000000..fccec99e2b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/AggregateSearch.tsx
@@ -0,0 +1,216 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext } from 'react';
+import { Input, Button, Empty, MenuProps, Dropdown, theme } from 'antd';
+import { useDepartmentTranslation } from '../locale';
+import { createStyles, useAPIClient, useRequest } from '@nocobase/client';
+import { ResourcesContext } from '../ResourcesProvider';
+
+const useStyles = createStyles(({ css }) => {
+  return {
+    searchDropdown: css`
+      .ant-dropdown-menu {
+        max-height: 500px;
+        overflow-y: scroll;
+      }
+    `,
+  };
+});
+
+export const AggregateSearch: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  const { token } = theme.useToken();
+  const { setDepartment, setUser } = useContext(ResourcesContext);
+  const [open, setOpen] = React.useState(false);
+  const [keyword, setKeyword] = React.useState('');
+  const [users, setUsers] = React.useState([]);
+  const [departments, setDepartments] = React.useState([]);
+  const [moreUsers, setMoreUsers] = React.useState(true);
+  const [moreDepartments, setMoreDepartments] = React.useState(true);
+  const { styles } = useStyles();
+  const limit = 10;
+
+  const api = useAPIClient();
+  const service = useRequest(
+    (params) =>
+      api
+        .resource('departments')
+        .aggregateSearch(params)
+        .then((res) => res?.data?.data),
+    {
+      manual: true,
+      onSuccess: (data, params) => {
+        const {
+          values: { type },
+        } = params[0] || {};
+        if (!data) {
+          return;
+        }
+        if ((!type || type === 'user') && data['users'].length < limit) {
+          setMoreUsers(false);
+        }
+        if ((!type || type === 'department') && data['departments'].length < limit) {
+          setMoreDepartments(false);
+        }
+        setUsers((users) => [...users, ...data['users']]);
+        setDepartments((departments) => [...departments, ...data['departments']]);
+      },
+    },
+  );
+  const { run } = service;
+
+  const handleSearch = (keyword: string) => {
+    setKeyword(keyword);
+    setUsers([]);
+    setDepartments([]);
+    setMoreUsers(true);
+    setMoreDepartments(true);
+    if (!keyword) {
+      return;
+    }
+    run({
+      values: { keyword, limit },
+    });
+    setOpen(true);
+  };
+
+  const handleChange = (e) => {
+    if (e.target.value) {
+      return;
+    }
+    setUser(null);
+    setKeyword('');
+    setOpen(false);
+    service.mutate({});
+    setUsers([]);
+    setDepartments([]);
+  };
+
+  const getTitle = (department: any) => {
+    const title = department.title;
+    const parent = department.parent;
+    if (parent) {
+      return getTitle(parent) + ' / ' + title;
+    }
+    return title;
+  };
+
+  const LoadMore: React.FC<{ type: string; last: number }> = (props) => {
+    return (
+      <Button
+        type="link"
+        style={{ padding: '0 8px' }}
+        onClick={(e) => {
+          setOpen(true);
+          run({
+            values: { keyword, limit, ...props },
+          });
+        }}
+      >
+        {t('Load more')}
+      </Button>
+    );
+  };
+
+  const getItems = () => {
+    const items: MenuProps['items'] = [];
+    if (!users.length && !departments.length) {
+      return [
+        {
+          key: '0',
+          label: <Empty description={t('No results')} image={Empty.PRESENTED_IMAGE_SIMPLE} />,
+          disabled: true,
+        },
+      ];
+    }
+    if (users.length) {
+      items.push({
+        key: '0',
+        type: 'group',
+        label: t('Users'),
+        children: users.map((user: { nickname: string; username: string; phone?: string; email?: string }) => ({
+          key: user.username,
+          label: (
+            <div onClick={() => setUser(user)}>
+              <div>{user.nickname || user.username}</div>
+              <div
+                style={{
+                  fontSize: token.fontSizeSM,
+                  color: token.colorTextDescription,
+                }}
+              >
+                {`${user.username}${user.phone ? ' | ' + user.phone : ''}${user.email ? ' | ' + user.email : ''}`}
+              </div>
+            </div>
+          ),
+        })),
+      });
+      if (moreUsers) {
+        items.push({
+          type: 'group',
+          key: '0-loadMore',
+          label: <LoadMore type="user" last={users[users.length - 1].id} />,
+        });
+      }
+    }
+    if (departments.length) {
+      items.push({
+        key: '1',
+        type: 'group',
+        label: t('Departments'),
+        children: departments.map((department: any) => ({
+          key: department.id,
+          label: <div onClick={() => setDepartment(department)}>{getTitle(department)}</div>,
+        })),
+      });
+      if (moreDepartments) {
+        items.push({
+          type: 'group',
+          key: '1-loadMore',
+          label: <LoadMore type="department" last={departments[departments.length - 1].id} />,
+        });
+      }
+    }
+    return items;
+  };
+
+  return (
+    <Dropdown
+      menu={{ items: getItems() }}
+      overlayClassName={styles.searchDropdown}
+      trigger={['click']}
+      open={open}
+      onOpenChange={(open) => setOpen(open)}
+    >
+      <Input.Search
+        allowClear
+        onClick={() => {
+          if (!keyword) {
+            setOpen(false);
+          }
+        }}
+        onFocus={() => setDepartment(null)}
+        onSearch={handleSearch}
+        onChange={handleChange}
+        placeholder={t('Search for departments, users')}
+        style={{ marginBottom: '20px' }}
+      />
+    </Dropdown>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/Department.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/Department.tsx
new file mode 100644
index 0000000000..b8673777ab
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/Department.tsx
@@ -0,0 +1,149 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { createContext, useContext, useState } from 'react';
+import { Row, Button, Divider, theme } from 'antd';
+import { UserOutlined } from '@ant-design/icons';
+import { useDepartmentTranslation } from '../locale';
+import { NewDepartment } from './NewDepartment';
+import { DepartmentTree } from './DepartmentTree';
+import { ResourcesContext } from '../ResourcesProvider';
+import { AggregateSearch } from './AggregateSearch';
+import { useDepartmentManager } from '../hooks';
+import {
+  ActionContextProvider,
+  RecordProvider,
+  SchemaComponent,
+  SchemaComponentOptions,
+  useAPIClient,
+  useActionContext,
+  useRecord,
+  useResourceActionContext,
+} from '@nocobase/client';
+import { useForm, useField } from '@formily/react';
+import { DepartmentOwnersField } from './DepartmentOwnersField';
+
+export const DepartmentTreeContext = createContext({} as ReturnType<typeof useDepartmentManager>);
+
+export const useCreateDepartment = () => {
+  const form = useForm();
+  const field = useField();
+  const ctx = useActionContext();
+  const { refreshAsync } = useResourceActionContext();
+  const api = useAPIClient();
+  const { expandedKeys, setLoadedKeys, setExpandedKeys } = useContext(DepartmentTreeContext);
+  return {
+    async run() {
+      try {
+        await form.submit();
+        field.data = field.data || {};
+        field.data.loading = true;
+        await api.resource('departments').create({ values: form.values });
+        ctx.setVisible(false);
+        await form.reset();
+        field.data.loading = false;
+        const expanded = [...expandedKeys];
+        setLoadedKeys([]);
+        setExpandedKeys([]);
+        await refreshAsync();
+        setExpandedKeys(expanded);
+      } catch (error) {
+        if (field.data) {
+          field.data.loading = false;
+        }
+      }
+    },
+  };
+};
+
+export const useUpdateDepartment = () => {
+  const field = useField();
+  const form = useForm();
+  const ctx = useActionContext();
+  const { refreshAsync } = useResourceActionContext();
+  const api = useAPIClient();
+  const { id: filterByTk } = useRecord() as any;
+  const { expandedKeys, setLoadedKeys, setExpandedKeys } = useContext(DepartmentTreeContext);
+  const { department, setDepartment } = useContext(ResourcesContext);
+  return {
+    async run() {
+      await form.submit();
+      field.data = field.data || {};
+      field.data.loading = true;
+      try {
+        await api.resource('departments').update({ filterByTk, values: form.values });
+        setDepartment({ department, ...form.values });
+        ctx.setVisible(false);
+        await form.reset();
+        const expanded = [...expandedKeys];
+        setLoadedKeys([]);
+        setExpandedKeys([]);
+        await refreshAsync();
+        setExpandedKeys(expanded);
+      } catch (e) {
+        console.log(e);
+      } finally {
+        field.data.loading = false;
+      }
+    },
+  };
+};
+
+export const Department: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  const [visible, setVisible] = useState(false);
+  const [drawer, setDrawer] = useState({} as any);
+  const { department, setDepartment } = useContext(ResourcesContext);
+  const { token } = theme.useToken();
+  const departmentManager = useDepartmentManager({
+    label: ({ node }) => <DepartmentTree.Item node={node} setVisible={setVisible} setDrawer={setDrawer} />,
+  });
+
+  return (
+    <SchemaComponentOptions scope={{ useCreateDepartment, useUpdateDepartment }}>
+      <DepartmentTreeContext.Provider value={departmentManager}>
+        <Row>
+          <AggregateSearch />
+          <Button
+            type="text"
+            icon={<UserOutlined />}
+            style={{
+              textAlign: 'left',
+              marginBottom: '5px',
+              background: department ? '' : token.colorBgTextHover,
+            }}
+            onClick={() => {
+              setDepartment(null);
+            }}
+            block
+          >
+            {t('All users')}
+          </Button>
+          <NewDepartment />
+        </Row>
+        <Divider style={{ margin: '12px 0' }} />
+        <DepartmentTree />
+        <ActionContextProvider value={{ visible, setVisible }}>
+          <RecordProvider record={drawer.node || {}}>
+            <SchemaComponent scope={{ t }} components={{ DepartmentOwnersField }} schema={drawer.schema || {}} />
+          </RecordProvider>
+        </ActionContextProvider>
+      </DepartmentTreeContext.Provider>
+    </SchemaComponentOptions>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentBlock.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentBlock.tsx
new file mode 100644
index 0000000000..01b379d59a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentBlock.tsx
@@ -0,0 +1,40 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React from 'react';
+import { SchemaComponent } from '@nocobase/client';
+import { DepartmentManagement } from './DepartmentManagement';
+import { uid } from '@formily/shared';
+
+export const DepartmentBlock: React.FC = () => {
+  return (
+    <SchemaComponent
+      components={{ DepartmentManagement }}
+      schema={{
+        type: 'void',
+        properties: {
+          [uid()]: {
+            type: 'void',
+            'x-decorator': 'CardItem',
+            'x-component': 'DepartmentManagement',
+          },
+        },
+      }}
+    />
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentField.tsx
new file mode 100644
index 0000000000..76763a15bb
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentField.tsx
@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext } from 'react';
+import { useField } from '@formily/react';
+import { Field } from '@formily/core';
+import { ResourcesContext } from '../ResourcesProvider';
+import { getDepartmentTitle } from '../utils';
+import { EllipsisWithTooltip } from '@nocobase/client';
+
+export const DepartmentField: React.FC = () => {
+  const { setDepartment } = useContext(ResourcesContext);
+  const field = useField<Field>();
+  const values = field.value || [];
+  const deptsMap = values.reduce((mp: { [id: number]: any }, dept: any) => {
+    mp[dept.id] = dept;
+    return mp;
+  }, {});
+  const depts = values.map((dept: { id: number; title: string }, index: number) => (
+    <span key={index}>
+      <a
+        onClick={(e) => {
+          e.preventDefault();
+          setDepartment(deptsMap[dept.id]);
+        }}
+      >
+        {getDepartmentTitle(dept)}
+      </a>
+      {index !== values.length - 1 ? <span style={{ marginRight: 4, color: '#aaa' }}>,</span> : ''}
+    </span>
+  ));
+  return <EllipsisWithTooltip ellipsis={true}>{depts}</EllipsisWithTooltip>;
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentManagement.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentManagement.tsx
new file mode 100644
index 0000000000..5bae972bf8
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentManagement.tsx
@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React from 'react';
+import { Col, Row } from 'antd';
+import { Department } from './Department';
+import { Member } from './Member';
+import { SchemaComponentOptions } from '@nocobase/client';
+import { SuperiorDepartmentSelect, DepartmentSelect } from './DepartmentTreeSelect';
+import { DepartmentsListProvider, UsersListProvider } from '../ResourcesProvider';
+
+export const DepartmentManagement: React.FC = () => {
+  return (
+    <SchemaComponentOptions components={{ SuperiorDepartmentSelect, DepartmentSelect }}>
+      <Row gutter={48} style={{ flexWrap: 'nowrap' }}>
+        <Col span={6} style={{ borderRight: '1px solid #eee', minWidth: '300px' }}>
+          <DepartmentsListProvider>
+            <Department />
+          </DepartmentsListProvider>
+        </Col>
+        <Col flex="auto" style={{ overflow: 'hidden' }}>
+          <UsersListProvider>
+            <Member />
+          </UsersListProvider>
+        </Col>
+      </Row>
+    </SchemaComponentOptions>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentOwnersField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentOwnersField.tsx
new file mode 100644
index 0000000000..6faffb38f3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentOwnersField.tsx
@@ -0,0 +1,115 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  ActionContextProvider,
+  ResourceActionProvider,
+  SchemaComponent,
+  useActionContext,
+  useRecord,
+} from '@nocobase/client';
+import React, { useEffect, useRef, useState } from 'react';
+import { Select } from 'antd';
+import { Field } from '@formily/core';
+import { useField } from '@formily/react';
+import { departmentOwnersSchema } from './schemas/departments';
+
+export const DepartmentOwnersField: React.FC = () => {
+  const [visible, setVisible] = useState(false);
+  const department = useRecord() as any;
+  const field = useField<Field>();
+  const [value, setValue] = useState([]);
+  const selectedRows = useRef([]);
+  const handleSelect = (_: number[], rows: any[]) => {
+    selectedRows.current = rows;
+  };
+
+  const useSelectOwners = () => {
+    const { setVisible } = useActionContext();
+    return {
+      run() {
+        const selected = field.value || [];
+        field.setValue([...selected, ...selectedRows.current]);
+        selectedRows.current = [];
+        setVisible(false);
+      },
+    };
+  };
+
+  useEffect(() => {
+    if (!field.value) {
+      return;
+    }
+    setValue(
+      field.value.map((owner: any) => ({
+        value: owner.id,
+        label: owner.nickname || owner.username,
+      })),
+    );
+  }, [field.value]);
+
+  const RequestProvider: React.FC = (props) => (
+    <ResourceActionProvider
+      collection="users"
+      request={{
+        resource: `departments/${department.id}/members`,
+        action: 'list',
+        params: {
+          filter: field.value?.length
+            ? {
+                id: {
+                  $notIn: field.value.map((owner: any) => owner.id),
+                },
+              }
+            : {},
+        },
+      }}
+    >
+      {props.children}
+    </ResourceActionProvider>
+  );
+
+  return (
+    <ActionContextProvider value={{ visible, setVisible }}>
+      <Select
+        open={false}
+        onChange={(value) => {
+          if (!value) {
+            field.setValue([]);
+            return;
+          }
+          field.setValue(
+            value.map(({ label, value }: { label: string; value: string }) => ({
+              id: value,
+              nickname: label,
+            })),
+          );
+        }}
+        mode="multiple"
+        value={value}
+        labelInValue={true}
+        onDropdownVisibleChange={(open) => setVisible(open)}
+      />
+      <SchemaComponent
+        schema={departmentOwnersSchema}
+        components={{ RequestProvider }}
+        scope={{ department, handleSelect, useSelectOwners }}
+      />
+    </ActionContextProvider>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx
new file mode 100644
index 0000000000..e1e3a768d2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx
@@ -0,0 +1,263 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  CollectionContext,
+  CollectionProvider_deprecated,
+  ResourceActionContext,
+  SchemaComponent,
+  mergeFilter,
+  removeNullCondition,
+  useFilterFieldOptions,
+  useFilterFieldProps,
+  useResourceActionContext,
+} from '@nocobase/client';
+import React, { createContext, useContext, useEffect, useState } from 'react';
+import { useDepartmentManager } from '../hooks';
+import { Table, TablePaginationConfig, TableProps } from 'antd';
+import { departmentCollection } from '../collections/departments';
+import { useDepartmentTranslation } from '../locale';
+import { useField } from '@formily/react';
+import { Field } from '@formily/core';
+import { uid } from '@formily/shared';
+import { getDepartmentTitle } from '../utils';
+
+const ExpandMetaContext = createContext<any>({});
+
+export const useFilterActionProps = () => {
+  const { setHasFilter, setExpandedKeys } = useContext(ExpandMetaContext);
+  const { t } = useDepartmentTranslation();
+  const collection = useContext(CollectionContext);
+  const options = useFilterFieldOptions(collection.fields);
+  const service = useResourceActionContext();
+  const { run, defaultRequest } = service;
+  const field = useField<Field>();
+  const { params } = defaultRequest || {};
+
+  return {
+    options,
+    onSubmit: async (values: any) => {
+      // filter parameter for the block
+      const defaultFilter = params.filter;
+      // filter parameter for the filter action
+      const filter = removeNullCondition(values?.filter);
+      run({
+        ...params,
+        page: 1,
+        pageSize: 10,
+        filter: mergeFilter([filter, defaultFilter]),
+      });
+      const items = filter?.$and || filter?.$or;
+      if (items?.length) {
+        field.title = t('{{count}} filter items', { count: items?.length || 0 });
+        setHasFilter(true);
+      } else {
+        field.title = t('Filter');
+        setHasFilter(false);
+      }
+    },
+    onReset() {
+      run({
+        ...(params || {}),
+        filter: {
+          ...(params?.filter || {}),
+          parentId: null,
+        },
+        page: 1,
+        pageSize: 10,
+      });
+      field.title = t('Filter');
+      setHasFilter(false);
+      setExpandedKeys([]);
+    },
+  };
+};
+
+const useDefaultDisabled = () => {
+  return {
+    disabled: () => false,
+  };
+};
+
+const InternalDepartmentTable: React.FC<{
+  useDisabled?: () => {
+    disabled: (record: any) => boolean;
+  };
+}> = ({ useDisabled = useDefaultDisabled }) => {
+  const { t } = useDepartmentTranslation();
+  const ctx = useResourceActionContext();
+  console.log(ctx);
+  const { run, data, loading, defaultRequest } = ctx;
+  const { resource, resourceOf, params } = defaultRequest || {};
+  const { treeData, initData, loadData } = useDepartmentManager({
+    resource,
+    resourceOf,
+    params,
+  });
+  const field = useField<Field>();
+  const { disabled } = useDisabled();
+  const { hasFilter, expandedKeys, setExpandedKeys } = useContext(ExpandMetaContext);
+
+  useEffect(() => {
+    if (hasFilter) {
+      return;
+    }
+    initData(data?.data);
+  }, [data, initData, loading, hasFilter]);
+
+  const pagination: TablePaginationConfig = {};
+  if (params?.pageSize) {
+    pagination.defaultPageSize = params.pageSize;
+  }
+  if (!pagination.total && data?.meta) {
+    const { count, page, pageSize } = data.meta;
+    pagination.total = count;
+    pagination.current = page;
+    pagination.pageSize = pageSize;
+  }
+
+  return (
+    <Table
+      rowKey="id"
+      columns={
+        [
+          {
+            dataIndex: 'title',
+            title: t('Department name'),
+            render: (text, record) => (hasFilter ? getDepartmentTitle(record) : text),
+          },
+        ] as TableProps['columns']
+      }
+      rowSelection={{
+        selectedRowKeys: (field?.value || []).map((dept: any) => dept.id),
+        onChange: (keys, depts) => field?.setValue?.(depts),
+        getCheckboxProps: (record: any) => ({
+          disabled: disabled(record),
+        }),
+      }}
+      pagination={{
+        showSizeChanger: true,
+        ...pagination,
+        onChange(page, pageSize) {
+          run({
+            ...(ctx?.params?.[0] || {}),
+            page,
+            pageSize,
+          });
+        },
+      }}
+      dataSource={hasFilter ? data?.data || [] : treeData}
+      expandable={{
+        onExpand: (expanded, record) => {
+          loadData({
+            key: record.id,
+            children: record.children,
+          });
+        },
+        expandedRowKeys: expandedKeys,
+        onExpandedRowsChange: (keys) => setExpandedKeys(keys),
+      }}
+    />
+  );
+};
+
+const RequestProvider: React.FC<{
+  useDataSource: any;
+}> = (props) => {
+  const [expandedKeys, setExpandedKeys] = useState([]);
+  const [hasFilter, setHasFilter] = useState(false);
+  const { useDataSource } = props;
+  const service = useDataSource({
+    manual: true,
+  });
+  useEffect(() => {
+    service.run({
+      filter: {
+        parentId: null,
+      },
+      pageSize: 10,
+    });
+  }, []);
+  return (
+    <ResourceActionContext.Provider value={{ ...service }}>
+      <CollectionProvider_deprecated collection={departmentCollection}>
+        <ExpandMetaContext.Provider value={{ expandedKeys, setExpandedKeys, hasFilter, setHasFilter }}>
+          {props.children}
+        </ExpandMetaContext.Provider>
+      </CollectionProvider_deprecated>
+    </ResourceActionContext.Provider>
+  );
+};
+
+export const DepartmentTable: React.FC<{
+  useDataSource: any;
+  useDisabled?: (record: any) => boolean;
+}> = ({ useDataSource, useDisabled }) => {
+  return (
+    <SchemaComponent
+      scope={{ useDisabled, useFilterActionProps }}
+      components={{ InternalDepartmentTable, RequestProvider }}
+      schema={{
+        type: 'void',
+        properties: {
+          [uid()]: {
+            type: 'void',
+            'x-component': 'RequestProvider',
+            'x-component-props': {
+              useDataSource,
+            },
+            properties: {
+              actions: {
+                type: 'void',
+                'x-component': 'ActionBar',
+                'x-component-props': {
+                  style: {
+                    marginBottom: 16,
+                  },
+                },
+                properties: {
+                  filter: {
+                    type: 'void',
+                    title: '{{ t("Filter") }}',
+                    default: {
+                      $and: [{ title: { $includes: '' } }],
+                    },
+                    'x-action': 'filter',
+                    'x-component': 'Filter.Action',
+                    'x-use-component-props': 'useFilterActionProps',
+                    'x-component-props': {
+                      icon: 'FilterOutlined',
+                    },
+                    'x-align': 'left',
+                  },
+                },
+              },
+              departments: {
+                type: 'array',
+                'x-component': 'InternalDepartmentTable',
+                'x-component-props': {
+                  useDisabled: '{{ useDisabled }}',
+                },
+              },
+            },
+          },
+        },
+      }}
+    />
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTree.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTree.tsx
new file mode 100644
index 0000000000..03ac4080b6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTree.tsx
@@ -0,0 +1,181 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext, useEffect } from 'react';
+import { Tree, Dropdown, App, Empty } from 'antd';
+import { MoreOutlined } from '@ant-design/icons';
+import { useAPIClient, useResourceActionContext } from '@nocobase/client';
+import { useDepartmentTranslation } from '../locale';
+import { editDepartmentSchema, newSubDepartmentSchema } from './schemas/departments';
+import { ResourcesContext } from '../ResourcesProvider';
+import { DepartmentTreeContext } from './Department';
+import { css } from '@emotion/css';
+
+type DepartmentTreeProps = {
+  node: {
+    id: number;
+    title: string;
+    parent?: any;
+  };
+  setVisible: (visible: boolean) => void;
+  setDrawer: (schema: any) => void;
+};
+
+export const DepartmentTree: React.FC & {
+  Item: React.FC<DepartmentTreeProps>;
+} = () => {
+  const { data, loading } = useResourceActionContext();
+  const { department, setDepartment, setUser } = useContext(ResourcesContext);
+  const { treeData, nodeMap, loadData, loadedKeys, setLoadedKeys, initData, expandedKeys, setExpandedKeys } =
+    useContext(DepartmentTreeContext);
+  const handleSelect = (keys: number[]) => {
+    if (!keys.length) {
+      return;
+    }
+    const node = nodeMap[keys[0]];
+    setDepartment(node);
+    setUser(null);
+  };
+
+  const handleExpand = (keys: number[]) => {
+    setExpandedKeys(keys);
+  };
+
+  const handleLoad = (keys: number[]) => {
+    setLoadedKeys(keys);
+  };
+
+  useEffect(() => {
+    initData(data?.data);
+  }, [data, initData, loading]);
+
+  useEffect(() => {
+    if (!department) {
+      return;
+    }
+    const getIds = (node: any) => {
+      if (node.parent) {
+        return [node.parent.id, ...getIds(node.parent)];
+      }
+      return [];
+    };
+    const newKeys = getIds(department);
+    setExpandedKeys((keys) => Array.from(new Set([...keys, ...newKeys])));
+  }, [department, setExpandedKeys]);
+
+  return (
+    <div
+      className={css`
+        height: 65vh;
+        overflow: auto;
+        .ant-tree-node-content-wrapper {
+          overflow: hidden;
+        }
+      `}
+    >
+      {treeData?.length ? (
+        <Tree.DirectoryTree
+          loadData={loadData}
+          treeData={treeData}
+          loadedKeys={loadedKeys}
+          onSelect={handleSelect}
+          selectedKeys={[department?.id]}
+          onExpand={handleExpand}
+          onLoad={handleLoad}
+          expandedKeys={expandedKeys}
+          expandAction={false}
+          showIcon={false}
+          fieldNames={{
+            key: 'id',
+          }}
+        />
+      ) : (
+        <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+      )}
+    </div>
+  );
+};
+
+DepartmentTree.Item = function DepartmentTreeItem({ node, setVisible, setDrawer }: DepartmentTreeProps) {
+  const { t } = useDepartmentTranslation();
+  const { refreshAsync } = useResourceActionContext();
+  const { setLoadedKeys, expandedKeys, setExpandedKeys } = useContext(DepartmentTreeContext);
+  const { modal, message } = App.useApp();
+  const api = useAPIClient();
+  const deleteDepartment = () => {
+    modal.confirm({
+      title: t('Delete'),
+      content: t('Are you sure you want to delete it?'),
+      onOk: async () => {
+        await api.resource('departments').destroy({ filterByTk: node.id });
+        message.success(t('Deleted successfully'));
+        setExpandedKeys((keys) => keys.filter((k) => k !== node.id));
+        const expanded = [...expandedKeys];
+        setLoadedKeys([]);
+        setExpandedKeys([]);
+        await refreshAsync();
+        setExpandedKeys(expanded);
+      },
+    });
+  };
+  const openDrawer = (schema: any) => {
+    setDrawer({ schema, node });
+    setVisible(true);
+  };
+  const handleClick = ({ key, domEvent }) => {
+    domEvent.stopPropagation();
+    switch (key) {
+      case 'new-sub':
+        openDrawer(newSubDepartmentSchema);
+        break;
+      case 'edit':
+        openDrawer(editDepartmentSchema);
+        break;
+      case 'delete':
+        deleteDepartment();
+    }
+  };
+  return (
+    <div style={{ display: 'flex', justifyContent: 'space-between', overflow: 'hidden' }}>
+      <div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{node.title}</div>
+      <Dropdown
+        menu={{
+          items: [
+            {
+              label: t('New sub department'),
+              key: 'new-sub',
+            },
+            {
+              label: t('Edit department'),
+              key: 'edit',
+            },
+            {
+              label: t('Delete department'),
+              key: 'delete',
+            },
+          ],
+          onClick: handleClick,
+        }}
+      >
+        <div style={{ marginLeft: '15px' }}>
+          <MoreOutlined />
+        </div>
+      </Dropdown>
+    </div>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTreeSelect.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTreeSelect.tsx
new file mode 100644
index 0000000000..b66b511548
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTreeSelect.tsx
@@ -0,0 +1,136 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useCallback, useContext, useEffect } from 'react';
+import { TreeSelect } from 'antd';
+import { useField } from '@formily/react';
+import { Field } from '@formily/core';
+import { useRecord } from '@nocobase/client';
+import { ResourcesContext } from '../ResourcesProvider';
+import { useDepartmentManager } from '../hooks/departments-manager';
+
+export const DepartmentTreeSelect: React.FC<{
+  originData: any;
+  treeData: any[];
+  [key: string]: any;
+}> = (props) => {
+  const field = useField<Field>();
+  const [value, setValue] = React.useState({ label: null, value: null });
+  const { treeData, initData, getByKeyword, loadData, loadedKeys, setLoadedKeys, originData } = props;
+
+  const handleSearch = async (keyword: string) => {
+    if (!keyword) {
+      initData(originData);
+      return;
+    }
+    await getByKeyword(keyword);
+  };
+
+  const getTitle = useCallback((record: any) => {
+    const title = record.title;
+    const parent = record.parent;
+    if (parent) {
+      return getTitle(parent) + ' / ' + title;
+    }
+    return title;
+  }, []);
+
+  useEffect(() => {
+    initData(originData);
+  }, [originData, initData]);
+
+  useEffect(() => {
+    if (!field.value) {
+      setValue({ label: null, value: null });
+      return;
+    }
+    setValue({
+      label: getTitle(field.value) || field.value.label,
+      value: field.value.id,
+    });
+  }, [field.value, getTitle]);
+
+  return (
+    <TreeSelect
+      value={value}
+      onSelect={(_: any, node: any) => {
+        field.setValue(node);
+      }}
+      onChange={(value: any) => {
+        if (!value) {
+          field.setValue(null);
+        }
+      }}
+      treeData={treeData}
+      treeLoadedKeys={loadedKeys}
+      onTreeLoad={(keys: any[]) => setLoadedKeys(keys)}
+      loadData={(node: any) => loadData({ key: node.id, children: node.children })}
+      fieldNames={{
+        value: 'id',
+      }}
+      showSearch
+      allowClear
+      treeNodeFilterProp="title"
+      onSearch={handleSearch}
+      labelInValue={true}
+    />
+  );
+};
+
+export const DepartmentSelect: React.FC = () => {
+  const departmentManager = useDepartmentManager();
+  const { departmentsResource } = useContext(ResourcesContext);
+  const {
+    service: { data },
+  } = departmentsResource || {};
+  return <DepartmentTreeSelect {...departmentManager} originData={data?.data} />;
+};
+
+export const SuperiorDepartmentSelect: React.FC = () => {
+  const departmentManager = useDepartmentManager();
+  const { setTreeData, getChildrenIds } = departmentManager;
+  const record = useRecord() as any;
+  const { departmentsResource } = useContext(ResourcesContext);
+  const {
+    service: { data },
+  } = departmentsResource || {};
+
+  useEffect(() => {
+    if (!record.id) {
+      return;
+    }
+    const childrenIds = getChildrenIds(record.id);
+    childrenIds.push(record.id);
+    setTreeData((treeData) => {
+      const setDisabled = (treeData: any[]) => {
+        return treeData.map((node) => {
+          if (childrenIds.includes(node.id)) {
+            node.disabled = true;
+          }
+          if (node.children) {
+            node.children = setDisabled(node.children);
+          }
+          return node;
+        });
+      };
+      return setDisabled(treeData);
+    });
+  }, [setTreeData, record.id, getChildrenIds]);
+
+  return <DepartmentTreeSelect {...departmentManager} originData={data?.data} />;
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/IsOwnerField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/IsOwnerField.tsx
new file mode 100644
index 0000000000..e685d2d89a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/IsOwnerField.tsx
@@ -0,0 +1,30 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext } from 'react';
+import { useDepartmentTranslation } from '../locale';
+import { Checkbox, useRecord } from '@nocobase/client';
+import { ResourcesContext } from '../ResourcesProvider';
+
+export const IsOwnerField: React.FC = () => {
+  const { department } = useContext(ResourcesContext);
+  const record = useRecord() as any;
+  const dept = (record.departments || []).find((dept: any) => dept?.id === department?.id);
+
+  return <Checkbox.ReadPretty value={dept?.departmentsUsers.isOwner} />;
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/Member.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/Member.tsx
new file mode 100644
index 0000000000..a23aa2bde8
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/Member.tsx
@@ -0,0 +1,235 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext, useRef, useEffect, useMemo } from 'react';
+import { useDepartmentTranslation } from '../locale';
+import {
+  CollectionContext,
+  ResourceActionProvider,
+  SchemaComponent,
+  useAPIClient,
+  useActionContext,
+  useFilterFieldOptions,
+  useFilterFieldProps,
+  useRecord,
+  useResourceActionContext,
+  useTableBlockContext,
+} from '@nocobase/client';
+import { membersActionSchema, addMembersSchema, rowRemoveActionSchema, getMembersSchema } from './schemas/users';
+import { App } from 'antd';
+import { DepartmentField } from './DepartmentField';
+import { IsOwnerField } from './IsOwnerField';
+import { UserDepartmentsField } from './UserDepartmentsField';
+import { ResourcesContext } from '../ResourcesProvider';
+import { useTableBlockProps } from '../hooks/useTableBlockProps';
+
+const AddMembersListProvider: React.FC = (props) => {
+  const { department } = useContext(ResourcesContext);
+  return (
+    <ResourceActionProvider
+      {...{
+        collection: 'users',
+        request: {
+          resource: 'users',
+          action: 'listExcludeDept',
+          params: {
+            departmentId: department?.id,
+          },
+        },
+      }}
+    >
+      {props.children}
+    </ResourceActionProvider>
+  );
+};
+
+const useAddMembersFilterActionProps = () => {
+  const collection = useContext(CollectionContext);
+  const options = useFilterFieldOptions(collection.fields);
+  const service = useResourceActionContext();
+  return useFilterFieldProps({
+    options,
+    params: service.state?.params?.[0] || service.params,
+    service,
+  });
+};
+
+export const AddMembers: React.FC = () => {
+  const { department } = useContext(ResourcesContext);
+  // This resource is the list of members of the current department.
+  const {
+    service: { refresh },
+  } = useTableBlockContext();
+  const selectedKeys = useRef([]);
+  const api = useAPIClient();
+
+  const useAddMembersActionProps = () => {
+    const { department } = useContext(ResourcesContext);
+    const { setVisible } = useActionContext();
+    return {
+      async onClick() {
+        const selected = selectedKeys.current;
+        if (!selected?.length) {
+          return;
+        }
+        await api.resource('departments.members', department.id).add({
+          values: selected,
+        });
+        selectedKeys.current = [];
+        refresh();
+        setVisible?.(false);
+      },
+    };
+  };
+
+  const handleSelect = (keys: any[]) => {
+    selectedKeys.current = keys;
+  };
+
+  return (
+    <SchemaComponent
+      scope={{
+        useAddMembersActionProps,
+        department,
+        handleSelect,
+        useAddMembersFilterActionProps,
+      }}
+      components={{ AddMembersListProvider }}
+      schema={addMembersSchema}
+    />
+  );
+};
+
+const useBulkRemoveMembersAction = () => {
+  const { t } = useDepartmentTranslation();
+  const { message } = App.useApp();
+  const api = useAPIClient();
+  const {
+    service: { refresh },
+    field,
+  } = useTableBlockContext();
+  const { department } = useContext(ResourcesContext);
+  return {
+    async run() {
+      const selected = field?.data?.selectedRowKeys;
+      if (!selected?.length) {
+        message.warning(t('Please select members'));
+        return;
+      }
+      await api.resource('departments.members', department.id).remove({
+        values: selected,
+      });
+      field.data.selectedRowKeys = [];
+      refresh();
+    },
+  };
+};
+
+const useRemoveMemberAction = () => {
+  const api = useAPIClient();
+  const { department } = useContext(ResourcesContext);
+  const { id } = useRecord() as any;
+  const {
+    service: { refresh },
+  } = useTableBlockContext();
+  return {
+    async run() {
+      await api.resource('departments.members', department.id).remove({
+        values: [id],
+      });
+      refresh();
+    },
+  };
+};
+
+const useShowTotal = () => {
+  const {
+    service: { data },
+  } = useTableBlockContext();
+  const { t } = useDepartmentTranslation();
+  return t('Total {{count}} members', { count: data?.meta?.count });
+};
+
+const useRefreshActionProps = () => {
+  const { service } = useTableBlockContext();
+  return {
+    async onClick() {
+      service?.refresh?.();
+    },
+  };
+};
+
+const RowRemoveAction = () => {
+  const { department } = useContext(ResourcesContext);
+  return department ? <SchemaComponent scope={{ useRemoveMemberAction }} schema={rowRemoveActionSchema} /> : null;
+};
+
+const MemberActions = () => {
+  const { department } = useContext(ResourcesContext);
+  return department ? <SchemaComponent schema={membersActionSchema} /> : null;
+};
+
+const useMemberFilterActionProps = () => {
+  const collection = useContext(CollectionContext);
+  const options = useFilterFieldOptions(collection.fields);
+  const { service } = useTableBlockContext();
+  return useFilterFieldProps({
+    options,
+    params: service.state?.params?.[0] || service.params,
+    service,
+  });
+};
+
+export const Member: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  const { department, user } = useContext(ResourcesContext);
+  const {
+    service: { data, setState },
+  } = useTableBlockContext();
+
+  useEffect(() => {
+    setState?.({ selectedRowKeys: [] });
+  }, [data, setState]);
+
+  const schema = useMemo(() => getMembersSchema(department, user), [department, user]);
+
+  return (
+    <>
+      {!user ? <h2>{t(department?.title || 'All users')}</h2> : <h2>{t('Search results')}</h2>}
+      <SchemaComponent
+        scope={{
+          useBulkRemoveMembersAction,
+          t,
+          useShowTotal,
+          useRefreshActionProps,
+          useMemberFilterActionProps,
+          useTableBlockProps,
+        }}
+        components={{
+          MemberActions,
+          AddMembers,
+          RowRemoveAction,
+          DepartmentField,
+          IsOwnerField,
+          UserDepartmentsField,
+        }}
+        schema={schema}
+      />
+    </>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/NewDepartment.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/NewDepartment.tsx
new file mode 100644
index 0000000000..08f4e78a9f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/NewDepartment.tsx
@@ -0,0 +1,97 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { SchemaComponent } from '@nocobase/client';
+import React from 'react';
+import { useDepartmentTranslation } from '../locale';
+
+export const NewDepartment: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  return (
+    <SchemaComponent
+      scope={{ t }}
+      schema={{
+        type: 'void',
+        properties: {
+          newDepartment: {
+            type: 'void',
+            title: t('New department'),
+            'x-component': 'Action',
+            'x-component-props': {
+              type: 'text',
+              icon: 'PlusOutlined',
+              style: {
+                width: '100%',
+                textAlign: 'left',
+              },
+            },
+            properties: {
+              drawer: {
+                type: 'void',
+                'x-component': 'Action.Drawer',
+                'x-decorator': 'Form',
+                title: t('New department'),
+                properties: {
+                  title: {
+                    'x-component': 'CollectionField',
+                    'x-decorator': 'FormItem',
+                    required: true,
+                  },
+                  parent: {
+                    'x-component': 'CollectionField',
+                    'x-decorator': 'FormItem',
+                    'x-collection-field': 'departments.parent',
+                    'x-component-props': {
+                      component: 'DepartmentSelect',
+                    },
+                  },
+                  roles: {
+                    'x-component': 'CollectionField',
+                    'x-decorator': 'FormItem',
+                    'x-collection-field': 'departments.roles',
+                  },
+                  footer: {
+                    type: 'void',
+                    'x-component': 'Action.Drawer.Footer',
+                    properties: {
+                      cancel: {
+                        title: '{{t("Cancel")}}',
+                        'x-component': 'Action',
+                        'x-component-props': {
+                          useAction: '{{ cm.useCancelAction }}',
+                        },
+                      },
+                      submit: {
+                        title: '{{t("Submit")}}',
+                        'x-component': 'Action',
+                        'x-component-props': {
+                          type: 'primary',
+                          useAction: '{{ useCreateDepartment }}',
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      }}
+    />
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/UserDepartmentsField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/UserDepartmentsField.tsx
new file mode 100644
index 0000000000..e72869046a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/UserDepartmentsField.tsx
@@ -0,0 +1,273 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  ActionContextProvider,
+  SchemaComponent,
+  useAPIClient,
+  useRecord,
+  useRequest,
+  useResourceActionContext,
+  useTableBlockContext,
+} from '@nocobase/client';
+import React, { useState } from 'react';
+import { Tag, Button, Dropdown, App } from 'antd';
+import { PlusOutlined, MoreOutlined } from '@ant-design/icons';
+import { Field } from '@formily/core';
+import { useField, useForm } from '@formily/react';
+import { userDepartmentsSchema } from './schemas/users';
+import { getDepartmentTitle } from '../utils';
+import { useDepartmentTranslation } from '../locale';
+import { DepartmentTable } from './DepartmentTable';
+
+const useDataSource = (options?: any) => {
+  const defaultRequest = {
+    resource: 'departments',
+    action: 'list',
+    params: {
+      appends: ['parent(recursively=true)'],
+      // filter: {
+      //   parentId: null,
+      // },
+      sort: ['createdAt'],
+    },
+  };
+  const service = useRequest(defaultRequest, options);
+  return {
+    ...service,
+    defaultRequest,
+  };
+};
+
+export const UserDepartmentsField: React.FC = () => {
+  const { modal, message } = App.useApp();
+  const { t } = useDepartmentTranslation();
+  const [visible, setVisible] = useState(false);
+  const user = useRecord() as any;
+  const field = useField<Field>();
+  const {
+    service: { refresh },
+  } = useTableBlockContext();
+
+  const formatData = (data: any[]) => {
+    if (!data?.length) {
+      return [];
+    }
+
+    return data.map((department) => ({
+      ...department,
+      isMain: department.departmentsUsers?.isMain,
+      isOwner: department.departmentsUsers?.isOwner,
+      title: getDepartmentTitle(department),
+    }));
+  };
+
+  const api = useAPIClient();
+  useRequest(
+    () =>
+      api
+        .resource(`users.departments`, user.id)
+        .list({
+          appends: ['parent(recursively=true)'],
+          paginate: false,
+        })
+        .then((res) => {
+          const data = formatData(res?.data?.data);
+          field.setValue(data);
+        }),
+    {
+      ready: user.id,
+    },
+  );
+
+  const useAddDepartments = () => {
+    const api = useAPIClient();
+    const drawerForm = useForm();
+    const { departments } = drawerForm.values || {};
+    return {
+      async run() {
+        await api.resource('users.departments', user.id).add({
+          values: departments.map((dept: any) => dept.id),
+        });
+        drawerForm.reset();
+        field.setValue([
+          ...field.value,
+          ...departments.map((dept: any, index: number) => ({
+            ...dept,
+            isMain: index === 0 && field.value.length === 0,
+            title: getDepartmentTitle(dept),
+          })),
+        ]);
+        setVisible(false);
+        refresh();
+      },
+    };
+  };
+
+  const removeDepartment = (dept: any) => {
+    modal.confirm({
+      title: t('Remove department'),
+      content: t('Are you sure you want to remove it?'),
+      onOk: async () => {
+        await api.resource('users.departments', user.id).remove({ values: [dept.id] });
+        message.success(t('Deleted successfully'));
+        field.setValue(
+          field.value
+            .filter((d: any) => d.id !== dept.id)
+            .map((d: any, index: number) => ({
+              ...d,
+              isMain: (dept.isMain && index === 0) || d.isMain,
+            })),
+        );
+        refresh();
+      },
+    });
+  };
+
+  const setMainDepartment = async (dept: any) => {
+    await api.resource('users').setMainDepartment({
+      values: {
+        userId: user.id,
+        departmentId: dept.id,
+      },
+    });
+    message.success(t('Set successfully'));
+    field.setValue(
+      field.value.map((d: any) => ({
+        ...d,
+        isMain: d.id === dept.id,
+      })),
+    );
+    refresh();
+  };
+
+  const setOwner = async (dept: any) => {
+    await api.resource('departments').setOwner({
+      values: {
+        userId: user.id,
+        departmentId: dept.id,
+      },
+    });
+    message.success(t('Set successfully'));
+    field.setValue(
+      field.value.map((d: any) => ({
+        ...d,
+        isOwner: d.id === dept.id ? true : d.isOwner,
+      })),
+    );
+    refresh();
+  };
+
+  const removeOwner = async (dept: any) => {
+    await api.resource('departments').removeOwner({
+      values: {
+        userId: user.id,
+        departmentId: dept.id,
+      },
+    });
+    message.success(t('Set successfully'));
+    field.setValue(
+      field.value.map((d: any) => ({
+        ...d,
+        isOwner: d.id === dept.id ? false : d.isOwner,
+      })),
+    );
+    refresh();
+  };
+
+  const handleClick = (key: string, dept: any) => {
+    switch (key) {
+      case 'setMain':
+        setMainDepartment(dept);
+        break;
+      case 'setOwner':
+        setOwner(dept);
+        break;
+      case 'removeOwner':
+        removeOwner(dept);
+        break;
+      case 'remove':
+        removeDepartment(dept);
+    }
+  };
+
+  const useDisabled = () => ({
+    disabled: (record: any) => {
+      return field.value.some((dept: any) => dept.id === record.id);
+    },
+  });
+
+  return (
+    <ActionContextProvider value={{ visible, setVisible }}>
+      <>
+        {(field?.value || []).map((dept) => (
+          <Tag style={{ padding: '5px 8px', background: 'transparent', marginBottom: '5px' }} key={dept.id}>
+            <span style={{ marginRight: '5px' }}>{dept.title}</span>
+            {dept.isMain ? (
+              <Tag color="processing" bordered={false}>
+                {t('Main')}
+              </Tag>
+            ) : (
+              ''
+            )}
+            {/* {dept.isOwner ? ( */}
+            {/*   <Tag color="gold" bordered={false}> */}
+            {/*     {t('Owner')} */}
+            {/*   </Tag> */}
+            {/* ) : ( */}
+            {/*   '' */}
+            {/* )} */}
+            <Dropdown
+              menu={{
+                items: [
+                  ...(dept.isMain
+                    ? []
+                    : [
+                        {
+                          label: t('Set as main department'),
+                          key: 'setMain',
+                        },
+                      ]),
+                  // {
+                  //   label: dept.isOwner ? t('Remove owner role') : t('Set as owner'),
+                  //   key: dept.isOwner ? 'removeOwner' : 'setOwner',
+                  // },
+                  {
+                    label: t('Remove'),
+                    key: 'remove',
+                  },
+                ],
+                onClick: ({ key }) => handleClick(key, dept),
+              }}
+            >
+              <div style={{ float: 'right' }}>
+                <MoreOutlined />
+              </div>
+            </Dropdown>
+          </Tag>
+        ))}
+        <Button icon={<PlusOutlined />} onClick={() => setVisible(true)} />
+      </>
+      <SchemaComponent
+        schema={userDepartmentsSchema}
+        components={{ DepartmentTable }}
+        scope={{ user, useDataSource, useAddDepartments, useDisabled }}
+      />
+    </ActionContextProvider>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/departments.ts
new file mode 100644
index 0000000000..32272647c7
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/departments.ts
@@ -0,0 +1,291 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { useEffect } from 'react';
+import { uid } from '@formily/shared';
+import { useAPIClient, useActionContext, useRecord, useRequest } from '@nocobase/client';
+
+export const newSubDepartmentSchema = {
+  type: 'object',
+  properties: {
+    [uid()]: {
+      type: 'void',
+      'x-component': 'Action.Drawer',
+      'x-decorator': 'Form',
+      'x-decorator-props': {
+        useValues(options: any) {
+          const ctx = useActionContext();
+          const record = useRecord();
+          return useRequest(() => Promise.resolve({ data: { parent: { ...record } } }), {
+            ...options,
+            refreshDeps: [ctx.visible],
+          });
+        },
+      },
+      title: '{{t("New sub department")}}',
+      properties: {
+        title: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+        },
+        parent: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+          'x-collection-field': 'departments.parent',
+          'x-component-props': {
+            component: 'DepartmentSelect',
+          },
+        },
+        roles: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+          'x-collection-field': 'departments.roles',
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            submit: {
+              title: '{{t("Submit")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useCreateDepartment }}',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export const editDepartmentSchema = {
+  type: 'object',
+  properties: {
+    [uid()]: {
+      type: 'void',
+      'x-component': 'Action.Drawer',
+      'x-decorator': 'Form',
+      'x-decorator-props': {
+        useValues(options: any) {
+          const api = useAPIClient();
+          const ctx = useActionContext();
+          const record = useRecord();
+          const result = useRequest(
+            () =>
+              api
+                .resource('departments')
+                .get({
+                  filterByTk: record['id'],
+                  appends: ['parent(recursively=true)', 'roles', 'owners'],
+                })
+                .then((res: any) => res?.data),
+            { ...options, manual: true },
+          );
+          useEffect(() => {
+            if (ctx.visible) {
+              result.run();
+            }
+          }, [ctx.visible]);
+          return result;
+        },
+      },
+      title: '{{t("Edit department")}}',
+      properties: {
+        title: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+        },
+        parent: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+          'x-collection-field': 'departments.parent',
+          'x-component-props': {
+            component: 'SuperiorDepartmentSelect',
+          },
+        },
+        roles: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+          'x-collection-field': 'departments.roles',
+        },
+        owners: {
+          title: '{{t("Owners")}}',
+          'x-component': 'DepartmentOwnersField',
+          'x-decorator': 'FormItem',
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            submit: {
+              title: '{{t("Submit")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useUpdateDepartment }}',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export const departmentOwnersSchema = {
+  type: 'void',
+  properties: {
+    drawer: {
+      title: '{{t("Select Owners")}}',
+      'x-component': 'Action.Drawer',
+      properties: {
+        resource: {
+          type: 'void',
+          'x-decorator': 'FormItem',
+          'x-component': 'RequestProvider',
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'ActionBar',
+              'x-component-props': {
+                style: {
+                  marginBottom: 16,
+                },
+              },
+              properties: {
+                filter: {
+                  type: 'void',
+                  title: '{{ t("Filter") }}',
+                  default: {
+                    $and: [{ username: { $includes: '' } }, { nickname: { $includes: '' } }],
+                  },
+                  'x-action': 'filter',
+                  'x-component': 'Filter.Action',
+                  'x-use-component-props': 'useFilterActionProps',
+                  'x-component-props': {
+                    icon: 'FilterOutlined',
+                  },
+                  'x-align': 'left',
+                },
+              },
+            },
+            table: {
+              type: 'void',
+              'x-component': 'Table.Void',
+              'x-component-props': {
+                rowKey: 'id',
+                rowSelection: {
+                  type: 'checkbox',
+                  onChange: '{{ handleSelect }}',
+                },
+                useDataSource: '{{ cm.useDataSourceFromRAC }}',
+              },
+              properties: {
+                username: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    username: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                nickname: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    nickname: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                phone: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    phone: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                email: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    email: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            confirm: {
+              title: '{{t("Confirm")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useSelectOwners }}',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/users.ts b/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/users.ts
new file mode 100644
index 0000000000..66c2115d0e
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/users.ts
@@ -0,0 +1,464 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { uid } from '@formily/shared';
+
+export const membersActionSchema = {
+  type: 'void',
+  'x-component': 'Space',
+  properties: {
+    remove: {
+      type: 'void',
+      title: '{{t("Remove")}}',
+      'x-component': 'Action',
+      'x-component-props': {
+        icon: 'UserDeleteOutlined',
+        confirm: {
+          title: "{{t('Remove members')}}",
+          content: "{{t('Are you sure you want to remove these members?')}}",
+        },
+        style: {
+          marginRight: 8,
+        },
+        useAction: '{{ useBulkRemoveMembersAction }}',
+      },
+    },
+    create: {
+      type: 'void',
+      title: '{{t("Add members")}}',
+      'x-component': 'Action',
+      'x-component-props': {
+        type: 'primary',
+        icon: 'UserAddOutlined',
+      },
+      properties: {
+        drawer: {
+          type: 'void',
+          'x-component': 'AddMembers',
+        },
+      },
+    },
+  },
+};
+
+export const rowRemoveActionSchema = {
+  type: 'void',
+  properties: {
+    remove: {
+      title: '{{ t("Remove") }}',
+      'x-component': 'Action.Link',
+      'x-component-props': {
+        confirm: {
+          title: "{{t('Remove member')}}",
+          content: "{{t('Are you sure you want to remove it?')}}",
+        },
+        useAction: '{{ useRemoveMemberAction }}',
+      },
+    },
+  },
+};
+
+export const getMembersSchema = (department: any, user: any) => ({
+  type: 'void',
+  'x-component': 'CardItem',
+  'x-component-props': {
+    heightMode: 'fullHeight',
+  },
+  properties: {
+    ...(!user
+      ? {
+          actions: {
+            type: 'void',
+            'x-component': 'ActionBar',
+            'x-component-props': {
+              style: {
+                marginBottom: 16,
+              },
+            },
+            properties: {
+              [uid()]: {
+                type: 'void',
+                title: '{{ t("Filter") }}',
+                'x-action': 'filter',
+                'x-component': 'Filter.Action',
+                'x-use-component-props': 'useMemberFilterActionProps',
+                'x-component-props': {
+                  icon: 'FilterOutlined',
+                },
+                'x-align': 'left',
+              },
+              refresh: {
+                type: 'void',
+                title: '{{ t("Refresh") }}',
+                'x-action': 'refresh',
+                'x-component': 'Action',
+                'x-use-component-props': 'useRefreshActionProps',
+                'x-component-props': {
+                  icon: 'ReloadOutlined',
+                },
+              },
+              actions: {
+                type: 'void',
+                'x-component': 'MemberActions',
+              },
+            },
+          },
+        }
+      : {}),
+    table: {
+      type: 'array',
+      'x-component': 'TableV2',
+      'x-use-component-props': 'useTableBlockProps',
+      'x-component-props': {
+        rowKey: 'id',
+        rowSelection: {
+          type: 'checkbox',
+        },
+        pagination: {
+          showTotal: '{{ useShowTotal }}',
+        },
+      },
+      properties: {
+        nickname: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            nickname: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        username: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            username: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        departments: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            departments: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        ...(department
+          ? {
+              isOwner: {
+                type: 'void',
+                'x-decorator': 'Table.Column.Decorator',
+                'x-component': 'Table.Column',
+                'x-component-props': {
+                  style: {
+                    minWidth: 100,
+                  },
+                },
+                title: '{{t("Owner")}}',
+                properties: {
+                  isOwner: {
+                    type: 'boolean',
+                    'x-component': 'IsOwnerField',
+                  },
+                },
+              },
+            }
+          : {}),
+        phone: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            phone: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        email: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            email: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        actions: {
+          type: 'void',
+          title: '{{t("Actions")}}',
+          'x-component': 'Table.Column',
+          'x-component-props': {
+            fixed: 'right',
+          },
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'Space',
+              'x-component-props': {
+                split: '|',
+              },
+              properties: {
+                update: {
+                  type: 'void',
+                  title: '{{t("Configure")}}',
+                  'x-component': 'Action.Link',
+                  'x-component-props': {
+                    type: 'primary',
+                  },
+                  properties: {
+                    drawer: {
+                      type: 'void',
+                      'x-component': 'Action.Drawer',
+                      'x-decorator': 'FormV2',
+                      title: '{{t("Configure")}}',
+                      properties: {
+                        departments: {
+                          title: '{{t("Departments")}}',
+                          'x-decorator': 'FormItem',
+                          'x-component': 'UserDepartmentsField',
+                        },
+                        // footer: {
+                        //   type: 'void',
+                        //   'x-component': 'Action.Drawer.Footer',
+                        //   properties: {
+                        //     cancel: {
+                        //       title: '{{t("Cancel")}}',
+                        //       'x-component': 'Action',
+                        //       'x-component-props': {
+                        //         useAction: '{{ cm.useCancelAction }}',
+                        //       },
+                        //     },
+                        //     submit: {
+                        //       title: '{{t("Submit")}}',
+                        //       'x-component': 'Action',
+                        //       'x-component-props': {
+                        //         type: 'primary',
+                        //         // useAction: '{{ useSetDepartments }}',
+                        //       },
+                        //     },
+                        //   },
+                        // },
+                      },
+                    },
+                  },
+                },
+                ...(department
+                  ? {
+                      remove: {
+                        type: 'void',
+                        'x-component': 'RowRemoveAction',
+                      },
+                    }
+                  : {}),
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+});
+
+export const addMembersSchema = {
+  type: 'object',
+  properties: {
+    drawer: {
+      type: 'void',
+      'x-component': 'Action.Drawer',
+      'x-decorator': 'Form',
+      title: '{{t("Add members")}}',
+      properties: {
+        resource: {
+          type: 'void',
+          'x-decorator': 'FormItem',
+          'x-component': 'AddMembersListProvider',
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'ActionBar',
+              'x-component-props': {
+                style: {
+                  marginBottom: 16,
+                },
+              },
+              properties: {
+                filter: {
+                  type: 'void',
+                  title: '{{ t("Filter") }}',
+                  default: {
+                    $and: [{ username: { $includes: '' } }, { nickname: { $includes: '' } }],
+                  },
+                  'x-action': 'filter',
+                  'x-component': 'Filter.Action',
+                  'x-use-component-props': 'useAddMembersFilterActionProps',
+                  'x-component-props': {
+                    icon: 'FilterOutlined',
+                  },
+                  'x-align': 'left',
+                },
+              },
+            },
+            table: {
+              type: 'void',
+              'x-component': 'Table.Void',
+              'x-component-props': {
+                rowKey: 'id',
+                rowSelection: {
+                  type: 'checkbox',
+                  onChange: '{{ handleSelect }}',
+                },
+                useDataSource: '{{ cm.useDataSourceFromRAC }}',
+              },
+              properties: {
+                username: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    username: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                nickname: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    nickname: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                phone: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    phone: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                email: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    email: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            submit: {
+              title: '{{t("Submit")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+              },
+              'x-use-component-props': 'useAddMembersActionProps',
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export const userDepartmentsSchema = {
+  type: 'void',
+  properties: {
+    drawer: {
+      title: '{{t("Select Departments")}}',
+      'x-decorator': 'Form',
+      'x-component': 'Action.Drawer',
+      properties: {
+        table: {
+          type: 'void',
+          'x-decorator': 'FormItem',
+          'x-component': 'DepartmentTable',
+          'x-component-props': {
+            useDataSource: '{{ useDataSource }}',
+            useDisabled: '{{ useDisabled }}',
+          },
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            confirm: {
+              title: '{{t("Submit")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useAddDepartments }}',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/hooks/departments-manager.ts b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/departments-manager.ts
new file mode 100644
index 0000000000..57d99ee9aa
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/departments-manager.ts
@@ -0,0 +1,75 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { useAPIClient } from '@nocobase/client';
+import { TreeManagerOptions, useTreeManager } from './tree-manager';
+import deepmerge from 'deepmerge';
+
+type DepartmentManagerOptions = {
+  resource?: string;
+  resourceOf?: string;
+  params?: any;
+} & TreeManagerOptions;
+
+export const useDepartmentManager = (options?: DepartmentManagerOptions) => {
+  const { resource = 'departments', resourceOf, params = {} } = options || {};
+  const api = useAPIClient();
+  const resourceAPI = api.resource(resource, resourceOf);
+  const treeManager = useTreeManager(options);
+  const { setTreeData, updateTreeData, setLoadedKeys, initData } = treeManager;
+  const loadData = async ({ key, children }) => {
+    if (children?.length) {
+      return;
+    }
+    const { data } = await resourceAPI.list(
+      deepmerge(params, {
+        paginate: false,
+        appends: ['parent(recursively=true)'],
+        filter: {
+          parentId: key,
+        },
+      }),
+    );
+    if (!data?.data?.length) {
+      return;
+    }
+    setTreeData(updateTreeData(key, data?.data));
+  };
+
+  const getByKeyword = async (keyword: string) => {
+    const { data } = await resourceAPI.list(
+      deepmerge(params, {
+        paginate: false,
+        filter: {
+          title: {
+            $includes: keyword,
+          },
+        },
+        appends: ['parent(recursively=true)'],
+        pageSize: 100,
+      }),
+    );
+    initData(data?.data);
+  };
+
+  return {
+    ...treeManager,
+    loadData,
+    getByKeyword,
+  };
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/hooks/index.ts b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/index.ts
new file mode 100644
index 0000000000..72af4ce551
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/index.ts
@@ -0,0 +1,68 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  CollectionContext,
+  useActionContext,
+  useFilterFieldOptions,
+  useFilterFieldProps,
+  useResourceActionContext,
+  useResourceContext,
+} from '@nocobase/client';
+import { useContext } from 'react';
+import { useForm, useField } from '@formily/react';
+
+export const useCreateAction = () => {
+  const form = useForm();
+  const field = useField();
+  const ctx = useActionContext();
+  const { refresh } = useResourceActionContext();
+  const { resource } = useResourceContext();
+  return {
+    async run() {
+      try {
+        await form.submit();
+        field.data = field.data || {};
+        field.data.loading = true;
+        await resource.create({ values: form.values });
+        ctx.setVisible(false);
+        await form.reset();
+        field.data.loading = false;
+        refresh();
+      } catch (error) {
+        if (field.data) {
+          field.data.loading = false;
+        }
+      }
+    },
+  };
+};
+
+export const useFilterActionProps = () => {
+  const collection = useContext(CollectionContext);
+  const options = useFilterFieldOptions(collection.fields);
+  const service = useResourceActionContext();
+  return useFilterFieldProps({
+    options,
+    params: service.state?.params?.[0] || service.params,
+    service,
+  });
+};
+
+export * from './tree-manager';
+export * from './departments-manager';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/hooks/tree-manager.ts b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/tree-manager.ts
new file mode 100644
index 0000000000..d2ef32c348
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/tree-manager.ts
@@ -0,0 +1,142 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useCallback, useState } from 'react';
+
+export type TreeManagerOptions = {
+  label?: React.FC<{ node: any }>;
+};
+
+export const useTreeManager = (options?: TreeManagerOptions) => {
+  const { label } = options || {};
+  const [treeData, setTreeData] = useState([]);
+  const [nodeMap, setNodeMap] = useState({});
+  const [expandedKeys, setExpandedKeys] = useState([]);
+  const [loadedKeys, setLoadedKeys] = useState([]);
+
+  const buildNodeMap = useCallback((data: any[]) => {
+    const mp = {};
+    const setNodeMapFromChild = (node: any) => {
+      let child = node ? { ...node } : null;
+      while (child) {
+        const parentId = child.parentId || 'root';
+        if (mp[parentId]) {
+          mp[parentId].childrenMap[child.id] = child;
+        } else {
+          mp[parentId] = {
+            ...(child.parent || { id: parentId }),
+            childrenMap: {
+              [child.id]: child,
+            },
+          };
+        }
+        child = child.parent;
+      }
+    };
+    const setNodeMapFromParent = (node: any) => {
+      const childrenMap = {};
+      if (node.children && node.children.length) {
+        node.children.forEach((child: any) => {
+          childrenMap[child.id] = child;
+          setNodeMapFromParent(child);
+        });
+      }
+      mp[node.id] = {
+        ...node,
+        childrenMap,
+      };
+    };
+    if (!(data && data.length)) {
+      return mp;
+    }
+    data.forEach((node) => {
+      setNodeMapFromChild(node);
+      setNodeMapFromParent(node);
+    });
+    return mp;
+  }, []);
+
+  const constructTreeData = useCallback((nodeMap: { [parentId: string | number]: any }) => {
+    const getChildren = (id: any) => {
+      if (!nodeMap[id]) {
+        return null;
+      }
+      if (nodeMap[id].isLeaf) {
+        return null;
+      }
+      return Object.values(nodeMap[id]?.childrenMap || {}).map((node: any) => {
+        return {
+          ...node,
+          title: label ? React.createElement(label, { node }) : node.title,
+          children: getChildren(node.id),
+        };
+      });
+    };
+    return getChildren('root');
+  }, []);
+
+  const initData = useCallback(
+    (data: any[]) => {
+      const mp = buildNodeMap(data);
+      setNodeMap(mp);
+      const treeData = constructTreeData(mp) || [];
+      setTreeData(treeData);
+      // setLoadedKeys([]);
+    },
+    [setTreeData, buildNodeMap, constructTreeData],
+  );
+
+  const updateTreeData = (key: any, children: any[]) => {
+    const mp = buildNodeMap(children);
+    const newMap = { ...mp, ...nodeMap };
+    children.forEach((node) => {
+      newMap[key].childrenMap[node.id] = node;
+    });
+    setNodeMap(newMap);
+    return constructTreeData(newMap);
+  };
+
+  const getChildrenIds = useCallback(
+    (id: any) => {
+      if (!nodeMap[id]) {
+        return [];
+      }
+      const ids = [];
+      ids.push(...Object.keys(nodeMap[id].childrenMap).map((id) => Number(id)));
+      Object.keys(nodeMap[id].childrenMap).forEach((id) => {
+        ids.push(...getChildrenIds(id));
+      });
+      return ids;
+    },
+    [nodeMap],
+  );
+
+  return {
+    initData,
+    treeData,
+    setTreeData,
+    nodeMap,
+    updateTreeData,
+    constructTreeData,
+    getChildrenIds,
+    loadedKeys,
+    setLoadedKeys,
+    expandedKeys,
+    setExpandedKeys,
+  };
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/hooks/useTableBlockProps.ts b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/useTableBlockProps.ts
new file mode 100644
index 0000000000..fe5b35eb8a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/useTableBlockProps.ts
@@ -0,0 +1,175 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { ArrayField } from '@formily/core';
+import { useField, useFieldSchema } from '@formily/react';
+import { isEqual } from 'lodash';
+import { useCallback, useEffect, useRef } from 'react';
+import {
+  useTableBlockContext,
+  findFilterTargets,
+  DataBlock,
+  useFilterBlock,
+  mergeFilter,
+  removeNullCondition,
+} from '@nocobase/client';
+
+export const useTableBlockProps = () => {
+  const field = useField<ArrayField>();
+  const fieldSchema = useFieldSchema();
+  const ctx = useTableBlockContext();
+  const { getDataBlocks } = useFilterBlock();
+  const isLoading = ctx?.service?.loading;
+
+  const ctxRef = useRef(null);
+  ctxRef.current = ctx;
+
+  useEffect(() => {
+    if (!isLoading) {
+      const serviceResponse = ctx?.service?.data;
+      const data = serviceResponse?.data || [];
+      const meta = serviceResponse?.meta || {};
+      const selectedRowKeys = ctx?.field?.data?.selectedRowKeys;
+
+      if (!isEqual(field.value, data)) {
+        field.value = data;
+        field?.setInitialValue(data);
+      }
+      field.data = field.data || {};
+
+      if (!isEqual(field.data.selectedRowKeys, selectedRowKeys)) {
+        field.data.selectedRowKeys = selectedRowKeys;
+      }
+
+      field.componentProps.pagination = field.componentProps.pagination || {};
+      field.componentProps.pagination.pageSize = meta?.pageSize;
+      field.componentProps.pagination.total = meta?.count;
+      field.componentProps.pagination.current = meta?.page;
+    }
+  }, [field, ctx?.service?.data, isLoading, ctx?.field?.data?.selectedRowKeys]);
+
+  return {
+    bordered: ctx.bordered,
+    childrenColumnName: ctx.childrenColumnName,
+    loading: ctx?.service?.loading,
+    showIndex: ctx.showIndex,
+    dragSort: ctx.dragSort && ctx.dragSortBy,
+    rowKey: ctx.rowKey || fieldSchema?.['x-component-props']?.rowKey || 'id',
+    pagination: fieldSchema?.['x-component-props']?.pagination === false ? false : field.componentProps.pagination,
+    onRowSelectionChange: useCallback((selectedRowKeys, selectedRowData) => {
+      ctx.field.data = ctx?.field?.data || {};
+      ctx.field.data.selectedRowKeys = selectedRowKeys;
+      ctx.field.data.selectedRowData = selectedRowData;
+      ctx?.field?.onRowSelect?.(selectedRowKeys);
+    }, []),
+    onRowDragEnd: useCallback(
+      async ({ from, to }) => {
+        await ctx.resource.move({
+          sourceId: from[ctx.rowKey || 'id'],
+          targetId: to[ctx.rowKey || 'id'],
+          sortField: ctx.dragSort && ctx.dragSortBy,
+        });
+        ctx.service.refresh();
+        // ctx.resource
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+      },
+      [ctx.rowKey, ctx.dragSort, ctx.dragSortBy],
+    ),
+    onChange: useCallback(
+      ({ current, pageSize }, filters, sorter) => {
+        const globalSort = fieldSchema.parent?.['x-decorator-props']?.['params']?.['sort'];
+        const sort = sorter.order
+          ? sorter.order === `ascend`
+            ? [sorter.field]
+            : [`-${sorter.field}`]
+          : globalSort || ctxRef.current.dragSortBy;
+        const currentPageSize = pageSize || fieldSchema.parent?.['x-decorator-props']?.['params']?.pageSize;
+        const args = { ...ctxRef.current?.service?.params?.[0], page: current || 1, pageSize: currentPageSize };
+        if (sort) {
+          args['sort'] = sort;
+        }
+        ctxRef.current?.service.run(args);
+      },
+      [fieldSchema.parent],
+    ),
+    onClickRow: useCallback(
+      (record, setSelectedRow, selectedRow) => {
+        const { targets, uid } = findFilterTargets(fieldSchema);
+        const dataBlocks = getDataBlocks();
+
+        // 如果是之前创建的区块是没有 x-filter-targets 属性的，所以这里需要判断一下避免报错
+        if (!targets || !targets.some((target) => dataBlocks.some((dataBlock) => dataBlock.uid === target.uid))) {
+          // 当用户已经点击过某一行，如果此时再把相连接的区块给删除的话，行的高亮状态就会一直保留。
+          // 这里暂时没有什么比较好的方法，只是在用户再次点击的时候，把高亮状态给清除掉。
+          setSelectedRow((prev) => (prev.length ? [] : prev));
+          return;
+        }
+
+        const currentBlock = dataBlocks.find((block) => block.uid === fieldSchema.parent['x-uid']);
+
+        dataBlocks.forEach((block) => {
+          const target = targets.find((target) => target.uid === block.uid);
+          if (!target) return;
+
+          const isForeignKey = block.foreignKeyFields?.some((field) => field.name === target.field);
+          const sourceKey = getSourceKey(currentBlock, target.field);
+          const recordKey = isForeignKey ? sourceKey : ctx.rowKey;
+          const value = [record[recordKey]];
+
+          const param = block.service.params?.[0] || {};
+          // 保留原有的 filter
+          const storedFilter = block.service.params?.[1]?.filters || {};
+
+          if (selectedRow.includes(record[ctx.rowKey])) {
+            if (block.dataLoadingMode === 'manual') {
+              return block.clearData();
+            }
+            delete storedFilter[uid];
+          } else {
+            storedFilter[uid] = {
+              $and: [
+                {
+                  [target.field || ctx.rowKey]: {
+                    [target.field ? '$in' : '$eq']: value,
+                  },
+                },
+              ],
+            };
+          }
+
+          const mergedFilter = mergeFilter([
+            ...Object.values(storedFilter).map((filter) => removeNullCondition(filter)),
+            block.defaultFilter,
+          ]);
+
+          return block.doFilter(
+            {
+              ...param,
+              page: 1,
+              filter: mergedFilter,
+            },
+            { filters: storedFilter },
+          );
+        });
+
+        // 更新表格的选中状态
+        setSelectedRow((prev) => (prev?.includes(record[ctx.rowKey]) ? [] : [record[ctx.rowKey]]));
+      },
+      [ctx.rowKey, fieldSchema, getDataBlocks],
+    ),
+    onExpand: useCallback((expanded, record) => {
+      ctx?.field.onExpandClick?.(expanded, record);
+    }, []),
+  };
+};
+
+function getSourceKey(currentBlock: DataBlock, field: string) {
+  const associationField = currentBlock?.associatedFields?.find((item) => item.foreignKey === field);
+  return associationField?.sourceKey || 'id';
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/index.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/index.tsx
new file mode 100644
index 0000000000..798fddecd6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/index.tsx
@@ -0,0 +1,76 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Plugin, SchemaComponentContext, useSchemaComponentContext } from '@nocobase/client';
+import { tval } from '@nocobase/utils/client';
+import { DepartmentBlock } from './departments/DepartmentBlock';
+import React from 'react';
+import { ResourcesProvider } from './ResourcesProvider';
+import ACLPlugin from '@nocobase/plugin-acl/client';
+import { RoleDepartmentsManager } from './roles/RoleDepartmentsManager';
+import {
+  UserDepartmentsFieldSettings,
+  ReadOnlyAssociationField,
+  UserMainDepartmentFieldSettings,
+  DepartmentOwnersFieldSettings,
+} from './components';
+
+export class PluginDepartmentsClient extends Plugin {
+  async afterAdd() {
+    // await this.app.pm.add()
+  }
+
+  async beforeLoad() {}
+
+  // You can get and modify the app instance here
+  async load() {
+    this.app.addComponents({
+      UserDepartmentsField: ReadOnlyAssociationField,
+      UserMainDepartmentField: ReadOnlyAssociationField,
+      DepartmentOwnersField: ReadOnlyAssociationField,
+    });
+    this.app.schemaSettingsManager.add(UserDepartmentsFieldSettings);
+    this.app.schemaSettingsManager.add(UserMainDepartmentFieldSettings);
+    this.app.schemaSettingsManager.add(DepartmentOwnersFieldSettings);
+
+    this.app.pluginSettingsManager.add('users-permissions.departments', {
+      icon: 'ApartmentOutlined',
+      title: tval('Departments', { ns: 'departments' }),
+      Component: () => {
+        const scCtx = useSchemaComponentContext();
+        return (
+          <SchemaComponentContext.Provider value={{ ...scCtx, designable: false }}>
+            <ResourcesProvider>
+              <DepartmentBlock />
+            </ResourcesProvider>
+          </SchemaComponentContext.Provider>
+        );
+      },
+      sort: 2,
+      aclSnippet: 'pm.departments',
+    });
+
+    const acl = this.app.pm.get(ACLPlugin);
+    acl.rolesManager.add('departments', {
+      title: tval('Departments', { ns: 'departments' }),
+      Component: RoleDepartmentsManager,
+    });
+  }
+}
+
+export default PluginDepartmentsClient;
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/locale.ts b/packages/plugins/@nocobase/plugin-departments/src/client/locale.ts
new file mode 100644
index 0000000000..2899c172d4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/locale.ts
@@ -0,0 +1,23 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { useTranslation } from 'react-i18next';
+
+export function useDepartmentTranslation() {
+  return useTranslation(['departments', 'client'], { nsMode: 'fallback' });
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/roles/RoleDepartmentsManager.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/roles/RoleDepartmentsManager.tsx
new file mode 100644
index 0000000000..30d8badc1d
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/roles/RoleDepartmentsManager.tsx
@@ -0,0 +1,178 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext, useEffect, useMemo } from 'react';
+import { App } from 'antd';
+import { useDepartmentTranslation } from '../locale';
+import {
+  CollectionManagerContext,
+  CollectionProvider_deprecated,
+  ResourceActionContext,
+  SchemaComponent,
+  useAPIClient,
+  useActionContext,
+  useRecord,
+  useRequest,
+  useResourceActionContext,
+} from '@nocobase/client';
+import { RolesManagerContext } from '@nocobase/plugin-acl/client';
+import { departmentCollection } from '../collections/departments';
+import { getDepartmentsSchema } from './schemas/departments';
+import { useFilterActionProps } from '../hooks';
+import { DepartmentTable } from '../departments/DepartmentTable';
+import { useForm } from '@formily/react';
+
+const useRemoveDepartment = () => {
+  const api = useAPIClient();
+  const { role } = useContext(RolesManagerContext);
+  const { id } = useRecord();
+  const { refresh } = useResourceActionContext();
+  return {
+    async run() {
+      await api.resource(`roles/${role?.name}/departments`).remove({
+        values: [id],
+      });
+      refresh();
+    },
+  };
+};
+
+const useBulkRemoveDepartments = () => {
+  const { t } = useDepartmentTranslation();
+  const { message } = App.useApp();
+  const api = useAPIClient();
+  const { state, setState, refresh } = useResourceActionContext();
+  const { role } = useContext(RolesManagerContext);
+
+  return {
+    async run() {
+      const selected = state?.selectedRowKeys;
+      if (!selected?.length) {
+        message.warning(t('Please select departments'));
+        return;
+      }
+      await api.resource(`roles/${role?.name}/departments`).remove({
+        values: selected,
+      });
+      setState?.({ selectedRowKeys: [] });
+      refresh();
+    },
+  };
+};
+
+const DepartmentTitle: React.FC = () => {
+  const record = useRecord();
+  const getTitle = (record: any) => {
+    const title = record.title;
+    const parent = record.parent;
+    if (parent) {
+      return getTitle(parent) + ' / ' + title;
+    }
+    return title;
+  };
+
+  return <>{getTitle(record)}</>;
+};
+
+const useDataSource = (options?: any) => {
+  const defaultRequest = {
+    resource: 'departments',
+    action: 'list',
+    params: {
+      // filter: {
+      //   parentId: null,
+      // },
+      appends: ['roles', 'parent(recursively=true)'],
+      sort: ['createdAt'],
+    },
+  };
+  const service = useRequest(defaultRequest, options);
+  return {
+    ...service,
+    defaultRequest,
+  };
+};
+
+const useDisabled = () => {
+  const { role } = useContext(RolesManagerContext);
+  return {
+    disabled: (record: any) => record?.roles?.some((r: { name: string }) => r.name === role?.name),
+  };
+};
+
+const useAddDepartments = () => {
+  const { role } = useContext(RolesManagerContext);
+  const api = useAPIClient();
+  const form = useForm();
+  const { setVisible } = useActionContext();
+  const { refresh } = useResourceActionContext();
+  const { departments } = form.values || {};
+  return {
+    async run() {
+      await api.resource('roles.departments', role.name).add({
+        values: departments.map((dept: any) => dept.id),
+      });
+      form.reset();
+      setVisible(false);
+      refresh();
+    },
+  };
+};
+
+export const RoleDepartmentsManager: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  const { role } = useContext(RolesManagerContext);
+  const service = useRequest(
+    {
+      resource: `roles/${role?.name}/departments`,
+      action: 'list',
+      params: {
+        appends: ['parent', 'parent.parent(recursively=true)'],
+      },
+    },
+    {
+      ready: !!role,
+    },
+  );
+
+  useEffect(() => {
+    service.run();
+  }, [role]);
+
+  const schema = useMemo(() => getDepartmentsSchema(), [role]);
+
+  return (
+    <ResourceActionContext.Provider value={{ ...service }}>
+      <CollectionProvider_deprecated collection={departmentCollection}>
+        <SchemaComponent
+          schema={schema}
+          components={{ DepartmentTable, DepartmentTitle }}
+          scope={{
+            useFilterActionProps,
+            t,
+            useRemoveDepartment,
+            useBulkRemoveDepartments,
+            useDataSource,
+            useDisabled,
+            useAddDepartments,
+          }}
+        />
+      </CollectionProvider_deprecated>
+    </ResourceActionContext.Provider>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/roles/schemas/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/client/roles/schemas/departments.ts
new file mode 100644
index 0000000000..240a37635c
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/roles/schemas/departments.ts
@@ -0,0 +1,171 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { uid } from '@formily/shared';
+
+export const getDepartmentsSchema = () => ({
+  type: 'void',
+  properties: {
+    actions: {
+      type: 'void',
+      'x-component': 'ActionBar',
+      'x-component-props': {
+        style: {
+          marginBottom: 16,
+        },
+      },
+      properties: {
+        [uid()]: {
+          type: 'void',
+          title: '{{ t("Filter") }}',
+          'x-action': 'filter',
+          'x-component': 'Filter.Action',
+          'x-use-component-props': 'useFilterActionProps',
+          'x-component-props': {
+            icon: 'FilterOutlined',
+          },
+          'x-align': 'left',
+        },
+        actions: {
+          type: 'void',
+          'x-component': 'Space',
+          properties: {
+            remove: {
+              type: 'void',
+              title: '{{t("Remove")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                icon: 'MinusOutlined',
+                confirm: {
+                  title: "{{t('Remove')}}",
+                  content: "{{t('Are you sure you want to remove these departments?')}}",
+                },
+                style: {
+                  marginRight: 8,
+                },
+                useAction: '{{ useBulkRemoveDepartments }}',
+              },
+            },
+            create: {
+              type: 'void',
+              title: '{{t("Add departments")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                icon: 'PlusOutlined',
+              },
+              properties: {
+                drawer: {
+                  type: 'void',
+                  'x-component': 'Action.Drawer',
+                  'x-decorator': 'FormV2',
+                  title: '{{t("Add departments")}}',
+                  properties: {
+                    table: {
+                      type: 'void',
+                      'x-decorator': 'FormItem',
+                      'x-component': 'DepartmentTable',
+                      'x-component-props': {
+                        useDataSource: '{{ useDataSource }}',
+                        useDisabled: '{{ useDisabled }}',
+                      },
+                    },
+                    footer: {
+                      type: 'void',
+                      'x-component': 'Action.Drawer.Footer',
+                      properties: {
+                        cancel: {
+                          title: '{{t("Cancel")}}',
+                          'x-component': 'Action',
+                          'x-component-props': {
+                            useAction: '{{ cm.useCancelAction }}',
+                          },
+                        },
+                        submit: {
+                          title: '{{t("Submit")}}',
+                          'x-component': 'Action',
+                          'x-component-props': {
+                            type: 'primary',
+                            useAction: '{{ useAddDepartments }}',
+                          },
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+    table: {
+      type: 'void',
+      'x-component': 'Table.Void',
+      'x-component-props': {
+        rowKey: 'id',
+        rowSelection: {
+          type: 'checkbox',
+        },
+        useDataSource: '{{ cm.useDataSourceFromRAC }}',
+      },
+      properties: {
+        title: {
+          type: 'void',
+          title: '{{t("Department name")}}',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            title: {
+              type: 'string',
+              'x-component': 'DepartmentTitle',
+            },
+          },
+        },
+        actions: {
+          type: 'void',
+          title: '{{t("Actions")}}',
+          'x-component': 'Table.Column',
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'Space',
+              'x-component-props': {
+                split: '|',
+              },
+              properties: {
+                remove: {
+                  type: 'void',
+                  title: '{{ t("Remove") }}',
+                  'x-component': 'Action.Link',
+                  'x-component-props': {
+                    confirm: {
+                      title: "{{t('Remove department')}}",
+                      content: "{{t('Are you sure you want to remove it?')}}",
+                    },
+                    useAction: '{{ useRemoveDepartment }}',
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/utils.ts b/packages/plugins/@nocobase/plugin-departments/src/client/utils.ts
new file mode 100644
index 0000000000..52f6fb7663
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/utils.ts
@@ -0,0 +1,26 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export const getDepartmentTitle = (record: any) => {
+  const title = record.title;
+  const parent = record.parent;
+  if (parent) {
+    return getDepartmentTitle(parent) + ' / ' + title;
+  }
+  return title;
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/index.ts b/packages/plugins/@nocobase/plugin-departments/src/index.ts
new file mode 100644
index 0000000000..7d69462f4f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/index.ts
@@ -0,0 +1,20 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export * from './server';
+export { default } from './server';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-departments/src/locale/en-US.json
new file mode 100644
index 0000000000..f872121a10
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/locale/en-US.json
@@ -0,0 +1,35 @@
+{
+  "Department": "Department",
+  "All users": "All users",
+  "New department": "New department",
+  "Add department": "Add department",
+  "Add departments": "Add departments",
+  "New sub department": "New sub department",
+  "Edit department": "Edit department",
+  "Delete department": "Delete department",
+  "Departments": "Departments",
+  "Main department": "Main department",
+  "Owner": "Owner",
+  "Department name": "Department name",
+  "Superior department": "Superior department",
+  "Owners": "Owners",
+  "Add members": "Add members",
+  "Search for departments, users": "Search for departments, users",
+  "Search results": "Search results",
+  "Departments management": "Departments management",
+  "Roles management": "Roles management",
+  "Remove members": "Remove members",
+  "Remove member": "Remove member",
+  "Remove departments": "Remove departments",
+  "Remove department": "Remove department",
+  "Are you sure you want to remove it?": "Are you sure you want to remove it?",
+  "Are you sure you want to remove these members?": "Are you sure you want to remove these members?",
+  "Are you sure you want to remove these departments?": "Are you sure you want to remove these departments?",
+  "Please select members": "Please select members",
+  "Please select departments": "Please select departments",
+  "The department has sub-departments, please delete them first": "The department has sub-departments, please delete them first",
+  "The department has members, please remove them first": "The department has members, please remove them first",
+  "Main": "Main",
+  "Set as main department": "Set as main department",
+  "This field is currently not supported for use in form blocks.": "This field is currently not supported for use in form blocks."
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-departments/src/locale/zh-CN.json
new file mode 100644
index 0000000000..be5393b399
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/locale/zh-CN.json
@@ -0,0 +1,35 @@
+{
+  "Department": "部门",
+  "All users": "所有用户",
+  "New department": "新建部门",
+  "New sub department": "新建子部门",
+  "Add department": "添加部门",
+  "Add departments": "添加部门",
+  "Edit department": "编辑部门",
+  "Delete department": "删除部门",
+  "Departments": "部门",
+  "Main department": "主属部门",
+  "Owner": "负责人",
+  "Department name": "部门名称",
+  "Superior department": "上级部门",
+  "Owners": "负责人",
+  "Add members": "添加成员",
+  "Search for departments, users": "搜索部门、用户",
+  "Search results": "搜索结果",
+  "Departments management": "部门管理",
+  "Roles management": "角色管理",
+  "Remove members": "移除成员",
+  "Remove member": "移除成员",
+  "Remove departments": "移除部门",
+  "Remove department": "移除部门",
+  "Are you sure you want to remove it?": "你确定要移除吗？",
+  "Are you sure you want to remove these members?": "你确定要移除这些成员吗？",
+  "Are you sure you want to remove these departments?": "你确定要移除这些部门吗？",
+  "Please select members": "请选择成员",
+  "Please select departments": "请选择部门",
+  "The department has sub-departments, please delete them first": "部门下有子部门，请先删除子部门",
+  "The department has members, please remove them first": "部门下有成员，请先移除",
+  "Main": "主属部门",
+  "Set as main department": "设置为主属部门",
+  "This field is currently not supported for use in form blocks.": "该字段目前不支持在表单区块中使用。"
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts
new file mode 100644
index 0000000000..8b4cd926da
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts
@@ -0,0 +1,125 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('actions', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should list users exclude department', async () => {
+    const dept = await repo.create({
+      values: {
+        title: 'Test department',
+        members: [1],
+      },
+    });
+    const res = await agent.resource('users').listExcludeDept({
+      departmentId: dept.id,
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.data.length).toBe(0);
+  });
+
+  it('should list users exclude department with filter', async () => {
+    let res = await agent.resource('users').listExcludeDept({
+      departmentId: 1,
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.data.length).toBe(1);
+
+    res = await agent.resource('users').listExcludeDept({
+      departmentId: 1,
+      filter: {
+        id: 1,
+      },
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.data.length).toBe(1);
+
+    res = await agent.resource('users').listExcludeDept({
+      departmentId: 1,
+      filter: {
+        id: 2,
+      },
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.data.length).toBe(0);
+  });
+
+  it('should set main department', async () => {
+    const depts = await repo.create({
+      values: [
+        {
+          title: 'Dept1',
+          members: [1],
+        },
+        {
+          title: 'Dept2',
+          members: [1],
+        },
+      ],
+    });
+    const deptUsers = db.getRepository('departmentsUsers');
+    await deptUsers.update({
+      filter: {
+        departmentId: depts[0].id,
+        userId: 1,
+      },
+      values: {
+        isMain: true,
+      },
+    });
+    const res = await agent.resource('users').setMainDepartment({
+      values: {
+        userId: 1,
+        departmentId: depts[1].id,
+      },
+    });
+    expect(res.status).toBe(200);
+    const records = await deptUsers.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    const dept1 = records.find((record: any) => record.departmentId === depts[0].id);
+    const dept2 = records.find((record: any) => record.departmentId === depts[1].id);
+    expect(dept1.isMain).toBe(false);
+    expect(dept2.isMain).toBe(true);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts
new file mode 100644
index 0000000000..64e73eb978
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts
@@ -0,0 +1,281 @@
+/**
+ * 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 { UserDataResourceManager } from '@nocobase/plugin-user-data-sync';
+import { MockDatabase, MockServer, createMockServer } from '@nocobase/test';
+import PluginUserDataSyncServer from '@nocobase/plugin-user-data-sync';
+
+describe('department data sync', async () => {
+  let app: MockServer;
+  let db: MockDatabase;
+  let resourceManager: UserDataResourceManager;
+
+  beforeEach(async () => {
+    app = await createMockServer({
+      plugins: ['user-data-sync', 'users', 'departments'],
+    });
+    db = app.db;
+    const plugin = app.pm.get('user-data-sync') as PluginUserDataSyncServer;
+    resourceManager = plugin.resourceManager;
+  });
+
+  afterEach(async () => {
+    await db.clean({ drop: true });
+    await app.destroy();
+  });
+
+  it('should create department', async () => {
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test',
+        },
+        {
+          uid: '2',
+          title: 'sub-test',
+          parentUid: '1',
+        },
+      ],
+    });
+    const department = await db.getRepository('departments').findOne({
+      filter: {
+        title: 'test',
+      },
+      appends: ['children'],
+    });
+    expect(department).toBeTruthy();
+    expect(department.title).toBe('test');
+    expect(department.children).toHaveLength(1);
+    expect(department.children[0].title).toBe('sub-test');
+  });
+
+  it('should update department', async () => {
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test',
+        },
+      ],
+    });
+    const department = await db.getRepository('departments').findOne({
+      filter: {
+        title: 'test',
+      },
+      appends: ['children'],
+    });
+    expect(department).toBeTruthy();
+    expect(department.children).toHaveLength(0);
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test2',
+        },
+        {
+          uid: '2',
+          title: 'sub-test',
+          parentUid: '1',
+        },
+      ],
+    });
+    const department2 = await db.getRepository('departments').findOne({
+      filter: {
+        id: department.id,
+      },
+      appends: ['children'],
+    });
+    expect(department2).toBeTruthy();
+    expect(department2.title).toBe('test2');
+    expect(department2.children).toHaveLength(1);
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '2',
+          title: 'sub-test',
+        },
+      ],
+    });
+    const department3 = await db.getRepository('departments').findOne({
+      filter: {
+        id: department2.children[0].id,
+      },
+      appends: ['parent'],
+    });
+    expect(department3).toBeTruthy();
+    expect(department3.parent).toBeNull();
+  });
+
+  it('should update user department', async () => {
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '12',
+          title: 'test',
+        },
+      ],
+    });
+    const department = await db.getRepository('departments').findOne({
+      filter: {
+        title: 'test',
+      },
+    });
+    expect(department).toBeTruthy();
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'user',
+      records: [
+        {
+          uid: '1',
+          nickname: 'test',
+          email: 'test@nocobase.com',
+          departments: ['12'],
+        },
+      ],
+    });
+    const user = await db.getRepository('users').findOne({
+      filter: {
+        email: 'test@nocobase.com',
+      },
+      appends: ['departments'],
+    });
+    expect(user).toBeTruthy();
+    expect(user.departments).toHaveLength(1);
+    expect(user.departments[0].id).toBe(department.id);
+    const departmentUser = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        departmentId: department.id,
+        userId: user.id,
+      },
+    });
+    expect(departmentUser).toBeTruthy();
+    expect(departmentUser.isOwner).toBe(false);
+    expect(departmentUser.isMain).toBe(false);
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'user',
+      records: [
+        {
+          uid: '1',
+          nickname: 'test',
+          email: 'test@nocobase.com',
+          departments: [
+            {
+              uid: '12',
+              isOwner: true,
+              isMain: true,
+            },
+          ],
+        },
+      ],
+    });
+    const departmentUser2 = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        departmentId: department.id,
+        userId: user.id,
+      },
+    });
+    expect(departmentUser2).toBeTruthy();
+    expect(departmentUser2.isOwner).toBe(true);
+    expect(departmentUser2.isMain).toBe(true);
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'user',
+      records: [
+        {
+          uid: '2',
+          nickname: 'test2',
+          email: 'test2@nocobase.com',
+          departments: [
+            {
+              uid: '12',
+              isOwner: true,
+              isMain: false,
+            },
+          ],
+        },
+      ],
+    });
+    const user2 = await db.getRepository('users').findOne({
+      filter: {
+        email: 'test2@nocobase.com',
+      },
+      appends: ['departments'],
+    });
+    expect(user2).toBeTruthy();
+    expect(user2.departments).toHaveLength(1);
+    expect(user2.departments[0].id).toBe(department.id);
+    const departmentUser3 = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        departmentId: department.id,
+        userId: user2.id,
+      },
+    });
+    expect(departmentUser3).toBeTruthy();
+    expect(departmentUser3.isOwner).toBe(true);
+    expect(departmentUser3.isMain).toBe(false);
+  });
+
+  it('should update department custom field', async () => {
+    const departmemntCollection = db.getCollection('departments');
+    departmemntCollection.addField('customField', { type: 'string' });
+    await db.sync({
+      alter: true,
+    });
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test',
+          customField: 'testField',
+        },
+      ],
+    });
+    const department = await db.getRepository('departments').findOne({
+      filter: {
+        title: 'test',
+      },
+    });
+    expect(department).toBeTruthy();
+    expect(department.customField).toBe('testField');
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'user',
+      matchKey: 'email',
+      records: [
+        {
+          uid: '1',
+          nickname: 'test',
+          email: 'test@nocobase.com',
+          customField: 'testField2',
+        },
+      ],
+    });
+    const department2 = await db.getRepository('users').findOne({
+      filter: {
+        id: department.id,
+      },
+    });
+    expect(department2).toBeTruthy();
+    expect(department2.customField).toBe('testField2');
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts
new file mode 100644
index 0000000000..02e85c4f02
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts
@@ -0,0 +1,72 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('destroy department check', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should check if it has sub departments', async () => {
+    const dept = await repo.create({
+      values: {
+        title: 'Department',
+        children: [{ title: 'Sub department' }],
+      },
+    });
+    const res = await agent.resource('departments').destroy({
+      filterByTk: dept.id,
+    });
+    expect(res.status).toBe(400);
+    expect(res.text).toBe('The department has sub-departments, please delete them first');
+  });
+
+  it('should check if it has members', async () => {
+    const dept = await repo.create({
+      values: {
+        title: 'Department',
+        members: [1],
+      },
+    });
+    const res = await agent.resource('departments').destroy({
+      filterByTk: dept.id,
+    });
+    expect(res.status).toBe(400);
+    expect(res.text).toBe('The department has members, please remove them first');
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts
new file mode 100644
index 0000000000..047b024708
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts
@@ -0,0 +1,91 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('set department owners', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should set department owners', async () => {
+    await db.getRepository('users').create({
+      values: {
+        username: 'test',
+      },
+    });
+    const dept = await repo.create({
+      values: {
+        title: 'Department',
+        members: [1, 2],
+      },
+    });
+    await agent.resource('departments').update({
+      filterByTk: dept.id,
+      values: {
+        owners: [{ id: 1 }],
+      },
+    });
+    const deptUser = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        userId: 1,
+        departmentId: dept.id,
+      },
+    });
+    expect(deptUser.isOwner).toBe(true);
+    await agent.resource('departments').update({
+      filterByTk: dept.id,
+      values: {
+        owners: [{ id: 2 }],
+      },
+    });
+    const deptUser1 = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        userId: 1,
+        departmentId: dept.id,
+      },
+    });
+    expect(deptUser1.isOwner).toBe(false);
+    const deptUser2 = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        userId: 2,
+        departmentId: dept.id,
+      },
+    });
+    expect(deptUser2.isOwner).toBe(true);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts
new file mode 100644
index 0000000000..987d77c938
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts
@@ -0,0 +1,73 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+import { setDepartmentsInfo } from '../middlewares';
+
+describe('set departments info', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+  let ctx: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['users', 'departments', 'acl', 'data-source-manager'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+    ctx = {
+      db,
+      cache: app.cache,
+      state: {},
+    };
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should set departments roles', async () => {
+    ctx.state.currentUser = await db.getRepository('users').findOne({
+      filterByTk: 1,
+    });
+    const role = await db.getRepository('roles').create({
+      values: {
+        name: 'test-role',
+        title: 'Test role',
+      },
+    });
+    await repo.create({
+      values: {
+        title: 'Department',
+        roles: [role.name],
+        members: [1],
+      },
+    });
+    await setDepartmentsInfo(ctx, () => {});
+    expect(ctx.state.attachRoles.length).toBe(1);
+    expect(ctx.state.attachRoles[0].name).toBe('test-role');
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts
new file mode 100644
index 0000000000..c65750f36b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts
@@ -0,0 +1,183 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('set main department', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+    await db.getRepository('departmentsUsers').destroy({ truncate: true });
+  });
+
+  it('should set main department when add department members', async () => {
+    const dept = await repo.create({
+      values: {
+        title: 'Department',
+      },
+    });
+    await db.getRepository('users').create({
+      values: {
+        username: 'test',
+      },
+    });
+    await agent.resource('departments.members', dept.id).add({
+      values: [1, 2],
+    });
+    const throughRepo = db.getRepository('departmentsUsers');
+    const deptUsers = await throughRepo.find({
+      filter: {
+        userId: {
+          $in: [1, 2],
+        },
+        departmentId: dept.id,
+      },
+    });
+    for (const item of deptUsers) {
+      expect(item.isMain).toBe(true);
+    }
+
+    const dept2 = await repo.create({
+      values: {
+        title: 'Department2',
+      },
+    });
+    await agent.resource('departments.members', dept2.id).add({
+      values: [2],
+    });
+    const deptUsers2 = await throughRepo.find({
+      filter: {
+        userId: 2,
+      },
+    });
+    expect(deptUsers2.length).toBe(2);
+    expect(deptUsers2.find((i: any) => i.departmentId === dept.id).isMain).toBe(true);
+    expect(deptUsers2.find((i: any) => i.departmentId === dept2.id).isMain).toBe(false);
+  });
+
+  it('should set main department when remove department members', async () => {
+    const depts = await repo.create({
+      values: [
+        {
+          title: 'Department',
+        },
+        {
+          title: 'Department2',
+        },
+      ],
+    });
+    await agent.resource('departments.members', depts[0].id).add({
+      values: [1],
+    });
+    await agent.resource('departments.members', depts[1].id).add({
+      values: [1],
+    });
+    const throughRepo = db.getRepository('departmentsUsers');
+    const deptUsers = await throughRepo.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    expect(deptUsers.length).toBe(2);
+    expect(deptUsers.find((i: any) => i.departmentId === depts[0].id).isMain).toBe(true);
+    expect(deptUsers.find((i: any) => i.departmentId === depts[1].id).isMain).toBe(false);
+
+    await agent.resource('departments.members', depts[0].id).remove({
+      values: [1],
+    });
+    const deptUsers2 = await throughRepo.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    expect(deptUsers2.length).toBe(1);
+    expect(deptUsers2[0].departmentId).toBe(depts[1].id);
+    expect(deptUsers2[0].isMain).toBe(true);
+  });
+
+  it('should set main department when add user departments', async () => {
+    const depts = await repo.create({
+      values: [
+        {
+          title: 'Department',
+        },
+        {
+          title: 'Department2',
+        },
+      ],
+    });
+    await agent.resource('users.departments', 1).add({
+      values: depts.map((dept: any) => dept.id),
+    });
+    const throughRepo = db.getRepository('departmentsUsers');
+    const deptUsers = await throughRepo.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    expect(deptUsers.length).toBe(2);
+    expect(deptUsers.find((i: any) => i.departmentId === depts[0].id).isMain).toBe(true);
+    expect(deptUsers.find((i: any) => i.departmentId === depts[1].id).isMain).toBe(false);
+  });
+
+  it('should set main department when remove user departments', async () => {
+    const depts = await repo.create({
+      values: [
+        {
+          title: 'Department',
+        },
+        {
+          title: 'Department2',
+        },
+      ],
+    });
+    await agent.resource('users.departments', 1).add({
+      values: depts.map((dept: any) => dept.id),
+    });
+    await agent.resource('users.departments', 1).remove({
+      values: [depts[0].id],
+    });
+    const throughRepo = db.getRepository('departmentsUsers');
+    const deptUsers = await throughRepo.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    expect(deptUsers.length).toBe(1);
+    expect(deptUsers[0].departmentId).toBe(depts[1].id);
+    expect(deptUsers[0].isMain).toBe(true);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts
new file mode 100644
index 0000000000..71c91b39b9
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts
@@ -0,0 +1,102 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('update department isLeaf', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should update isLeaf when create sub department', async () => {
+    const res = await agent.resource('departments').create({
+      values: {
+        title: 'Department',
+      },
+    });
+    const dept = res.body.data;
+    expect(dept).toBeTruthy();
+    expect(dept.isLeaf).toBe(true);
+
+    await agent.resource('departments').create({
+      values: {
+        title: 'Sub Department',
+        parent: dept,
+      },
+    });
+    const record = await repo.findOne({
+      filterByTk: dept.id,
+    });
+    expect(record.isLeaf).toBe(false);
+  });
+
+  it('should update isLeaf when update department', async () => {
+    const res = await agent.resource('departments').create({
+      values: {
+        title: 'Department',
+      },
+    });
+    const res2 = await agent.resource('departments').create({
+      values: {
+        title: 'Department2',
+      },
+    });
+    const dept1 = res.body.data;
+    const dept2 = res2.body.data;
+    const res3 = await agent.resource('departments').create({
+      values: {
+        title: 'Sub Department',
+        parent: dept1,
+      },
+    });
+    const subDept = res3.body.data;
+    await agent.resource('departments').update({
+      filterByTk: subDept.id,
+      values: {
+        parent: dept2,
+      },
+    });
+    const record1 = await repo.findOne({
+      filterByTk: dept1.id,
+    });
+    expect(record1.isLeaf).toBe(true);
+    const record2 = await repo.findOne({
+      filterByTk: dept2.id,
+    });
+    expect(record2.isLeaf).toBe(false);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/actions/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/server/actions/departments.ts
new file mode 100644
index 0000000000..280fd8ab18
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/actions/departments.ts
@@ -0,0 +1,97 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import { DepartmentModel } from '../models/department';
+
+export const getAppendsOwners = async (ctx: Context, next: Next) => {
+  const { filterByTk, appends } = ctx.action.params;
+  const repo = ctx.db.getRepository('departments');
+  const department: DepartmentModel = await repo.findOne({
+    filterByTk,
+    appends,
+  });
+  const owners = await department.getOwners();
+  department.setDataValue('owners', owners);
+  ctx.body = department;
+  await next();
+};
+
+export const aggregateSearch = async (ctx: Context, next: Next) => {
+  const { keyword, type, last = 0, limit = 10 } = ctx.action.params.values || {};
+  let users = [];
+  let departments = [];
+  if (!type || type === 'user') {
+    const repo = ctx.db.getRepository('users');
+    users = await repo.find({
+      filter: {
+        id: { $gt: last },
+        $or: [
+          { username: { $includes: keyword } },
+          { nickname: { $includes: keyword } },
+          { phone: { $includes: keyword } },
+          { email: { $includes: keyword } },
+        ],
+      },
+      limit,
+    });
+  }
+  if (!type || type === 'department') {
+    const repo = ctx.db.getRepository('departments');
+    departments = await repo.find({
+      filter: {
+        id: { $gt: last },
+        title: { $includes: keyword },
+      },
+      appends: ['parent(recursively=true)'],
+      limit,
+    });
+  }
+  ctx.body = { users, departments };
+  await next();
+};
+
+export const setOwner = async (ctx: Context, next: Next) => {
+  const { userId, departmentId } = ctx.action.params.values || {};
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  await throughRepo.update({
+    filter: {
+      userId,
+      departmentId,
+    },
+    values: {
+      isOwner: true,
+    },
+  });
+  await next();
+};
+
+export const removeOwner = async (ctx: Context, next: Next) => {
+  const { userId, departmentId } = ctx.action.params.values || {};
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  await throughRepo.update({
+    filter: {
+      userId,
+      departmentId,
+    },
+    values: {
+      isOwner: false,
+    },
+  });
+  await next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/actions/users.ts b/packages/plugins/@nocobase/plugin-departments/src/server/actions/users.ts
new file mode 100644
index 0000000000..38681fa574
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/actions/users.ts
@@ -0,0 +1,133 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, DEFAULT_PAGE, DEFAULT_PER_PAGE, Next } from '@nocobase/actions';
+
+export const listExcludeDept = async (ctx: Context, next: Next) => {
+  const { departmentId, page = DEFAULT_PAGE, pageSize = DEFAULT_PER_PAGE } = ctx.action.params;
+  const repo = ctx.db.getRepository('users');
+  const members = await repo.find({
+    fields: ['id'],
+    filter: {
+      'departments.id': departmentId,
+    },
+  });
+  const memberIds = members.map((member: { id: number }) => member.id);
+  if (memberIds.length) {
+    ctx.action.mergeParams({
+      filter: {
+        id: {
+          $notIn: memberIds,
+        },
+      },
+    });
+  }
+  const { filter } = ctx.action.params;
+  const [rows, count] = await repo.findAndCount({
+    context: ctx,
+    offset: (page - 1) * pageSize,
+    limit: +pageSize,
+    filter,
+  });
+  ctx.body = {
+    count,
+    rows,
+    page: Number(page),
+    pageSize: Number(pageSize),
+    totalPage: Math.ceil(count / pageSize),
+  };
+  await next();
+};
+
+export const setDepartments = async (ctx: Context, next: Next) => {
+  const { values = {} } = ctx.action.params;
+  const { userId, departments = [] } = values;
+  const repo = ctx.db.getRepository('users');
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  const user = await repo.findOne({ filterByTk: userId });
+  if (!user) {
+    ctx.throw(400, ctx.t('User does not exist'));
+  }
+  const departmentIds = departments.map((department: any) => department.id);
+  const main = departments.find((department: any) => department.isMain);
+  const owners = departments.filter((department: any) => department.isOwner);
+  await ctx.db.sequelize.transaction(async (t) => {
+    await user.setDepartments(departmentIds, {
+      through: {
+        isMain: false,
+        isOwner: false,
+      },
+      transaction: t,
+    });
+    if (main) {
+      await throughRepo.update({
+        filter: {
+          userId,
+          departmentId: main.id,
+        },
+        values: {
+          isMain: true,
+        },
+        transaction: t,
+      });
+    }
+    if (owners.length) {
+      await throughRepo.update({
+        filter: {
+          userId,
+          departmentId: {
+            $in: owners.map((owner: any) => owner.id),
+          },
+        },
+        values: {
+          isOwner: true,
+        },
+        transaction: t,
+      });
+    }
+  });
+  await next();
+};
+
+export const setMainDepartment = async (ctx: Context, next: Next) => {
+  const { userId, departmentId } = ctx.action.params.values || {};
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  await ctx.db.sequelize.transaction(async (t) => {
+    await throughRepo.update({
+      filter: {
+        userId,
+        isMain: true,
+      },
+      values: {
+        isMain: false,
+      },
+      transaction: t,
+    });
+    await throughRepo.update({
+      filter: {
+        userId,
+        departmentId,
+      },
+      values: {
+        isMain: true,
+      },
+      transaction: t,
+    });
+  });
+  await next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/.gitkeep b/packages/plugins/@nocobase/plugin-departments/src/server/collections/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentRoles.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentRoles.ts
new file mode 100644
index 0000000000..b0f44497c2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentRoles.ts
@@ -0,0 +1,25 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { defineCollection } from '@nocobase/database';
+
+export default defineCollection({
+  name: 'departmentsRoles',
+  dumpRules: 'required',
+  migrationRules: ['overwrite'],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departments.ts
new file mode 100644
index 0000000000..a5881b35c9
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departments.ts
@@ -0,0 +1,156 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { defineCollection } from '@nocobase/database';
+
+export const ownersField = {
+  interface: 'm2m',
+  type: 'belongsToMany',
+  name: 'owners',
+  collectionName: 'departments',
+  target: 'users',
+  through: 'departmentsUsers',
+  foreignKey: 'departmentId',
+  otherKey: 'userId',
+  targetKey: 'id',
+  sourceKey: 'id',
+  throughScope: {
+    isOwner: true,
+  },
+  uiSchema: {
+    type: 'm2m',
+    title: '{{t("Owners")}}',
+    'x-component': 'DepartmentOwnersField',
+    'x-component-props': {
+      multiple: true,
+      fieldNames: {
+        label: 'nickname',
+        value: 'id',
+      },
+    },
+  },
+};
+
+export default defineCollection({
+  name: 'departments',
+  migrationRules: ['overwrite'],
+  title: '{{t("Departments")}}',
+  dumpRules: 'required',
+  tree: 'adjacency-list',
+  template: 'tree',
+  shared: true,
+  sortable: true,
+  model: 'DepartmentModel',
+  createdBy: true,
+  updatedBy: true,
+  logging: true,
+  fields: [
+    {
+      type: 'bigInt',
+      name: 'id',
+      primaryKey: true,
+      autoIncrement: true,
+      interface: 'id',
+      uiSchema: {
+        type: 'number',
+        title: '{{t("ID")}}',
+        'x-component': 'InputNumber',
+        'x-read-pretty': true,
+      },
+    },
+    {
+      type: 'string',
+      name: 'title',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Department name")}}',
+        'x-component': 'Input',
+      },
+    },
+    {
+      type: 'boolean',
+      name: 'isLeaf',
+    },
+    {
+      type: 'belongsTo',
+      name: 'parent',
+      target: 'departments',
+      foreignKey: 'parentId',
+      treeParent: true,
+      onDelete: 'CASCADE',
+      interface: 'm2o',
+      uiSchema: {
+        type: 'm2o',
+        title: '{{t("Superior department")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: false,
+          fieldNames: {
+            label: 'title',
+            value: 'id',
+          },
+        },
+      },
+    },
+    {
+      type: 'hasMany',
+      name: 'children',
+      target: 'departments',
+      foreignKey: 'parentId',
+      treeChildren: true,
+      onDelete: 'CASCADE',
+    },
+    {
+      type: 'belongsToMany',
+      name: 'members',
+      target: 'users',
+      through: 'departmentsUsers',
+      foreignKey: 'departmentId',
+      otherKey: 'userId',
+      targetKey: 'id',
+      sourceKey: 'id',
+      onDelete: 'CASCADE',
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'roles',
+      target: 'roles',
+      through: 'departmentsRoles',
+      foreignKey: 'departmentId',
+      otherKey: 'roleName',
+      targetKey: 'name',
+      sourceKey: 'id',
+      onDelete: 'CASCADE',
+      uiSchema: {
+        type: 'm2m',
+        title: '{{t("Roles")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            label: 'title',
+            value: 'name',
+          },
+        },
+      },
+    },
+    ownersField,
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentsUsers.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentsUsers.ts
new file mode 100644
index 0000000000..70d5534d2c
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentsUsers.ts
@@ -0,0 +1,39 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { defineCollection } from '@nocobase/database';
+
+export default defineCollection({
+  name: 'departmentsUsers',
+  dumpRules: 'required',
+  migrationRules: ['schema-only'],
+  fields: [
+    {
+      type: 'boolean',
+      name: 'isOwner', // Weather the user is the owner of the department
+      allowNull: false,
+      defaultValue: false,
+    },
+    {
+      type: 'boolean',
+      name: 'isMain', // Weather this is the main department of the user
+      allowNull: false,
+      defaultValue: false,
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/roles.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/roles.ts
new file mode 100644
index 0000000000..bac06fa60b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/roles.ts
@@ -0,0 +1,36 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { extendCollection } from '@nocobase/database';
+
+export default extendCollection({
+  name: 'roles',
+  fields: [
+    {
+      type: 'belongsToMany',
+      name: 'departments',
+      target: 'departments',
+      foreignKey: 'roleName',
+      otherKey: 'departmentId',
+      onDelete: 'CASCADE',
+      sourceKey: 'name',
+      targetKey: 'id',
+      through: 'departmentsRoles',
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/users.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/users.ts
new file mode 100644
index 0000000000..c5bcf488cc
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/users.ts
@@ -0,0 +1,79 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { extendCollection } from '@nocobase/database';
+
+export const departmentsField = {
+  collectionName: 'users',
+  interface: 'm2m',
+  type: 'belongsToMany',
+  name: 'departments',
+  target: 'departments',
+  foreignKey: 'userId',
+  otherKey: 'departmentId',
+  onDelete: 'CASCADE',
+  sourceKey: 'id',
+  targetKey: 'id',
+  through: 'departmentsUsers',
+  uiSchema: {
+    type: 'm2m',
+    title: '{{t("Departments")}}',
+    'x-component': 'UserDepartmentsField',
+    'x-component-props': {
+      multiple: true,
+      fieldNames: {
+        label: 'title',
+        value: 'name',
+      },
+    },
+  },
+};
+
+export const mainDepartmentField = {
+  collectionName: 'users',
+  interface: 'm2m',
+  type: 'belongsToMany',
+  name: 'mainDepartment',
+  target: 'departments',
+  foreignKey: 'userId',
+  otherKey: 'departmentId',
+  onDelete: 'CASCADE',
+  sourceKey: 'id',
+  targetKey: 'id',
+  through: 'departmentsUsers',
+  throughScope: {
+    isMain: true,
+  },
+  uiSchema: {
+    type: 'm2m',
+    title: '{{t("Main department")}}',
+    'x-component': 'UserMainDepartmentField',
+    'x-component-props': {
+      multiple: false,
+      fieldNames: {
+        label: 'title',
+        value: 'name',
+      },
+    },
+  },
+};
+
+export default extendCollection({
+  name: 'users',
+  fields: [departmentsField, mainDepartmentField],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/department-data-sync-resource.ts b/packages/plugins/@nocobase/plugin-departments/src/server/department-data-sync-resource.ts
new file mode 100644
index 0000000000..69d0d414df
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/department-data-sync-resource.ts
@@ -0,0 +1,333 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Model } from '@nocobase/database';
+import lodash from 'lodash';
+import {
+  FormatDepartment,
+  FormatUserDepartment,
+  OriginRecord,
+  PrimaryKey,
+  RecordResourceChanged,
+  SyncAccept,
+  UserDataResource,
+} from '@nocobase/plugin-user-data-sync';
+
+export class DepartmentDataSyncResource extends UserDataResource {
+  name = 'departments';
+  accepts: SyncAccept[] = ['user', 'department'];
+
+  get userRepo() {
+    return this.db.getRepository('users');
+  }
+
+  get deptRepo() {
+    return this.db.getRepository('departments');
+  }
+
+  get deptUserRepo() {
+    return this.db.getRepository('departmentsUsers');
+  }
+
+  getFlteredSourceDepartment(sourceDepartment: FormatDepartment) {
+    const deleteProps = [
+      'id',
+      'uid',
+      'createdAt',
+      'updatedAt',
+      'sort',
+      'createdById',
+      'updatedById',
+      'isDeleted',
+      'parentId',
+      'parentUid',
+    ];
+    return lodash.omit(sourceDepartment, deleteProps);
+  }
+
+  async update(record: OriginRecord, resourcePks: PrimaryKey[]): Promise<RecordResourceChanged[]> {
+    const { dataType, metaData, sourceName } = record;
+    if (dataType === 'user') {
+      const sourceUser = metaData;
+      if (sourceUser.isDeleted) {
+        if (!resourcePks || !resourcePks.length) {
+          return [];
+        } else {
+          return resourcePks.map((id) => ({ resourcesPk: id, isDeleted: true }));
+        }
+      }
+      const resources = record.resources.filter((r) => r.resource === 'users');
+      if (!resources.length) {
+        return [];
+      }
+      const user = await this.userRepo.findOne({
+        filterByTk: resources[0].resourcePk,
+      });
+      if (!user) {
+        if (!resourcePks || !resourcePks.length) {
+          return [];
+        } else {
+          return resourcePks.map((id) => ({ resourcesPk: id, isDeleted: true }));
+        }
+      } else {
+        return await this.updateUserDepartments(user, resourcePks, sourceUser.departments, sourceName);
+      }
+    } else if (dataType === 'department') {
+      const sourceDepartment = metaData;
+      const department = await this.deptRepo.findOne({
+        filterByTk: resourcePks[0],
+      });
+      if (!department) {
+        if (sourceDepartment.isDeleted) {
+          return [{ resourcesPk: resourcePks[0], isDeleted: true }];
+        }
+        const result = await this.create(record);
+        return [...result, { resourcesPk: resourcePks[0], isDeleted: true }];
+      }
+      await this.updateDepartment(department, sourceDepartment, sourceName);
+    } else {
+      this.logger.warn(`update department: unsupported data type: ${dataType}`);
+    }
+    return [];
+  }
+
+  async create(record: OriginRecord): Promise<RecordResourceChanged[]> {
+    const { dataType, metaData, sourceName } = record;
+    if (dataType === 'user') {
+      const sourceUser = metaData;
+      if (sourceUser.isDeleted) {
+        return [];
+      }
+      const resources = record.resources.filter((r) => r.resource === 'users');
+      if (!resources.length) {
+        return [];
+      }
+      const user = await this.userRepo.findOne({
+        filterByTk: resources[0].resourcePk,
+      });
+      return await this.updateUserDepartments(user, [], sourceUser.departments, sourceName);
+    } else if (dataType === 'department') {
+      const sourceDepartment = metaData;
+      const newDepartmentId = await this.createDepartment(sourceDepartment, sourceName);
+      return [{ resourcesPk: newDepartmentId, isDeleted: false }];
+    } else {
+      this.logger.warn(`create department: unsupported data type: ${dataType}`);
+    }
+    return [];
+  }
+
+  async getDepartmentIdsBySourceUks(sourceUks: PrimaryKey[], sourceName: string) {
+    const syncDepartmentRecords = await this.syncRecordRepo.find({
+      filter: {
+        sourceName,
+        dataType: 'department',
+        sourceUk: { $in: sourceUks },
+        'resources.resource': this.name,
+      },
+      appends: ['resources'],
+    });
+    const departmentIds = syncDepartmentRecords
+      .filter((record) => record.resources?.length)
+      .map((record) => record.resources[0].resourcePk);
+    return departmentIds;
+  }
+
+  async getDepartmentIdBySourceUk(sourceUk: PrimaryKey, sourceName: string) {
+    const syncDepartmentRecord = await this.syncRecordRepo.findOne({
+      filter: {
+        sourceName,
+        dataType: 'department',
+        sourceUk,
+        'resources.resource': this.name,
+      },
+      appends: ['resources'],
+    });
+    if (syncDepartmentRecord && syncDepartmentRecord.resources?.length) {
+      return syncDepartmentRecord.resources[0].resourcePk;
+    }
+  }
+
+  async updateUserDepartments(
+    user: any,
+    currentDepartmentIds: PrimaryKey[],
+    sourceDepartments: (PrimaryKey | FormatUserDepartment)[],
+    sourceName: string,
+  ): Promise<RecordResourceChanged[]> {
+    if (!this.deptRepo) {
+      return [];
+    }
+    if (!sourceDepartments || !sourceDepartments.length) {
+      const userDepartments = await user.getDepartments();
+      if (userDepartments.length) {
+        await user.removeDepartments(userDepartments);
+      }
+      if (currentDepartmentIds && currentDepartmentIds.length) {
+        return currentDepartmentIds.map((id) => ({ resourcesPk: id, isDeleted: true }));
+      } else {
+        return [];
+      }
+    } else {
+      const sourceDepartmentIds = sourceDepartments.map((sourceDepartment) => {
+        if (typeof sourceDepartment === 'string' || typeof sourceDepartment === 'number') {
+          return sourceDepartment;
+        }
+        return sourceDepartment.uid;
+      });
+      const newDepartmentIds = await this.getDepartmentIdsBySourceUks(sourceDepartmentIds, sourceName);
+      const newDepartments = await this.deptRepo.find({
+        filter: { id: { $in: newDepartmentIds } },
+      });
+      const realCurrentDepartments = await user.getDepartments();
+      // 需要删除的部门
+      const toRealRemoveDepartments = realCurrentDepartments.filter((currnetDepartment) => {
+        return !newDepartments.find((newDepartment) => newDepartment.id === currnetDepartment.id);
+      });
+      if (toRealRemoveDepartments.length) {
+        await user.removeDepartments(toRealRemoveDepartments);
+      }
+      // 需要添加的部门
+      const toRealAddDepartments = newDepartments.filter((newDepartment) => {
+        if (realCurrentDepartments.length === 0) {
+          return true;
+        }
+        return !realCurrentDepartments.find((currentDepartment) => currentDepartment.id === newDepartment.id);
+      });
+      if (toRealAddDepartments.length) {
+        await user.addDepartments(toRealAddDepartments);
+      }
+      // 更新部门主管和主部门
+      for (const sourceDepartment of sourceDepartments) {
+        this.logger.debug('update dept owner: ' + JSON.stringify(sourceDepartment));
+        let isOwner = false;
+        let isMain = false;
+        let uid;
+        if (typeof sourceDepartment !== 'string' && typeof sourceDepartment !== 'number') {
+          isOwner = sourceDepartment.isOwner || false;
+          isMain = sourceDepartment.isMain || false;
+          uid = sourceDepartment.uid;
+        } else {
+          uid = sourceDepartment;
+        }
+        const deptId = await this.getDepartmentIdBySourceUk(uid, sourceName);
+        this.logger.debug('update dept owner: ' + JSON.stringify({ deptId, isOwner, isMain, userId: user.id }));
+        if (!deptId) {
+          continue;
+        }
+        await this.deptUserRepo.update({
+          filter: {
+            userId: user.id,
+            departmentId: deptId,
+          },
+          values: {
+            isOwner,
+            isMain,
+          },
+        });
+      }
+      const recordResourceChangeds: RecordResourceChanged[] = [];
+      if (currentDepartmentIds !== undefined && currentDepartmentIds.length > 0) {
+        // 需要删除的部门ID
+        const toRemoveDepartmentIds = currentDepartmentIds.filter(
+          (currentDepartmentId) => !newDepartmentIds.includes(currentDepartmentId),
+        );
+        recordResourceChangeds.push(
+          ...toRemoveDepartmentIds.map((departmentId) => {
+            return { resourcesPk: departmentId, isDeleted: true };
+          }),
+        );
+        // 需要添加的部门ID
+        const toAddDepartmentIds = newDepartmentIds.filter(
+          (newDepartmentId) => !currentDepartmentIds.includes(newDepartmentId),
+        );
+        recordResourceChangeds.push(
+          ...toAddDepartmentIds.map((departmentId) => {
+            return { resourcesPk: departmentId, isDeleted: false };
+          }),
+        );
+      } else {
+        recordResourceChangeds.push(
+          ...toRealAddDepartments.map((department) => {
+            return {
+              resourcesPk: department.id,
+              isDeleted: false,
+            };
+          }),
+        );
+      }
+      return recordResourceChangeds;
+    }
+  }
+
+  async updateDepartment(department: Model, sourceDepartment: FormatDepartment, sourceName: string) {
+    if (sourceDepartment.isDeleted) {
+      // 删除部门
+      await department.destroy();
+      return;
+    }
+    let dataChanged = false;
+    const filteredSourceDepartment = this.getFlteredSourceDepartment(sourceDepartment);
+    lodash.forOwn(filteredSourceDepartment, (value, key) => {
+      if (department[key] !== value) {
+        department[key] = value;
+        dataChanged = true;
+      }
+    });
+    if (dataChanged) {
+      await department.save();
+    }
+    await this.updateParentDepartment(department, sourceDepartment.parentUid, sourceName);
+  }
+
+  async createDepartment(sourceDepartment: FormatDepartment, sourceName: string): Promise<string> {
+    const filteredSourceDepartment = this.getFlteredSourceDepartment(sourceDepartment);
+    const department = await this.deptRepo.create({
+      values: filteredSourceDepartment,
+    });
+    await this.updateParentDepartment(department, sourceDepartment.parentUid, sourceName);
+    return department.id;
+  }
+
+  async updateParentDepartment(department: Model, parentUid: string, sourceName: string) {
+    if (!parentUid) {
+      const parentDepartment = await department.getParent();
+      if (parentDepartment) {
+        await department.setParent(null);
+      }
+    } else {
+      const syncDepartmentRecord = await this.syncRecordRepo.findOne({
+        filter: {
+          sourceName,
+          dataType: 'department',
+          sourceUk: parentUid,
+          'resources.resource': this.name,
+        },
+        appends: ['resources'],
+      });
+      if (syncDepartmentRecord && syncDepartmentRecord.resources?.length) {
+        const parentDepartment = await this.deptRepo.findOne({
+          filterByTk: syncDepartmentRecord.resources[0].resourcePk,
+        });
+        if (!parentDepartment) {
+          await department.setParent(null);
+          return;
+        }
+        const parent = await department.getParent();
+        if (parent) {
+          if (parentDepartment.id !== parent.id) {
+            await department.setParent(parentDepartment);
+          }
+        } else {
+          await department.setParent(parentDepartment);
+        }
+      } else {
+        await department.setParent(null);
+      }
+    }
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/index.ts b/packages/plugins/@nocobase/plugin-departments/src/server/index.ts
new file mode 100644
index 0000000000..61787e8e89
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/index.ts
@@ -0,0 +1,19 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export { default } from './plugin';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/destroy-department-check.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/destroy-department-check.ts
new file mode 100644
index 0000000000..ade251e3d9
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/destroy-department-check.ts
@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+
+const destroyCheck = async (ctx: Context) => {
+  const { filterByTk } = ctx.action.params;
+  const repo = ctx.db.getRepository('departments');
+  const children = await repo.count({
+    filter: {
+      parentId: filterByTk,
+    },
+  });
+  if (children) {
+    ctx.throw(400, ctx.t('The department has sub-departments, please delete them first', { ns: 'departments' }));
+  }
+  const members = await ctx.db.getRepository('departmentsUsers').count({
+    filter: {
+      departmentId: filterByTk,
+    },
+  });
+  if (members) {
+    ctx.throw(400, ctx.t('The department has members, please remove them first', { ns: 'departments' }));
+  }
+};
+
+export const destroyDepartmentCheck = async (ctx: Context, next: Next) => {
+  const { resourceName, actionName } = ctx.action.params;
+  if (resourceName === 'departments' && actionName === 'destroy') {
+    await destroyCheck(ctx as any);
+  }
+  await next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/index.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/index.ts
new file mode 100644
index 0000000000..8d2e037c65
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/index.ts
@@ -0,0 +1,24 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export * from './destroy-department-check';
+export * from './reset-user-departments-cache';
+export * from './set-department-owners';
+export * from './update-department-isleaf';
+export * from './set-departments-roles';
+export * from './set-main-department';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/reset-user-departments-cache.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/reset-user-departments-cache.ts
new file mode 100644
index 0000000000..0606093be1
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/reset-user-departments-cache.ts
@@ -0,0 +1,41 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import { Cache } from '@nocobase/cache';
+
+export const resetUserDepartmentsCache = async (ctx: Context, next: Next) => {
+  await next();
+  const { associatedName, resourceName, associatedIndex, actionName, values } = ctx.action.params;
+  const cache = ctx.app.cache as Cache;
+  if (
+    associatedName === 'departments' &&
+    resourceName === 'members' &&
+    ['add', 'remove', 'set'].includes(actionName) &&
+    values?.length
+  ) {
+    // Delete cache when the members of a department changed
+    for (const memberId of values) {
+      await cache.del(`departments:${memberId}`);
+    }
+  }
+
+  if (associatedName === 'users' && resourceName === 'departments' && ['add', 'remove', 'set'].includes(actionName)) {
+    await cache.del(`departments:${associatedIndex}`);
+  }
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-department-owners.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-department-owners.ts
new file mode 100644
index 0000000000..56a0da774f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-department-owners.ts
@@ -0,0 +1,59 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import lodash from 'lodash';
+
+const setOwners = async (ctx: Context, filterByTk: any, owners: any[]) => {
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  await ctx.db.sequelize.transaction(async (t) => {
+    await throughRepo.update({
+      filter: {
+        departmentId: filterByTk,
+      },
+      values: {
+        isOwner: false,
+      },
+      transaction: t,
+    });
+    await throughRepo.update({
+      filter: {
+        departmentId: filterByTk,
+        userId: {
+          $in: owners.map((owner: any) => owner.id),
+        },
+      },
+      values: {
+        isOwner: true,
+      },
+      transaction: t,
+    });
+  });
+};
+
+export const setDepartmentOwners = async (ctx: Context, next: Next) => {
+  const { filterByTk, values = {}, resourceName, actionName } = ctx.action.params;
+  const { owners } = values;
+  if (resourceName === 'departments' && actionName === 'update' && owners) {
+    ctx.action.params.values = lodash.omit(values, ['owners']);
+    await next();
+    await setOwners(ctx as any, filterByTk, owners);
+  } else {
+    return next();
+  }
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-departments-roles.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-departments-roles.ts
new file mode 100644
index 0000000000..5171d69ae0
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-departments-roles.ts
@@ -0,0 +1,60 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import { Cache } from '@nocobase/cache';
+import { Model, Repository } from '@nocobase/database';
+
+export const setDepartmentsInfo = async (ctx: Context, next: Next) => {
+  const currentUser = ctx.state.currentUser;
+  if (!currentUser) {
+    return next();
+  }
+
+  const cache = ctx.cache as Cache;
+  const repo = ctx.db.getRepository('users.departments', currentUser.id) as unknown as Repository;
+  const departments = (await cache.wrap(`departments:${currentUser.id}`, () =>
+    repo.find({
+      appends: ['owners', 'roles', 'parent(recursively=true)'],
+      raw: true,
+    }),
+  )) as Model[];
+  if (!departments.length) {
+    return next();
+  }
+  ctx.state.currentUser.departments = departments;
+  ctx.state.currentUser.mainDeparmtent = departments.find((dept) => dept.isMain);
+
+  const departmentIds = departments.map((dept) => dept.id);
+  const roleRepo = ctx.db.getRepository('roles');
+  const roles = await roleRepo.find({
+    filter: {
+      'departments.id': {
+        $in: departmentIds,
+      },
+    },
+  });
+  if (!roles.length) {
+    return next();
+  }
+  const rolesMap = new Map();
+  roles.forEach((role: any) => rolesMap.set(role.name, role));
+  ctx.state.attachRoles = Array.from(rolesMap.values());
+
+  await next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-main-department.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-main-department.ts
new file mode 100644
index 0000000000..b5f7083fa3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-main-department.ts
@@ -0,0 +1,101 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+
+export const setMainDepartment = async (ctx: Context, next: Next) => {
+  await next();
+  const { associatedName, resourceName, associatedIndex, actionName, values } = ctx.action.params;
+  if (associatedName === 'departments' && resourceName === 'members' && values?.length) {
+    const throughRepo = ctx.db.getRepository('departmentsUsers');
+    const usersHasMain = await throughRepo.find({
+      filter: {
+        userId: {
+          $in: values,
+        },
+        isMain: true,
+      },
+    });
+    const userIdsHasMain = usersHasMain.map((item) => item.userId);
+    if (actionName === 'add' || actionName === 'set') {
+      await throughRepo.update({
+        filter: {
+          userId: {
+            $in: values.filter((id) => !userIdsHasMain.includes(id)),
+          },
+          departmentId: associatedIndex,
+        },
+        values: {
+          isMain: true,
+        },
+      });
+      return;
+    }
+
+    if (actionName === 'remove') {
+      const userIdsHasNoMain = values.filter((id) => !userIdsHasMain.includes(id));
+      for (const userId of userIdsHasNoMain) {
+        const firstDept = await throughRepo.findOne({
+          filter: {
+            userId,
+          },
+        });
+        if (firstDept) {
+          await throughRepo.update({
+            filter: {
+              userId,
+              departmentId: firstDept.departmentId,
+            },
+            values: {
+              isMain: true,
+            },
+          });
+        }
+      }
+    }
+  }
+
+  if (associatedName === 'users' && resourceName === 'departments' && ['add', 'remove', 'set'].includes(actionName)) {
+    const throughRepo = ctx.db.getRepository('departmentsUsers');
+    const hasMain = await throughRepo.findOne({
+      filter: {
+        userId: associatedIndex,
+        isMain: true,
+      },
+    });
+    if (hasMain) {
+      return;
+    }
+    const firstDept = await throughRepo.findOne({
+      filter: {
+        userId: associatedIndex,
+      },
+    });
+    if (firstDept) {
+      await throughRepo.update({
+        filter: {
+          userId: associatedIndex,
+          departmentId: firstDept.departmentId,
+        },
+        values: {
+          isMain: true,
+        },
+      });
+    }
+  }
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/update-department-isleaf.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/update-department-isleaf.ts
new file mode 100644
index 0000000000..9d0cbdf947
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/update-department-isleaf.ts
@@ -0,0 +1,88 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import { Repository } from '@nocobase/database';
+
+const updateIsLeafWhenAddChild = async (repo: Repository, parent: any) => {
+  if (parent && parent.isLeaf !== false) {
+    await repo.update({
+      filter: {
+        id: parent.id,
+      },
+      values: {
+        isLeaf: false,
+      },
+    });
+  }
+};
+
+const updateIsLeafWhenChangeChild = async (
+  repo: Repository,
+  oldParentId: number | null,
+  newParentId: number | null,
+) => {
+  if (oldParentId && oldParentId !== newParentId) {
+    const hasChild = await repo.count({
+      filter: {
+        parentId: oldParentId,
+      },
+    });
+    if (!hasChild) {
+      await repo.update({
+        filter: {
+          id: oldParentId,
+        },
+        values: {
+          isLeaf: true,
+        },
+      });
+    }
+  }
+};
+
+export const updateDepartmentIsLeaf = async (ctx: Context, next: Next) => {
+  const { filterByTk, values = {}, resourceName, actionName } = ctx.action.params;
+  const repo = ctx.db.getRepository('departments');
+  const { parent } = values;
+  if (resourceName === 'departments' && actionName === 'create') {
+    ctx.action.params.values = { ...values, isLeaf: true };
+    await next();
+    await updateIsLeafWhenAddChild(repo, parent);
+    return;
+  }
+
+  if (resourceName === 'departments' && actionName === 'update') {
+    const department = await repo.findOne({ filterByTk });
+    await next();
+    await Promise.all([
+      updateIsLeafWhenChangeChild(repo, department.parentId, parent?.id),
+      updateIsLeafWhenAddChild(repo, parent),
+    ]);
+    return;
+  }
+
+  if (resourceName === 'departments' && actionName === 'destroy') {
+    const department = await repo.findOne({ filterByTk });
+    await next();
+    await updateIsLeafWhenChangeChild(repo, department.parentId, null);
+    return;
+  }
+
+  return next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/migrations/update-field-uischemas-20240307124823.ts b/packages/plugins/@nocobase/plugin-departments/src/server/migrations/update-field-uischemas-20240307124823.ts
new file mode 100644
index 0000000000..542d5865bf
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/migrations/update-field-uischemas-20240307124823.ts
@@ -0,0 +1,96 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Migration } from '@nocobase/server';
+import { departmentsField, mainDepartmentField } from '../collections/users';
+import { ownersField } from '../collections/departments';
+
+export default class UpdateFieldUISchemasMigration extends Migration {
+  async up() {
+    const result = await this.app.version.satisfies('<=0.20.0-alpha.6');
+
+    if (!result) {
+      return;
+    }
+
+    const fieldRepo = this.db.getRepository('fields');
+    const departmentsFieldInstance = await fieldRepo.findOne({
+      filter: {
+        name: 'departments',
+        collectionName: 'users',
+      },
+    });
+    if (departmentsFieldInstance) {
+      const options = {
+        ...departmentsFieldInstance.options,
+        uiSchema: departmentsField.uiSchema,
+      };
+      await fieldRepo.update({
+        filter: {
+          name: 'departments',
+          collectionName: 'users',
+        },
+        values: {
+          options,
+        },
+      });
+    }
+    const mainDepartmentFieldInstance = await fieldRepo.findOne({
+      filter: {
+        name: 'mainDepartment',
+        collectionName: 'users',
+      },
+    });
+    if (mainDepartmentFieldInstance) {
+      const options = {
+        ...mainDepartmentFieldInstance.options,
+        uiSchema: mainDepartmentField.uiSchema,
+      };
+      await fieldRepo.update({
+        filter: {
+          name: 'mainDepartment',
+          collectionName: 'users',
+        },
+        values: {
+          options,
+        },
+      });
+    }
+    const ownersFieldInstance = await fieldRepo.findOne({
+      filter: {
+        name: 'owners',
+        collectionName: 'departments',
+      },
+    });
+    if (ownersFieldInstance) {
+      const options = {
+        ...ownersFieldInstance.options,
+        uiSchema: ownersField.uiSchema,
+      };
+      await fieldRepo.update({
+        filter: {
+          name: 'owners',
+          collectionName: 'departments',
+        },
+        values: {
+          options,
+        },
+      });
+    }
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/models/department.ts b/packages/plugins/@nocobase/plugin-departments/src/server/models/department.ts
new file mode 100644
index 0000000000..fddd8fc0ce
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/models/department.ts
@@ -0,0 +1,31 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Model } from '@nocobase/database';
+
+export class DepartmentModel extends Model {
+  getOwners() {
+    return this.getMembers({
+      through: {
+        where: {
+          isOwner: true,
+        },
+      },
+    });
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-departments/src/server/plugin.ts
new file mode 100644
index 0000000000..6aeaf51fe3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/plugin.ts
@@ -0,0 +1,156 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Cache } from '@nocobase/cache';
+import { InstallOptions, Plugin } from '@nocobase/server';
+import { aggregateSearch, removeOwner, setOwner } from './actions/departments';
+import { listExcludeDept, setMainDepartment } from './actions/users';
+import { departmentsField, mainDepartmentField } from './collections/users';
+import {
+  destroyDepartmentCheck,
+  resetUserDepartmentsCache,
+  setDepartmentOwners,
+  setMainDepartment as setMainDepartmentMiddleware,
+  updateDepartmentIsLeaf,
+} from './middlewares';
+import { setDepartmentsInfo } from './middlewares/set-departments-roles';
+import { DepartmentModel } from './models/department';
+import { DepartmentDataSyncResource } from './department-data-sync-resource';
+import PluginUserDataSyncServer from '@nocobase/plugin-user-data-sync';
+import { DataSource } from '@nocobase/data-source-manager';
+
+export class PluginDepartmentsServer extends Plugin {
+  afterAdd() {}
+
+  beforeLoad() {
+    this.app.db.registerModels({ DepartmentModel });
+
+    this.app.acl.addFixedParams('collections', 'destroy', () => {
+      return {
+        filter: {
+          'name.$notIn': ['departments', 'departmentsUsers', 'departmentsRoles'],
+        },
+      };
+    });
+  }
+
+  async load() {
+    this.app.resourceManager.registerActionHandlers({
+      'users:listExcludeDept': listExcludeDept,
+      'users:setMainDepartment': setMainDepartment,
+      'departments:aggregateSearch': aggregateSearch,
+      'departments:setOwner': setOwner,
+      'departments:removeOwner': removeOwner,
+    });
+
+    this.app.acl.allow('users', ['setMainDepartment', 'listExcludeDept'], 'loggedIn');
+    this.app.acl.registerSnippet({
+      name: `pm.${this.name}`,
+      actions: [
+        'departments:*',
+        'roles:list',
+        'users:list',
+        'users:listExcludeDept',
+        'users:setMainDepartment',
+        'users.departments:*',
+        'roles.departments:*',
+        'departments.members:*',
+      ],
+    });
+
+    this.app.resourceManager.use(setDepartmentsInfo, {
+      tag: 'setDepartmentsInfo',
+      before: 'setCurrentRole',
+      after: 'auth',
+    });
+    this.app.dataSourceManager.afterAddDataSource((dataSource: DataSource) => {
+      dataSource.resourceManager.use(setDepartmentsInfo, {
+        tag: 'setDepartmentsInfo',
+        before: 'setCurrentRole',
+        after: 'auth',
+      });
+    });
+
+    this.app.resourceManager.use(setDepartmentOwners);
+    this.app.resourceManager.use(destroyDepartmentCheck);
+    this.app.resourceManager.use(updateDepartmentIsLeaf);
+    this.app.resourceManager.use(resetUserDepartmentsCache);
+    this.app.resourceManager.use(setMainDepartmentMiddleware);
+
+    // Delete cache when the departments of a user changed
+    this.app.db.on('departmentsUsers.afterSave', async (model) => {
+      const cache = this.app.cache as Cache;
+      await cache.del(`departments:${model.get('userId')}`);
+    });
+    this.app.db.on('departmentsUsers.afterDestroy', async (model) => {
+      const cache = this.app.cache as Cache;
+      await cache.del(`departments:${model.get('userId')}`);
+    });
+    this.app.on('beforeSignOut', ({ userId }) => {
+      this.app.cache.del(`departments:${userId}`);
+    });
+
+    const userDataSyncPlugin = this.app.pm.get('user-data-sync') as PluginUserDataSyncServer;
+    if (userDataSyncPlugin && userDataSyncPlugin.enabled) {
+      userDataSyncPlugin.resourceManager.registerResource(new DepartmentDataSyncResource(this.db, this.app.logger), {
+        // write department records after writing user records
+        after: 'users',
+      });
+    }
+  }
+
+  async install(options?: InstallOptions) {
+    const collectionRepo = this.db.getRepository<any>('collections');
+    if (collectionRepo) {
+      await collectionRepo.db2cm('departments');
+    }
+    const fieldRepo = this.db.getRepository('fields');
+    if (fieldRepo) {
+      const isDepartmentsFieldExists = await fieldRepo.count({
+        filter: {
+          name: 'departments',
+          collectionName: 'users',
+        },
+      });
+      if (!isDepartmentsFieldExists) {
+        await fieldRepo.create({
+          values: departmentsField,
+        });
+      }
+      const isMainDepartmentFieldExists = await fieldRepo.count({
+        filter: {
+          name: 'mainDepartment',
+          collectionName: 'users',
+        },
+      });
+      if (!isMainDepartmentFieldExists) {
+        await fieldRepo.create({
+          values: mainDepartmentField,
+        });
+      }
+    }
+  }
+
+  async afterEnable() {}
+
+  async afterDisable() {}
+
+  async remove() {}
+}
+
+export default PluginDepartmentsServer;
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/.npmignore b/packages/plugins/@nocobase/plugin-field-attachment-url/.npmignore
new file mode 100644
index 0000000000..65f5e8779f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/README.md b/packages/plugins/@nocobase/plugin-field-attachment-url/README.md
new file mode 100644
index 0000000000..806a995fd7
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/README.md
@@ -0,0 +1 @@
+# @nocobase/plugin-field-attachment-url
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/client.d.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/client.d.ts
new file mode 100644
index 0000000000..6c459cbac4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/client.js b/packages/plugins/@nocobase/plugin-field-attachment-url/client.js
new file mode 100644
index 0000000000..b6e3be70e6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/package.json b/packages/plugins/@nocobase/plugin-field-attachment-url/package.json
new file mode 100644
index 0000000000..87082d9a9e
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@nocobase/plugin-field-attachment-url",
+  "version": "1.7.0-alpha.10",
+  "main": "dist/server/index.js",
+  "displayName": "Collection field: Attachment(URL)",
+  "displayName.zh-CN": "数据表字段：附件（URL）",
+  "description": "Supports attachments in URL format.",
+  "description.zh-CN": "支持 URL 格式的附件。",
+  "peerDependencies": {
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x"
+  },
+  "keywords": [
+    "Collection fields"
+  ]
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/server.d.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/server.d.ts
new file mode 100644
index 0000000000..c41081ddc6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/server.js b/packages/plugins/@nocobase/plugin-field-attachment-url/server.js
new file mode 100644
index 0000000000..972842039a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/__e2e__/createField.test.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/__e2e__/createField.test.ts
new file mode 100644
index 0000000000..89e1432ff4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/__e2e__/createField.test.ts
@@ -0,0 +1,28 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { expect, test } from '@nocobase/test/e2e';
+
+test('create Attachment (URL) field', async ({ page }) => {
+  await page.goto('/admin/settings/data-source-manager/main/collections?type=main');
+  await page.getByLabel('action-Action.Link-Configure fields-collections-users', { exact: true }).click();
+  await page.getByRole('button', { name: 'plus Add field' }).click();
+  await page.getByRole('menuitem', { name: 'Attachment (URL)' }).click();
+  const displayName = `a${Math.random().toString(36).substring(7)}`;
+  const name = `a${Math.random().toString(36).substring(7)}`;
+  await page.getByLabel('block-item-Input-fields-Field display name').getByRole('textbox').fill(displayName);
+  await page.getByLabel('block-item-Input-fields-Field name').getByRole('textbox').fill(name);
+  await expect(page.getByLabel('block-item-RemoteSelect-')).toBeVisible();
+  await page.getByLabel('action-Action-Submit-fields-').click();
+  await expect(page.getByText(name)).toBeVisible();
+
+  // 删除
+  await page.getByLabel(`action-CollectionFields-Delete-fields-${name}`).click();
+  await page.getByRole('button', { name: 'OK', exact: true }).click();
+});
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/client.d.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/client.d.ts
new file mode 100644
index 0000000000..4e96f83fa1
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/client.d.ts
@@ -0,0 +1,249 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// CSS modules
+type CSSModuleClasses = { readonly [key: string]: string };
+
+declare module '*.module.css' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.scss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.sass' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.less' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.styl' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.stylus' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.pcss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.sss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+
+// CSS
+declare module '*.css' { }
+declare module '*.scss' { }
+declare module '*.sass' { }
+declare module '*.less' { }
+declare module '*.styl' { }
+declare module '*.stylus' { }
+declare module '*.pcss' { }
+declare module '*.sss' { }
+
+// Built-in asset types
+// see `src/node/constants.ts`
+
+// images
+declare module '*.apng' {
+  const src: string;
+  export default src;
+}
+declare module '*.png' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpg' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpeg' {
+  const src: string;
+  export default src;
+}
+declare module '*.jfif' {
+  const src: string;
+  export default src;
+}
+declare module '*.pjpeg' {
+  const src: string;
+  export default src;
+}
+declare module '*.pjp' {
+  const src: string;
+  export default src;
+}
+declare module '*.gif' {
+  const src: string;
+  export default src;
+}
+declare module '*.svg' {
+  const src: string;
+  export default src;
+}
+declare module '*.ico' {
+  const src: string;
+  export default src;
+}
+declare module '*.webp' {
+  const src: string;
+  export default src;
+}
+declare module '*.avif' {
+  const src: string;
+  export default src;
+}
+
+// media
+declare module '*.mp4' {
+  const src: string;
+  export default src;
+}
+declare module '*.webm' {
+  const src: string;
+  export default src;
+}
+declare module '*.ogg' {
+  const src: string;
+  export default src;
+}
+declare module '*.mp3' {
+  const src: string;
+  export default src;
+}
+declare module '*.wav' {
+  const src: string;
+  export default src;
+}
+declare module '*.flac' {
+  const src: string;
+  export default src;
+}
+declare module '*.aac' {
+  const src: string;
+  export default src;
+}
+declare module '*.opus' {
+  const src: string;
+  export default src;
+}
+declare module '*.mov' {
+  const src: string;
+  export default src;
+}
+declare module '*.m4a' {
+  const src: string;
+  export default src;
+}
+declare module '*.vtt' {
+  const src: string;
+  export default src;
+}
+
+// fonts
+declare module '*.woff' {
+  const src: string;
+  export default src;
+}
+declare module '*.woff2' {
+  const src: string;
+  export default src;
+}
+declare module '*.eot' {
+  const src: string;
+  export default src;
+}
+declare module '*.ttf' {
+  const src: string;
+  export default src;
+}
+declare module '*.otf' {
+  const src: string;
+  export default src;
+}
+
+// other
+declare module '*.webmanifest' {
+  const src: string;
+  export default src;
+}
+declare module '*.pdf' {
+  const src: string;
+  export default src;
+}
+declare module '*.txt' {
+  const src: string;
+  export default src;
+}
+
+// wasm?init
+declare module '*.wasm?init' {
+  const initWasm: (options?: WebAssembly.Imports) => Promise<WebAssembly.Instance>;
+  export default initWasm;
+}
+
+// web worker
+declare module '*?worker' {
+  const workerConstructor: {
+    new(options?: { name?: string }): Worker;
+  };
+  export default workerConstructor;
+}
+
+declare module '*?worker&inline' {
+  const workerConstructor: {
+    new(options?: { name?: string }): Worker;
+  };
+  export default workerConstructor;
+}
+
+declare module '*?worker&url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?sharedworker' {
+  const sharedWorkerConstructor: {
+    new(options?: { name?: string }): SharedWorker;
+  };
+  export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&inline' {
+  const sharedWorkerConstructor: {
+    new(options?: { name?: string }): SharedWorker;
+  };
+  export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?raw' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?inline' {
+  const src: string;
+  export default src;
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx
new file mode 100644
index 0000000000..0cfa332988
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx
@@ -0,0 +1,184 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { RecursionField, connect, mapReadPretty, useField, useFieldSchema } from '@formily/react';
+import React, { useContext, useEffect, useState } from 'react';
+import {
+  FormProvider,
+  RecordPickerContext,
+  RecordPickerProvider,
+  SchemaComponentOptions,
+  useActionContext,
+  TableSelectorParamsProvider,
+  useTableSelectorProps as useTsp,
+  EllipsisWithTooltip,
+  CollectionProvider_deprecated,
+  useCollection_deprecated,
+  useCollectionManager_deprecated,
+  Upload,
+  useFieldNames,
+  ActionContextProvider,
+  AssociationField,
+  Input,
+} from '@nocobase/client';
+import schema from '../schema';
+import { useInsertSchema } from '../hook';
+
+const defaultToValueItem = (data) => {
+  return data?.thumbnailRule ? `${data?.url}${data?.thumbnailRule}` : data?.url;
+};
+
+const InnerAttachmentUrl = (props) => {
+  const { value, onChange, toValueItem = defaultToValueItem, disabled, underFilter, ...others } = props;
+  const fieldSchema = useFieldSchema();
+  const [visibleSelector, setVisibleSelector] = useState(false);
+  const [selectedRows, setSelectedRows] = useState([]);
+  const insertSelector = useInsertSchema('Selector');
+  const fieldNames = useFieldNames(props);
+  const field: any = useField();
+  const [options, setOptions] = useState();
+  const { getField } = useCollection_deprecated();
+  const collectionField = getField(field.props.name);
+  const { modalProps } = useActionContext();
+  const handleSelect = (ev) => {
+    ev.stopPropagation();
+    ev.preventDefault();
+    insertSelector(schema.Selector);
+    setVisibleSelector(true);
+    setSelectedRows([]);
+  };
+
+  useEffect(() => {
+    if (value && Object.keys(value).length > 0) {
+      setOptions(value);
+    } else {
+      setOptions(null);
+    }
+  }, [value, fieldNames?.label]);
+
+  const pickerProps = {
+    size: 'small',
+    fieldNames,
+    multiple: false,
+    association: {
+      target: collectionField?.target,
+    },
+    options,
+    onChange: props?.onChange,
+    selectedRows,
+    setSelectedRows,
+    collectionField,
+  };
+  const usePickActionProps = () => {
+    const { setVisible } = useActionContext();
+    const { selectedRows, onChange } = useContext(RecordPickerContext);
+    return {
+      onClick() {
+        onChange(toValueItem(selectedRows?.[0]) || null);
+        setVisible(false);
+      },
+    };
+  };
+  const useTableSelectorProps = () => {
+    const {
+      multiple,
+      options,
+      setSelectedRows,
+      selectedRows: rcSelectRows = [],
+      onChange,
+    } = useContext(RecordPickerContext);
+    const { onRowSelectionChange, rowKey = 'id', ...others } = useTsp();
+    const { setVisible } = useActionContext();
+    return {
+      ...others,
+      rowKey,
+      rowSelection: {
+        type: multiple ? 'checkbox' : 'radio',
+        selectedRowKeys: rcSelectRows?.filter((item) => options?.[rowKey] !== item[rowKey]).map((item) => item[rowKey]),
+      },
+      onRowSelectionChange(selectedRowKeys, selectedRows) {
+        setSelectedRows?.(selectedRows);
+        onRowSelectionChange?.(selectedRowKeys, selectedRows);
+        onChange(toValueItem(selectedRows?.[0]) || null);
+        setVisible(false);
+      },
+    };
+  };
+  if (underFilter) {
+    return <Input {...props} />;
+  }
+  console.log(collectionField);
+  return (
+    <div style={{ width: '100%', overflow: 'auto' }}>
+      <AssociationField.FileSelector
+        toValueItem={toValueItem}
+        value={options}
+        quickUpload={fieldSchema['x-component-props']?.quickUpload !== false}
+        selectFile={
+          collectionField?.target && collectionField?.target !== 'attachments'
+            ? fieldSchema['x-component-props']?.selectFile !== false
+            : false
+        }
+        action={`${collectionField?.target || 'attachments'}:create`}
+        onSelect={handleSelect}
+        onChange={onChange}
+        disabled={disabled}
+      />
+      <ActionContextProvider
+        value={{
+          openMode: 'drawer',
+          visible: visibleSelector,
+          setVisible: setVisibleSelector,
+          modalProps: {
+            getContainer: others?.getContainer || modalProps?.getContainer,
+          },
+          formValueChanged: false,
+        }}
+      >
+        {collectionField?.target && collectionField?.target !== 'attachments' && (
+          <RecordPickerProvider {...pickerProps}>
+            <CollectionProvider_deprecated name={collectionField?.target} dataSource={'main'}>
+              <FormProvider>
+                <TableSelectorParamsProvider params={{}}>
+                  <SchemaComponentOptions scope={{ usePickActionProps, useTableSelectorProps }}>
+                    <RecursionField
+                      onlyRenderProperties
+                      basePath={field.address}
+                      schema={fieldSchema}
+                      filterProperties={(s) => {
+                        return s['x-component'] === 'AssociationField.Selector';
+                      }}
+                    />
+                  </SchemaComponentOptions>
+                </TableSelectorParamsProvider>
+              </FormProvider>
+            </CollectionProvider_deprecated>
+          </RecordPickerProvider>
+        )}
+      </ActionContextProvider>
+    </div>
+  );
+};
+
+const FileManageReadPretty = connect((props) => {
+  const { value } = props;
+  const fieldSchema = useFieldSchema();
+  const componentMode = fieldSchema?.['x-component-props']?.['componentMode'];
+  const { getField } = useCollection_deprecated();
+  const { getCollectionJoinField } = useCollectionManager_deprecated();
+  const collectionField = getField(fieldSchema.name) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  if (componentMode === 'url') {
+    return <EllipsisWithTooltip ellipsis>{value}</EllipsisWithTooltip>;
+  }
+  return (
+    <EllipsisWithTooltip ellipsis>{collectionField ? <Upload.ReadPretty {...props} /> : null}</EllipsisWithTooltip>
+  );
+});
+
+export const AttachmentUrl = connect(InnerAttachmentUrl, mapReadPretty(FileManageReadPretty));
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts
new file mode 100644
index 0000000000..412cd9c469
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts
@@ -0,0 +1,106 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { useFieldSchema } from '@formily/react';
+import { useCollectionField, useDesignable, useRequest } from '@nocobase/client';
+import { cloneDeep, uniqBy } from 'lodash';
+import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+
+function useStorageRules(storage) {
+  const name = storage ?? '';
+  const { loading, data } = useRequest<any>(
+    {
+      url: `storages:getBasicInfo/${name}`,
+    },
+    {
+      refreshDeps: [name],
+    },
+  );
+  return (!loading && data?.data) || null;
+}
+export function useAttachmentUrlFieldProps(props) {
+  const field = useCollectionField();
+  const rules = useStorageRules(field?.storage);
+  return {
+    ...props,
+    rules,
+    action: `${field.target}:create${field.storage ? `?attachmentField=${field.collectionName}.${field.name}` : ''}`,
+    toValueItem: (data) => {
+      return data?.thumbnailRule ? `${data?.url}${data?.thumbnailRule}` : data?.url;
+    },
+    getThumbnailURL: (file) => {
+      return file?.url;
+    },
+  };
+}
+
+export const useInsertSchema = (component) => {
+  const fieldSchema = useFieldSchema();
+  const { insertAfterBegin } = useDesignable();
+  const insert = useCallback(
+    (ss) => {
+      const schema = fieldSchema.reduceProperties((buf, s) => {
+        if (s['x-component'] === 'AssociationField.' + component) {
+          return s;
+        }
+        return buf;
+      }, null);
+      if (!schema) {
+        insertAfterBegin(cloneDeep(ss));
+      }
+    },
+    [component, fieldSchema, insertAfterBegin],
+  );
+  return insert;
+};
+
+export const useAttachmentTargetProps = () => {
+  const { t } = useTranslation();
+  // TODO(refactor): whitelist should be changed to storage property，url is signed by plugin-s3-pro, this enmus is from plugin-file-manager
+  const buildInStorage = ['local', 'ali-oss', 's3', 'tx-cos'];
+  return {
+    service: {
+      resource: 'collections',
+      params: {
+        filter: {
+          'options.template': 'file',
+        },
+        paginate: false,
+      },
+    },
+    manual: false,
+    fieldNames: {
+      label: 'title',
+      value: 'name',
+    },
+    mapOptions: (value) => {
+      if (value.name === 'attachments') {
+        return {
+          ...value,
+          title: t('Attachments'),
+        };
+      }
+      return value;
+    },
+    toOptionsItem: (data) => {
+      data.unshift({
+        name: 'attachments',
+        title: t('Attachments'),
+      });
+      return uniqBy(
+        data.filter((v) => v.name),
+        'name',
+      );
+    },
+    optionFilter: (option) => {
+      return !option.storage || buildInStorage.includes(option.storage);
+    },
+  };
+};
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/index.tsx b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/index.tsx
new file mode 100644
index 0000000000..c535c97f67
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/index.tsx
@@ -0,0 +1,38 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Plugin, lazy } from '@nocobase/client';
+import { AttachmentURLFieldInterface } from './interfaces/attachment-url';
+import { useAttachmentUrlFieldProps } from './hook';
+// import { AttachmentUrl } from './component/AttachmentUrl';
+const { AttachmentUrl } = lazy(() => import('./component/AttachmentUrl'), 'AttachmentUrl');
+
+import { attachmentUrlComponentFieldSettings } from './settings';
+export class PluginFieldAttachmentUrlClient extends Plugin {
+  async afterAdd() {
+    // await this.app.pm.add()
+  }
+
+  async beforeLoad() {}
+
+  // You can get and modify the app instance here
+  async load() {
+    this.app.dataSourceManager.addFieldInterfaces([AttachmentURLFieldInterface]);
+    this.app.addScopes({ useAttachmentUrlFieldProps });
+
+    this.app.addComponents({ AttachmentUrl });
+    this.app.schemaSettingsManager.add(attachmentUrlComponentFieldSettings);
+
+    // this.app.addProvider()
+    // this.app.addProviders()
+    // this.app.router.add()
+  }
+}
+
+export default PluginFieldAttachmentUrlClient;
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx
new file mode 100644
index 0000000000..781da59f6b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx
@@ -0,0 +1,79 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client';
+import { ISchema } from '@formily/react';
+import { useAttachmentTargetProps } from '../hook';
+import { tStr } from '../locale';
+
+const { defaultProps, operators } = interfacesProperties;
+
+export const defaultToolbar = [
+  'headings',
+  'bold',
+  'italic',
+  'strike',
+  'link',
+  'list',
+  'ordered-list',
+  'check',
+  'quote',
+  'line',
+  'code',
+  'inline-code',
+  'upload',
+  'fullscreen',
+];
+
+export class AttachmentURLFieldInterface extends CollectionFieldInterface {
+  name = 'attachmentURL';
+  type = 'object';
+  group = 'media';
+  title = tStr('Attachment (URL)');
+  default = {
+    type: 'string',
+    // name,
+    uiSchema: {
+      type: 'string',
+      // title,
+      'x-component': 'AttachmentUrl',
+      'x-use-component-props': 'useAttachmentUrlFieldProps',
+    },
+  };
+  availableTypes = ['string', 'text'];
+  properties = {
+    ...defaultProps,
+    target: {
+      required: true,
+      default: 'attachments',
+      type: 'string',
+      title: tStr('Which file collection should it be uploaded to'),
+      'x-decorator': 'FormItem',
+      'x-component': 'RemoteSelect',
+      'x-use-component-props': useAttachmentTargetProps,
+    },
+    targetKey: {
+      'x-hidden': true,
+      default: 'id',
+      type: 'string',
+    },
+  };
+  schemaInitialize(schema: ISchema, { block }) {
+    schema['x-component-props'] = schema['x-component-props'] || {};
+    schema['x-component-props']['mode'] = 'AttachmentUrl';
+    if (['Table', 'Kanban'].includes(block)) {
+      schema['x-component-props']['ellipsis'] = true;
+      schema['x-component-props']['size'] = 'small';
+    }
+  }
+  filterable = {
+    operators: operators.bigField,
+  };
+  titleUsable = true;
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/locale.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/locale.ts
new file mode 100644
index 0000000000..a26dd0158f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/locale.ts
@@ -0,0 +1,30 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// @ts-ignore
+import pkg from '../../package.json';
+import { useApp } from '@nocobase/client';
+import { useTranslation } from 'react-i18next';
+
+export const NAMESPACE = 'attachmentUrl';
+
+export function useT() {
+  const app = useApp();
+  return (str: string) => app.i18n.t(str, { ns: [pkg.name, 'client'] });
+}
+
+export function tStr(key: string) {
+  return `{{t(${JSON.stringify(key)}, { ns: ['${pkg.name}', 'client'], nsMode: 'fallback' })}}`;
+}
+
+export function useAttachmentUrlTranslation() {
+  return useTranslation([NAMESPACE, 'client'], {
+    nsMode: 'fallback',
+  });
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/schema.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/schema.ts
new file mode 100644
index 0000000000..f5ae80d0ce
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/schema.ts
@@ -0,0 +1,53 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export default {
+  Selector: {
+    type: 'void',
+    'x-component': 'AssociationField.Selector',
+    title: '{{ t("Select record") }}',
+    'x-component-props': {
+      className: 'nb-record-picker-selector',
+    },
+    properties: {
+      grid: {
+        type: 'void',
+        'x-component': 'Grid',
+        'x-initializer': 'popup:tableSelector:addBlock',
+        properties: {},
+      },
+      footer: {
+        'x-component': 'Action.Container.Footer',
+        'x-component-props': {},
+        properties: {
+          actions: {
+            type: 'void',
+            'x-component': 'ActionBar',
+            'x-component-props': {},
+            properties: {
+              submit: {
+                title: '{{ t("Submit") }}',
+                'x-action': 'submit',
+                'x-component': 'Action',
+                'x-use-component-props': 'usePickActionProps',
+                // 'x-designer': 'Action.Designer',
+                'x-toolbar': 'ActionSchemaToolbar',
+                'x-settings': 'actionSettings:submit',
+                'x-component-props': {
+                  type: 'primary',
+                  htmlType: 'submit',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/settings/index.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/settings/index.ts
new file mode 100644
index 0000000000..52463073c2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/settings/index.ts
@@ -0,0 +1,171 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Field } from '@formily/core';
+import { useField, useFieldSchema, useForm } from '@formily/react';
+import { useTranslation } from 'react-i18next';
+import { useColumnSchema, useIsFieldReadPretty, SchemaSettings, useDesignable } from '@nocobase/client';
+
+const fieldComponent: any = {
+  name: 'fieldComponent',
+  type: 'select',
+  useComponentProps() {
+    const { t } = useTranslation();
+    const field = useField<Field>();
+    const { fieldSchema: tableColumnSchema } = useColumnSchema();
+    const schema = useFieldSchema();
+    const fieldSchema = tableColumnSchema || schema;
+    const { dn } = useDesignable();
+
+    return {
+      title: t('Field component'),
+      options: [
+        { label: t('URL'), value: 'url' },
+        { label: t('Preview'), value: 'preview' },
+      ],
+      value: fieldSchema['x-component-props']['componentMode'] || 'preview',
+      onChange(componentMode) {
+        const schema = {
+          ['x-uid']: fieldSchema['x-uid'],
+        };
+        fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+        fieldSchema['x-component-props']['componentMode'] = componentMode;
+        schema['x-component-props'] = fieldSchema['x-component-props'];
+        field.componentProps = field.componentProps || {};
+        field.componentProps.componentMode = componentMode;
+        void dn.emit('patch', {
+          schema,
+        });
+        dn.refresh();
+      },
+    };
+  },
+  useVisible() {
+    const readPretty = useIsFieldReadPretty();
+    const { fieldSchema: tableColumnSchema } = useColumnSchema();
+    return readPretty;
+  },
+};
+
+export const attachmentUrlComponentFieldSettings = new SchemaSettings({
+  name: 'fieldSettings:component:AttachmentUrl',
+  items: [
+    {
+      name: 'quickUpload',
+      type: 'switch',
+      useComponentProps() {
+        const { t } = useTranslation();
+        const field = useField<Field>();
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        const schema = useFieldSchema();
+        const fieldSchema = tableColumnSchema || schema;
+        const { dn, refresh } = useDesignable();
+        return {
+          title: t('Quick upload'),
+          checked: fieldSchema['x-component-props']?.quickUpload !== (false as boolean),
+          onChange(value) {
+            const schema = {
+              ['x-uid']: fieldSchema['x-uid'],
+            };
+            field.componentProps.quickUpload = value;
+            fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+            fieldSchema['x-component-props'].quickUpload = value;
+            schema['x-component-props'] = fieldSchema['x-component-props'];
+            dn.emit('patch', {
+              schema,
+            });
+            refresh();
+          },
+        };
+      },
+      useVisible() {
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        const field = useField();
+        const form = useForm();
+        const isReadPretty = tableColumnSchema?.['x-read-pretty'] || field.readPretty || form.readPretty;
+        return !isReadPretty && !field.componentProps.underFilter;
+      },
+    },
+    {
+      name: 'selectFile',
+      type: 'switch',
+      useComponentProps() {
+        const { t } = useTranslation();
+        const field = useField<Field>();
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        const schema = useFieldSchema();
+        const fieldSchema = tableColumnSchema || schema;
+        const { dn, refresh } = useDesignable();
+        return {
+          title: t('Select file'),
+          checked: fieldSchema['x-component-props']?.selectFile !== (false as boolean),
+          onChange(value) {
+            const schema = {
+              ['x-uid']: fieldSchema['x-uid'],
+            };
+            field.componentProps.selectFile = value;
+            fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+            fieldSchema['x-component-props'].selectFile = value;
+            schema['x-component-props'] = fieldSchema['x-component-props'];
+            dn.emit('patch', {
+              schema,
+            });
+            refresh();
+          },
+        };
+      },
+      useVisible() {
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        const field = useField();
+        const form = useForm();
+        const isReadPretty = tableColumnSchema?.['x-read-pretty'] || field.readPretty || form.readPretty;
+        return !isReadPretty && !field.componentProps.underFilter;
+      },
+    },
+    fieldComponent,
+    {
+      name: 'size',
+      type: 'select',
+      useVisible() {
+        const readPretty = useIsFieldReadPretty();
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        return readPretty && !tableColumnSchema;
+      },
+      useComponentProps() {
+        const { t } = useTranslation();
+        const field = useField<Field>();
+        const fieldSchema = useFieldSchema();
+        const { dn } = useDesignable();
+        return {
+          title: t('Size'),
+          options: [
+            { label: t('Large'), value: 'large' },
+            { label: t('Default'), value: 'default' },
+            { label: t('Small'), value: 'small' },
+          ],
+          value: field?.componentProps?.size || 'default',
+          onChange(size) {
+            const schema = {
+              ['x-uid']: fieldSchema['x-uid'],
+            };
+            fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+            fieldSchema['x-component-props']['size'] = size;
+            schema['x-component-props'] = fieldSchema['x-component-props'];
+            field.componentProps = field.componentProps || {};
+            field.componentProps.size = size;
+            dn.emit('patch', {
+              schema,
+            });
+            dn.refresh();
+          },
+        };
+      },
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/index.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/index.ts
new file mode 100644
index 0000000000..be99a2ff1a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/index.ts
@@ -0,0 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export * from './server';
+export { default } from './server';
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/en-US.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/en-US.json
@@ -0,0 +1 @@
+{}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/zh-CN.json
new file mode 100644
index 0000000000..78def6ea14
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/zh-CN.json
@@ -0,0 +1,4 @@
+{
+    "Which file collection should it be uploaded to":"上传到文件表",
+    "Attachment (URL)":"附件 (URL)"
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/collections/.gitkeep b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/collections/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/index.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/index.ts
new file mode 100644
index 0000000000..be989de7c3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/index.ts
@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export { default } from './plugin';
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts
new file mode 100644
index 0000000000..372274c091
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts
@@ -0,0 +1,28 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Plugin } from '@nocobase/server';
+
+export class PluginFieldAttachmentUrlServer extends Plugin {
+  async afterAdd() {}
+
+  async beforeLoad() {}
+
+  async load() {}
+
+  async install() {}
+
+  async afterEnable() {}
+
+  async afterDisable() {}
+
+  async remove() {}
+}
+
+export default PluginFieldAttachmentUrlServer;
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/.npmignore b/packages/plugins/@nocobase/plugin-workflow-response-message/.npmignore
new file mode 100644
index 0000000000..65f5e8779f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/README.md b/packages/plugins/@nocobase/plugin-workflow-response-message/README.md
new file mode 100644
index 0000000000..8ced21e948
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/README.md
@@ -0,0 +1 @@
+# @nocobase/plugin-workflow-response-message
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/client.d.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/client.d.ts
new file mode 100644
index 0000000000..6c459cbac4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/client.js b/packages/plugins/@nocobase/plugin-workflow-response-message/client.js
new file mode 100644
index 0000000000..b6e3be70e6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/package.json b/packages/plugins/@nocobase/plugin-workflow-response-message/package.json
new file mode 100644
index 0000000000..be505e66a4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@nocobase/plugin-workflow-response-message",
+  "version": "1.7.0-alpha.10",
+  "displayName": "Workflow: Response message",
+  "displayName.zh-CN": "工作流：响应消息",
+  "description": "Used for assemble response message and showing to client in form event and request interception workflows.",
+  "description.zh-CN": "用于在表单事件和请求拦截工作流中组装并向客户端显示响应消息。",
+  "main": "dist/server/index.js",
+  "homepage": "https://docs.nocobase.com/handbook/workflow-response-message",
+  "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow-response-message",
+  "peerDependencies": {
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x",
+    "@nocobase/utils": "1.x"
+  },
+  "keywords": [
+    "Workflow"
+  ],
+  "gitHead": "080fc78c1a744d47e010b3bbe5840446775800e4"
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/server.d.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/server.d.ts
new file mode 100644
index 0000000000..c41081ddc6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/server.js b/packages/plugins/@nocobase/plugin-workflow-response-message/server.js
new file mode 100644
index 0000000000..972842039a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/ResponseMessageInstruction.tsx b/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/ResponseMessageInstruction.tsx
new file mode 100644
index 0000000000..efdd6a7241
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/ResponseMessageInstruction.tsx
@@ -0,0 +1,87 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React from 'react';
+import { InfoCircleOutlined } from '@ant-design/icons';
+import { Alert, Space } from 'antd';
+
+import {
+  Instruction,
+  RadioWithTooltip,
+  WorkflowVariableInput,
+  WorkflowVariableTextArea,
+} from '@nocobase/plugin-workflow/client';
+
+import { NAMESPACE } from '../locale';
+
+export default class extends Instruction {
+  title = `{{t("Response message", { ns: "${NAMESPACE}" })}}`;
+  type = 'response-message';
+  group = 'extended';
+  description = `{{t("Add response message, will be send to client when process of request ends.", { ns: "${NAMESPACE}" })}}`;
+  icon = (<InfoCircleOutlined />);
+  fieldset = {
+    message: {
+      type: 'string',
+      title: `{{t("Message content", { ns: "${NAMESPACE}" })}}`,
+      description: `{{t('Supports variables in template.', { ns: "${NAMESPACE}", name: '{{name}}' })}}`,
+      'x-decorator': 'FormItem',
+      'x-component': 'WorkflowVariableTextArea',
+    },
+    info: {
+      type: 'void',
+      'x-component': 'Space',
+      'x-component-props': {
+        direction: 'vertical',
+      },
+      properties: {
+        success: {
+          type: 'void',
+          'x-component': 'Alert',
+          'x-component-props': {
+            type: 'success',
+            showIcon: true,
+            description: `{{t('If the workflow ends normally, the response message will return a success status by default.', { ns: "${NAMESPACE}" })}}`,
+          },
+        },
+        failure: {
+          type: 'void',
+          'x-component': 'Alert',
+          'x-component-props': {
+            type: 'error',
+            showIcon: true,
+            description: `{{t('If you want to return a failure status, please add an "End Process" node downstream to terminate the workflow.', { ns: "${NAMESPACE}" })}}`,
+          },
+        },
+      },
+    },
+  };
+  scope = {};
+  components = {
+    RadioWithTooltip,
+    WorkflowVariableTextArea,
+    WorkflowVariableInput,
+    Alert,
+    Space,
+  };
+  isAvailable({ workflow, upstream, branchIndex }) {
+    return (
+      workflow.type === 'request-interception' || (['action', 'custom-action'].includes(workflow.type) && workflow.sync)
+    );
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/index.tsx b/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/index.tsx
new file mode 100644
index 0000000000..258f6c8d8b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/index.tsx
@@ -0,0 +1,31 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Plugin } from '@nocobase/client';
+import WorkflowPlugin from '@nocobase/plugin-workflow/client';
+
+import ResponseMessageInstruction from './ResponseMessageInstruction';
+
+export class PluginWorkflowResponseMessageClient extends Plugin {
+  async load() {
+    const workflowPlugin = this.app.pm.get('workflow') as WorkflowPlugin;
+    workflowPlugin.registerInstruction('response-message', ResponseMessageInstruction);
+  }
+}
+
+export default PluginWorkflowResponseMessageClient;
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/index.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/index.ts
new file mode 100644
index 0000000000..7d69462f4f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/index.ts
@@ -0,0 +1,20 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export * from './server';
+export { default } from './server';
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/en-US.json
new file mode 100644
index 0000000000..11832d6610
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/en-US.json
@@ -0,0 +1,6 @@
+{
+  "Response message": "Response message",
+  "Add response message, will be send to client when process of request ends.": "Add response message, will be send to client when process of request ends.",
+  "Message content": "Message content",
+  "Supports variables in template.": "Supports variables in template."
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/index.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/index.ts
new file mode 100644
index 0000000000..543b392f21
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/index.ts
@@ -0,0 +1,25 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { i18n } from '@nocobase/client';
+
+export const NAMESPACE = '@nocobase/plugin-workflow-response-message';
+
+export function lang(key: string, options = {}) {
+  return i18n.t(key, { ...options, ns: NAMESPACE });
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/zh-CN.json
new file mode 100644
index 0000000000..c8b986cace
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/zh-CN.json
@@ -0,0 +1,8 @@
+{
+  "Response message": "响应消息",
+  "Add response message, will be send to client when process of request ends.": "添加响应消息，将在请求处理结束时发送给客户端。",
+  "Message content": "消息内容",
+  "Supports variables in template.": "支持模板变量。",
+  "If the workflow ends normally, the response message will return a success status by default.": "如果工作流正常结束，响应消息默认返回成功状态。",
+  "If you want to return a failure status, please add an \"End Process\" node downstream to terminate the workflow.": "如果希望返回失败状态，请在下游添加“结束流程”节点终止工作流。"
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/Plugin.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/Plugin.ts
new file mode 100644
index 0000000000..cdd6eece72
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/Plugin.ts
@@ -0,0 +1,31 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Plugin } from '@nocobase/server';
+import PluginWorkflowServer from '@nocobase/plugin-workflow';
+
+import ResponseMessageInstruction from './ResponseMessageInstruction';
+
+export class PluginWorkflowResponseMessageServer extends Plugin {
+  async load() {
+    const workflowPlugin = this.app.pm.get(PluginWorkflowServer) as PluginWorkflowServer;
+    workflowPlugin.registerInstruction('response-message', ResponseMessageInstruction);
+  }
+}
+
+export default PluginWorkflowResponseMessageServer;
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/ResponseMessageInstruction.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/ResponseMessageInstruction.ts
new file mode 100644
index 0000000000..e277a44e35
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/ResponseMessageInstruction.ts
@@ -0,0 +1,55 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Instruction, Processor, JOB_STATUS, FlowNodeModel } from '@nocobase/plugin-workflow';
+
+interface Config {
+  message?: string;
+}
+
+export default class extends Instruction {
+  async run(node: FlowNodeModel, prevJob, processor: Processor) {
+    const { httpContext } = processor.options;
+
+    if (!httpContext) {
+      return {
+        status: JOB_STATUS.RESOLVED,
+        result: null,
+      };
+    }
+
+    if (!httpContext.state) {
+      httpContext.state = {};
+    }
+
+    if (!httpContext.state.messages) {
+      httpContext.state.messages = [];
+    }
+
+    const message = processor.getParsedValue(node.config.message, node.id);
+
+    if (message) {
+      httpContext.state.messages.push({ message });
+    }
+
+    return {
+      status: JOB_STATUS.RESOLVED,
+      result: message,
+    };
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts
new file mode 100644
index 0000000000..3d4c4caf10
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts
@@ -0,0 +1,346 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import Database from '@nocobase/database';
+import { MockServer } from '@nocobase/test';
+import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
+import { getApp } from '@nocobase/plugin-workflow-test';
+
+import Plugin from '..';
+
+describe('workflow > instructions > response-message', () => {
+  let app: MockServer;
+  let db: Database;
+  let PostRepo;
+  let WorkflowModel;
+  let workflow;
+  let users;
+  let userAgents;
+
+  beforeEach(async () => {
+    app = await getApp({
+      plugins: ['users', 'auth', 'error-handler', 'workflow-request-interceptor', Plugin],
+    });
+
+    db = app.db;
+
+    PostRepo = db.getCollection('posts').repository;
+
+    WorkflowModel = db.getModel('workflows');
+    workflow = await WorkflowModel.create({
+      enabled: true,
+      type: 'request-interception',
+      config: {
+        global: true,
+        actions: ['create'],
+        collection: 'posts',
+      },
+    });
+
+    const UserModel = db.getCollection('users').model;
+    users = await UserModel.bulkCreate([
+      { id: 2, nickname: 'a' },
+      { id: 3, nickname: 'b' },
+    ]);
+
+    userAgents = await Promise.all(users.map((user) => app.agent().login(user)));
+  });
+
+  afterEach(() => app.destroy());
+
+  describe('no end, pass flow', () => {
+    it('no message', async () => {
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(0);
+    });
+
+    it('has node, but null message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+
+    it('has node, but empty message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: '',
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+
+    it('single static message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toEqual([{ message: 'm1' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+
+    it('multiple static messages', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+      const n2 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm2',
+        },
+        upstreamId: n1.id,
+      });
+      await n1.setDownstream(n2);
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toEqual([{ message: 'm1' }, { message: 'm2' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(2);
+    });
+
+    it('single dynamic message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'new post "{{ $context.params.values.title }}" by {{ $context.user.nickname }}',
+        },
+      });
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toEqual([{ message: `new post "t1" by ${users[0].nickname}` }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+  });
+
+  describe('end as success', () => {
+    it('no message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+
+      const posts = await PostRepo.find();
+      expect(posts.length).toBe(0);
+    });
+
+    it('single static message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+
+      const n2 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+        upstreamId: n1.id,
+      });
+
+      await n1.setDownstream(n2);
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toEqual([{ message: 'm1' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(2);
+    });
+  });
+
+  describe('end as failure', () => {
+    it('no message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.FAILED,
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(400);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.FAILED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+
+    it('single static message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+
+      const n2 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.FAILED,
+        },
+        upstreamId: n1.id,
+      });
+
+      await n1.setDownstream(n2);
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(400);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.errors).toEqual([{ message: 'm1' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.FAILED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(2);
+    });
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts
new file mode 100644
index 0000000000..a97be3e1d6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts
@@ -0,0 +1,185 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import Database from '@nocobase/database';
+import { MockServer } from '@nocobase/test';
+import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
+import { getApp } from '@nocobase/plugin-workflow-test';
+
+import Plugin from '..';
+
+describe('workflow > multiple workflows', () => {
+  let app: MockServer;
+  let db: Database;
+  let PostRepo;
+  let WorkflowModel;
+  let workflow;
+  let users;
+  let userAgents;
+
+  beforeEach(async () => {
+    app = await getApp({
+      plugins: ['users', 'auth', 'error-handler', 'workflow-request-interceptor', Plugin],
+    });
+
+    db = app.db;
+
+    PostRepo = db.getCollection('posts').repository;
+
+    WorkflowModel = db.getModel('workflows');
+    workflow = await WorkflowModel.create({
+      enabled: true,
+      type: 'request-interception',
+      config: {
+        global: true,
+        actions: ['create'],
+        collection: 'posts',
+      },
+    });
+
+    const UserModel = db.getCollection('users').model;
+    users = await UserModel.bulkCreate([
+      { id: 2, nickname: 'a' },
+      { id: 3, nickname: 'b' },
+    ]);
+
+    userAgents = await Promise.all(users.map((user) => app.agent().login(user)));
+  });
+
+  afterEach(() => app.destroy());
+
+  describe('order', () => {
+    it('workflow 2 run first and pass, workflow 1 ends as success', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+      const n2 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+        upstreamId: n1.id,
+      });
+      await n1.setDownstream(n2);
+
+      const w2 = await WorkflowModel.create({
+        enabled: true,
+        type: 'request-interception',
+        config: {
+          action: 'create',
+          collection: 'posts',
+        },
+      });
+
+      const n3 = await w2.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm2',
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+        triggerWorkflows: w2.key,
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toEqual([{ message: 'm2' }, { message: 'm1' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const j1s = await e1.getJobs();
+      expect(j1s.length).toBe(2);
+
+      const [e2] = await w2.getExecutions();
+      expect(e2.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const j2s = await e2.getJobs();
+      expect(j2s.length).toBe(1);
+    });
+
+    it('local workflow in trigger key order', async () => {
+      const w1 = await WorkflowModel.create({
+        enabled: true,
+        type: 'request-interception',
+        config: {
+          action: 'create',
+          collection: 'posts',
+        },
+      });
+
+      const n1 = await w1.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+
+      const w2 = await WorkflowModel.create({
+        enabled: true,
+        type: 'request-interception',
+        config: {
+          action: 'create',
+          collection: 'posts',
+        },
+      });
+
+      const n2 = await w2.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm2',
+        },
+      });
+
+      const n3 = await w2.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+        upstreamId: n2.id,
+      });
+
+      await n2.setDownstream(n3);
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+        triggerWorkflows: [w2.key, w1.key].join(),
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toEqual([{ message: 'm2' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const e1s = await w1.getExecutions();
+      expect(e1s.length).toBe(0);
+      const [e2] = await w2.getExecutions();
+      expect(e2.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e2.getJobs();
+      expect(jobs.length).toBe(2);
+    });
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/index.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/index.ts
new file mode 100644
index 0000000000..b0c269d075
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/index.ts
@@ -0,0 +1,19 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export { default } from './Plugin';

From 65a7a4476c830d9d9b6708128e4bd0c1ec8a987e Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Mon, 14 Apr 2025 19:03:55 +0800
Subject: [PATCH 21/22] fix: preset

---
 packages/plugins/@nocobase/plugin-departments/package.json | 2 +-
 packages/presets/nocobase/package.json                     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/plugins/@nocobase/plugin-departments/package.json b/packages/plugins/@nocobase/plugin-departments/package.json
index 2a52252569..2f2400e325 100644
--- a/packages/plugins/@nocobase/plugin-departments/package.json
+++ b/packages/plugins/@nocobase/plugin-departments/package.json
@@ -4,7 +4,7 @@
   "displayName.zh-CN": "部门",
   "description": "Organize users by departments, set hierarchical relationships, link roles to control permissions, and use departments as variables in workflows and expressions.",
   "description.zh-CN": "以部门来组织用户，设定上下级关系，绑定角色控制权限，并支持作为变量用于工作流和表达式。",
-  "version": "1.7.0-alpha.16",
+  "version": "1.7.0-alpha.10",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/actions": "1.x",
diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json
index 7d6abf4e7c..c1a2a885bf 100644
--- a/packages/presets/nocobase/package.json
+++ b/packages/presets/nocobase/package.json
@@ -34,6 +34,7 @@
     "@nocobase/plugin-data-visualization": "1.7.0-alpha.10",
     "@nocobase/plugin-environment-variables": "1.7.0-alpha.10",
     "@nocobase/plugin-error-handler": "1.7.0-alpha.10",
+    "@nocobase/plugin-field-attachment-url": "1.7.0-alpha.10",
     "@nocobase/plugin-field-china-region": "1.7.0-alpha.10",
     "@nocobase/plugin-field-formula": "1.7.0-alpha.10",
     "@nocobase/plugin-field-m2m-array": "1.7.0-alpha.10",
@@ -75,7 +76,9 @@
     "@nocobase/plugin-workflow-notification": "1.7.0-alpha.10",
     "@nocobase/plugin-workflow-parallel": "1.7.0-alpha.10",
     "@nocobase/plugin-workflow-request": "1.7.0-alpha.10",
+    "@nocobase/plugin-workflow-response-message": "1.7.0-alpha.10",
     "@nocobase/plugin-workflow-sql": "1.7.0-alpha.10",
+    "@nocobase/plugin-departments": "1.7.0-alpha.10",
     "@nocobase/server": "1.7.0-alpha.10",
     "cronstrue": "^2.11.0",
     "fs-extra": "^11.1.1"

From 3e2abe3d3c2479cd1a1a0b6d289fbf5a6a1d5b80 Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Mon, 14 Apr 2025 19:30:02 +0800
Subject: [PATCH 22/22] feat: make commercial plugins free

---
 .../@nocobase/plugin-departments/.npmignore   |   2 +
 .../@nocobase/plugin-departments/README.md    |   1 +
 .../@nocobase/plugin-departments/client.d.ts  |   2 +
 .../@nocobase/plugin-departments/client.js    |   1 +
 .../@nocobase/plugin-departments/package.json |  19 +
 .../@nocobase/plugin-departments/server.d.ts  |   2 +
 .../@nocobase/plugin-departments/server.js    |   1 +
 .../src/client/ResourcesProvider.tsx          | 110 +++++
 .../src/client/collections/departments.ts     | 115 +++++
 .../src/client/collections/users.ts           | 142 ++++++
 .../components/DepartmentOwnersField.tsx      |  35 ++
 .../components/ReadOnlyAssociationField.tsx   |  27 +
 .../components/UserDepartmentsField.tsx       |  35 ++
 .../components/UserMainDepartmentField.tsx    |  35 ++
 .../src/client/components/fieldSettings.ts    | 185 +++++++
 .../src/client/components/index.ts            |  22 +
 .../client/departments/AggregateSearch.tsx    | 216 ++++++++
 .../src/client/departments/Department.tsx     | 149 ++++++
 .../client/departments/DepartmentBlock.tsx    |  40 ++
 .../client/departments/DepartmentField.tsx    |  48 ++
 .../departments/DepartmentManagement.tsx      |  44 ++
 .../departments/DepartmentOwnersField.tsx     | 115 +++++
 .../client/departments/DepartmentTable.tsx    | 263 ++++++++++
 .../src/client/departments/DepartmentTree.tsx | 181 +++++++
 .../departments/DepartmentTreeSelect.tsx      | 136 +++++
 .../src/client/departments/IsOwnerField.tsx   |  30 ++
 .../src/client/departments/Member.tsx         | 235 +++++++++
 .../src/client/departments/NewDepartment.tsx  |  97 ++++
 .../departments/UserDepartmentsField.tsx      | 273 +++++++++++
 .../client/departments/schemas/departments.ts | 291 +++++++++++
 .../src/client/departments/schemas/users.ts   | 464 ++++++++++++++++++
 .../src/client/hooks/departments-manager.ts   |  75 +++
 .../src/client/hooks/index.ts                 |  68 +++
 .../src/client/hooks/tree-manager.ts          | 142 ++++++
 .../src/client/hooks/useTableBlockProps.ts    | 175 +++++++
 .../plugin-departments/src/client/index.tsx   |  76 +++
 .../plugin-departments/src/client/locale.ts   |  23 +
 .../client/roles/RoleDepartmentsManager.tsx   | 178 +++++++
 .../src/client/roles/schemas/departments.ts   | 171 +++++++
 .../plugin-departments/src/client/utils.ts    |  26 +
 .../@nocobase/plugin-departments/src/index.ts |  20 +
 .../plugin-departments/src/locale/en-US.json  |  35 ++
 .../plugin-departments/src/locale/zh-CN.json  |  35 ++
 .../src/server/__tests__/actions.test.ts      | 125 +++++
 .../src/server/__tests__/data-sync.test.ts    | 281 +++++++++++
 .../destroy-department-check.test.ts          |  72 +++
 .../__tests__/set-department-owners.test.ts   |  91 ++++
 .../__tests__/set-departments-info.test.ts    |  73 +++
 .../__tests__/set-main-department.test.ts     | 183 +++++++
 .../update-department-is-leaf.test.ts         | 102 ++++
 .../src/server/actions/departments.ts         |  97 ++++
 .../src/server/actions/users.ts               | 133 +++++
 .../src/server/collections/.gitkeep           |   0
 .../src/server/collections/departmentRoles.ts |  25 +
 .../src/server/collections/departments.ts     | 156 ++++++
 .../server/collections/departmentsUsers.ts    |  39 ++
 .../src/server/collections/roles.ts           |  36 ++
 .../src/server/collections/users.ts           |  79 +++
 .../server/department-data-sync-resource.ts   | 333 +++++++++++++
 .../plugin-departments/src/server/index.ts    |  19 +
 .../middlewares/destroy-department-check.ts   |  48 ++
 .../src/server/middlewares/index.ts           |  24 +
 .../reset-user-departments-cache.ts           |  41 ++
 .../middlewares/set-department-owners.ts      |  59 +++
 .../middlewares/set-departments-roles.ts      |  60 +++
 .../server/middlewares/set-main-department.ts | 101 ++++
 .../middlewares/update-department-isleaf.ts   |  88 ++++
 .../update-field-uischemas-20240307124823.ts  |  96 ++++
 .../src/server/models/department.ts           |  31 ++
 .../plugin-departments/src/server/plugin.ts   | 156 ++++++
 .../plugin-field-attachment-url/.npmignore    |   2 +
 .../plugin-field-attachment-url/README.md     |   1 +
 .../plugin-field-attachment-url/client.d.ts   |   2 +
 .../plugin-field-attachment-url/client.js     |   1 +
 .../plugin-field-attachment-url/package.json  |  17 +
 .../plugin-field-attachment-url/server.d.ts   |   2 +
 .../plugin-field-attachment-url/server.js     |   1 +
 .../src/client/__e2e__/createField.test.ts    |  28 ++
 .../src/client/client.d.ts                    | 249 ++++++++++
 .../src/client/component/AttachmentUrl.tsx    | 184 +++++++
 .../src/client/hook/index.ts                  | 106 ++++
 .../src/client/index.tsx                      |  38 ++
 .../src/client/interfaces/attachment-url.tsx  |  79 +++
 .../src/client/locale.ts                      |  30 ++
 .../src/client/schema.ts                      |  53 ++
 .../src/client/settings/index.ts              | 171 +++++++
 .../plugin-field-attachment-url/src/index.ts  |  11 +
 .../src/locale/en-US.json                     |   1 +
 .../src/locale/zh-CN.json                     |   4 +
 .../src/server/collections/.gitkeep           |   0
 .../src/server/index.ts                       |  10 +
 .../src/server/plugin.ts                      |  28 ++
 .../.npmignore                                |   2 +
 .../README.md                                 |   1 +
 .../client.d.ts                               |   2 +
 .../client.js                                 |   1 +
 .../package.json                              |  21 +
 .../server.d.ts                               |   2 +
 .../server.js                                 |   1 +
 .../src/client/ResponseMessageInstruction.tsx |  87 ++++
 .../src/client/index.tsx                      |  31 ++
 .../src/index.ts                              |  20 +
 .../src/locale/en-US.json                     |   6 +
 .../src/locale/index.ts                       |  25 +
 .../src/locale/zh-CN.json                     |   8 +
 .../src/server/Plugin.ts                      |  31 ++
 .../src/server/ResponseMessageInstruction.ts  |  55 +++
 .../src/server/__tests__/instruction.test.ts  | 346 +++++++++++++
 .../src/server/__tests__/multiple.test.ts     | 185 +++++++
 .../src/server/index.ts                       |  19 +
 packages/presets/nocobase/package.json        |   3 +
 111 files changed, 8752 insertions(+)
 create mode 100644 packages/plugins/@nocobase/plugin-departments/.npmignore
 create mode 100644 packages/plugins/@nocobase/plugin-departments/README.md
 create mode 100644 packages/plugins/@nocobase/plugin-departments/client.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/client.js
 create mode 100644 packages/plugins/@nocobase/plugin-departments/package.json
 create mode 100644 packages/plugins/@nocobase/plugin-departments/server.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/server.js
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/ResourcesProvider.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/collections/departments.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/collections/users.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/components/DepartmentOwnersField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/components/ReadOnlyAssociationField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/components/UserDepartmentsField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/components/UserMainDepartmentField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/components/fieldSettings.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/components/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/AggregateSearch.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/Department.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentBlock.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentManagement.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentOwnersField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTree.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTreeSelect.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/IsOwnerField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/Member.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/NewDepartment.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/UserDepartmentsField.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/departments.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/users.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/hooks/departments-manager.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/hooks/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/hooks/tree-manager.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/hooks/useTableBlockProps.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/index.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/locale.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/roles/RoleDepartmentsManager.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/roles/schemas/departments.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/client/utils.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/locale/en-US.json
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/locale/zh-CN.json
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/actions/departments.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/actions/users.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/collections/.gitkeep
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentRoles.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/collections/departments.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentsUsers.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/collections/roles.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/collections/users.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/department-data-sync-resource.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/destroy-department-check.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/reset-user-departments-cache.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-department-owners.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-departments-roles.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-main-department.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/middlewares/update-department-isleaf.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/migrations/update-field-uischemas-20240307124823.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/models/department.ts
 create mode 100644 packages/plugins/@nocobase/plugin-departments/src/server/plugin.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/.npmignore
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/README.md
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/client.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/client.js
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/package.json
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/server.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/server.js
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/__e2e__/createField.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/client.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/index.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/locale.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/schema.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/client/settings/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/en-US.json
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/zh-CN.json
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/server/collections/.gitkeep
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/server/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/.npmignore
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/README.md
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/client.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/client.js
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/package.json
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/server.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/server.js
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/client/ResponseMessageInstruction.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/client/index.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/en-US.json
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/zh-CN.json
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/server/Plugin.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/server/ResponseMessageInstruction.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts
 create mode 100644 packages/plugins/@nocobase/plugin-workflow-response-message/src/server/index.ts

diff --git a/packages/plugins/@nocobase/plugin-departments/.npmignore b/packages/plugins/@nocobase/plugin-departments/.npmignore
new file mode 100644
index 0000000000..65f5e8779f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-departments/README.md b/packages/plugins/@nocobase/plugin-departments/README.md
new file mode 100644
index 0000000000..cb4fb63505
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/README.md
@@ -0,0 +1 @@
+# @nocobase/plugin-department
diff --git a/packages/plugins/@nocobase/plugin-departments/client.d.ts b/packages/plugins/@nocobase/plugin-departments/client.d.ts
new file mode 100644
index 0000000000..6c459cbac4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-departments/client.js b/packages/plugins/@nocobase/plugin-departments/client.js
new file mode 100644
index 0000000000..b6e3be70e6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-departments/package.json b/packages/plugins/@nocobase/plugin-departments/package.json
new file mode 100644
index 0000000000..a7b191e875
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@nocobase/plugin-departments",
+  "displayName": "Departments",
+  "displayName.zh-CN": "部门",
+  "description": "Organize users by departments, set hierarchical relationships, link roles to control permissions, and use departments as variables in workflows and expressions.",
+  "description.zh-CN": "以部门来组织用户，设定上下级关系，绑定角色控制权限，并支持作为变量用于工作流和表达式。",
+  "version": "1.7.0-beta.16",
+  "main": "dist/server/index.js",
+  "peerDependencies": {
+    "@nocobase/actions": "1.x",
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x"
+  },
+  "keywords": [
+    "Users & permissions"
+  ],
+  "gitHead": "080fc78c1a744d47e010b3bbe5840446775800e4"
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/server.d.ts b/packages/plugins/@nocobase/plugin-departments/server.d.ts
new file mode 100644
index 0000000000..c41081ddc6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-departments/server.js b/packages/plugins/@nocobase/plugin-departments/server.js
new file mode 100644
index 0000000000..972842039a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/ResourcesProvider.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/ResourcesProvider.tsx
new file mode 100644
index 0000000000..2ad0daac83
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/ResourcesProvider.tsx
@@ -0,0 +1,110 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { CollectionProvider_deprecated, ResourceActionContext, TableBlockContext, useRequest } from '@nocobase/client';
+import React, { useContext, useEffect, useMemo } from 'react';
+import { departmentCollection } from './collections/departments';
+import { userCollection } from './collections/users';
+import { FormContext } from '@formily/react';
+import { createForm } from '@formily/core';
+
+export const ResourcesContext = React.createContext<{
+  user: any;
+  setUser?: (user: any) => void;
+  department: any; // department name
+  setDepartment?: (department: any) => void;
+  departmentsResource?: any;
+  usersResource?: any;
+}>({
+  user: {},
+  department: {},
+});
+
+export const ResourcesProvider: React.FC = (props) => {
+  const [user, setUser] = React.useState(null);
+  const [department, setDepartment] = React.useState(null);
+
+  const userService = useRequest({
+    resource: 'users',
+    action: 'list',
+    params: {
+      appends: ['departments', 'departments.parent(recursively=true)'],
+      filter: department
+        ? {
+            'departments.id': department.id,
+          }
+        : {},
+      pageSize: 20,
+    },
+  });
+
+  useEffect(() => {
+    userService.run();
+  }, [department]);
+
+  const departmentRequest = {
+    resource: 'departments',
+    action: 'list',
+    params: {
+      paginate: false,
+      filter: {
+        parentId: null,
+      },
+    },
+  };
+  const departmentService = useRequest(departmentRequest);
+
+  return (
+    <ResourcesContext.Provider
+      value={{
+        user,
+        setUser,
+        department,
+        setDepartment,
+        usersResource: { service: userService },
+        departmentsResource: { service: departmentService },
+      }}
+    >
+      {props.children}
+    </ResourcesContext.Provider>
+  );
+};
+
+export const DepartmentsListProvider: React.FC = (props) => {
+  const { departmentsResource } = useContext(ResourcesContext);
+  const { service } = departmentsResource || {};
+  return (
+    <ResourceActionContext.Provider value={{ ...service }}>
+      <CollectionProvider_deprecated collection={departmentCollection}>{props.children}</CollectionProvider_deprecated>
+    </ResourceActionContext.Provider>
+  );
+};
+
+export const UsersListProvider: React.FC = (props) => {
+  const { usersResource } = useContext(ResourcesContext);
+  const { service } = usersResource || {};
+  const form = useMemo(() => createForm(), []);
+  const field = form.createField({ name: 'table' });
+  return (
+    <FormContext.Provider value={form}>
+      <TableBlockContext.Provider value={{ service, field }}>
+        <CollectionProvider_deprecated collection={userCollection}>{props.children}</CollectionProvider_deprecated>
+      </TableBlockContext.Provider>
+    </FormContext.Provider>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/collections/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/client/collections/departments.ts
new file mode 100644
index 0000000000..38105c0b2b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/collections/departments.ts
@@ -0,0 +1,115 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export const departmentCollection = {
+  name: 'departments',
+  fields: [
+    {
+      type: 'bigInt',
+      name: 'id',
+      primaryKey: true,
+      autoIncrement: true,
+      interface: 'id',
+      uiSchema: {
+        type: 'id',
+        title: '{{t("ID")}}',
+      },
+    },
+    {
+      name: 'title',
+      type: 'string',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Department name")}}',
+        'x-component': 'Input',
+        required: true,
+      },
+    },
+    {
+      name: 'parent',
+      type: 'belongsTo',
+      interface: 'm2o',
+      collectionName: 'departments',
+      foreignKey: 'parentId',
+      target: 'departments',
+      targetKey: 'id',
+      treeParent: true,
+      uiSchema: {
+        title: '{{t("Superior department")}}',
+        'x-component': 'DepartmentSelect',
+        // 'x-component-props': {
+        //   multiple: false,
+        //   fieldNames: {
+        //     label: 'title',
+        //     value: 'id',
+        //   },
+        // },
+      },
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'roles',
+      target: 'roles',
+      collectionName: 'departments',
+      through: 'departmentsRoles',
+      foreignKey: 'departmentId',
+      otherKey: 'roleName',
+      targetKey: 'name',
+      sourceKey: 'id',
+      uiSchema: {
+        title: '{{t("Roles")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            label: 'title',
+            value: 'name',
+          },
+        },
+      },
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'owners',
+      collectionName: 'departments',
+      target: 'users',
+      through: 'departmentsUsers',
+      foreignKey: 'departmentId',
+      otherKey: 'userId',
+      targetKey: 'id',
+      sourceKey: 'id',
+      scope: {
+        isOwner: true,
+      },
+      uiSchema: {
+        title: '{{t("Owners")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            label: 'nickname',
+            value: 'id',
+          },
+        },
+      },
+    },
+  ],
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/collections/users.ts b/packages/plugins/@nocobase/plugin-departments/src/client/collections/users.ts
new file mode 100644
index 0000000000..ba309455a7
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/collections/users.ts
@@ -0,0 +1,142 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export const userCollection = {
+  name: 'users',
+  fields: [
+    {
+      name: 'id',
+      type: 'bigInt',
+      autoIncrement: true,
+      primaryKey: true,
+      allowNull: false,
+      uiSchema: { type: 'number', title: '{{t("ID")}}', 'x-component': 'InputNumber', 'x-read-pretty': true },
+      interface: 'id',
+    },
+    {
+      interface: 'input',
+      type: 'string',
+      name: 'nickname',
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Nickname")}}',
+        'x-component': 'Input',
+      },
+    },
+    {
+      interface: 'input',
+      type: 'string',
+      name: 'username',
+      unique: true,
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Username")}}',
+        'x-component': 'Input',
+        'x-validator': { username: true },
+        required: true,
+      },
+    },
+    {
+      interface: 'email',
+      type: 'string',
+      name: 'email',
+      unique: true,
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Email")}}',
+        'x-component': 'Input',
+        'x-validator': 'email',
+        required: true,
+      },
+    },
+    {
+      interface: 'phone',
+      type: 'string',
+      name: 'phone',
+      unique: true,
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Phone")}}',
+        'x-component': 'Input',
+        'x-validator': 'phone',
+        required: true,
+      },
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'roles',
+      target: 'roles',
+      foreignKey: 'userId',
+      otherKey: 'roleName',
+      onDelete: 'CASCADE',
+      sourceKey: 'id',
+      targetKey: 'name',
+      through: 'rolesUsers',
+      uiSchema: {
+        type: 'array',
+        title: '{{t("Roles")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            label: 'title',
+            value: 'name',
+          },
+        },
+      },
+    },
+    {
+      name: 'departments',
+      type: 'belongsToMany',
+      interface: 'm2m',
+      target: 'departments',
+      foreignKey: 'userId',
+      otherKey: 'departmentId',
+      onDelete: 'CASCADE',
+      sourceKey: 'id',
+      targetKey: 'id',
+      through: 'departmentsUsers',
+      uiSchema: {
+        type: 'array',
+        title: '{{t("Departments")}}',
+        'x-component': 'DepartmentField',
+      },
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'mainDepartment',
+      target: 'departments',
+      foreignKey: 'userId',
+      otherKey: 'departmentId',
+      onDelete: 'CASCADE',
+      sourceKey: 'id',
+      targetKey: 'id',
+      through: 'departmentsUsers',
+      throughScope: {
+        isMain: true,
+      },
+      uiSchema: {
+        type: 'array',
+        title: '{{t("Main department")}}',
+        'x-component': 'DepartmentField',
+      },
+    },
+  ],
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/DepartmentOwnersField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/components/DepartmentOwnersField.tsx
new file mode 100644
index 0000000000..afcb651250
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/DepartmentOwnersField.tsx
@@ -0,0 +1,35 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { SchemaSettings } from '@nocobase/client';
+import { enableLink, fieldComponent, titleField } from './fieldSettings';
+
+export const DepartmentOwnersFieldSettings = new SchemaSettings({
+  name: 'fieldSettings:component:DepartmentOwnersField',
+  items: [
+    {
+      ...fieldComponent,
+    },
+    {
+      ...titleField,
+    },
+    {
+      ...enableLink,
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/ReadOnlyAssociationField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/components/ReadOnlyAssociationField.tsx
new file mode 100644
index 0000000000..d843d62847
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/ReadOnlyAssociationField.tsx
@@ -0,0 +1,27 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React from 'react';
+import { useDepartmentTranslation } from '../locale';
+import { AssociationField } from '@nocobase/client';
+import { connect, mapReadPretty } from '@formily/react';
+
+export const ReadOnlyAssociationField = connect(() => {
+  const { t } = useDepartmentTranslation();
+  return <div style={{ color: '#ccc' }}>{t('This field is currently not supported for use in form blocks.')} </div>;
+}, mapReadPretty(AssociationField.ReadPretty));
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/UserDepartmentsField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/components/UserDepartmentsField.tsx
new file mode 100644
index 0000000000..e866411db2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/UserDepartmentsField.tsx
@@ -0,0 +1,35 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { SchemaSettings } from '@nocobase/client';
+import { enableLink, fieldComponent, titleField } from './fieldSettings';
+
+export const UserDepartmentsFieldSettings = new SchemaSettings({
+  name: 'fieldSettings:component:UserDepartmentsField',
+  items: [
+    {
+      ...fieldComponent,
+    },
+    {
+      ...titleField,
+    },
+    {
+      ...enableLink,
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/UserMainDepartmentField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/components/UserMainDepartmentField.tsx
new file mode 100644
index 0000000000..0e8355e408
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/UserMainDepartmentField.tsx
@@ -0,0 +1,35 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { SchemaSettings } from '@nocobase/client';
+import { enableLink, fieldComponent, titleField } from './fieldSettings';
+
+export const UserMainDepartmentFieldSettings = new SchemaSettings({
+  name: 'fieldSettings:component:UserMainDepartmentField',
+  items: [
+    {
+      ...fieldComponent,
+    },
+    {
+      ...titleField,
+    },
+    {
+      ...enableLink,
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/fieldSettings.ts b/packages/plugins/@nocobase/plugin-departments/src/client/components/fieldSettings.ts
new file mode 100644
index 0000000000..bc637afa40
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/fieldSettings.ts
@@ -0,0 +1,185 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  useCollectionField,
+  useCollectionManager_deprecated,
+  useCollection_deprecated,
+  useCompile,
+  useDesignable,
+  useFieldComponentName,
+  useFieldModeOptions,
+  useIsAddNewForm,
+  useTitleFieldOptions,
+} from '@nocobase/client';
+import { useDepartmentTranslation } from '../locale';
+import { Field } from '@formily/core';
+import { useField, useFieldSchema, ISchema } from '@formily/react';
+
+export const titleField: any = {
+  name: 'titleField',
+  type: 'select',
+  useComponentProps() {
+    const { t } = useDepartmentTranslation();
+    const field = useField<Field>();
+    const { dn } = useDesignable();
+    const options = useTitleFieldOptions();
+    const { uiSchema, fieldSchema: tableColumnSchema, collectionField: tableColumnField } = useColumnSchema();
+    const schema = useFieldSchema();
+    const fieldSchema = tableColumnSchema || schema;
+    const targetCollectionField = useCollectionField();
+    const collectionField = tableColumnField || targetCollectionField;
+    const fieldNames = {
+      ...collectionField?.uiSchema?.['x-component-props']?.['fieldNames'],
+      ...field?.componentProps?.fieldNames,
+      ...fieldSchema?.['x-component-props']?.['fieldNames'],
+    };
+    return {
+      title: t('Title field'),
+      options,
+      value: fieldNames?.label,
+      onChange(label) {
+        const schema = {
+          ['x-uid']: fieldSchema['x-uid'],
+        };
+        const newFieldNames = {
+          ...collectionField?.uiSchema?.['x-component-props']?.['fieldNames'],
+          ...fieldSchema['x-component-props']?.['fieldNames'],
+          label,
+        };
+        fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+        fieldSchema['x-component-props']['fieldNames'] = newFieldNames;
+        schema['x-component-props'] = fieldSchema['x-component-props'];
+        field.componentProps.fieldNames = fieldSchema['x-component-props']?.fieldNames;
+        const path = field.path?.splice(field.path?.length - 1, 1);
+        field.form.query(`${path.concat(`*.` + fieldSchema.name)}`).forEach((f) => {
+          f.componentProps.fieldNames = fieldNames;
+        });
+        dn.emit('patch', {
+          schema,
+        });
+        dn.refresh();
+      },
+    };
+  },
+};
+
+export const isCollectionFieldComponent = (schema: ISchema) => {
+  return schema['x-component'] === 'CollectionField';
+};
+
+const useColumnSchema = () => {
+  const { getField } = useCollection_deprecated();
+  const compile = useCompile();
+  const columnSchema = useFieldSchema();
+  const { getCollectionJoinField } = useCollectionManager_deprecated();
+  const fieldSchema = columnSchema.reduceProperties((buf, s) => {
+    if (isCollectionFieldComponent(s)) {
+      return s;
+    }
+    return buf;
+  }, null);
+  if (!fieldSchema) {
+    return {};
+  }
+
+  const collectionField = getField(fieldSchema.name) || getCollectionJoinField(fieldSchema?.['x-collection-field']);
+  return { columnSchema, fieldSchema, collectionField, uiSchema: compile(collectionField?.uiSchema) };
+};
+
+export const enableLink = {
+  name: 'enableLink',
+  type: 'switch',
+  useVisible() {
+    const field = useField();
+    return field.readPretty;
+  },
+  useComponentProps() {
+    const { t } = useDepartmentTranslation();
+    const field = useField<Field>();
+    const { fieldSchema: tableColumnSchema } = useColumnSchema();
+    const schema = useFieldSchema();
+    const fieldSchema = tableColumnSchema || schema;
+    const { dn } = useDesignable();
+    return {
+      title: t('Enable link'),
+      checked: fieldSchema['x-component-props']?.enableLink !== false,
+      onChange(flag) {
+        fieldSchema['x-component-props'] = {
+          ...fieldSchema?.['x-component-props'],
+          enableLink: flag,
+        };
+        field.componentProps['enableLink'] = flag;
+        dn.emit('patch', {
+          schema: {
+            'x-uid': fieldSchema['x-uid'],
+            'x-component-props': {
+              ...fieldSchema?.['x-component-props'],
+            },
+          },
+        });
+        dn.refresh();
+      },
+    };
+  },
+};
+
+export const fieldComponent: any = {
+  name: 'fieldComponent',
+  type: 'select',
+  useComponentProps() {
+    const { t } = useDepartmentTranslation();
+    const field = useField<Field>();
+    const { fieldSchema: tableColumnSchema, collectionField } = useColumnSchema();
+    const schema = useFieldSchema();
+    const fieldSchema = tableColumnSchema || schema;
+    const fieldModeOptions = useFieldModeOptions({ fieldSchema: tableColumnSchema, collectionField });
+    // const isAddNewForm = useIsAddNewForm();
+    // const fieldMode = useFieldComponentName();
+    const { dn } = useDesignable();
+    return {
+      title: t('Field component'),
+      options: fieldModeOptions,
+      value: 'Select',
+      onChange(mode) {
+        const schema = {
+          ['x-uid']: fieldSchema['x-uid'],
+        };
+        fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+        fieldSchema['x-component-props']['mode'] = mode;
+        schema['x-component-props'] = fieldSchema['x-component-props'];
+        field.componentProps = field.componentProps || {};
+        field.componentProps.mode = mode;
+
+        // 子表单状态不允许设置默认值
+        // if (isSubMode(fieldSchema) && isAddNewForm) {
+        //   // @ts-ignore
+        //   schema.default = null;
+        //   fieldSchema.default = null;
+        //   field?.setInitialValue?.(null);
+        //   field?.setValue?.(null);
+        // }
+
+        void dn.emit('patch', {
+          schema,
+        });
+        dn.refresh();
+      },
+    };
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/components/index.ts b/packages/plugins/@nocobase/plugin-departments/src/client/components/index.ts
new file mode 100644
index 0000000000..a9a4c4c641
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/components/index.ts
@@ -0,0 +1,22 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export * from './ReadOnlyAssociationField';
+export * from './UserDepartmentsField';
+export * from './UserMainDepartmentField';
+export * from './DepartmentOwnersField';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/AggregateSearch.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/AggregateSearch.tsx
new file mode 100644
index 0000000000..fccec99e2b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/AggregateSearch.tsx
@@ -0,0 +1,216 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext } from 'react';
+import { Input, Button, Empty, MenuProps, Dropdown, theme } from 'antd';
+import { useDepartmentTranslation } from '../locale';
+import { createStyles, useAPIClient, useRequest } from '@nocobase/client';
+import { ResourcesContext } from '../ResourcesProvider';
+
+const useStyles = createStyles(({ css }) => {
+  return {
+    searchDropdown: css`
+      .ant-dropdown-menu {
+        max-height: 500px;
+        overflow-y: scroll;
+      }
+    `,
+  };
+});
+
+export const AggregateSearch: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  const { token } = theme.useToken();
+  const { setDepartment, setUser } = useContext(ResourcesContext);
+  const [open, setOpen] = React.useState(false);
+  const [keyword, setKeyword] = React.useState('');
+  const [users, setUsers] = React.useState([]);
+  const [departments, setDepartments] = React.useState([]);
+  const [moreUsers, setMoreUsers] = React.useState(true);
+  const [moreDepartments, setMoreDepartments] = React.useState(true);
+  const { styles } = useStyles();
+  const limit = 10;
+
+  const api = useAPIClient();
+  const service = useRequest(
+    (params) =>
+      api
+        .resource('departments')
+        .aggregateSearch(params)
+        .then((res) => res?.data?.data),
+    {
+      manual: true,
+      onSuccess: (data, params) => {
+        const {
+          values: { type },
+        } = params[0] || {};
+        if (!data) {
+          return;
+        }
+        if ((!type || type === 'user') && data['users'].length < limit) {
+          setMoreUsers(false);
+        }
+        if ((!type || type === 'department') && data['departments'].length < limit) {
+          setMoreDepartments(false);
+        }
+        setUsers((users) => [...users, ...data['users']]);
+        setDepartments((departments) => [...departments, ...data['departments']]);
+      },
+    },
+  );
+  const { run } = service;
+
+  const handleSearch = (keyword: string) => {
+    setKeyword(keyword);
+    setUsers([]);
+    setDepartments([]);
+    setMoreUsers(true);
+    setMoreDepartments(true);
+    if (!keyword) {
+      return;
+    }
+    run({
+      values: { keyword, limit },
+    });
+    setOpen(true);
+  };
+
+  const handleChange = (e) => {
+    if (e.target.value) {
+      return;
+    }
+    setUser(null);
+    setKeyword('');
+    setOpen(false);
+    service.mutate({});
+    setUsers([]);
+    setDepartments([]);
+  };
+
+  const getTitle = (department: any) => {
+    const title = department.title;
+    const parent = department.parent;
+    if (parent) {
+      return getTitle(parent) + ' / ' + title;
+    }
+    return title;
+  };
+
+  const LoadMore: React.FC<{ type: string; last: number }> = (props) => {
+    return (
+      <Button
+        type="link"
+        style={{ padding: '0 8px' }}
+        onClick={(e) => {
+          setOpen(true);
+          run({
+            values: { keyword, limit, ...props },
+          });
+        }}
+      >
+        {t('Load more')}
+      </Button>
+    );
+  };
+
+  const getItems = () => {
+    const items: MenuProps['items'] = [];
+    if (!users.length && !departments.length) {
+      return [
+        {
+          key: '0',
+          label: <Empty description={t('No results')} image={Empty.PRESENTED_IMAGE_SIMPLE} />,
+          disabled: true,
+        },
+      ];
+    }
+    if (users.length) {
+      items.push({
+        key: '0',
+        type: 'group',
+        label: t('Users'),
+        children: users.map((user: { nickname: string; username: string; phone?: string; email?: string }) => ({
+          key: user.username,
+          label: (
+            <div onClick={() => setUser(user)}>
+              <div>{user.nickname || user.username}</div>
+              <div
+                style={{
+                  fontSize: token.fontSizeSM,
+                  color: token.colorTextDescription,
+                }}
+              >
+                {`${user.username}${user.phone ? ' | ' + user.phone : ''}${user.email ? ' | ' + user.email : ''}`}
+              </div>
+            </div>
+          ),
+        })),
+      });
+      if (moreUsers) {
+        items.push({
+          type: 'group',
+          key: '0-loadMore',
+          label: <LoadMore type="user" last={users[users.length - 1].id} />,
+        });
+      }
+    }
+    if (departments.length) {
+      items.push({
+        key: '1',
+        type: 'group',
+        label: t('Departments'),
+        children: departments.map((department: any) => ({
+          key: department.id,
+          label: <div onClick={() => setDepartment(department)}>{getTitle(department)}</div>,
+        })),
+      });
+      if (moreDepartments) {
+        items.push({
+          type: 'group',
+          key: '1-loadMore',
+          label: <LoadMore type="department" last={departments[departments.length - 1].id} />,
+        });
+      }
+    }
+    return items;
+  };
+
+  return (
+    <Dropdown
+      menu={{ items: getItems() }}
+      overlayClassName={styles.searchDropdown}
+      trigger={['click']}
+      open={open}
+      onOpenChange={(open) => setOpen(open)}
+    >
+      <Input.Search
+        allowClear
+        onClick={() => {
+          if (!keyword) {
+            setOpen(false);
+          }
+        }}
+        onFocus={() => setDepartment(null)}
+        onSearch={handleSearch}
+        onChange={handleChange}
+        placeholder={t('Search for departments, users')}
+        style={{ marginBottom: '20px' }}
+      />
+    </Dropdown>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/Department.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/Department.tsx
new file mode 100644
index 0000000000..b8673777ab
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/Department.tsx
@@ -0,0 +1,149 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { createContext, useContext, useState } from 'react';
+import { Row, Button, Divider, theme } from 'antd';
+import { UserOutlined } from '@ant-design/icons';
+import { useDepartmentTranslation } from '../locale';
+import { NewDepartment } from './NewDepartment';
+import { DepartmentTree } from './DepartmentTree';
+import { ResourcesContext } from '../ResourcesProvider';
+import { AggregateSearch } from './AggregateSearch';
+import { useDepartmentManager } from '../hooks';
+import {
+  ActionContextProvider,
+  RecordProvider,
+  SchemaComponent,
+  SchemaComponentOptions,
+  useAPIClient,
+  useActionContext,
+  useRecord,
+  useResourceActionContext,
+} from '@nocobase/client';
+import { useForm, useField } from '@formily/react';
+import { DepartmentOwnersField } from './DepartmentOwnersField';
+
+export const DepartmentTreeContext = createContext({} as ReturnType<typeof useDepartmentManager>);
+
+export const useCreateDepartment = () => {
+  const form = useForm();
+  const field = useField();
+  const ctx = useActionContext();
+  const { refreshAsync } = useResourceActionContext();
+  const api = useAPIClient();
+  const { expandedKeys, setLoadedKeys, setExpandedKeys } = useContext(DepartmentTreeContext);
+  return {
+    async run() {
+      try {
+        await form.submit();
+        field.data = field.data || {};
+        field.data.loading = true;
+        await api.resource('departments').create({ values: form.values });
+        ctx.setVisible(false);
+        await form.reset();
+        field.data.loading = false;
+        const expanded = [...expandedKeys];
+        setLoadedKeys([]);
+        setExpandedKeys([]);
+        await refreshAsync();
+        setExpandedKeys(expanded);
+      } catch (error) {
+        if (field.data) {
+          field.data.loading = false;
+        }
+      }
+    },
+  };
+};
+
+export const useUpdateDepartment = () => {
+  const field = useField();
+  const form = useForm();
+  const ctx = useActionContext();
+  const { refreshAsync } = useResourceActionContext();
+  const api = useAPIClient();
+  const { id: filterByTk } = useRecord() as any;
+  const { expandedKeys, setLoadedKeys, setExpandedKeys } = useContext(DepartmentTreeContext);
+  const { department, setDepartment } = useContext(ResourcesContext);
+  return {
+    async run() {
+      await form.submit();
+      field.data = field.data || {};
+      field.data.loading = true;
+      try {
+        await api.resource('departments').update({ filterByTk, values: form.values });
+        setDepartment({ department, ...form.values });
+        ctx.setVisible(false);
+        await form.reset();
+        const expanded = [...expandedKeys];
+        setLoadedKeys([]);
+        setExpandedKeys([]);
+        await refreshAsync();
+        setExpandedKeys(expanded);
+      } catch (e) {
+        console.log(e);
+      } finally {
+        field.data.loading = false;
+      }
+    },
+  };
+};
+
+export const Department: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  const [visible, setVisible] = useState(false);
+  const [drawer, setDrawer] = useState({} as any);
+  const { department, setDepartment } = useContext(ResourcesContext);
+  const { token } = theme.useToken();
+  const departmentManager = useDepartmentManager({
+    label: ({ node }) => <DepartmentTree.Item node={node} setVisible={setVisible} setDrawer={setDrawer} />,
+  });
+
+  return (
+    <SchemaComponentOptions scope={{ useCreateDepartment, useUpdateDepartment }}>
+      <DepartmentTreeContext.Provider value={departmentManager}>
+        <Row>
+          <AggregateSearch />
+          <Button
+            type="text"
+            icon={<UserOutlined />}
+            style={{
+              textAlign: 'left',
+              marginBottom: '5px',
+              background: department ? '' : token.colorBgTextHover,
+            }}
+            onClick={() => {
+              setDepartment(null);
+            }}
+            block
+          >
+            {t('All users')}
+          </Button>
+          <NewDepartment />
+        </Row>
+        <Divider style={{ margin: '12px 0' }} />
+        <DepartmentTree />
+        <ActionContextProvider value={{ visible, setVisible }}>
+          <RecordProvider record={drawer.node || {}}>
+            <SchemaComponent scope={{ t }} components={{ DepartmentOwnersField }} schema={drawer.schema || {}} />
+          </RecordProvider>
+        </ActionContextProvider>
+      </DepartmentTreeContext.Provider>
+    </SchemaComponentOptions>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentBlock.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentBlock.tsx
new file mode 100644
index 0000000000..01b379d59a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentBlock.tsx
@@ -0,0 +1,40 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React from 'react';
+import { SchemaComponent } from '@nocobase/client';
+import { DepartmentManagement } from './DepartmentManagement';
+import { uid } from '@formily/shared';
+
+export const DepartmentBlock: React.FC = () => {
+  return (
+    <SchemaComponent
+      components={{ DepartmentManagement }}
+      schema={{
+        type: 'void',
+        properties: {
+          [uid()]: {
+            type: 'void',
+            'x-decorator': 'CardItem',
+            'x-component': 'DepartmentManagement',
+          },
+        },
+      }}
+    />
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentField.tsx
new file mode 100644
index 0000000000..76763a15bb
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentField.tsx
@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext } from 'react';
+import { useField } from '@formily/react';
+import { Field } from '@formily/core';
+import { ResourcesContext } from '../ResourcesProvider';
+import { getDepartmentTitle } from '../utils';
+import { EllipsisWithTooltip } from '@nocobase/client';
+
+export const DepartmentField: React.FC = () => {
+  const { setDepartment } = useContext(ResourcesContext);
+  const field = useField<Field>();
+  const values = field.value || [];
+  const deptsMap = values.reduce((mp: { [id: number]: any }, dept: any) => {
+    mp[dept.id] = dept;
+    return mp;
+  }, {});
+  const depts = values.map((dept: { id: number; title: string }, index: number) => (
+    <span key={index}>
+      <a
+        onClick={(e) => {
+          e.preventDefault();
+          setDepartment(deptsMap[dept.id]);
+        }}
+      >
+        {getDepartmentTitle(dept)}
+      </a>
+      {index !== values.length - 1 ? <span style={{ marginRight: 4, color: '#aaa' }}>,</span> : ''}
+    </span>
+  ));
+  return <EllipsisWithTooltip ellipsis={true}>{depts}</EllipsisWithTooltip>;
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentManagement.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentManagement.tsx
new file mode 100644
index 0000000000..5bae972bf8
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentManagement.tsx
@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React from 'react';
+import { Col, Row } from 'antd';
+import { Department } from './Department';
+import { Member } from './Member';
+import { SchemaComponentOptions } from '@nocobase/client';
+import { SuperiorDepartmentSelect, DepartmentSelect } from './DepartmentTreeSelect';
+import { DepartmentsListProvider, UsersListProvider } from '../ResourcesProvider';
+
+export const DepartmentManagement: React.FC = () => {
+  return (
+    <SchemaComponentOptions components={{ SuperiorDepartmentSelect, DepartmentSelect }}>
+      <Row gutter={48} style={{ flexWrap: 'nowrap' }}>
+        <Col span={6} style={{ borderRight: '1px solid #eee', minWidth: '300px' }}>
+          <DepartmentsListProvider>
+            <Department />
+          </DepartmentsListProvider>
+        </Col>
+        <Col flex="auto" style={{ overflow: 'hidden' }}>
+          <UsersListProvider>
+            <Member />
+          </UsersListProvider>
+        </Col>
+      </Row>
+    </SchemaComponentOptions>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentOwnersField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentOwnersField.tsx
new file mode 100644
index 0000000000..6faffb38f3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentOwnersField.tsx
@@ -0,0 +1,115 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  ActionContextProvider,
+  ResourceActionProvider,
+  SchemaComponent,
+  useActionContext,
+  useRecord,
+} from '@nocobase/client';
+import React, { useEffect, useRef, useState } from 'react';
+import { Select } from 'antd';
+import { Field } from '@formily/core';
+import { useField } from '@formily/react';
+import { departmentOwnersSchema } from './schemas/departments';
+
+export const DepartmentOwnersField: React.FC = () => {
+  const [visible, setVisible] = useState(false);
+  const department = useRecord() as any;
+  const field = useField<Field>();
+  const [value, setValue] = useState([]);
+  const selectedRows = useRef([]);
+  const handleSelect = (_: number[], rows: any[]) => {
+    selectedRows.current = rows;
+  };
+
+  const useSelectOwners = () => {
+    const { setVisible } = useActionContext();
+    return {
+      run() {
+        const selected = field.value || [];
+        field.setValue([...selected, ...selectedRows.current]);
+        selectedRows.current = [];
+        setVisible(false);
+      },
+    };
+  };
+
+  useEffect(() => {
+    if (!field.value) {
+      return;
+    }
+    setValue(
+      field.value.map((owner: any) => ({
+        value: owner.id,
+        label: owner.nickname || owner.username,
+      })),
+    );
+  }, [field.value]);
+
+  const RequestProvider: React.FC = (props) => (
+    <ResourceActionProvider
+      collection="users"
+      request={{
+        resource: `departments/${department.id}/members`,
+        action: 'list',
+        params: {
+          filter: field.value?.length
+            ? {
+                id: {
+                  $notIn: field.value.map((owner: any) => owner.id),
+                },
+              }
+            : {},
+        },
+      }}
+    >
+      {props.children}
+    </ResourceActionProvider>
+  );
+
+  return (
+    <ActionContextProvider value={{ visible, setVisible }}>
+      <Select
+        open={false}
+        onChange={(value) => {
+          if (!value) {
+            field.setValue([]);
+            return;
+          }
+          field.setValue(
+            value.map(({ label, value }: { label: string; value: string }) => ({
+              id: value,
+              nickname: label,
+            })),
+          );
+        }}
+        mode="multiple"
+        value={value}
+        labelInValue={true}
+        onDropdownVisibleChange={(open) => setVisible(open)}
+      />
+      <SchemaComponent
+        schema={departmentOwnersSchema}
+        components={{ RequestProvider }}
+        scope={{ department, handleSelect, useSelectOwners }}
+      />
+    </ActionContextProvider>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx
new file mode 100644
index 0000000000..e1e3a768d2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx
@@ -0,0 +1,263 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  CollectionContext,
+  CollectionProvider_deprecated,
+  ResourceActionContext,
+  SchemaComponent,
+  mergeFilter,
+  removeNullCondition,
+  useFilterFieldOptions,
+  useFilterFieldProps,
+  useResourceActionContext,
+} from '@nocobase/client';
+import React, { createContext, useContext, useEffect, useState } from 'react';
+import { useDepartmentManager } from '../hooks';
+import { Table, TablePaginationConfig, TableProps } from 'antd';
+import { departmentCollection } from '../collections/departments';
+import { useDepartmentTranslation } from '../locale';
+import { useField } from '@formily/react';
+import { Field } from '@formily/core';
+import { uid } from '@formily/shared';
+import { getDepartmentTitle } from '../utils';
+
+const ExpandMetaContext = createContext<any>({});
+
+export const useFilterActionProps = () => {
+  const { setHasFilter, setExpandedKeys } = useContext(ExpandMetaContext);
+  const { t } = useDepartmentTranslation();
+  const collection = useContext(CollectionContext);
+  const options = useFilterFieldOptions(collection.fields);
+  const service = useResourceActionContext();
+  const { run, defaultRequest } = service;
+  const field = useField<Field>();
+  const { params } = defaultRequest || {};
+
+  return {
+    options,
+    onSubmit: async (values: any) => {
+      // filter parameter for the block
+      const defaultFilter = params.filter;
+      // filter parameter for the filter action
+      const filter = removeNullCondition(values?.filter);
+      run({
+        ...params,
+        page: 1,
+        pageSize: 10,
+        filter: mergeFilter([filter, defaultFilter]),
+      });
+      const items = filter?.$and || filter?.$or;
+      if (items?.length) {
+        field.title = t('{{count}} filter items', { count: items?.length || 0 });
+        setHasFilter(true);
+      } else {
+        field.title = t('Filter');
+        setHasFilter(false);
+      }
+    },
+    onReset() {
+      run({
+        ...(params || {}),
+        filter: {
+          ...(params?.filter || {}),
+          parentId: null,
+        },
+        page: 1,
+        pageSize: 10,
+      });
+      field.title = t('Filter');
+      setHasFilter(false);
+      setExpandedKeys([]);
+    },
+  };
+};
+
+const useDefaultDisabled = () => {
+  return {
+    disabled: () => false,
+  };
+};
+
+const InternalDepartmentTable: React.FC<{
+  useDisabled?: () => {
+    disabled: (record: any) => boolean;
+  };
+}> = ({ useDisabled = useDefaultDisabled }) => {
+  const { t } = useDepartmentTranslation();
+  const ctx = useResourceActionContext();
+  console.log(ctx);
+  const { run, data, loading, defaultRequest } = ctx;
+  const { resource, resourceOf, params } = defaultRequest || {};
+  const { treeData, initData, loadData } = useDepartmentManager({
+    resource,
+    resourceOf,
+    params,
+  });
+  const field = useField<Field>();
+  const { disabled } = useDisabled();
+  const { hasFilter, expandedKeys, setExpandedKeys } = useContext(ExpandMetaContext);
+
+  useEffect(() => {
+    if (hasFilter) {
+      return;
+    }
+    initData(data?.data);
+  }, [data, initData, loading, hasFilter]);
+
+  const pagination: TablePaginationConfig = {};
+  if (params?.pageSize) {
+    pagination.defaultPageSize = params.pageSize;
+  }
+  if (!pagination.total && data?.meta) {
+    const { count, page, pageSize } = data.meta;
+    pagination.total = count;
+    pagination.current = page;
+    pagination.pageSize = pageSize;
+  }
+
+  return (
+    <Table
+      rowKey="id"
+      columns={
+        [
+          {
+            dataIndex: 'title',
+            title: t('Department name'),
+            render: (text, record) => (hasFilter ? getDepartmentTitle(record) : text),
+          },
+        ] as TableProps['columns']
+      }
+      rowSelection={{
+        selectedRowKeys: (field?.value || []).map((dept: any) => dept.id),
+        onChange: (keys, depts) => field?.setValue?.(depts),
+        getCheckboxProps: (record: any) => ({
+          disabled: disabled(record),
+        }),
+      }}
+      pagination={{
+        showSizeChanger: true,
+        ...pagination,
+        onChange(page, pageSize) {
+          run({
+            ...(ctx?.params?.[0] || {}),
+            page,
+            pageSize,
+          });
+        },
+      }}
+      dataSource={hasFilter ? data?.data || [] : treeData}
+      expandable={{
+        onExpand: (expanded, record) => {
+          loadData({
+            key: record.id,
+            children: record.children,
+          });
+        },
+        expandedRowKeys: expandedKeys,
+        onExpandedRowsChange: (keys) => setExpandedKeys(keys),
+      }}
+    />
+  );
+};
+
+const RequestProvider: React.FC<{
+  useDataSource: any;
+}> = (props) => {
+  const [expandedKeys, setExpandedKeys] = useState([]);
+  const [hasFilter, setHasFilter] = useState(false);
+  const { useDataSource } = props;
+  const service = useDataSource({
+    manual: true,
+  });
+  useEffect(() => {
+    service.run({
+      filter: {
+        parentId: null,
+      },
+      pageSize: 10,
+    });
+  }, []);
+  return (
+    <ResourceActionContext.Provider value={{ ...service }}>
+      <CollectionProvider_deprecated collection={departmentCollection}>
+        <ExpandMetaContext.Provider value={{ expandedKeys, setExpandedKeys, hasFilter, setHasFilter }}>
+          {props.children}
+        </ExpandMetaContext.Provider>
+      </CollectionProvider_deprecated>
+    </ResourceActionContext.Provider>
+  );
+};
+
+export const DepartmentTable: React.FC<{
+  useDataSource: any;
+  useDisabled?: (record: any) => boolean;
+}> = ({ useDataSource, useDisabled }) => {
+  return (
+    <SchemaComponent
+      scope={{ useDisabled, useFilterActionProps }}
+      components={{ InternalDepartmentTable, RequestProvider }}
+      schema={{
+        type: 'void',
+        properties: {
+          [uid()]: {
+            type: 'void',
+            'x-component': 'RequestProvider',
+            'x-component-props': {
+              useDataSource,
+            },
+            properties: {
+              actions: {
+                type: 'void',
+                'x-component': 'ActionBar',
+                'x-component-props': {
+                  style: {
+                    marginBottom: 16,
+                  },
+                },
+                properties: {
+                  filter: {
+                    type: 'void',
+                    title: '{{ t("Filter") }}',
+                    default: {
+                      $and: [{ title: { $includes: '' } }],
+                    },
+                    'x-action': 'filter',
+                    'x-component': 'Filter.Action',
+                    'x-use-component-props': 'useFilterActionProps',
+                    'x-component-props': {
+                      icon: 'FilterOutlined',
+                    },
+                    'x-align': 'left',
+                  },
+                },
+              },
+              departments: {
+                type: 'array',
+                'x-component': 'InternalDepartmentTable',
+                'x-component-props': {
+                  useDisabled: '{{ useDisabled }}',
+                },
+              },
+            },
+          },
+        },
+      }}
+    />
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTree.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTree.tsx
new file mode 100644
index 0000000000..03ac4080b6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTree.tsx
@@ -0,0 +1,181 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext, useEffect } from 'react';
+import { Tree, Dropdown, App, Empty } from 'antd';
+import { MoreOutlined } from '@ant-design/icons';
+import { useAPIClient, useResourceActionContext } from '@nocobase/client';
+import { useDepartmentTranslation } from '../locale';
+import { editDepartmentSchema, newSubDepartmentSchema } from './schemas/departments';
+import { ResourcesContext } from '../ResourcesProvider';
+import { DepartmentTreeContext } from './Department';
+import { css } from '@emotion/css';
+
+type DepartmentTreeProps = {
+  node: {
+    id: number;
+    title: string;
+    parent?: any;
+  };
+  setVisible: (visible: boolean) => void;
+  setDrawer: (schema: any) => void;
+};
+
+export const DepartmentTree: React.FC & {
+  Item: React.FC<DepartmentTreeProps>;
+} = () => {
+  const { data, loading } = useResourceActionContext();
+  const { department, setDepartment, setUser } = useContext(ResourcesContext);
+  const { treeData, nodeMap, loadData, loadedKeys, setLoadedKeys, initData, expandedKeys, setExpandedKeys } =
+    useContext(DepartmentTreeContext);
+  const handleSelect = (keys: number[]) => {
+    if (!keys.length) {
+      return;
+    }
+    const node = nodeMap[keys[0]];
+    setDepartment(node);
+    setUser(null);
+  };
+
+  const handleExpand = (keys: number[]) => {
+    setExpandedKeys(keys);
+  };
+
+  const handleLoad = (keys: number[]) => {
+    setLoadedKeys(keys);
+  };
+
+  useEffect(() => {
+    initData(data?.data);
+  }, [data, initData, loading]);
+
+  useEffect(() => {
+    if (!department) {
+      return;
+    }
+    const getIds = (node: any) => {
+      if (node.parent) {
+        return [node.parent.id, ...getIds(node.parent)];
+      }
+      return [];
+    };
+    const newKeys = getIds(department);
+    setExpandedKeys((keys) => Array.from(new Set([...keys, ...newKeys])));
+  }, [department, setExpandedKeys]);
+
+  return (
+    <div
+      className={css`
+        height: 65vh;
+        overflow: auto;
+        .ant-tree-node-content-wrapper {
+          overflow: hidden;
+        }
+      `}
+    >
+      {treeData?.length ? (
+        <Tree.DirectoryTree
+          loadData={loadData}
+          treeData={treeData}
+          loadedKeys={loadedKeys}
+          onSelect={handleSelect}
+          selectedKeys={[department?.id]}
+          onExpand={handleExpand}
+          onLoad={handleLoad}
+          expandedKeys={expandedKeys}
+          expandAction={false}
+          showIcon={false}
+          fieldNames={{
+            key: 'id',
+          }}
+        />
+      ) : (
+        <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+      )}
+    </div>
+  );
+};
+
+DepartmentTree.Item = function DepartmentTreeItem({ node, setVisible, setDrawer }: DepartmentTreeProps) {
+  const { t } = useDepartmentTranslation();
+  const { refreshAsync } = useResourceActionContext();
+  const { setLoadedKeys, expandedKeys, setExpandedKeys } = useContext(DepartmentTreeContext);
+  const { modal, message } = App.useApp();
+  const api = useAPIClient();
+  const deleteDepartment = () => {
+    modal.confirm({
+      title: t('Delete'),
+      content: t('Are you sure you want to delete it?'),
+      onOk: async () => {
+        await api.resource('departments').destroy({ filterByTk: node.id });
+        message.success(t('Deleted successfully'));
+        setExpandedKeys((keys) => keys.filter((k) => k !== node.id));
+        const expanded = [...expandedKeys];
+        setLoadedKeys([]);
+        setExpandedKeys([]);
+        await refreshAsync();
+        setExpandedKeys(expanded);
+      },
+    });
+  };
+  const openDrawer = (schema: any) => {
+    setDrawer({ schema, node });
+    setVisible(true);
+  };
+  const handleClick = ({ key, domEvent }) => {
+    domEvent.stopPropagation();
+    switch (key) {
+      case 'new-sub':
+        openDrawer(newSubDepartmentSchema);
+        break;
+      case 'edit':
+        openDrawer(editDepartmentSchema);
+        break;
+      case 'delete':
+        deleteDepartment();
+    }
+  };
+  return (
+    <div style={{ display: 'flex', justifyContent: 'space-between', overflow: 'hidden' }}>
+      <div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{node.title}</div>
+      <Dropdown
+        menu={{
+          items: [
+            {
+              label: t('New sub department'),
+              key: 'new-sub',
+            },
+            {
+              label: t('Edit department'),
+              key: 'edit',
+            },
+            {
+              label: t('Delete department'),
+              key: 'delete',
+            },
+          ],
+          onClick: handleClick,
+        }}
+      >
+        <div style={{ marginLeft: '15px' }}>
+          <MoreOutlined />
+        </div>
+      </Dropdown>
+    </div>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTreeSelect.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTreeSelect.tsx
new file mode 100644
index 0000000000..b66b511548
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTreeSelect.tsx
@@ -0,0 +1,136 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useCallback, useContext, useEffect } from 'react';
+import { TreeSelect } from 'antd';
+import { useField } from '@formily/react';
+import { Field } from '@formily/core';
+import { useRecord } from '@nocobase/client';
+import { ResourcesContext } from '../ResourcesProvider';
+import { useDepartmentManager } from '../hooks/departments-manager';
+
+export const DepartmentTreeSelect: React.FC<{
+  originData: any;
+  treeData: any[];
+  [key: string]: any;
+}> = (props) => {
+  const field = useField<Field>();
+  const [value, setValue] = React.useState({ label: null, value: null });
+  const { treeData, initData, getByKeyword, loadData, loadedKeys, setLoadedKeys, originData } = props;
+
+  const handleSearch = async (keyword: string) => {
+    if (!keyword) {
+      initData(originData);
+      return;
+    }
+    await getByKeyword(keyword);
+  };
+
+  const getTitle = useCallback((record: any) => {
+    const title = record.title;
+    const parent = record.parent;
+    if (parent) {
+      return getTitle(parent) + ' / ' + title;
+    }
+    return title;
+  }, []);
+
+  useEffect(() => {
+    initData(originData);
+  }, [originData, initData]);
+
+  useEffect(() => {
+    if (!field.value) {
+      setValue({ label: null, value: null });
+      return;
+    }
+    setValue({
+      label: getTitle(field.value) || field.value.label,
+      value: field.value.id,
+    });
+  }, [field.value, getTitle]);
+
+  return (
+    <TreeSelect
+      value={value}
+      onSelect={(_: any, node: any) => {
+        field.setValue(node);
+      }}
+      onChange={(value: any) => {
+        if (!value) {
+          field.setValue(null);
+        }
+      }}
+      treeData={treeData}
+      treeLoadedKeys={loadedKeys}
+      onTreeLoad={(keys: any[]) => setLoadedKeys(keys)}
+      loadData={(node: any) => loadData({ key: node.id, children: node.children })}
+      fieldNames={{
+        value: 'id',
+      }}
+      showSearch
+      allowClear
+      treeNodeFilterProp="title"
+      onSearch={handleSearch}
+      labelInValue={true}
+    />
+  );
+};
+
+export const DepartmentSelect: React.FC = () => {
+  const departmentManager = useDepartmentManager();
+  const { departmentsResource } = useContext(ResourcesContext);
+  const {
+    service: { data },
+  } = departmentsResource || {};
+  return <DepartmentTreeSelect {...departmentManager} originData={data?.data} />;
+};
+
+export const SuperiorDepartmentSelect: React.FC = () => {
+  const departmentManager = useDepartmentManager();
+  const { setTreeData, getChildrenIds } = departmentManager;
+  const record = useRecord() as any;
+  const { departmentsResource } = useContext(ResourcesContext);
+  const {
+    service: { data },
+  } = departmentsResource || {};
+
+  useEffect(() => {
+    if (!record.id) {
+      return;
+    }
+    const childrenIds = getChildrenIds(record.id);
+    childrenIds.push(record.id);
+    setTreeData((treeData) => {
+      const setDisabled = (treeData: any[]) => {
+        return treeData.map((node) => {
+          if (childrenIds.includes(node.id)) {
+            node.disabled = true;
+          }
+          if (node.children) {
+            node.children = setDisabled(node.children);
+          }
+          return node;
+        });
+      };
+      return setDisabled(treeData);
+    });
+  }, [setTreeData, record.id, getChildrenIds]);
+
+  return <DepartmentTreeSelect {...departmentManager} originData={data?.data} />;
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/IsOwnerField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/IsOwnerField.tsx
new file mode 100644
index 0000000000..e685d2d89a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/IsOwnerField.tsx
@@ -0,0 +1,30 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext } from 'react';
+import { useDepartmentTranslation } from '../locale';
+import { Checkbox, useRecord } from '@nocobase/client';
+import { ResourcesContext } from '../ResourcesProvider';
+
+export const IsOwnerField: React.FC = () => {
+  const { department } = useContext(ResourcesContext);
+  const record = useRecord() as any;
+  const dept = (record.departments || []).find((dept: any) => dept?.id === department?.id);
+
+  return <Checkbox.ReadPretty value={dept?.departmentsUsers.isOwner} />;
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/Member.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/Member.tsx
new file mode 100644
index 0000000000..a23aa2bde8
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/Member.tsx
@@ -0,0 +1,235 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext, useRef, useEffect, useMemo } from 'react';
+import { useDepartmentTranslation } from '../locale';
+import {
+  CollectionContext,
+  ResourceActionProvider,
+  SchemaComponent,
+  useAPIClient,
+  useActionContext,
+  useFilterFieldOptions,
+  useFilterFieldProps,
+  useRecord,
+  useResourceActionContext,
+  useTableBlockContext,
+} from '@nocobase/client';
+import { membersActionSchema, addMembersSchema, rowRemoveActionSchema, getMembersSchema } from './schemas/users';
+import { App } from 'antd';
+import { DepartmentField } from './DepartmentField';
+import { IsOwnerField } from './IsOwnerField';
+import { UserDepartmentsField } from './UserDepartmentsField';
+import { ResourcesContext } from '../ResourcesProvider';
+import { useTableBlockProps } from '../hooks/useTableBlockProps';
+
+const AddMembersListProvider: React.FC = (props) => {
+  const { department } = useContext(ResourcesContext);
+  return (
+    <ResourceActionProvider
+      {...{
+        collection: 'users',
+        request: {
+          resource: 'users',
+          action: 'listExcludeDept',
+          params: {
+            departmentId: department?.id,
+          },
+        },
+      }}
+    >
+      {props.children}
+    </ResourceActionProvider>
+  );
+};
+
+const useAddMembersFilterActionProps = () => {
+  const collection = useContext(CollectionContext);
+  const options = useFilterFieldOptions(collection.fields);
+  const service = useResourceActionContext();
+  return useFilterFieldProps({
+    options,
+    params: service.state?.params?.[0] || service.params,
+    service,
+  });
+};
+
+export const AddMembers: React.FC = () => {
+  const { department } = useContext(ResourcesContext);
+  // This resource is the list of members of the current department.
+  const {
+    service: { refresh },
+  } = useTableBlockContext();
+  const selectedKeys = useRef([]);
+  const api = useAPIClient();
+
+  const useAddMembersActionProps = () => {
+    const { department } = useContext(ResourcesContext);
+    const { setVisible } = useActionContext();
+    return {
+      async onClick() {
+        const selected = selectedKeys.current;
+        if (!selected?.length) {
+          return;
+        }
+        await api.resource('departments.members', department.id).add({
+          values: selected,
+        });
+        selectedKeys.current = [];
+        refresh();
+        setVisible?.(false);
+      },
+    };
+  };
+
+  const handleSelect = (keys: any[]) => {
+    selectedKeys.current = keys;
+  };
+
+  return (
+    <SchemaComponent
+      scope={{
+        useAddMembersActionProps,
+        department,
+        handleSelect,
+        useAddMembersFilterActionProps,
+      }}
+      components={{ AddMembersListProvider }}
+      schema={addMembersSchema}
+    />
+  );
+};
+
+const useBulkRemoveMembersAction = () => {
+  const { t } = useDepartmentTranslation();
+  const { message } = App.useApp();
+  const api = useAPIClient();
+  const {
+    service: { refresh },
+    field,
+  } = useTableBlockContext();
+  const { department } = useContext(ResourcesContext);
+  return {
+    async run() {
+      const selected = field?.data?.selectedRowKeys;
+      if (!selected?.length) {
+        message.warning(t('Please select members'));
+        return;
+      }
+      await api.resource('departments.members', department.id).remove({
+        values: selected,
+      });
+      field.data.selectedRowKeys = [];
+      refresh();
+    },
+  };
+};
+
+const useRemoveMemberAction = () => {
+  const api = useAPIClient();
+  const { department } = useContext(ResourcesContext);
+  const { id } = useRecord() as any;
+  const {
+    service: { refresh },
+  } = useTableBlockContext();
+  return {
+    async run() {
+      await api.resource('departments.members', department.id).remove({
+        values: [id],
+      });
+      refresh();
+    },
+  };
+};
+
+const useShowTotal = () => {
+  const {
+    service: { data },
+  } = useTableBlockContext();
+  const { t } = useDepartmentTranslation();
+  return t('Total {{count}} members', { count: data?.meta?.count });
+};
+
+const useRefreshActionProps = () => {
+  const { service } = useTableBlockContext();
+  return {
+    async onClick() {
+      service?.refresh?.();
+    },
+  };
+};
+
+const RowRemoveAction = () => {
+  const { department } = useContext(ResourcesContext);
+  return department ? <SchemaComponent scope={{ useRemoveMemberAction }} schema={rowRemoveActionSchema} /> : null;
+};
+
+const MemberActions = () => {
+  const { department } = useContext(ResourcesContext);
+  return department ? <SchemaComponent schema={membersActionSchema} /> : null;
+};
+
+const useMemberFilterActionProps = () => {
+  const collection = useContext(CollectionContext);
+  const options = useFilterFieldOptions(collection.fields);
+  const { service } = useTableBlockContext();
+  return useFilterFieldProps({
+    options,
+    params: service.state?.params?.[0] || service.params,
+    service,
+  });
+};
+
+export const Member: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  const { department, user } = useContext(ResourcesContext);
+  const {
+    service: { data, setState },
+  } = useTableBlockContext();
+
+  useEffect(() => {
+    setState?.({ selectedRowKeys: [] });
+  }, [data, setState]);
+
+  const schema = useMemo(() => getMembersSchema(department, user), [department, user]);
+
+  return (
+    <>
+      {!user ? <h2>{t(department?.title || 'All users')}</h2> : <h2>{t('Search results')}</h2>}
+      <SchemaComponent
+        scope={{
+          useBulkRemoveMembersAction,
+          t,
+          useShowTotal,
+          useRefreshActionProps,
+          useMemberFilterActionProps,
+          useTableBlockProps,
+        }}
+        components={{
+          MemberActions,
+          AddMembers,
+          RowRemoveAction,
+          DepartmentField,
+          IsOwnerField,
+          UserDepartmentsField,
+        }}
+        schema={schema}
+      />
+    </>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/NewDepartment.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/NewDepartment.tsx
new file mode 100644
index 0000000000..08f4e78a9f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/NewDepartment.tsx
@@ -0,0 +1,97 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { SchemaComponent } from '@nocobase/client';
+import React from 'react';
+import { useDepartmentTranslation } from '../locale';
+
+export const NewDepartment: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  return (
+    <SchemaComponent
+      scope={{ t }}
+      schema={{
+        type: 'void',
+        properties: {
+          newDepartment: {
+            type: 'void',
+            title: t('New department'),
+            'x-component': 'Action',
+            'x-component-props': {
+              type: 'text',
+              icon: 'PlusOutlined',
+              style: {
+                width: '100%',
+                textAlign: 'left',
+              },
+            },
+            properties: {
+              drawer: {
+                type: 'void',
+                'x-component': 'Action.Drawer',
+                'x-decorator': 'Form',
+                title: t('New department'),
+                properties: {
+                  title: {
+                    'x-component': 'CollectionField',
+                    'x-decorator': 'FormItem',
+                    required: true,
+                  },
+                  parent: {
+                    'x-component': 'CollectionField',
+                    'x-decorator': 'FormItem',
+                    'x-collection-field': 'departments.parent',
+                    'x-component-props': {
+                      component: 'DepartmentSelect',
+                    },
+                  },
+                  roles: {
+                    'x-component': 'CollectionField',
+                    'x-decorator': 'FormItem',
+                    'x-collection-field': 'departments.roles',
+                  },
+                  footer: {
+                    type: 'void',
+                    'x-component': 'Action.Drawer.Footer',
+                    properties: {
+                      cancel: {
+                        title: '{{t("Cancel")}}',
+                        'x-component': 'Action',
+                        'x-component-props': {
+                          useAction: '{{ cm.useCancelAction }}',
+                        },
+                      },
+                      submit: {
+                        title: '{{t("Submit")}}',
+                        'x-component': 'Action',
+                        'x-component-props': {
+                          type: 'primary',
+                          useAction: '{{ useCreateDepartment }}',
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      }}
+    />
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/UserDepartmentsField.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/departments/UserDepartmentsField.tsx
new file mode 100644
index 0000000000..e72869046a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/UserDepartmentsField.tsx
@@ -0,0 +1,273 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  ActionContextProvider,
+  SchemaComponent,
+  useAPIClient,
+  useRecord,
+  useRequest,
+  useResourceActionContext,
+  useTableBlockContext,
+} from '@nocobase/client';
+import React, { useState } from 'react';
+import { Tag, Button, Dropdown, App } from 'antd';
+import { PlusOutlined, MoreOutlined } from '@ant-design/icons';
+import { Field } from '@formily/core';
+import { useField, useForm } from '@formily/react';
+import { userDepartmentsSchema } from './schemas/users';
+import { getDepartmentTitle } from '../utils';
+import { useDepartmentTranslation } from '../locale';
+import { DepartmentTable } from './DepartmentTable';
+
+const useDataSource = (options?: any) => {
+  const defaultRequest = {
+    resource: 'departments',
+    action: 'list',
+    params: {
+      appends: ['parent(recursively=true)'],
+      // filter: {
+      //   parentId: null,
+      // },
+      sort: ['createdAt'],
+    },
+  };
+  const service = useRequest(defaultRequest, options);
+  return {
+    ...service,
+    defaultRequest,
+  };
+};
+
+export const UserDepartmentsField: React.FC = () => {
+  const { modal, message } = App.useApp();
+  const { t } = useDepartmentTranslation();
+  const [visible, setVisible] = useState(false);
+  const user = useRecord() as any;
+  const field = useField<Field>();
+  const {
+    service: { refresh },
+  } = useTableBlockContext();
+
+  const formatData = (data: any[]) => {
+    if (!data?.length) {
+      return [];
+    }
+
+    return data.map((department) => ({
+      ...department,
+      isMain: department.departmentsUsers?.isMain,
+      isOwner: department.departmentsUsers?.isOwner,
+      title: getDepartmentTitle(department),
+    }));
+  };
+
+  const api = useAPIClient();
+  useRequest(
+    () =>
+      api
+        .resource(`users.departments`, user.id)
+        .list({
+          appends: ['parent(recursively=true)'],
+          paginate: false,
+        })
+        .then((res) => {
+          const data = formatData(res?.data?.data);
+          field.setValue(data);
+        }),
+    {
+      ready: user.id,
+    },
+  );
+
+  const useAddDepartments = () => {
+    const api = useAPIClient();
+    const drawerForm = useForm();
+    const { departments } = drawerForm.values || {};
+    return {
+      async run() {
+        await api.resource('users.departments', user.id).add({
+          values: departments.map((dept: any) => dept.id),
+        });
+        drawerForm.reset();
+        field.setValue([
+          ...field.value,
+          ...departments.map((dept: any, index: number) => ({
+            ...dept,
+            isMain: index === 0 && field.value.length === 0,
+            title: getDepartmentTitle(dept),
+          })),
+        ]);
+        setVisible(false);
+        refresh();
+      },
+    };
+  };
+
+  const removeDepartment = (dept: any) => {
+    modal.confirm({
+      title: t('Remove department'),
+      content: t('Are you sure you want to remove it?'),
+      onOk: async () => {
+        await api.resource('users.departments', user.id).remove({ values: [dept.id] });
+        message.success(t('Deleted successfully'));
+        field.setValue(
+          field.value
+            .filter((d: any) => d.id !== dept.id)
+            .map((d: any, index: number) => ({
+              ...d,
+              isMain: (dept.isMain && index === 0) || d.isMain,
+            })),
+        );
+        refresh();
+      },
+    });
+  };
+
+  const setMainDepartment = async (dept: any) => {
+    await api.resource('users').setMainDepartment({
+      values: {
+        userId: user.id,
+        departmentId: dept.id,
+      },
+    });
+    message.success(t('Set successfully'));
+    field.setValue(
+      field.value.map((d: any) => ({
+        ...d,
+        isMain: d.id === dept.id,
+      })),
+    );
+    refresh();
+  };
+
+  const setOwner = async (dept: any) => {
+    await api.resource('departments').setOwner({
+      values: {
+        userId: user.id,
+        departmentId: dept.id,
+      },
+    });
+    message.success(t('Set successfully'));
+    field.setValue(
+      field.value.map((d: any) => ({
+        ...d,
+        isOwner: d.id === dept.id ? true : d.isOwner,
+      })),
+    );
+    refresh();
+  };
+
+  const removeOwner = async (dept: any) => {
+    await api.resource('departments').removeOwner({
+      values: {
+        userId: user.id,
+        departmentId: dept.id,
+      },
+    });
+    message.success(t('Set successfully'));
+    field.setValue(
+      field.value.map((d: any) => ({
+        ...d,
+        isOwner: d.id === dept.id ? false : d.isOwner,
+      })),
+    );
+    refresh();
+  };
+
+  const handleClick = (key: string, dept: any) => {
+    switch (key) {
+      case 'setMain':
+        setMainDepartment(dept);
+        break;
+      case 'setOwner':
+        setOwner(dept);
+        break;
+      case 'removeOwner':
+        removeOwner(dept);
+        break;
+      case 'remove':
+        removeDepartment(dept);
+    }
+  };
+
+  const useDisabled = () => ({
+    disabled: (record: any) => {
+      return field.value.some((dept: any) => dept.id === record.id);
+    },
+  });
+
+  return (
+    <ActionContextProvider value={{ visible, setVisible }}>
+      <>
+        {(field?.value || []).map((dept) => (
+          <Tag style={{ padding: '5px 8px', background: 'transparent', marginBottom: '5px' }} key={dept.id}>
+            <span style={{ marginRight: '5px' }}>{dept.title}</span>
+            {dept.isMain ? (
+              <Tag color="processing" bordered={false}>
+                {t('Main')}
+              </Tag>
+            ) : (
+              ''
+            )}
+            {/* {dept.isOwner ? ( */}
+            {/*   <Tag color="gold" bordered={false}> */}
+            {/*     {t('Owner')} */}
+            {/*   </Tag> */}
+            {/* ) : ( */}
+            {/*   '' */}
+            {/* )} */}
+            <Dropdown
+              menu={{
+                items: [
+                  ...(dept.isMain
+                    ? []
+                    : [
+                        {
+                          label: t('Set as main department'),
+                          key: 'setMain',
+                        },
+                      ]),
+                  // {
+                  //   label: dept.isOwner ? t('Remove owner role') : t('Set as owner'),
+                  //   key: dept.isOwner ? 'removeOwner' : 'setOwner',
+                  // },
+                  {
+                    label: t('Remove'),
+                    key: 'remove',
+                  },
+                ],
+                onClick: ({ key }) => handleClick(key, dept),
+              }}
+            >
+              <div style={{ float: 'right' }}>
+                <MoreOutlined />
+              </div>
+            </Dropdown>
+          </Tag>
+        ))}
+        <Button icon={<PlusOutlined />} onClick={() => setVisible(true)} />
+      </>
+      <SchemaComponent
+        schema={userDepartmentsSchema}
+        components={{ DepartmentTable }}
+        scope={{ user, useDataSource, useAddDepartments, useDisabled }}
+      />
+    </ActionContextProvider>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/departments.ts
new file mode 100644
index 0000000000..32272647c7
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/departments.ts
@@ -0,0 +1,291 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { useEffect } from 'react';
+import { uid } from '@formily/shared';
+import { useAPIClient, useActionContext, useRecord, useRequest } from '@nocobase/client';
+
+export const newSubDepartmentSchema = {
+  type: 'object',
+  properties: {
+    [uid()]: {
+      type: 'void',
+      'x-component': 'Action.Drawer',
+      'x-decorator': 'Form',
+      'x-decorator-props': {
+        useValues(options: any) {
+          const ctx = useActionContext();
+          const record = useRecord();
+          return useRequest(() => Promise.resolve({ data: { parent: { ...record } } }), {
+            ...options,
+            refreshDeps: [ctx.visible],
+          });
+        },
+      },
+      title: '{{t("New sub department")}}',
+      properties: {
+        title: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+        },
+        parent: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+          'x-collection-field': 'departments.parent',
+          'x-component-props': {
+            component: 'DepartmentSelect',
+          },
+        },
+        roles: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+          'x-collection-field': 'departments.roles',
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            submit: {
+              title: '{{t("Submit")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useCreateDepartment }}',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export const editDepartmentSchema = {
+  type: 'object',
+  properties: {
+    [uid()]: {
+      type: 'void',
+      'x-component': 'Action.Drawer',
+      'x-decorator': 'Form',
+      'x-decorator-props': {
+        useValues(options: any) {
+          const api = useAPIClient();
+          const ctx = useActionContext();
+          const record = useRecord();
+          const result = useRequest(
+            () =>
+              api
+                .resource('departments')
+                .get({
+                  filterByTk: record['id'],
+                  appends: ['parent(recursively=true)', 'roles', 'owners'],
+                })
+                .then((res: any) => res?.data),
+            { ...options, manual: true },
+          );
+          useEffect(() => {
+            if (ctx.visible) {
+              result.run();
+            }
+          }, [ctx.visible]);
+          return result;
+        },
+      },
+      title: '{{t("Edit department")}}',
+      properties: {
+        title: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+        },
+        parent: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+          'x-collection-field': 'departments.parent',
+          'x-component-props': {
+            component: 'SuperiorDepartmentSelect',
+          },
+        },
+        roles: {
+          'x-component': 'CollectionField',
+          'x-decorator': 'FormItem',
+          'x-collection-field': 'departments.roles',
+        },
+        owners: {
+          title: '{{t("Owners")}}',
+          'x-component': 'DepartmentOwnersField',
+          'x-decorator': 'FormItem',
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            submit: {
+              title: '{{t("Submit")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useUpdateDepartment }}',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export const departmentOwnersSchema = {
+  type: 'void',
+  properties: {
+    drawer: {
+      title: '{{t("Select Owners")}}',
+      'x-component': 'Action.Drawer',
+      properties: {
+        resource: {
+          type: 'void',
+          'x-decorator': 'FormItem',
+          'x-component': 'RequestProvider',
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'ActionBar',
+              'x-component-props': {
+                style: {
+                  marginBottom: 16,
+                },
+              },
+              properties: {
+                filter: {
+                  type: 'void',
+                  title: '{{ t("Filter") }}',
+                  default: {
+                    $and: [{ username: { $includes: '' } }, { nickname: { $includes: '' } }],
+                  },
+                  'x-action': 'filter',
+                  'x-component': 'Filter.Action',
+                  'x-use-component-props': 'useFilterActionProps',
+                  'x-component-props': {
+                    icon: 'FilterOutlined',
+                  },
+                  'x-align': 'left',
+                },
+              },
+            },
+            table: {
+              type: 'void',
+              'x-component': 'Table.Void',
+              'x-component-props': {
+                rowKey: 'id',
+                rowSelection: {
+                  type: 'checkbox',
+                  onChange: '{{ handleSelect }}',
+                },
+                useDataSource: '{{ cm.useDataSourceFromRAC }}',
+              },
+              properties: {
+                username: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    username: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                nickname: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    nickname: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                phone: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    phone: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                email: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    email: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            confirm: {
+              title: '{{t("Confirm")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useSelectOwners }}',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/users.ts b/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/users.ts
new file mode 100644
index 0000000000..66c2115d0e
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/departments/schemas/users.ts
@@ -0,0 +1,464 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { uid } from '@formily/shared';
+
+export const membersActionSchema = {
+  type: 'void',
+  'x-component': 'Space',
+  properties: {
+    remove: {
+      type: 'void',
+      title: '{{t("Remove")}}',
+      'x-component': 'Action',
+      'x-component-props': {
+        icon: 'UserDeleteOutlined',
+        confirm: {
+          title: "{{t('Remove members')}}",
+          content: "{{t('Are you sure you want to remove these members?')}}",
+        },
+        style: {
+          marginRight: 8,
+        },
+        useAction: '{{ useBulkRemoveMembersAction }}',
+      },
+    },
+    create: {
+      type: 'void',
+      title: '{{t("Add members")}}',
+      'x-component': 'Action',
+      'x-component-props': {
+        type: 'primary',
+        icon: 'UserAddOutlined',
+      },
+      properties: {
+        drawer: {
+          type: 'void',
+          'x-component': 'AddMembers',
+        },
+      },
+    },
+  },
+};
+
+export const rowRemoveActionSchema = {
+  type: 'void',
+  properties: {
+    remove: {
+      title: '{{ t("Remove") }}',
+      'x-component': 'Action.Link',
+      'x-component-props': {
+        confirm: {
+          title: "{{t('Remove member')}}",
+          content: "{{t('Are you sure you want to remove it?')}}",
+        },
+        useAction: '{{ useRemoveMemberAction }}',
+      },
+    },
+  },
+};
+
+export const getMembersSchema = (department: any, user: any) => ({
+  type: 'void',
+  'x-component': 'CardItem',
+  'x-component-props': {
+    heightMode: 'fullHeight',
+  },
+  properties: {
+    ...(!user
+      ? {
+          actions: {
+            type: 'void',
+            'x-component': 'ActionBar',
+            'x-component-props': {
+              style: {
+                marginBottom: 16,
+              },
+            },
+            properties: {
+              [uid()]: {
+                type: 'void',
+                title: '{{ t("Filter") }}',
+                'x-action': 'filter',
+                'x-component': 'Filter.Action',
+                'x-use-component-props': 'useMemberFilterActionProps',
+                'x-component-props': {
+                  icon: 'FilterOutlined',
+                },
+                'x-align': 'left',
+              },
+              refresh: {
+                type: 'void',
+                title: '{{ t("Refresh") }}',
+                'x-action': 'refresh',
+                'x-component': 'Action',
+                'x-use-component-props': 'useRefreshActionProps',
+                'x-component-props': {
+                  icon: 'ReloadOutlined',
+                },
+              },
+              actions: {
+                type: 'void',
+                'x-component': 'MemberActions',
+              },
+            },
+          },
+        }
+      : {}),
+    table: {
+      type: 'array',
+      'x-component': 'TableV2',
+      'x-use-component-props': 'useTableBlockProps',
+      'x-component-props': {
+        rowKey: 'id',
+        rowSelection: {
+          type: 'checkbox',
+        },
+        pagination: {
+          showTotal: '{{ useShowTotal }}',
+        },
+      },
+      properties: {
+        nickname: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            nickname: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        username: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            username: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        departments: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            departments: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        ...(department
+          ? {
+              isOwner: {
+                type: 'void',
+                'x-decorator': 'Table.Column.Decorator',
+                'x-component': 'Table.Column',
+                'x-component-props': {
+                  style: {
+                    minWidth: 100,
+                  },
+                },
+                title: '{{t("Owner")}}',
+                properties: {
+                  isOwner: {
+                    type: 'boolean',
+                    'x-component': 'IsOwnerField',
+                  },
+                },
+              },
+            }
+          : {}),
+        phone: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            phone: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        email: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            email: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true,
+            },
+          },
+        },
+        actions: {
+          type: 'void',
+          title: '{{t("Actions")}}',
+          'x-component': 'Table.Column',
+          'x-component-props': {
+            fixed: 'right',
+          },
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'Space',
+              'x-component-props': {
+                split: '|',
+              },
+              properties: {
+                update: {
+                  type: 'void',
+                  title: '{{t("Configure")}}',
+                  'x-component': 'Action.Link',
+                  'x-component-props': {
+                    type: 'primary',
+                  },
+                  properties: {
+                    drawer: {
+                      type: 'void',
+                      'x-component': 'Action.Drawer',
+                      'x-decorator': 'FormV2',
+                      title: '{{t("Configure")}}',
+                      properties: {
+                        departments: {
+                          title: '{{t("Departments")}}',
+                          'x-decorator': 'FormItem',
+                          'x-component': 'UserDepartmentsField',
+                        },
+                        // footer: {
+                        //   type: 'void',
+                        //   'x-component': 'Action.Drawer.Footer',
+                        //   properties: {
+                        //     cancel: {
+                        //       title: '{{t("Cancel")}}',
+                        //       'x-component': 'Action',
+                        //       'x-component-props': {
+                        //         useAction: '{{ cm.useCancelAction }}',
+                        //       },
+                        //     },
+                        //     submit: {
+                        //       title: '{{t("Submit")}}',
+                        //       'x-component': 'Action',
+                        //       'x-component-props': {
+                        //         type: 'primary',
+                        //         // useAction: '{{ useSetDepartments }}',
+                        //       },
+                        //     },
+                        //   },
+                        // },
+                      },
+                    },
+                  },
+                },
+                ...(department
+                  ? {
+                      remove: {
+                        type: 'void',
+                        'x-component': 'RowRemoveAction',
+                      },
+                    }
+                  : {}),
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+});
+
+export const addMembersSchema = {
+  type: 'object',
+  properties: {
+    drawer: {
+      type: 'void',
+      'x-component': 'Action.Drawer',
+      'x-decorator': 'Form',
+      title: '{{t("Add members")}}',
+      properties: {
+        resource: {
+          type: 'void',
+          'x-decorator': 'FormItem',
+          'x-component': 'AddMembersListProvider',
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'ActionBar',
+              'x-component-props': {
+                style: {
+                  marginBottom: 16,
+                },
+              },
+              properties: {
+                filter: {
+                  type: 'void',
+                  title: '{{ t("Filter") }}',
+                  default: {
+                    $and: [{ username: { $includes: '' } }, { nickname: { $includes: '' } }],
+                  },
+                  'x-action': 'filter',
+                  'x-component': 'Filter.Action',
+                  'x-use-component-props': 'useAddMembersFilterActionProps',
+                  'x-component-props': {
+                    icon: 'FilterOutlined',
+                  },
+                  'x-align': 'left',
+                },
+              },
+            },
+            table: {
+              type: 'void',
+              'x-component': 'Table.Void',
+              'x-component-props': {
+                rowKey: 'id',
+                rowSelection: {
+                  type: 'checkbox',
+                  onChange: '{{ handleSelect }}',
+                },
+                useDataSource: '{{ cm.useDataSourceFromRAC }}',
+              },
+              properties: {
+                username: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    username: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                nickname: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    nickname: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                phone: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    phone: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+                email: {
+                  type: 'void',
+                  'x-decorator': 'Table.Column.Decorator',
+                  'x-component': 'Table.Column',
+                  properties: {
+                    email: {
+                      type: 'string',
+                      'x-component': 'CollectionField',
+                      'x-read-pretty': true,
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            submit: {
+              title: '{{t("Submit")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+              },
+              'x-use-component-props': 'useAddMembersActionProps',
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export const userDepartmentsSchema = {
+  type: 'void',
+  properties: {
+    drawer: {
+      title: '{{t("Select Departments")}}',
+      'x-decorator': 'Form',
+      'x-component': 'Action.Drawer',
+      properties: {
+        table: {
+          type: 'void',
+          'x-decorator': 'FormItem',
+          'x-component': 'DepartmentTable',
+          'x-component-props': {
+            useDataSource: '{{ useDataSource }}',
+            useDisabled: '{{ useDisabled }}',
+          },
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Drawer.Footer',
+          properties: {
+            cancel: {
+              title: '{{t("Cancel")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ cm.useCancelAction }}',
+              },
+            },
+            confirm: {
+              title: '{{t("Submit")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useAddDepartments }}',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/hooks/departments-manager.ts b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/departments-manager.ts
new file mode 100644
index 0000000000..57d99ee9aa
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/departments-manager.ts
@@ -0,0 +1,75 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { useAPIClient } from '@nocobase/client';
+import { TreeManagerOptions, useTreeManager } from './tree-manager';
+import deepmerge from 'deepmerge';
+
+type DepartmentManagerOptions = {
+  resource?: string;
+  resourceOf?: string;
+  params?: any;
+} & TreeManagerOptions;
+
+export const useDepartmentManager = (options?: DepartmentManagerOptions) => {
+  const { resource = 'departments', resourceOf, params = {} } = options || {};
+  const api = useAPIClient();
+  const resourceAPI = api.resource(resource, resourceOf);
+  const treeManager = useTreeManager(options);
+  const { setTreeData, updateTreeData, setLoadedKeys, initData } = treeManager;
+  const loadData = async ({ key, children }) => {
+    if (children?.length) {
+      return;
+    }
+    const { data } = await resourceAPI.list(
+      deepmerge(params, {
+        paginate: false,
+        appends: ['parent(recursively=true)'],
+        filter: {
+          parentId: key,
+        },
+      }),
+    );
+    if (!data?.data?.length) {
+      return;
+    }
+    setTreeData(updateTreeData(key, data?.data));
+  };
+
+  const getByKeyword = async (keyword: string) => {
+    const { data } = await resourceAPI.list(
+      deepmerge(params, {
+        paginate: false,
+        filter: {
+          title: {
+            $includes: keyword,
+          },
+        },
+        appends: ['parent(recursively=true)'],
+        pageSize: 100,
+      }),
+    );
+    initData(data?.data);
+  };
+
+  return {
+    ...treeManager,
+    loadData,
+    getByKeyword,
+  };
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/hooks/index.ts b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/index.ts
new file mode 100644
index 0000000000..72af4ce551
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/index.ts
@@ -0,0 +1,68 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import {
+  CollectionContext,
+  useActionContext,
+  useFilterFieldOptions,
+  useFilterFieldProps,
+  useResourceActionContext,
+  useResourceContext,
+} from '@nocobase/client';
+import { useContext } from 'react';
+import { useForm, useField } from '@formily/react';
+
+export const useCreateAction = () => {
+  const form = useForm();
+  const field = useField();
+  const ctx = useActionContext();
+  const { refresh } = useResourceActionContext();
+  const { resource } = useResourceContext();
+  return {
+    async run() {
+      try {
+        await form.submit();
+        field.data = field.data || {};
+        field.data.loading = true;
+        await resource.create({ values: form.values });
+        ctx.setVisible(false);
+        await form.reset();
+        field.data.loading = false;
+        refresh();
+      } catch (error) {
+        if (field.data) {
+          field.data.loading = false;
+        }
+      }
+    },
+  };
+};
+
+export const useFilterActionProps = () => {
+  const collection = useContext(CollectionContext);
+  const options = useFilterFieldOptions(collection.fields);
+  const service = useResourceActionContext();
+  return useFilterFieldProps({
+    options,
+    params: service.state?.params?.[0] || service.params,
+    service,
+  });
+};
+
+export * from './tree-manager';
+export * from './departments-manager';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/hooks/tree-manager.ts b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/tree-manager.ts
new file mode 100644
index 0000000000..d2ef32c348
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/tree-manager.ts
@@ -0,0 +1,142 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useCallback, useState } from 'react';
+
+export type TreeManagerOptions = {
+  label?: React.FC<{ node: any }>;
+};
+
+export const useTreeManager = (options?: TreeManagerOptions) => {
+  const { label } = options || {};
+  const [treeData, setTreeData] = useState([]);
+  const [nodeMap, setNodeMap] = useState({});
+  const [expandedKeys, setExpandedKeys] = useState([]);
+  const [loadedKeys, setLoadedKeys] = useState([]);
+
+  const buildNodeMap = useCallback((data: any[]) => {
+    const mp = {};
+    const setNodeMapFromChild = (node: any) => {
+      let child = node ? { ...node } : null;
+      while (child) {
+        const parentId = child.parentId || 'root';
+        if (mp[parentId]) {
+          mp[parentId].childrenMap[child.id] = child;
+        } else {
+          mp[parentId] = {
+            ...(child.parent || { id: parentId }),
+            childrenMap: {
+              [child.id]: child,
+            },
+          };
+        }
+        child = child.parent;
+      }
+    };
+    const setNodeMapFromParent = (node: any) => {
+      const childrenMap = {};
+      if (node.children && node.children.length) {
+        node.children.forEach((child: any) => {
+          childrenMap[child.id] = child;
+          setNodeMapFromParent(child);
+        });
+      }
+      mp[node.id] = {
+        ...node,
+        childrenMap,
+      };
+    };
+    if (!(data && data.length)) {
+      return mp;
+    }
+    data.forEach((node) => {
+      setNodeMapFromChild(node);
+      setNodeMapFromParent(node);
+    });
+    return mp;
+  }, []);
+
+  const constructTreeData = useCallback((nodeMap: { [parentId: string | number]: any }) => {
+    const getChildren = (id: any) => {
+      if (!nodeMap[id]) {
+        return null;
+      }
+      if (nodeMap[id].isLeaf) {
+        return null;
+      }
+      return Object.values(nodeMap[id]?.childrenMap || {}).map((node: any) => {
+        return {
+          ...node,
+          title: label ? React.createElement(label, { node }) : node.title,
+          children: getChildren(node.id),
+        };
+      });
+    };
+    return getChildren('root');
+  }, []);
+
+  const initData = useCallback(
+    (data: any[]) => {
+      const mp = buildNodeMap(data);
+      setNodeMap(mp);
+      const treeData = constructTreeData(mp) || [];
+      setTreeData(treeData);
+      // setLoadedKeys([]);
+    },
+    [setTreeData, buildNodeMap, constructTreeData],
+  );
+
+  const updateTreeData = (key: any, children: any[]) => {
+    const mp = buildNodeMap(children);
+    const newMap = { ...mp, ...nodeMap };
+    children.forEach((node) => {
+      newMap[key].childrenMap[node.id] = node;
+    });
+    setNodeMap(newMap);
+    return constructTreeData(newMap);
+  };
+
+  const getChildrenIds = useCallback(
+    (id: any) => {
+      if (!nodeMap[id]) {
+        return [];
+      }
+      const ids = [];
+      ids.push(...Object.keys(nodeMap[id].childrenMap).map((id) => Number(id)));
+      Object.keys(nodeMap[id].childrenMap).forEach((id) => {
+        ids.push(...getChildrenIds(id));
+      });
+      return ids;
+    },
+    [nodeMap],
+  );
+
+  return {
+    initData,
+    treeData,
+    setTreeData,
+    nodeMap,
+    updateTreeData,
+    constructTreeData,
+    getChildrenIds,
+    loadedKeys,
+    setLoadedKeys,
+    expandedKeys,
+    setExpandedKeys,
+  };
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/hooks/useTableBlockProps.ts b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/useTableBlockProps.ts
new file mode 100644
index 0000000000..fe5b35eb8a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/hooks/useTableBlockProps.ts
@@ -0,0 +1,175 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { ArrayField } from '@formily/core';
+import { useField, useFieldSchema } from '@formily/react';
+import { isEqual } from 'lodash';
+import { useCallback, useEffect, useRef } from 'react';
+import {
+  useTableBlockContext,
+  findFilterTargets,
+  DataBlock,
+  useFilterBlock,
+  mergeFilter,
+  removeNullCondition,
+} from '@nocobase/client';
+
+export const useTableBlockProps = () => {
+  const field = useField<ArrayField>();
+  const fieldSchema = useFieldSchema();
+  const ctx = useTableBlockContext();
+  const { getDataBlocks } = useFilterBlock();
+  const isLoading = ctx?.service?.loading;
+
+  const ctxRef = useRef(null);
+  ctxRef.current = ctx;
+
+  useEffect(() => {
+    if (!isLoading) {
+      const serviceResponse = ctx?.service?.data;
+      const data = serviceResponse?.data || [];
+      const meta = serviceResponse?.meta || {};
+      const selectedRowKeys = ctx?.field?.data?.selectedRowKeys;
+
+      if (!isEqual(field.value, data)) {
+        field.value = data;
+        field?.setInitialValue(data);
+      }
+      field.data = field.data || {};
+
+      if (!isEqual(field.data.selectedRowKeys, selectedRowKeys)) {
+        field.data.selectedRowKeys = selectedRowKeys;
+      }
+
+      field.componentProps.pagination = field.componentProps.pagination || {};
+      field.componentProps.pagination.pageSize = meta?.pageSize;
+      field.componentProps.pagination.total = meta?.count;
+      field.componentProps.pagination.current = meta?.page;
+    }
+  }, [field, ctx?.service?.data, isLoading, ctx?.field?.data?.selectedRowKeys]);
+
+  return {
+    bordered: ctx.bordered,
+    childrenColumnName: ctx.childrenColumnName,
+    loading: ctx?.service?.loading,
+    showIndex: ctx.showIndex,
+    dragSort: ctx.dragSort && ctx.dragSortBy,
+    rowKey: ctx.rowKey || fieldSchema?.['x-component-props']?.rowKey || 'id',
+    pagination: fieldSchema?.['x-component-props']?.pagination === false ? false : field.componentProps.pagination,
+    onRowSelectionChange: useCallback((selectedRowKeys, selectedRowData) => {
+      ctx.field.data = ctx?.field?.data || {};
+      ctx.field.data.selectedRowKeys = selectedRowKeys;
+      ctx.field.data.selectedRowData = selectedRowData;
+      ctx?.field?.onRowSelect?.(selectedRowKeys);
+    }, []),
+    onRowDragEnd: useCallback(
+      async ({ from, to }) => {
+        await ctx.resource.move({
+          sourceId: from[ctx.rowKey || 'id'],
+          targetId: to[ctx.rowKey || 'id'],
+          sortField: ctx.dragSort && ctx.dragSortBy,
+        });
+        ctx.service.refresh();
+        // ctx.resource
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+      },
+      [ctx.rowKey, ctx.dragSort, ctx.dragSortBy],
+    ),
+    onChange: useCallback(
+      ({ current, pageSize }, filters, sorter) => {
+        const globalSort = fieldSchema.parent?.['x-decorator-props']?.['params']?.['sort'];
+        const sort = sorter.order
+          ? sorter.order === `ascend`
+            ? [sorter.field]
+            : [`-${sorter.field}`]
+          : globalSort || ctxRef.current.dragSortBy;
+        const currentPageSize = pageSize || fieldSchema.parent?.['x-decorator-props']?.['params']?.pageSize;
+        const args = { ...ctxRef.current?.service?.params?.[0], page: current || 1, pageSize: currentPageSize };
+        if (sort) {
+          args['sort'] = sort;
+        }
+        ctxRef.current?.service.run(args);
+      },
+      [fieldSchema.parent],
+    ),
+    onClickRow: useCallback(
+      (record, setSelectedRow, selectedRow) => {
+        const { targets, uid } = findFilterTargets(fieldSchema);
+        const dataBlocks = getDataBlocks();
+
+        // 如果是之前创建的区块是没有 x-filter-targets 属性的，所以这里需要判断一下避免报错
+        if (!targets || !targets.some((target) => dataBlocks.some((dataBlock) => dataBlock.uid === target.uid))) {
+          // 当用户已经点击过某一行，如果此时再把相连接的区块给删除的话，行的高亮状态就会一直保留。
+          // 这里暂时没有什么比较好的方法，只是在用户再次点击的时候，把高亮状态给清除掉。
+          setSelectedRow((prev) => (prev.length ? [] : prev));
+          return;
+        }
+
+        const currentBlock = dataBlocks.find((block) => block.uid === fieldSchema.parent['x-uid']);
+
+        dataBlocks.forEach((block) => {
+          const target = targets.find((target) => target.uid === block.uid);
+          if (!target) return;
+
+          const isForeignKey = block.foreignKeyFields?.some((field) => field.name === target.field);
+          const sourceKey = getSourceKey(currentBlock, target.field);
+          const recordKey = isForeignKey ? sourceKey : ctx.rowKey;
+          const value = [record[recordKey]];
+
+          const param = block.service.params?.[0] || {};
+          // 保留原有的 filter
+          const storedFilter = block.service.params?.[1]?.filters || {};
+
+          if (selectedRow.includes(record[ctx.rowKey])) {
+            if (block.dataLoadingMode === 'manual') {
+              return block.clearData();
+            }
+            delete storedFilter[uid];
+          } else {
+            storedFilter[uid] = {
+              $and: [
+                {
+                  [target.field || ctx.rowKey]: {
+                    [target.field ? '$in' : '$eq']: value,
+                  },
+                },
+              ],
+            };
+          }
+
+          const mergedFilter = mergeFilter([
+            ...Object.values(storedFilter).map((filter) => removeNullCondition(filter)),
+            block.defaultFilter,
+          ]);
+
+          return block.doFilter(
+            {
+              ...param,
+              page: 1,
+              filter: mergedFilter,
+            },
+            { filters: storedFilter },
+          );
+        });
+
+        // 更新表格的选中状态
+        setSelectedRow((prev) => (prev?.includes(record[ctx.rowKey]) ? [] : [record[ctx.rowKey]]));
+      },
+      [ctx.rowKey, fieldSchema, getDataBlocks],
+    ),
+    onExpand: useCallback((expanded, record) => {
+      ctx?.field.onExpandClick?.(expanded, record);
+    }, []),
+  };
+};
+
+function getSourceKey(currentBlock: DataBlock, field: string) {
+  const associationField = currentBlock?.associatedFields?.find((item) => item.foreignKey === field);
+  return associationField?.sourceKey || 'id';
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/index.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/index.tsx
new file mode 100644
index 0000000000..798fddecd6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/index.tsx
@@ -0,0 +1,76 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Plugin, SchemaComponentContext, useSchemaComponentContext } from '@nocobase/client';
+import { tval } from '@nocobase/utils/client';
+import { DepartmentBlock } from './departments/DepartmentBlock';
+import React from 'react';
+import { ResourcesProvider } from './ResourcesProvider';
+import ACLPlugin from '@nocobase/plugin-acl/client';
+import { RoleDepartmentsManager } from './roles/RoleDepartmentsManager';
+import {
+  UserDepartmentsFieldSettings,
+  ReadOnlyAssociationField,
+  UserMainDepartmentFieldSettings,
+  DepartmentOwnersFieldSettings,
+} from './components';
+
+export class PluginDepartmentsClient extends Plugin {
+  async afterAdd() {
+    // await this.app.pm.add()
+  }
+
+  async beforeLoad() {}
+
+  // You can get and modify the app instance here
+  async load() {
+    this.app.addComponents({
+      UserDepartmentsField: ReadOnlyAssociationField,
+      UserMainDepartmentField: ReadOnlyAssociationField,
+      DepartmentOwnersField: ReadOnlyAssociationField,
+    });
+    this.app.schemaSettingsManager.add(UserDepartmentsFieldSettings);
+    this.app.schemaSettingsManager.add(UserMainDepartmentFieldSettings);
+    this.app.schemaSettingsManager.add(DepartmentOwnersFieldSettings);
+
+    this.app.pluginSettingsManager.add('users-permissions.departments', {
+      icon: 'ApartmentOutlined',
+      title: tval('Departments', { ns: 'departments' }),
+      Component: () => {
+        const scCtx = useSchemaComponentContext();
+        return (
+          <SchemaComponentContext.Provider value={{ ...scCtx, designable: false }}>
+            <ResourcesProvider>
+              <DepartmentBlock />
+            </ResourcesProvider>
+          </SchemaComponentContext.Provider>
+        );
+      },
+      sort: 2,
+      aclSnippet: 'pm.departments',
+    });
+
+    const acl = this.app.pm.get(ACLPlugin);
+    acl.rolesManager.add('departments', {
+      title: tval('Departments', { ns: 'departments' }),
+      Component: RoleDepartmentsManager,
+    });
+  }
+}
+
+export default PluginDepartmentsClient;
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/locale.ts b/packages/plugins/@nocobase/plugin-departments/src/client/locale.ts
new file mode 100644
index 0000000000..2899c172d4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/locale.ts
@@ -0,0 +1,23 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { useTranslation } from 'react-i18next';
+
+export function useDepartmentTranslation() {
+  return useTranslation(['departments', 'client'], { nsMode: 'fallback' });
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/roles/RoleDepartmentsManager.tsx b/packages/plugins/@nocobase/plugin-departments/src/client/roles/RoleDepartmentsManager.tsx
new file mode 100644
index 0000000000..30d8badc1d
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/roles/RoleDepartmentsManager.tsx
@@ -0,0 +1,178 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React, { useContext, useEffect, useMemo } from 'react';
+import { App } from 'antd';
+import { useDepartmentTranslation } from '../locale';
+import {
+  CollectionManagerContext,
+  CollectionProvider_deprecated,
+  ResourceActionContext,
+  SchemaComponent,
+  useAPIClient,
+  useActionContext,
+  useRecord,
+  useRequest,
+  useResourceActionContext,
+} from '@nocobase/client';
+import { RolesManagerContext } from '@nocobase/plugin-acl/client';
+import { departmentCollection } from '../collections/departments';
+import { getDepartmentsSchema } from './schemas/departments';
+import { useFilterActionProps } from '../hooks';
+import { DepartmentTable } from '../departments/DepartmentTable';
+import { useForm } from '@formily/react';
+
+const useRemoveDepartment = () => {
+  const api = useAPIClient();
+  const { role } = useContext(RolesManagerContext);
+  const { id } = useRecord();
+  const { refresh } = useResourceActionContext();
+  return {
+    async run() {
+      await api.resource(`roles/${role?.name}/departments`).remove({
+        values: [id],
+      });
+      refresh();
+    },
+  };
+};
+
+const useBulkRemoveDepartments = () => {
+  const { t } = useDepartmentTranslation();
+  const { message } = App.useApp();
+  const api = useAPIClient();
+  const { state, setState, refresh } = useResourceActionContext();
+  const { role } = useContext(RolesManagerContext);
+
+  return {
+    async run() {
+      const selected = state?.selectedRowKeys;
+      if (!selected?.length) {
+        message.warning(t('Please select departments'));
+        return;
+      }
+      await api.resource(`roles/${role?.name}/departments`).remove({
+        values: selected,
+      });
+      setState?.({ selectedRowKeys: [] });
+      refresh();
+    },
+  };
+};
+
+const DepartmentTitle: React.FC = () => {
+  const record = useRecord();
+  const getTitle = (record: any) => {
+    const title = record.title;
+    const parent = record.parent;
+    if (parent) {
+      return getTitle(parent) + ' / ' + title;
+    }
+    return title;
+  };
+
+  return <>{getTitle(record)}</>;
+};
+
+const useDataSource = (options?: any) => {
+  const defaultRequest = {
+    resource: 'departments',
+    action: 'list',
+    params: {
+      // filter: {
+      //   parentId: null,
+      // },
+      appends: ['roles', 'parent(recursively=true)'],
+      sort: ['createdAt'],
+    },
+  };
+  const service = useRequest(defaultRequest, options);
+  return {
+    ...service,
+    defaultRequest,
+  };
+};
+
+const useDisabled = () => {
+  const { role } = useContext(RolesManagerContext);
+  return {
+    disabled: (record: any) => record?.roles?.some((r: { name: string }) => r.name === role?.name),
+  };
+};
+
+const useAddDepartments = () => {
+  const { role } = useContext(RolesManagerContext);
+  const api = useAPIClient();
+  const form = useForm();
+  const { setVisible } = useActionContext();
+  const { refresh } = useResourceActionContext();
+  const { departments } = form.values || {};
+  return {
+    async run() {
+      await api.resource('roles.departments', role.name).add({
+        values: departments.map((dept: any) => dept.id),
+      });
+      form.reset();
+      setVisible(false);
+      refresh();
+    },
+  };
+};
+
+export const RoleDepartmentsManager: React.FC = () => {
+  const { t } = useDepartmentTranslation();
+  const { role } = useContext(RolesManagerContext);
+  const service = useRequest(
+    {
+      resource: `roles/${role?.name}/departments`,
+      action: 'list',
+      params: {
+        appends: ['parent', 'parent.parent(recursively=true)'],
+      },
+    },
+    {
+      ready: !!role,
+    },
+  );
+
+  useEffect(() => {
+    service.run();
+  }, [role]);
+
+  const schema = useMemo(() => getDepartmentsSchema(), [role]);
+
+  return (
+    <ResourceActionContext.Provider value={{ ...service }}>
+      <CollectionProvider_deprecated collection={departmentCollection}>
+        <SchemaComponent
+          schema={schema}
+          components={{ DepartmentTable, DepartmentTitle }}
+          scope={{
+            useFilterActionProps,
+            t,
+            useRemoveDepartment,
+            useBulkRemoveDepartments,
+            useDataSource,
+            useDisabled,
+            useAddDepartments,
+          }}
+        />
+      </CollectionProvider_deprecated>
+    </ResourceActionContext.Provider>
+  );
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/roles/schemas/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/client/roles/schemas/departments.ts
new file mode 100644
index 0000000000..240a37635c
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/roles/schemas/departments.ts
@@ -0,0 +1,171 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { uid } from '@formily/shared';
+
+export const getDepartmentsSchema = () => ({
+  type: 'void',
+  properties: {
+    actions: {
+      type: 'void',
+      'x-component': 'ActionBar',
+      'x-component-props': {
+        style: {
+          marginBottom: 16,
+        },
+      },
+      properties: {
+        [uid()]: {
+          type: 'void',
+          title: '{{ t("Filter") }}',
+          'x-action': 'filter',
+          'x-component': 'Filter.Action',
+          'x-use-component-props': 'useFilterActionProps',
+          'x-component-props': {
+            icon: 'FilterOutlined',
+          },
+          'x-align': 'left',
+        },
+        actions: {
+          type: 'void',
+          'x-component': 'Space',
+          properties: {
+            remove: {
+              type: 'void',
+              title: '{{t("Remove")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                icon: 'MinusOutlined',
+                confirm: {
+                  title: "{{t('Remove')}}",
+                  content: "{{t('Are you sure you want to remove these departments?')}}",
+                },
+                style: {
+                  marginRight: 8,
+                },
+                useAction: '{{ useBulkRemoveDepartments }}',
+              },
+            },
+            create: {
+              type: 'void',
+              title: '{{t("Add departments")}}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                icon: 'PlusOutlined',
+              },
+              properties: {
+                drawer: {
+                  type: 'void',
+                  'x-component': 'Action.Drawer',
+                  'x-decorator': 'FormV2',
+                  title: '{{t("Add departments")}}',
+                  properties: {
+                    table: {
+                      type: 'void',
+                      'x-decorator': 'FormItem',
+                      'x-component': 'DepartmentTable',
+                      'x-component-props': {
+                        useDataSource: '{{ useDataSource }}',
+                        useDisabled: '{{ useDisabled }}',
+                      },
+                    },
+                    footer: {
+                      type: 'void',
+                      'x-component': 'Action.Drawer.Footer',
+                      properties: {
+                        cancel: {
+                          title: '{{t("Cancel")}}',
+                          'x-component': 'Action',
+                          'x-component-props': {
+                            useAction: '{{ cm.useCancelAction }}',
+                          },
+                        },
+                        submit: {
+                          title: '{{t("Submit")}}',
+                          'x-component': 'Action',
+                          'x-component-props': {
+                            type: 'primary',
+                            useAction: '{{ useAddDepartments }}',
+                          },
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+    table: {
+      type: 'void',
+      'x-component': 'Table.Void',
+      'x-component-props': {
+        rowKey: 'id',
+        rowSelection: {
+          type: 'checkbox',
+        },
+        useDataSource: '{{ cm.useDataSourceFromRAC }}',
+      },
+      properties: {
+        title: {
+          type: 'void',
+          title: '{{t("Department name")}}',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            title: {
+              type: 'string',
+              'x-component': 'DepartmentTitle',
+            },
+          },
+        },
+        actions: {
+          type: 'void',
+          title: '{{t("Actions")}}',
+          'x-component': 'Table.Column',
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'Space',
+              'x-component-props': {
+                split: '|',
+              },
+              properties: {
+                remove: {
+                  type: 'void',
+                  title: '{{ t("Remove") }}',
+                  'x-component': 'Action.Link',
+                  'x-component-props': {
+                    confirm: {
+                      title: "{{t('Remove department')}}",
+                      content: "{{t('Are you sure you want to remove it?')}}",
+                    },
+                    useAction: '{{ useRemoveDepartment }}',
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/client/utils.ts b/packages/plugins/@nocobase/plugin-departments/src/client/utils.ts
new file mode 100644
index 0000000000..52f6fb7663
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/client/utils.ts
@@ -0,0 +1,26 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export const getDepartmentTitle = (record: any) => {
+  const title = record.title;
+  const parent = record.parent;
+  if (parent) {
+    return getDepartmentTitle(parent) + ' / ' + title;
+  }
+  return title;
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/index.ts b/packages/plugins/@nocobase/plugin-departments/src/index.ts
new file mode 100644
index 0000000000..7d69462f4f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/index.ts
@@ -0,0 +1,20 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export * from './server';
+export { default } from './server';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-departments/src/locale/en-US.json
new file mode 100644
index 0000000000..f872121a10
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/locale/en-US.json
@@ -0,0 +1,35 @@
+{
+  "Department": "Department",
+  "All users": "All users",
+  "New department": "New department",
+  "Add department": "Add department",
+  "Add departments": "Add departments",
+  "New sub department": "New sub department",
+  "Edit department": "Edit department",
+  "Delete department": "Delete department",
+  "Departments": "Departments",
+  "Main department": "Main department",
+  "Owner": "Owner",
+  "Department name": "Department name",
+  "Superior department": "Superior department",
+  "Owners": "Owners",
+  "Add members": "Add members",
+  "Search for departments, users": "Search for departments, users",
+  "Search results": "Search results",
+  "Departments management": "Departments management",
+  "Roles management": "Roles management",
+  "Remove members": "Remove members",
+  "Remove member": "Remove member",
+  "Remove departments": "Remove departments",
+  "Remove department": "Remove department",
+  "Are you sure you want to remove it?": "Are you sure you want to remove it?",
+  "Are you sure you want to remove these members?": "Are you sure you want to remove these members?",
+  "Are you sure you want to remove these departments?": "Are you sure you want to remove these departments?",
+  "Please select members": "Please select members",
+  "Please select departments": "Please select departments",
+  "The department has sub-departments, please delete them first": "The department has sub-departments, please delete them first",
+  "The department has members, please remove them first": "The department has members, please remove them first",
+  "Main": "Main",
+  "Set as main department": "Set as main department",
+  "This field is currently not supported for use in form blocks.": "This field is currently not supported for use in form blocks."
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-departments/src/locale/zh-CN.json
new file mode 100644
index 0000000000..be5393b399
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/locale/zh-CN.json
@@ -0,0 +1,35 @@
+{
+  "Department": "部门",
+  "All users": "所有用户",
+  "New department": "新建部门",
+  "New sub department": "新建子部门",
+  "Add department": "添加部门",
+  "Add departments": "添加部门",
+  "Edit department": "编辑部门",
+  "Delete department": "删除部门",
+  "Departments": "部门",
+  "Main department": "主属部门",
+  "Owner": "负责人",
+  "Department name": "部门名称",
+  "Superior department": "上级部门",
+  "Owners": "负责人",
+  "Add members": "添加成员",
+  "Search for departments, users": "搜索部门、用户",
+  "Search results": "搜索结果",
+  "Departments management": "部门管理",
+  "Roles management": "角色管理",
+  "Remove members": "移除成员",
+  "Remove member": "移除成员",
+  "Remove departments": "移除部门",
+  "Remove department": "移除部门",
+  "Are you sure you want to remove it?": "你确定要移除吗？",
+  "Are you sure you want to remove these members?": "你确定要移除这些成员吗？",
+  "Are you sure you want to remove these departments?": "你确定要移除这些部门吗？",
+  "Please select members": "请选择成员",
+  "Please select departments": "请选择部门",
+  "The department has sub-departments, please delete them first": "部门下有子部门，请先删除子部门",
+  "The department has members, please remove them first": "部门下有成员，请先移除",
+  "Main": "主属部门",
+  "Set as main department": "设置为主属部门",
+  "This field is currently not supported for use in form blocks.": "该字段目前不支持在表单区块中使用。"
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts
new file mode 100644
index 0000000000..8b4cd926da
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts
@@ -0,0 +1,125 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('actions', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should list users exclude department', async () => {
+    const dept = await repo.create({
+      values: {
+        title: 'Test department',
+        members: [1],
+      },
+    });
+    const res = await agent.resource('users').listExcludeDept({
+      departmentId: dept.id,
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.data.length).toBe(0);
+  });
+
+  it('should list users exclude department with filter', async () => {
+    let res = await agent.resource('users').listExcludeDept({
+      departmentId: 1,
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.data.length).toBe(1);
+
+    res = await agent.resource('users').listExcludeDept({
+      departmentId: 1,
+      filter: {
+        id: 1,
+      },
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.data.length).toBe(1);
+
+    res = await agent.resource('users').listExcludeDept({
+      departmentId: 1,
+      filter: {
+        id: 2,
+      },
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.data.length).toBe(0);
+  });
+
+  it('should set main department', async () => {
+    const depts = await repo.create({
+      values: [
+        {
+          title: 'Dept1',
+          members: [1],
+        },
+        {
+          title: 'Dept2',
+          members: [1],
+        },
+      ],
+    });
+    const deptUsers = db.getRepository('departmentsUsers');
+    await deptUsers.update({
+      filter: {
+        departmentId: depts[0].id,
+        userId: 1,
+      },
+      values: {
+        isMain: true,
+      },
+    });
+    const res = await agent.resource('users').setMainDepartment({
+      values: {
+        userId: 1,
+        departmentId: depts[1].id,
+      },
+    });
+    expect(res.status).toBe(200);
+    const records = await deptUsers.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    const dept1 = records.find((record: any) => record.departmentId === depts[0].id);
+    const dept2 = records.find((record: any) => record.departmentId === depts[1].id);
+    expect(dept1.isMain).toBe(false);
+    expect(dept2.isMain).toBe(true);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts
new file mode 100644
index 0000000000..64e73eb978
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts
@@ -0,0 +1,281 @@
+/**
+ * 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 { UserDataResourceManager } from '@nocobase/plugin-user-data-sync';
+import { MockDatabase, MockServer, createMockServer } from '@nocobase/test';
+import PluginUserDataSyncServer from '@nocobase/plugin-user-data-sync';
+
+describe('department data sync', async () => {
+  let app: MockServer;
+  let db: MockDatabase;
+  let resourceManager: UserDataResourceManager;
+
+  beforeEach(async () => {
+    app = await createMockServer({
+      plugins: ['user-data-sync', 'users', 'departments'],
+    });
+    db = app.db;
+    const plugin = app.pm.get('user-data-sync') as PluginUserDataSyncServer;
+    resourceManager = plugin.resourceManager;
+  });
+
+  afterEach(async () => {
+    await db.clean({ drop: true });
+    await app.destroy();
+  });
+
+  it('should create department', async () => {
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test',
+        },
+        {
+          uid: '2',
+          title: 'sub-test',
+          parentUid: '1',
+        },
+      ],
+    });
+    const department = await db.getRepository('departments').findOne({
+      filter: {
+        title: 'test',
+      },
+      appends: ['children'],
+    });
+    expect(department).toBeTruthy();
+    expect(department.title).toBe('test');
+    expect(department.children).toHaveLength(1);
+    expect(department.children[0].title).toBe('sub-test');
+  });
+
+  it('should update department', async () => {
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test',
+        },
+      ],
+    });
+    const department = await db.getRepository('departments').findOne({
+      filter: {
+        title: 'test',
+      },
+      appends: ['children'],
+    });
+    expect(department).toBeTruthy();
+    expect(department.children).toHaveLength(0);
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test2',
+        },
+        {
+          uid: '2',
+          title: 'sub-test',
+          parentUid: '1',
+        },
+      ],
+    });
+    const department2 = await db.getRepository('departments').findOne({
+      filter: {
+        id: department.id,
+      },
+      appends: ['children'],
+    });
+    expect(department2).toBeTruthy();
+    expect(department2.title).toBe('test2');
+    expect(department2.children).toHaveLength(1);
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '2',
+          title: 'sub-test',
+        },
+      ],
+    });
+    const department3 = await db.getRepository('departments').findOne({
+      filter: {
+        id: department2.children[0].id,
+      },
+      appends: ['parent'],
+    });
+    expect(department3).toBeTruthy();
+    expect(department3.parent).toBeNull();
+  });
+
+  it('should update user department', async () => {
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '12',
+          title: 'test',
+        },
+      ],
+    });
+    const department = await db.getRepository('departments').findOne({
+      filter: {
+        title: 'test',
+      },
+    });
+    expect(department).toBeTruthy();
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'user',
+      records: [
+        {
+          uid: '1',
+          nickname: 'test',
+          email: 'test@nocobase.com',
+          departments: ['12'],
+        },
+      ],
+    });
+    const user = await db.getRepository('users').findOne({
+      filter: {
+        email: 'test@nocobase.com',
+      },
+      appends: ['departments'],
+    });
+    expect(user).toBeTruthy();
+    expect(user.departments).toHaveLength(1);
+    expect(user.departments[0].id).toBe(department.id);
+    const departmentUser = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        departmentId: department.id,
+        userId: user.id,
+      },
+    });
+    expect(departmentUser).toBeTruthy();
+    expect(departmentUser.isOwner).toBe(false);
+    expect(departmentUser.isMain).toBe(false);
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'user',
+      records: [
+        {
+          uid: '1',
+          nickname: 'test',
+          email: 'test@nocobase.com',
+          departments: [
+            {
+              uid: '12',
+              isOwner: true,
+              isMain: true,
+            },
+          ],
+        },
+      ],
+    });
+    const departmentUser2 = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        departmentId: department.id,
+        userId: user.id,
+      },
+    });
+    expect(departmentUser2).toBeTruthy();
+    expect(departmentUser2.isOwner).toBe(true);
+    expect(departmentUser2.isMain).toBe(true);
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'user',
+      records: [
+        {
+          uid: '2',
+          nickname: 'test2',
+          email: 'test2@nocobase.com',
+          departments: [
+            {
+              uid: '12',
+              isOwner: true,
+              isMain: false,
+            },
+          ],
+        },
+      ],
+    });
+    const user2 = await db.getRepository('users').findOne({
+      filter: {
+        email: 'test2@nocobase.com',
+      },
+      appends: ['departments'],
+    });
+    expect(user2).toBeTruthy();
+    expect(user2.departments).toHaveLength(1);
+    expect(user2.departments[0].id).toBe(department.id);
+    const departmentUser3 = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        departmentId: department.id,
+        userId: user2.id,
+      },
+    });
+    expect(departmentUser3).toBeTruthy();
+    expect(departmentUser3.isOwner).toBe(true);
+    expect(departmentUser3.isMain).toBe(false);
+  });
+
+  it('should update department custom field', async () => {
+    const departmemntCollection = db.getCollection('departments');
+    departmemntCollection.addField('customField', { type: 'string' });
+    await db.sync({
+      alter: true,
+    });
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'department',
+      records: [
+        {
+          uid: '1',
+          title: 'test',
+          customField: 'testField',
+        },
+      ],
+    });
+    const department = await db.getRepository('departments').findOne({
+      filter: {
+        title: 'test',
+      },
+    });
+    expect(department).toBeTruthy();
+    expect(department.customField).toBe('testField');
+    await resourceManager.updateOrCreate({
+      sourceName: 'test',
+      dataType: 'user',
+      matchKey: 'email',
+      records: [
+        {
+          uid: '1',
+          nickname: 'test',
+          email: 'test@nocobase.com',
+          customField: 'testField2',
+        },
+      ],
+    });
+    const department2 = await db.getRepository('users').findOne({
+      filter: {
+        id: department.id,
+      },
+    });
+    expect(department2).toBeTruthy();
+    expect(department2.customField).toBe('testField2');
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts
new file mode 100644
index 0000000000..02e85c4f02
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts
@@ -0,0 +1,72 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('destroy department check', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should check if it has sub departments', async () => {
+    const dept = await repo.create({
+      values: {
+        title: 'Department',
+        children: [{ title: 'Sub department' }],
+      },
+    });
+    const res = await agent.resource('departments').destroy({
+      filterByTk: dept.id,
+    });
+    expect(res.status).toBe(400);
+    expect(res.text).toBe('The department has sub-departments, please delete them first');
+  });
+
+  it('should check if it has members', async () => {
+    const dept = await repo.create({
+      values: {
+        title: 'Department',
+        members: [1],
+      },
+    });
+    const res = await agent.resource('departments').destroy({
+      filterByTk: dept.id,
+    });
+    expect(res.status).toBe(400);
+    expect(res.text).toBe('The department has members, please remove them first');
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts
new file mode 100644
index 0000000000..047b024708
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts
@@ -0,0 +1,91 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('set department owners', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should set department owners', async () => {
+    await db.getRepository('users').create({
+      values: {
+        username: 'test',
+      },
+    });
+    const dept = await repo.create({
+      values: {
+        title: 'Department',
+        members: [1, 2],
+      },
+    });
+    await agent.resource('departments').update({
+      filterByTk: dept.id,
+      values: {
+        owners: [{ id: 1 }],
+      },
+    });
+    const deptUser = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        userId: 1,
+        departmentId: dept.id,
+      },
+    });
+    expect(deptUser.isOwner).toBe(true);
+    await agent.resource('departments').update({
+      filterByTk: dept.id,
+      values: {
+        owners: [{ id: 2 }],
+      },
+    });
+    const deptUser1 = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        userId: 1,
+        departmentId: dept.id,
+      },
+    });
+    expect(deptUser1.isOwner).toBe(false);
+    const deptUser2 = await db.getRepository('departmentsUsers').findOne({
+      filter: {
+        userId: 2,
+        departmentId: dept.id,
+      },
+    });
+    expect(deptUser2.isOwner).toBe(true);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts
new file mode 100644
index 0000000000..987d77c938
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts
@@ -0,0 +1,73 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+import { setDepartmentsInfo } from '../middlewares';
+
+describe('set departments info', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+  let ctx: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['users', 'departments', 'acl', 'data-source-manager'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+    ctx = {
+      db,
+      cache: app.cache,
+      state: {},
+    };
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should set departments roles', async () => {
+    ctx.state.currentUser = await db.getRepository('users').findOne({
+      filterByTk: 1,
+    });
+    const role = await db.getRepository('roles').create({
+      values: {
+        name: 'test-role',
+        title: 'Test role',
+      },
+    });
+    await repo.create({
+      values: {
+        title: 'Department',
+        roles: [role.name],
+        members: [1],
+      },
+    });
+    await setDepartmentsInfo(ctx, () => {});
+    expect(ctx.state.attachRoles.length).toBe(1);
+    expect(ctx.state.attachRoles[0].name).toBe('test-role');
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts
new file mode 100644
index 0000000000..c65750f36b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts
@@ -0,0 +1,183 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('set main department', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+    await db.getRepository('departmentsUsers').destroy({ truncate: true });
+  });
+
+  it('should set main department when add department members', async () => {
+    const dept = await repo.create({
+      values: {
+        title: 'Department',
+      },
+    });
+    await db.getRepository('users').create({
+      values: {
+        username: 'test',
+      },
+    });
+    await agent.resource('departments.members', dept.id).add({
+      values: [1, 2],
+    });
+    const throughRepo = db.getRepository('departmentsUsers');
+    const deptUsers = await throughRepo.find({
+      filter: {
+        userId: {
+          $in: [1, 2],
+        },
+        departmentId: dept.id,
+      },
+    });
+    for (const item of deptUsers) {
+      expect(item.isMain).toBe(true);
+    }
+
+    const dept2 = await repo.create({
+      values: {
+        title: 'Department2',
+      },
+    });
+    await agent.resource('departments.members', dept2.id).add({
+      values: [2],
+    });
+    const deptUsers2 = await throughRepo.find({
+      filter: {
+        userId: 2,
+      },
+    });
+    expect(deptUsers2.length).toBe(2);
+    expect(deptUsers2.find((i: any) => i.departmentId === dept.id).isMain).toBe(true);
+    expect(deptUsers2.find((i: any) => i.departmentId === dept2.id).isMain).toBe(false);
+  });
+
+  it('should set main department when remove department members', async () => {
+    const depts = await repo.create({
+      values: [
+        {
+          title: 'Department',
+        },
+        {
+          title: 'Department2',
+        },
+      ],
+    });
+    await agent.resource('departments.members', depts[0].id).add({
+      values: [1],
+    });
+    await agent.resource('departments.members', depts[1].id).add({
+      values: [1],
+    });
+    const throughRepo = db.getRepository('departmentsUsers');
+    const deptUsers = await throughRepo.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    expect(deptUsers.length).toBe(2);
+    expect(deptUsers.find((i: any) => i.departmentId === depts[0].id).isMain).toBe(true);
+    expect(deptUsers.find((i: any) => i.departmentId === depts[1].id).isMain).toBe(false);
+
+    await agent.resource('departments.members', depts[0].id).remove({
+      values: [1],
+    });
+    const deptUsers2 = await throughRepo.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    expect(deptUsers2.length).toBe(1);
+    expect(deptUsers2[0].departmentId).toBe(depts[1].id);
+    expect(deptUsers2[0].isMain).toBe(true);
+  });
+
+  it('should set main department when add user departments', async () => {
+    const depts = await repo.create({
+      values: [
+        {
+          title: 'Department',
+        },
+        {
+          title: 'Department2',
+        },
+      ],
+    });
+    await agent.resource('users.departments', 1).add({
+      values: depts.map((dept: any) => dept.id),
+    });
+    const throughRepo = db.getRepository('departmentsUsers');
+    const deptUsers = await throughRepo.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    expect(deptUsers.length).toBe(2);
+    expect(deptUsers.find((i: any) => i.departmentId === depts[0].id).isMain).toBe(true);
+    expect(deptUsers.find((i: any) => i.departmentId === depts[1].id).isMain).toBe(false);
+  });
+
+  it('should set main department when remove user departments', async () => {
+    const depts = await repo.create({
+      values: [
+        {
+          title: 'Department',
+        },
+        {
+          title: 'Department2',
+        },
+      ],
+    });
+    await agent.resource('users.departments', 1).add({
+      values: depts.map((dept: any) => dept.id),
+    });
+    await agent.resource('users.departments', 1).remove({
+      values: [depts[0].id],
+    });
+    const throughRepo = db.getRepository('departmentsUsers');
+    const deptUsers = await throughRepo.find({
+      filter: {
+        userId: 1,
+      },
+    });
+    expect(deptUsers.length).toBe(1);
+    expect(deptUsers[0].departmentId).toBe(depts[1].id);
+    expect(deptUsers[0].isMain).toBe(true);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts
new file mode 100644
index 0000000000..71c91b39b9
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts
@@ -0,0 +1,102 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Database, Repository } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('update department isLeaf', () => {
+  let app: MockServer;
+  let db: Database;
+  let repo: Repository;
+  let agent: any;
+
+  beforeAll(async () => {
+    app = await createMockServer({
+      plugins: ['users', 'departments'],
+    });
+    db = app.db;
+    repo = db.getRepository('departments');
+    agent = app.agent();
+  });
+
+  afterAll(async () => {
+    await app.destroy();
+  });
+
+  afterEach(async () => {
+    await repo.destroy({ truncate: true });
+  });
+
+  it('should update isLeaf when create sub department', async () => {
+    const res = await agent.resource('departments').create({
+      values: {
+        title: 'Department',
+      },
+    });
+    const dept = res.body.data;
+    expect(dept).toBeTruthy();
+    expect(dept.isLeaf).toBe(true);
+
+    await agent.resource('departments').create({
+      values: {
+        title: 'Sub Department',
+        parent: dept,
+      },
+    });
+    const record = await repo.findOne({
+      filterByTk: dept.id,
+    });
+    expect(record.isLeaf).toBe(false);
+  });
+
+  it('should update isLeaf when update department', async () => {
+    const res = await agent.resource('departments').create({
+      values: {
+        title: 'Department',
+      },
+    });
+    const res2 = await agent.resource('departments').create({
+      values: {
+        title: 'Department2',
+      },
+    });
+    const dept1 = res.body.data;
+    const dept2 = res2.body.data;
+    const res3 = await agent.resource('departments').create({
+      values: {
+        title: 'Sub Department',
+        parent: dept1,
+      },
+    });
+    const subDept = res3.body.data;
+    await agent.resource('departments').update({
+      filterByTk: subDept.id,
+      values: {
+        parent: dept2,
+      },
+    });
+    const record1 = await repo.findOne({
+      filterByTk: dept1.id,
+    });
+    expect(record1.isLeaf).toBe(true);
+    const record2 = await repo.findOne({
+      filterByTk: dept2.id,
+    });
+    expect(record2.isLeaf).toBe(false);
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/actions/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/server/actions/departments.ts
new file mode 100644
index 0000000000..280fd8ab18
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/actions/departments.ts
@@ -0,0 +1,97 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import { DepartmentModel } from '../models/department';
+
+export const getAppendsOwners = async (ctx: Context, next: Next) => {
+  const { filterByTk, appends } = ctx.action.params;
+  const repo = ctx.db.getRepository('departments');
+  const department: DepartmentModel = await repo.findOne({
+    filterByTk,
+    appends,
+  });
+  const owners = await department.getOwners();
+  department.setDataValue('owners', owners);
+  ctx.body = department;
+  await next();
+};
+
+export const aggregateSearch = async (ctx: Context, next: Next) => {
+  const { keyword, type, last = 0, limit = 10 } = ctx.action.params.values || {};
+  let users = [];
+  let departments = [];
+  if (!type || type === 'user') {
+    const repo = ctx.db.getRepository('users');
+    users = await repo.find({
+      filter: {
+        id: { $gt: last },
+        $or: [
+          { username: { $includes: keyword } },
+          { nickname: { $includes: keyword } },
+          { phone: { $includes: keyword } },
+          { email: { $includes: keyword } },
+        ],
+      },
+      limit,
+    });
+  }
+  if (!type || type === 'department') {
+    const repo = ctx.db.getRepository('departments');
+    departments = await repo.find({
+      filter: {
+        id: { $gt: last },
+        title: { $includes: keyword },
+      },
+      appends: ['parent(recursively=true)'],
+      limit,
+    });
+  }
+  ctx.body = { users, departments };
+  await next();
+};
+
+export const setOwner = async (ctx: Context, next: Next) => {
+  const { userId, departmentId } = ctx.action.params.values || {};
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  await throughRepo.update({
+    filter: {
+      userId,
+      departmentId,
+    },
+    values: {
+      isOwner: true,
+    },
+  });
+  await next();
+};
+
+export const removeOwner = async (ctx: Context, next: Next) => {
+  const { userId, departmentId } = ctx.action.params.values || {};
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  await throughRepo.update({
+    filter: {
+      userId,
+      departmentId,
+    },
+    values: {
+      isOwner: false,
+    },
+  });
+  await next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/actions/users.ts b/packages/plugins/@nocobase/plugin-departments/src/server/actions/users.ts
new file mode 100644
index 0000000000..38681fa574
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/actions/users.ts
@@ -0,0 +1,133 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, DEFAULT_PAGE, DEFAULT_PER_PAGE, Next } from '@nocobase/actions';
+
+export const listExcludeDept = async (ctx: Context, next: Next) => {
+  const { departmentId, page = DEFAULT_PAGE, pageSize = DEFAULT_PER_PAGE } = ctx.action.params;
+  const repo = ctx.db.getRepository('users');
+  const members = await repo.find({
+    fields: ['id'],
+    filter: {
+      'departments.id': departmentId,
+    },
+  });
+  const memberIds = members.map((member: { id: number }) => member.id);
+  if (memberIds.length) {
+    ctx.action.mergeParams({
+      filter: {
+        id: {
+          $notIn: memberIds,
+        },
+      },
+    });
+  }
+  const { filter } = ctx.action.params;
+  const [rows, count] = await repo.findAndCount({
+    context: ctx,
+    offset: (page - 1) * pageSize,
+    limit: +pageSize,
+    filter,
+  });
+  ctx.body = {
+    count,
+    rows,
+    page: Number(page),
+    pageSize: Number(pageSize),
+    totalPage: Math.ceil(count / pageSize),
+  };
+  await next();
+};
+
+export const setDepartments = async (ctx: Context, next: Next) => {
+  const { values = {} } = ctx.action.params;
+  const { userId, departments = [] } = values;
+  const repo = ctx.db.getRepository('users');
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  const user = await repo.findOne({ filterByTk: userId });
+  if (!user) {
+    ctx.throw(400, ctx.t('User does not exist'));
+  }
+  const departmentIds = departments.map((department: any) => department.id);
+  const main = departments.find((department: any) => department.isMain);
+  const owners = departments.filter((department: any) => department.isOwner);
+  await ctx.db.sequelize.transaction(async (t) => {
+    await user.setDepartments(departmentIds, {
+      through: {
+        isMain: false,
+        isOwner: false,
+      },
+      transaction: t,
+    });
+    if (main) {
+      await throughRepo.update({
+        filter: {
+          userId,
+          departmentId: main.id,
+        },
+        values: {
+          isMain: true,
+        },
+        transaction: t,
+      });
+    }
+    if (owners.length) {
+      await throughRepo.update({
+        filter: {
+          userId,
+          departmentId: {
+            $in: owners.map((owner: any) => owner.id),
+          },
+        },
+        values: {
+          isOwner: true,
+        },
+        transaction: t,
+      });
+    }
+  });
+  await next();
+};
+
+export const setMainDepartment = async (ctx: Context, next: Next) => {
+  const { userId, departmentId } = ctx.action.params.values || {};
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  await ctx.db.sequelize.transaction(async (t) => {
+    await throughRepo.update({
+      filter: {
+        userId,
+        isMain: true,
+      },
+      values: {
+        isMain: false,
+      },
+      transaction: t,
+    });
+    await throughRepo.update({
+      filter: {
+        userId,
+        departmentId,
+      },
+      values: {
+        isMain: true,
+      },
+      transaction: t,
+    });
+  });
+  await next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/.gitkeep b/packages/plugins/@nocobase/plugin-departments/src/server/collections/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentRoles.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentRoles.ts
new file mode 100644
index 0000000000..b0f44497c2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentRoles.ts
@@ -0,0 +1,25 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { defineCollection } from '@nocobase/database';
+
+export default defineCollection({
+  name: 'departmentsRoles',
+  dumpRules: 'required',
+  migrationRules: ['overwrite'],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/departments.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departments.ts
new file mode 100644
index 0000000000..a5881b35c9
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departments.ts
@@ -0,0 +1,156 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { defineCollection } from '@nocobase/database';
+
+export const ownersField = {
+  interface: 'm2m',
+  type: 'belongsToMany',
+  name: 'owners',
+  collectionName: 'departments',
+  target: 'users',
+  through: 'departmentsUsers',
+  foreignKey: 'departmentId',
+  otherKey: 'userId',
+  targetKey: 'id',
+  sourceKey: 'id',
+  throughScope: {
+    isOwner: true,
+  },
+  uiSchema: {
+    type: 'm2m',
+    title: '{{t("Owners")}}',
+    'x-component': 'DepartmentOwnersField',
+    'x-component-props': {
+      multiple: true,
+      fieldNames: {
+        label: 'nickname',
+        value: 'id',
+      },
+    },
+  },
+};
+
+export default defineCollection({
+  name: 'departments',
+  migrationRules: ['overwrite'],
+  title: '{{t("Departments")}}',
+  dumpRules: 'required',
+  tree: 'adjacency-list',
+  template: 'tree',
+  shared: true,
+  sortable: true,
+  model: 'DepartmentModel',
+  createdBy: true,
+  updatedBy: true,
+  logging: true,
+  fields: [
+    {
+      type: 'bigInt',
+      name: 'id',
+      primaryKey: true,
+      autoIncrement: true,
+      interface: 'id',
+      uiSchema: {
+        type: 'number',
+        title: '{{t("ID")}}',
+        'x-component': 'InputNumber',
+        'x-read-pretty': true,
+      },
+    },
+    {
+      type: 'string',
+      name: 'title',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: '{{t("Department name")}}',
+        'x-component': 'Input',
+      },
+    },
+    {
+      type: 'boolean',
+      name: 'isLeaf',
+    },
+    {
+      type: 'belongsTo',
+      name: 'parent',
+      target: 'departments',
+      foreignKey: 'parentId',
+      treeParent: true,
+      onDelete: 'CASCADE',
+      interface: 'm2o',
+      uiSchema: {
+        type: 'm2o',
+        title: '{{t("Superior department")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: false,
+          fieldNames: {
+            label: 'title',
+            value: 'id',
+          },
+        },
+      },
+    },
+    {
+      type: 'hasMany',
+      name: 'children',
+      target: 'departments',
+      foreignKey: 'parentId',
+      treeChildren: true,
+      onDelete: 'CASCADE',
+    },
+    {
+      type: 'belongsToMany',
+      name: 'members',
+      target: 'users',
+      through: 'departmentsUsers',
+      foreignKey: 'departmentId',
+      otherKey: 'userId',
+      targetKey: 'id',
+      sourceKey: 'id',
+      onDelete: 'CASCADE',
+    },
+    {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      name: 'roles',
+      target: 'roles',
+      through: 'departmentsRoles',
+      foreignKey: 'departmentId',
+      otherKey: 'roleName',
+      targetKey: 'name',
+      sourceKey: 'id',
+      onDelete: 'CASCADE',
+      uiSchema: {
+        type: 'm2m',
+        title: '{{t("Roles")}}',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            label: 'title',
+            value: 'name',
+          },
+        },
+      },
+    },
+    ownersField,
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentsUsers.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentsUsers.ts
new file mode 100644
index 0000000000..70d5534d2c
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/departmentsUsers.ts
@@ -0,0 +1,39 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { defineCollection } from '@nocobase/database';
+
+export default defineCollection({
+  name: 'departmentsUsers',
+  dumpRules: 'required',
+  migrationRules: ['schema-only'],
+  fields: [
+    {
+      type: 'boolean',
+      name: 'isOwner', // Weather the user is the owner of the department
+      allowNull: false,
+      defaultValue: false,
+    },
+    {
+      type: 'boolean',
+      name: 'isMain', // Weather this is the main department of the user
+      allowNull: false,
+      defaultValue: false,
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/roles.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/roles.ts
new file mode 100644
index 0000000000..bac06fa60b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/roles.ts
@@ -0,0 +1,36 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { extendCollection } from '@nocobase/database';
+
+export default extendCollection({
+  name: 'roles',
+  fields: [
+    {
+      type: 'belongsToMany',
+      name: 'departments',
+      target: 'departments',
+      foreignKey: 'roleName',
+      otherKey: 'departmentId',
+      onDelete: 'CASCADE',
+      sourceKey: 'name',
+      targetKey: 'id',
+      through: 'departmentsRoles',
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/collections/users.ts b/packages/plugins/@nocobase/plugin-departments/src/server/collections/users.ts
new file mode 100644
index 0000000000..c5bcf488cc
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/collections/users.ts
@@ -0,0 +1,79 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { extendCollection } from '@nocobase/database';
+
+export const departmentsField = {
+  collectionName: 'users',
+  interface: 'm2m',
+  type: 'belongsToMany',
+  name: 'departments',
+  target: 'departments',
+  foreignKey: 'userId',
+  otherKey: 'departmentId',
+  onDelete: 'CASCADE',
+  sourceKey: 'id',
+  targetKey: 'id',
+  through: 'departmentsUsers',
+  uiSchema: {
+    type: 'm2m',
+    title: '{{t("Departments")}}',
+    'x-component': 'UserDepartmentsField',
+    'x-component-props': {
+      multiple: true,
+      fieldNames: {
+        label: 'title',
+        value: 'name',
+      },
+    },
+  },
+};
+
+export const mainDepartmentField = {
+  collectionName: 'users',
+  interface: 'm2m',
+  type: 'belongsToMany',
+  name: 'mainDepartment',
+  target: 'departments',
+  foreignKey: 'userId',
+  otherKey: 'departmentId',
+  onDelete: 'CASCADE',
+  sourceKey: 'id',
+  targetKey: 'id',
+  through: 'departmentsUsers',
+  throughScope: {
+    isMain: true,
+  },
+  uiSchema: {
+    type: 'm2m',
+    title: '{{t("Main department")}}',
+    'x-component': 'UserMainDepartmentField',
+    'x-component-props': {
+      multiple: false,
+      fieldNames: {
+        label: 'title',
+        value: 'name',
+      },
+    },
+  },
+};
+
+export default extendCollection({
+  name: 'users',
+  fields: [departmentsField, mainDepartmentField],
+});
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/department-data-sync-resource.ts b/packages/plugins/@nocobase/plugin-departments/src/server/department-data-sync-resource.ts
new file mode 100644
index 0000000000..69d0d414df
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/department-data-sync-resource.ts
@@ -0,0 +1,333 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Model } from '@nocobase/database';
+import lodash from 'lodash';
+import {
+  FormatDepartment,
+  FormatUserDepartment,
+  OriginRecord,
+  PrimaryKey,
+  RecordResourceChanged,
+  SyncAccept,
+  UserDataResource,
+} from '@nocobase/plugin-user-data-sync';
+
+export class DepartmentDataSyncResource extends UserDataResource {
+  name = 'departments';
+  accepts: SyncAccept[] = ['user', 'department'];
+
+  get userRepo() {
+    return this.db.getRepository('users');
+  }
+
+  get deptRepo() {
+    return this.db.getRepository('departments');
+  }
+
+  get deptUserRepo() {
+    return this.db.getRepository('departmentsUsers');
+  }
+
+  getFlteredSourceDepartment(sourceDepartment: FormatDepartment) {
+    const deleteProps = [
+      'id',
+      'uid',
+      'createdAt',
+      'updatedAt',
+      'sort',
+      'createdById',
+      'updatedById',
+      'isDeleted',
+      'parentId',
+      'parentUid',
+    ];
+    return lodash.omit(sourceDepartment, deleteProps);
+  }
+
+  async update(record: OriginRecord, resourcePks: PrimaryKey[]): Promise<RecordResourceChanged[]> {
+    const { dataType, metaData, sourceName } = record;
+    if (dataType === 'user') {
+      const sourceUser = metaData;
+      if (sourceUser.isDeleted) {
+        if (!resourcePks || !resourcePks.length) {
+          return [];
+        } else {
+          return resourcePks.map((id) => ({ resourcesPk: id, isDeleted: true }));
+        }
+      }
+      const resources = record.resources.filter((r) => r.resource === 'users');
+      if (!resources.length) {
+        return [];
+      }
+      const user = await this.userRepo.findOne({
+        filterByTk: resources[0].resourcePk,
+      });
+      if (!user) {
+        if (!resourcePks || !resourcePks.length) {
+          return [];
+        } else {
+          return resourcePks.map((id) => ({ resourcesPk: id, isDeleted: true }));
+        }
+      } else {
+        return await this.updateUserDepartments(user, resourcePks, sourceUser.departments, sourceName);
+      }
+    } else if (dataType === 'department') {
+      const sourceDepartment = metaData;
+      const department = await this.deptRepo.findOne({
+        filterByTk: resourcePks[0],
+      });
+      if (!department) {
+        if (sourceDepartment.isDeleted) {
+          return [{ resourcesPk: resourcePks[0], isDeleted: true }];
+        }
+        const result = await this.create(record);
+        return [...result, { resourcesPk: resourcePks[0], isDeleted: true }];
+      }
+      await this.updateDepartment(department, sourceDepartment, sourceName);
+    } else {
+      this.logger.warn(`update department: unsupported data type: ${dataType}`);
+    }
+    return [];
+  }
+
+  async create(record: OriginRecord): Promise<RecordResourceChanged[]> {
+    const { dataType, metaData, sourceName } = record;
+    if (dataType === 'user') {
+      const sourceUser = metaData;
+      if (sourceUser.isDeleted) {
+        return [];
+      }
+      const resources = record.resources.filter((r) => r.resource === 'users');
+      if (!resources.length) {
+        return [];
+      }
+      const user = await this.userRepo.findOne({
+        filterByTk: resources[0].resourcePk,
+      });
+      return await this.updateUserDepartments(user, [], sourceUser.departments, sourceName);
+    } else if (dataType === 'department') {
+      const sourceDepartment = metaData;
+      const newDepartmentId = await this.createDepartment(sourceDepartment, sourceName);
+      return [{ resourcesPk: newDepartmentId, isDeleted: false }];
+    } else {
+      this.logger.warn(`create department: unsupported data type: ${dataType}`);
+    }
+    return [];
+  }
+
+  async getDepartmentIdsBySourceUks(sourceUks: PrimaryKey[], sourceName: string) {
+    const syncDepartmentRecords = await this.syncRecordRepo.find({
+      filter: {
+        sourceName,
+        dataType: 'department',
+        sourceUk: { $in: sourceUks },
+        'resources.resource': this.name,
+      },
+      appends: ['resources'],
+    });
+    const departmentIds = syncDepartmentRecords
+      .filter((record) => record.resources?.length)
+      .map((record) => record.resources[0].resourcePk);
+    return departmentIds;
+  }
+
+  async getDepartmentIdBySourceUk(sourceUk: PrimaryKey, sourceName: string) {
+    const syncDepartmentRecord = await this.syncRecordRepo.findOne({
+      filter: {
+        sourceName,
+        dataType: 'department',
+        sourceUk,
+        'resources.resource': this.name,
+      },
+      appends: ['resources'],
+    });
+    if (syncDepartmentRecord && syncDepartmentRecord.resources?.length) {
+      return syncDepartmentRecord.resources[0].resourcePk;
+    }
+  }
+
+  async updateUserDepartments(
+    user: any,
+    currentDepartmentIds: PrimaryKey[],
+    sourceDepartments: (PrimaryKey | FormatUserDepartment)[],
+    sourceName: string,
+  ): Promise<RecordResourceChanged[]> {
+    if (!this.deptRepo) {
+      return [];
+    }
+    if (!sourceDepartments || !sourceDepartments.length) {
+      const userDepartments = await user.getDepartments();
+      if (userDepartments.length) {
+        await user.removeDepartments(userDepartments);
+      }
+      if (currentDepartmentIds && currentDepartmentIds.length) {
+        return currentDepartmentIds.map((id) => ({ resourcesPk: id, isDeleted: true }));
+      } else {
+        return [];
+      }
+    } else {
+      const sourceDepartmentIds = sourceDepartments.map((sourceDepartment) => {
+        if (typeof sourceDepartment === 'string' || typeof sourceDepartment === 'number') {
+          return sourceDepartment;
+        }
+        return sourceDepartment.uid;
+      });
+      const newDepartmentIds = await this.getDepartmentIdsBySourceUks(sourceDepartmentIds, sourceName);
+      const newDepartments = await this.deptRepo.find({
+        filter: { id: { $in: newDepartmentIds } },
+      });
+      const realCurrentDepartments = await user.getDepartments();
+      // 需要删除的部门
+      const toRealRemoveDepartments = realCurrentDepartments.filter((currnetDepartment) => {
+        return !newDepartments.find((newDepartment) => newDepartment.id === currnetDepartment.id);
+      });
+      if (toRealRemoveDepartments.length) {
+        await user.removeDepartments(toRealRemoveDepartments);
+      }
+      // 需要添加的部门
+      const toRealAddDepartments = newDepartments.filter((newDepartment) => {
+        if (realCurrentDepartments.length === 0) {
+          return true;
+        }
+        return !realCurrentDepartments.find((currentDepartment) => currentDepartment.id === newDepartment.id);
+      });
+      if (toRealAddDepartments.length) {
+        await user.addDepartments(toRealAddDepartments);
+      }
+      // 更新部门主管和主部门
+      for (const sourceDepartment of sourceDepartments) {
+        this.logger.debug('update dept owner: ' + JSON.stringify(sourceDepartment));
+        let isOwner = false;
+        let isMain = false;
+        let uid;
+        if (typeof sourceDepartment !== 'string' && typeof sourceDepartment !== 'number') {
+          isOwner = sourceDepartment.isOwner || false;
+          isMain = sourceDepartment.isMain || false;
+          uid = sourceDepartment.uid;
+        } else {
+          uid = sourceDepartment;
+        }
+        const deptId = await this.getDepartmentIdBySourceUk(uid, sourceName);
+        this.logger.debug('update dept owner: ' + JSON.stringify({ deptId, isOwner, isMain, userId: user.id }));
+        if (!deptId) {
+          continue;
+        }
+        await this.deptUserRepo.update({
+          filter: {
+            userId: user.id,
+            departmentId: deptId,
+          },
+          values: {
+            isOwner,
+            isMain,
+          },
+        });
+      }
+      const recordResourceChangeds: RecordResourceChanged[] = [];
+      if (currentDepartmentIds !== undefined && currentDepartmentIds.length > 0) {
+        // 需要删除的部门ID
+        const toRemoveDepartmentIds = currentDepartmentIds.filter(
+          (currentDepartmentId) => !newDepartmentIds.includes(currentDepartmentId),
+        );
+        recordResourceChangeds.push(
+          ...toRemoveDepartmentIds.map((departmentId) => {
+            return { resourcesPk: departmentId, isDeleted: true };
+          }),
+        );
+        // 需要添加的部门ID
+        const toAddDepartmentIds = newDepartmentIds.filter(
+          (newDepartmentId) => !currentDepartmentIds.includes(newDepartmentId),
+        );
+        recordResourceChangeds.push(
+          ...toAddDepartmentIds.map((departmentId) => {
+            return { resourcesPk: departmentId, isDeleted: false };
+          }),
+        );
+      } else {
+        recordResourceChangeds.push(
+          ...toRealAddDepartments.map((department) => {
+            return {
+              resourcesPk: department.id,
+              isDeleted: false,
+            };
+          }),
+        );
+      }
+      return recordResourceChangeds;
+    }
+  }
+
+  async updateDepartment(department: Model, sourceDepartment: FormatDepartment, sourceName: string) {
+    if (sourceDepartment.isDeleted) {
+      // 删除部门
+      await department.destroy();
+      return;
+    }
+    let dataChanged = false;
+    const filteredSourceDepartment = this.getFlteredSourceDepartment(sourceDepartment);
+    lodash.forOwn(filteredSourceDepartment, (value, key) => {
+      if (department[key] !== value) {
+        department[key] = value;
+        dataChanged = true;
+      }
+    });
+    if (dataChanged) {
+      await department.save();
+    }
+    await this.updateParentDepartment(department, sourceDepartment.parentUid, sourceName);
+  }
+
+  async createDepartment(sourceDepartment: FormatDepartment, sourceName: string): Promise<string> {
+    const filteredSourceDepartment = this.getFlteredSourceDepartment(sourceDepartment);
+    const department = await this.deptRepo.create({
+      values: filteredSourceDepartment,
+    });
+    await this.updateParentDepartment(department, sourceDepartment.parentUid, sourceName);
+    return department.id;
+  }
+
+  async updateParentDepartment(department: Model, parentUid: string, sourceName: string) {
+    if (!parentUid) {
+      const parentDepartment = await department.getParent();
+      if (parentDepartment) {
+        await department.setParent(null);
+      }
+    } else {
+      const syncDepartmentRecord = await this.syncRecordRepo.findOne({
+        filter: {
+          sourceName,
+          dataType: 'department',
+          sourceUk: parentUid,
+          'resources.resource': this.name,
+        },
+        appends: ['resources'],
+      });
+      if (syncDepartmentRecord && syncDepartmentRecord.resources?.length) {
+        const parentDepartment = await this.deptRepo.findOne({
+          filterByTk: syncDepartmentRecord.resources[0].resourcePk,
+        });
+        if (!parentDepartment) {
+          await department.setParent(null);
+          return;
+        }
+        const parent = await department.getParent();
+        if (parent) {
+          if (parentDepartment.id !== parent.id) {
+            await department.setParent(parentDepartment);
+          }
+        } else {
+          await department.setParent(parentDepartment);
+        }
+      } else {
+        await department.setParent(null);
+      }
+    }
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/index.ts b/packages/plugins/@nocobase/plugin-departments/src/server/index.ts
new file mode 100644
index 0000000000..61787e8e89
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/index.ts
@@ -0,0 +1,19 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export { default } from './plugin';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/destroy-department-check.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/destroy-department-check.ts
new file mode 100644
index 0000000000..ade251e3d9
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/destroy-department-check.ts
@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+
+const destroyCheck = async (ctx: Context) => {
+  const { filterByTk } = ctx.action.params;
+  const repo = ctx.db.getRepository('departments');
+  const children = await repo.count({
+    filter: {
+      parentId: filterByTk,
+    },
+  });
+  if (children) {
+    ctx.throw(400, ctx.t('The department has sub-departments, please delete them first', { ns: 'departments' }));
+  }
+  const members = await ctx.db.getRepository('departmentsUsers').count({
+    filter: {
+      departmentId: filterByTk,
+    },
+  });
+  if (members) {
+    ctx.throw(400, ctx.t('The department has members, please remove them first', { ns: 'departments' }));
+  }
+};
+
+export const destroyDepartmentCheck = async (ctx: Context, next: Next) => {
+  const { resourceName, actionName } = ctx.action.params;
+  if (resourceName === 'departments' && actionName === 'destroy') {
+    await destroyCheck(ctx as any);
+  }
+  await next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/index.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/index.ts
new file mode 100644
index 0000000000..8d2e037c65
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/index.ts
@@ -0,0 +1,24 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export * from './destroy-department-check';
+export * from './reset-user-departments-cache';
+export * from './set-department-owners';
+export * from './update-department-isleaf';
+export * from './set-departments-roles';
+export * from './set-main-department';
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/reset-user-departments-cache.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/reset-user-departments-cache.ts
new file mode 100644
index 0000000000..0606093be1
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/reset-user-departments-cache.ts
@@ -0,0 +1,41 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import { Cache } from '@nocobase/cache';
+
+export const resetUserDepartmentsCache = async (ctx: Context, next: Next) => {
+  await next();
+  const { associatedName, resourceName, associatedIndex, actionName, values } = ctx.action.params;
+  const cache = ctx.app.cache as Cache;
+  if (
+    associatedName === 'departments' &&
+    resourceName === 'members' &&
+    ['add', 'remove', 'set'].includes(actionName) &&
+    values?.length
+  ) {
+    // Delete cache when the members of a department changed
+    for (const memberId of values) {
+      await cache.del(`departments:${memberId}`);
+    }
+  }
+
+  if (associatedName === 'users' && resourceName === 'departments' && ['add', 'remove', 'set'].includes(actionName)) {
+    await cache.del(`departments:${associatedIndex}`);
+  }
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-department-owners.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-department-owners.ts
new file mode 100644
index 0000000000..56a0da774f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-department-owners.ts
@@ -0,0 +1,59 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import lodash from 'lodash';
+
+const setOwners = async (ctx: Context, filterByTk: any, owners: any[]) => {
+  const throughRepo = ctx.db.getRepository('departmentsUsers');
+  await ctx.db.sequelize.transaction(async (t) => {
+    await throughRepo.update({
+      filter: {
+        departmentId: filterByTk,
+      },
+      values: {
+        isOwner: false,
+      },
+      transaction: t,
+    });
+    await throughRepo.update({
+      filter: {
+        departmentId: filterByTk,
+        userId: {
+          $in: owners.map((owner: any) => owner.id),
+        },
+      },
+      values: {
+        isOwner: true,
+      },
+      transaction: t,
+    });
+  });
+};
+
+export const setDepartmentOwners = async (ctx: Context, next: Next) => {
+  const { filterByTk, values = {}, resourceName, actionName } = ctx.action.params;
+  const { owners } = values;
+  if (resourceName === 'departments' && actionName === 'update' && owners) {
+    ctx.action.params.values = lodash.omit(values, ['owners']);
+    await next();
+    await setOwners(ctx as any, filterByTk, owners);
+  } else {
+    return next();
+  }
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-departments-roles.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-departments-roles.ts
new file mode 100644
index 0000000000..5171d69ae0
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-departments-roles.ts
@@ -0,0 +1,60 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import { Cache } from '@nocobase/cache';
+import { Model, Repository } from '@nocobase/database';
+
+export const setDepartmentsInfo = async (ctx: Context, next: Next) => {
+  const currentUser = ctx.state.currentUser;
+  if (!currentUser) {
+    return next();
+  }
+
+  const cache = ctx.cache as Cache;
+  const repo = ctx.db.getRepository('users.departments', currentUser.id) as unknown as Repository;
+  const departments = (await cache.wrap(`departments:${currentUser.id}`, () =>
+    repo.find({
+      appends: ['owners', 'roles', 'parent(recursively=true)'],
+      raw: true,
+    }),
+  )) as Model[];
+  if (!departments.length) {
+    return next();
+  }
+  ctx.state.currentUser.departments = departments;
+  ctx.state.currentUser.mainDeparmtent = departments.find((dept) => dept.isMain);
+
+  const departmentIds = departments.map((dept) => dept.id);
+  const roleRepo = ctx.db.getRepository('roles');
+  const roles = await roleRepo.find({
+    filter: {
+      'departments.id': {
+        $in: departmentIds,
+      },
+    },
+  });
+  if (!roles.length) {
+    return next();
+  }
+  const rolesMap = new Map();
+  roles.forEach((role: any) => rolesMap.set(role.name, role));
+  ctx.state.attachRoles = Array.from(rolesMap.values());
+
+  await next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-main-department.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-main-department.ts
new file mode 100644
index 0000000000..b5f7083fa3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/set-main-department.ts
@@ -0,0 +1,101 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+
+export const setMainDepartment = async (ctx: Context, next: Next) => {
+  await next();
+  const { associatedName, resourceName, associatedIndex, actionName, values } = ctx.action.params;
+  if (associatedName === 'departments' && resourceName === 'members' && values?.length) {
+    const throughRepo = ctx.db.getRepository('departmentsUsers');
+    const usersHasMain = await throughRepo.find({
+      filter: {
+        userId: {
+          $in: values,
+        },
+        isMain: true,
+      },
+    });
+    const userIdsHasMain = usersHasMain.map((item) => item.userId);
+    if (actionName === 'add' || actionName === 'set') {
+      await throughRepo.update({
+        filter: {
+          userId: {
+            $in: values.filter((id) => !userIdsHasMain.includes(id)),
+          },
+          departmentId: associatedIndex,
+        },
+        values: {
+          isMain: true,
+        },
+      });
+      return;
+    }
+
+    if (actionName === 'remove') {
+      const userIdsHasNoMain = values.filter((id) => !userIdsHasMain.includes(id));
+      for (const userId of userIdsHasNoMain) {
+        const firstDept = await throughRepo.findOne({
+          filter: {
+            userId,
+          },
+        });
+        if (firstDept) {
+          await throughRepo.update({
+            filter: {
+              userId,
+              departmentId: firstDept.departmentId,
+            },
+            values: {
+              isMain: true,
+            },
+          });
+        }
+      }
+    }
+  }
+
+  if (associatedName === 'users' && resourceName === 'departments' && ['add', 'remove', 'set'].includes(actionName)) {
+    const throughRepo = ctx.db.getRepository('departmentsUsers');
+    const hasMain = await throughRepo.findOne({
+      filter: {
+        userId: associatedIndex,
+        isMain: true,
+      },
+    });
+    if (hasMain) {
+      return;
+    }
+    const firstDept = await throughRepo.findOne({
+      filter: {
+        userId: associatedIndex,
+      },
+    });
+    if (firstDept) {
+      await throughRepo.update({
+        filter: {
+          userId: associatedIndex,
+          departmentId: firstDept.departmentId,
+        },
+        values: {
+          isMain: true,
+        },
+      });
+    }
+  }
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/update-department-isleaf.ts b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/update-department-isleaf.ts
new file mode 100644
index 0000000000..9d0cbdf947
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/middlewares/update-department-isleaf.ts
@@ -0,0 +1,88 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Context, Next } from '@nocobase/actions';
+import { Repository } from '@nocobase/database';
+
+const updateIsLeafWhenAddChild = async (repo: Repository, parent: any) => {
+  if (parent && parent.isLeaf !== false) {
+    await repo.update({
+      filter: {
+        id: parent.id,
+      },
+      values: {
+        isLeaf: false,
+      },
+    });
+  }
+};
+
+const updateIsLeafWhenChangeChild = async (
+  repo: Repository,
+  oldParentId: number | null,
+  newParentId: number | null,
+) => {
+  if (oldParentId && oldParentId !== newParentId) {
+    const hasChild = await repo.count({
+      filter: {
+        parentId: oldParentId,
+      },
+    });
+    if (!hasChild) {
+      await repo.update({
+        filter: {
+          id: oldParentId,
+        },
+        values: {
+          isLeaf: true,
+        },
+      });
+    }
+  }
+};
+
+export const updateDepartmentIsLeaf = async (ctx: Context, next: Next) => {
+  const { filterByTk, values = {}, resourceName, actionName } = ctx.action.params;
+  const repo = ctx.db.getRepository('departments');
+  const { parent } = values;
+  if (resourceName === 'departments' && actionName === 'create') {
+    ctx.action.params.values = { ...values, isLeaf: true };
+    await next();
+    await updateIsLeafWhenAddChild(repo, parent);
+    return;
+  }
+
+  if (resourceName === 'departments' && actionName === 'update') {
+    const department = await repo.findOne({ filterByTk });
+    await next();
+    await Promise.all([
+      updateIsLeafWhenChangeChild(repo, department.parentId, parent?.id),
+      updateIsLeafWhenAddChild(repo, parent),
+    ]);
+    return;
+  }
+
+  if (resourceName === 'departments' && actionName === 'destroy') {
+    const department = await repo.findOne({ filterByTk });
+    await next();
+    await updateIsLeafWhenChangeChild(repo, department.parentId, null);
+    return;
+  }
+
+  return next();
+};
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/migrations/update-field-uischemas-20240307124823.ts b/packages/plugins/@nocobase/plugin-departments/src/server/migrations/update-field-uischemas-20240307124823.ts
new file mode 100644
index 0000000000..542d5865bf
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/migrations/update-field-uischemas-20240307124823.ts
@@ -0,0 +1,96 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Migration } from '@nocobase/server';
+import { departmentsField, mainDepartmentField } from '../collections/users';
+import { ownersField } from '../collections/departments';
+
+export default class UpdateFieldUISchemasMigration extends Migration {
+  async up() {
+    const result = await this.app.version.satisfies('<=0.20.0-alpha.6');
+
+    if (!result) {
+      return;
+    }
+
+    const fieldRepo = this.db.getRepository('fields');
+    const departmentsFieldInstance = await fieldRepo.findOne({
+      filter: {
+        name: 'departments',
+        collectionName: 'users',
+      },
+    });
+    if (departmentsFieldInstance) {
+      const options = {
+        ...departmentsFieldInstance.options,
+        uiSchema: departmentsField.uiSchema,
+      };
+      await fieldRepo.update({
+        filter: {
+          name: 'departments',
+          collectionName: 'users',
+        },
+        values: {
+          options,
+        },
+      });
+    }
+    const mainDepartmentFieldInstance = await fieldRepo.findOne({
+      filter: {
+        name: 'mainDepartment',
+        collectionName: 'users',
+      },
+    });
+    if (mainDepartmentFieldInstance) {
+      const options = {
+        ...mainDepartmentFieldInstance.options,
+        uiSchema: mainDepartmentField.uiSchema,
+      };
+      await fieldRepo.update({
+        filter: {
+          name: 'mainDepartment',
+          collectionName: 'users',
+        },
+        values: {
+          options,
+        },
+      });
+    }
+    const ownersFieldInstance = await fieldRepo.findOne({
+      filter: {
+        name: 'owners',
+        collectionName: 'departments',
+      },
+    });
+    if (ownersFieldInstance) {
+      const options = {
+        ...ownersFieldInstance.options,
+        uiSchema: ownersField.uiSchema,
+      };
+      await fieldRepo.update({
+        filter: {
+          name: 'owners',
+          collectionName: 'departments',
+        },
+        values: {
+          options,
+        },
+      });
+    }
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/models/department.ts b/packages/plugins/@nocobase/plugin-departments/src/server/models/department.ts
new file mode 100644
index 0000000000..fddd8fc0ce
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/models/department.ts
@@ -0,0 +1,31 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Model } from '@nocobase/database';
+
+export class DepartmentModel extends Model {
+  getOwners() {
+    return this.getMembers({
+      through: {
+        where: {
+          isOwner: true,
+        },
+      },
+    });
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-departments/src/server/plugin.ts
new file mode 100644
index 0000000000..6aeaf51fe3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-departments/src/server/plugin.ts
@@ -0,0 +1,156 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Cache } from '@nocobase/cache';
+import { InstallOptions, Plugin } from '@nocobase/server';
+import { aggregateSearch, removeOwner, setOwner } from './actions/departments';
+import { listExcludeDept, setMainDepartment } from './actions/users';
+import { departmentsField, mainDepartmentField } from './collections/users';
+import {
+  destroyDepartmentCheck,
+  resetUserDepartmentsCache,
+  setDepartmentOwners,
+  setMainDepartment as setMainDepartmentMiddleware,
+  updateDepartmentIsLeaf,
+} from './middlewares';
+import { setDepartmentsInfo } from './middlewares/set-departments-roles';
+import { DepartmentModel } from './models/department';
+import { DepartmentDataSyncResource } from './department-data-sync-resource';
+import PluginUserDataSyncServer from '@nocobase/plugin-user-data-sync';
+import { DataSource } from '@nocobase/data-source-manager';
+
+export class PluginDepartmentsServer extends Plugin {
+  afterAdd() {}
+
+  beforeLoad() {
+    this.app.db.registerModels({ DepartmentModel });
+
+    this.app.acl.addFixedParams('collections', 'destroy', () => {
+      return {
+        filter: {
+          'name.$notIn': ['departments', 'departmentsUsers', 'departmentsRoles'],
+        },
+      };
+    });
+  }
+
+  async load() {
+    this.app.resourceManager.registerActionHandlers({
+      'users:listExcludeDept': listExcludeDept,
+      'users:setMainDepartment': setMainDepartment,
+      'departments:aggregateSearch': aggregateSearch,
+      'departments:setOwner': setOwner,
+      'departments:removeOwner': removeOwner,
+    });
+
+    this.app.acl.allow('users', ['setMainDepartment', 'listExcludeDept'], 'loggedIn');
+    this.app.acl.registerSnippet({
+      name: `pm.${this.name}`,
+      actions: [
+        'departments:*',
+        'roles:list',
+        'users:list',
+        'users:listExcludeDept',
+        'users:setMainDepartment',
+        'users.departments:*',
+        'roles.departments:*',
+        'departments.members:*',
+      ],
+    });
+
+    this.app.resourceManager.use(setDepartmentsInfo, {
+      tag: 'setDepartmentsInfo',
+      before: 'setCurrentRole',
+      after: 'auth',
+    });
+    this.app.dataSourceManager.afterAddDataSource((dataSource: DataSource) => {
+      dataSource.resourceManager.use(setDepartmentsInfo, {
+        tag: 'setDepartmentsInfo',
+        before: 'setCurrentRole',
+        after: 'auth',
+      });
+    });
+
+    this.app.resourceManager.use(setDepartmentOwners);
+    this.app.resourceManager.use(destroyDepartmentCheck);
+    this.app.resourceManager.use(updateDepartmentIsLeaf);
+    this.app.resourceManager.use(resetUserDepartmentsCache);
+    this.app.resourceManager.use(setMainDepartmentMiddleware);
+
+    // Delete cache when the departments of a user changed
+    this.app.db.on('departmentsUsers.afterSave', async (model) => {
+      const cache = this.app.cache as Cache;
+      await cache.del(`departments:${model.get('userId')}`);
+    });
+    this.app.db.on('departmentsUsers.afterDestroy', async (model) => {
+      const cache = this.app.cache as Cache;
+      await cache.del(`departments:${model.get('userId')}`);
+    });
+    this.app.on('beforeSignOut', ({ userId }) => {
+      this.app.cache.del(`departments:${userId}`);
+    });
+
+    const userDataSyncPlugin = this.app.pm.get('user-data-sync') as PluginUserDataSyncServer;
+    if (userDataSyncPlugin && userDataSyncPlugin.enabled) {
+      userDataSyncPlugin.resourceManager.registerResource(new DepartmentDataSyncResource(this.db, this.app.logger), {
+        // write department records after writing user records
+        after: 'users',
+      });
+    }
+  }
+
+  async install(options?: InstallOptions) {
+    const collectionRepo = this.db.getRepository<any>('collections');
+    if (collectionRepo) {
+      await collectionRepo.db2cm('departments');
+    }
+    const fieldRepo = this.db.getRepository('fields');
+    if (fieldRepo) {
+      const isDepartmentsFieldExists = await fieldRepo.count({
+        filter: {
+          name: 'departments',
+          collectionName: 'users',
+        },
+      });
+      if (!isDepartmentsFieldExists) {
+        await fieldRepo.create({
+          values: departmentsField,
+        });
+      }
+      const isMainDepartmentFieldExists = await fieldRepo.count({
+        filter: {
+          name: 'mainDepartment',
+          collectionName: 'users',
+        },
+      });
+      if (!isMainDepartmentFieldExists) {
+        await fieldRepo.create({
+          values: mainDepartmentField,
+        });
+      }
+    }
+  }
+
+  async afterEnable() {}
+
+  async afterDisable() {}
+
+  async remove() {}
+}
+
+export default PluginDepartmentsServer;
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/.npmignore b/packages/plugins/@nocobase/plugin-field-attachment-url/.npmignore
new file mode 100644
index 0000000000..65f5e8779f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/README.md b/packages/plugins/@nocobase/plugin-field-attachment-url/README.md
new file mode 100644
index 0000000000..806a995fd7
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/README.md
@@ -0,0 +1 @@
+# @nocobase/plugin-field-attachment-url
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/client.d.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/client.d.ts
new file mode 100644
index 0000000000..6c459cbac4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/client.js b/packages/plugins/@nocobase/plugin-field-attachment-url/client.js
new file mode 100644
index 0000000000..b6e3be70e6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/package.json b/packages/plugins/@nocobase/plugin-field-attachment-url/package.json
new file mode 100644
index 0000000000..ad663e5f42
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@nocobase/plugin-field-attachment-url",
+  "version": "1.7.0-beta.16",
+  "main": "dist/server/index.js",
+  "displayName": "Collection field: Attachment(URL)",
+  "displayName.zh-CN": "数据表字段：附件（URL）",
+  "description": "Supports attachments in URL format.",
+  "description.zh-CN": "支持 URL 格式的附件。",
+  "peerDependencies": {
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x"
+  },
+  "keywords": [
+    "Collection fields"
+  ]
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/server.d.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/server.d.ts
new file mode 100644
index 0000000000..c41081ddc6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/server.js b/packages/plugins/@nocobase/plugin-field-attachment-url/server.js
new file mode 100644
index 0000000000..972842039a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/__e2e__/createField.test.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/__e2e__/createField.test.ts
new file mode 100644
index 0000000000..89e1432ff4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/__e2e__/createField.test.ts
@@ -0,0 +1,28 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { expect, test } from '@nocobase/test/e2e';
+
+test('create Attachment (URL) field', async ({ page }) => {
+  await page.goto('/admin/settings/data-source-manager/main/collections?type=main');
+  await page.getByLabel('action-Action.Link-Configure fields-collections-users', { exact: true }).click();
+  await page.getByRole('button', { name: 'plus Add field' }).click();
+  await page.getByRole('menuitem', { name: 'Attachment (URL)' }).click();
+  const displayName = `a${Math.random().toString(36).substring(7)}`;
+  const name = `a${Math.random().toString(36).substring(7)}`;
+  await page.getByLabel('block-item-Input-fields-Field display name').getByRole('textbox').fill(displayName);
+  await page.getByLabel('block-item-Input-fields-Field name').getByRole('textbox').fill(name);
+  await expect(page.getByLabel('block-item-RemoteSelect-')).toBeVisible();
+  await page.getByLabel('action-Action-Submit-fields-').click();
+  await expect(page.getByText(name)).toBeVisible();
+
+  // 删除
+  await page.getByLabel(`action-CollectionFields-Delete-fields-${name}`).click();
+  await page.getByRole('button', { name: 'OK', exact: true }).click();
+});
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/client.d.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/client.d.ts
new file mode 100644
index 0000000000..4e96f83fa1
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/client.d.ts
@@ -0,0 +1,249 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// CSS modules
+type CSSModuleClasses = { readonly [key: string]: string };
+
+declare module '*.module.css' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.scss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.sass' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.less' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.styl' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.stylus' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.pcss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+declare module '*.module.sss' {
+  const classes: CSSModuleClasses;
+  export default classes;
+}
+
+// CSS
+declare module '*.css' { }
+declare module '*.scss' { }
+declare module '*.sass' { }
+declare module '*.less' { }
+declare module '*.styl' { }
+declare module '*.stylus' { }
+declare module '*.pcss' { }
+declare module '*.sss' { }
+
+// Built-in asset types
+// see `src/node/constants.ts`
+
+// images
+declare module '*.apng' {
+  const src: string;
+  export default src;
+}
+declare module '*.png' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpg' {
+  const src: string;
+  export default src;
+}
+declare module '*.jpeg' {
+  const src: string;
+  export default src;
+}
+declare module '*.jfif' {
+  const src: string;
+  export default src;
+}
+declare module '*.pjpeg' {
+  const src: string;
+  export default src;
+}
+declare module '*.pjp' {
+  const src: string;
+  export default src;
+}
+declare module '*.gif' {
+  const src: string;
+  export default src;
+}
+declare module '*.svg' {
+  const src: string;
+  export default src;
+}
+declare module '*.ico' {
+  const src: string;
+  export default src;
+}
+declare module '*.webp' {
+  const src: string;
+  export default src;
+}
+declare module '*.avif' {
+  const src: string;
+  export default src;
+}
+
+// media
+declare module '*.mp4' {
+  const src: string;
+  export default src;
+}
+declare module '*.webm' {
+  const src: string;
+  export default src;
+}
+declare module '*.ogg' {
+  const src: string;
+  export default src;
+}
+declare module '*.mp3' {
+  const src: string;
+  export default src;
+}
+declare module '*.wav' {
+  const src: string;
+  export default src;
+}
+declare module '*.flac' {
+  const src: string;
+  export default src;
+}
+declare module '*.aac' {
+  const src: string;
+  export default src;
+}
+declare module '*.opus' {
+  const src: string;
+  export default src;
+}
+declare module '*.mov' {
+  const src: string;
+  export default src;
+}
+declare module '*.m4a' {
+  const src: string;
+  export default src;
+}
+declare module '*.vtt' {
+  const src: string;
+  export default src;
+}
+
+// fonts
+declare module '*.woff' {
+  const src: string;
+  export default src;
+}
+declare module '*.woff2' {
+  const src: string;
+  export default src;
+}
+declare module '*.eot' {
+  const src: string;
+  export default src;
+}
+declare module '*.ttf' {
+  const src: string;
+  export default src;
+}
+declare module '*.otf' {
+  const src: string;
+  export default src;
+}
+
+// other
+declare module '*.webmanifest' {
+  const src: string;
+  export default src;
+}
+declare module '*.pdf' {
+  const src: string;
+  export default src;
+}
+declare module '*.txt' {
+  const src: string;
+  export default src;
+}
+
+// wasm?init
+declare module '*.wasm?init' {
+  const initWasm: (options?: WebAssembly.Imports) => Promise<WebAssembly.Instance>;
+  export default initWasm;
+}
+
+// web worker
+declare module '*?worker' {
+  const workerConstructor: {
+    new(options?: { name?: string }): Worker;
+  };
+  export default workerConstructor;
+}
+
+declare module '*?worker&inline' {
+  const workerConstructor: {
+    new(options?: { name?: string }): Worker;
+  };
+  export default workerConstructor;
+}
+
+declare module '*?worker&url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?sharedworker' {
+  const sharedWorkerConstructor: {
+    new(options?: { name?: string }): SharedWorker;
+  };
+  export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&inline' {
+  const sharedWorkerConstructor: {
+    new(options?: { name?: string }): SharedWorker;
+  };
+  export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?raw' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*?inline' {
+  const src: string;
+  export default src;
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx
new file mode 100644
index 0000000000..0cfa332988
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx
@@ -0,0 +1,184 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { RecursionField, connect, mapReadPretty, useField, useFieldSchema } from '@formily/react';
+import React, { useContext, useEffect, useState } from 'react';
+import {
+  FormProvider,
+  RecordPickerContext,
+  RecordPickerProvider,
+  SchemaComponentOptions,
+  useActionContext,
+  TableSelectorParamsProvider,
+  useTableSelectorProps as useTsp,
+  EllipsisWithTooltip,
+  CollectionProvider_deprecated,
+  useCollection_deprecated,
+  useCollectionManager_deprecated,
+  Upload,
+  useFieldNames,
+  ActionContextProvider,
+  AssociationField,
+  Input,
+} from '@nocobase/client';
+import schema from '../schema';
+import { useInsertSchema } from '../hook';
+
+const defaultToValueItem = (data) => {
+  return data?.thumbnailRule ? `${data?.url}${data?.thumbnailRule}` : data?.url;
+};
+
+const InnerAttachmentUrl = (props) => {
+  const { value, onChange, toValueItem = defaultToValueItem, disabled, underFilter, ...others } = props;
+  const fieldSchema = useFieldSchema();
+  const [visibleSelector, setVisibleSelector] = useState(false);
+  const [selectedRows, setSelectedRows] = useState([]);
+  const insertSelector = useInsertSchema('Selector');
+  const fieldNames = useFieldNames(props);
+  const field: any = useField();
+  const [options, setOptions] = useState();
+  const { getField } = useCollection_deprecated();
+  const collectionField = getField(field.props.name);
+  const { modalProps } = useActionContext();
+  const handleSelect = (ev) => {
+    ev.stopPropagation();
+    ev.preventDefault();
+    insertSelector(schema.Selector);
+    setVisibleSelector(true);
+    setSelectedRows([]);
+  };
+
+  useEffect(() => {
+    if (value && Object.keys(value).length > 0) {
+      setOptions(value);
+    } else {
+      setOptions(null);
+    }
+  }, [value, fieldNames?.label]);
+
+  const pickerProps = {
+    size: 'small',
+    fieldNames,
+    multiple: false,
+    association: {
+      target: collectionField?.target,
+    },
+    options,
+    onChange: props?.onChange,
+    selectedRows,
+    setSelectedRows,
+    collectionField,
+  };
+  const usePickActionProps = () => {
+    const { setVisible } = useActionContext();
+    const { selectedRows, onChange } = useContext(RecordPickerContext);
+    return {
+      onClick() {
+        onChange(toValueItem(selectedRows?.[0]) || null);
+        setVisible(false);
+      },
+    };
+  };
+  const useTableSelectorProps = () => {
+    const {
+      multiple,
+      options,
+      setSelectedRows,
+      selectedRows: rcSelectRows = [],
+      onChange,
+    } = useContext(RecordPickerContext);
+    const { onRowSelectionChange, rowKey = 'id', ...others } = useTsp();
+    const { setVisible } = useActionContext();
+    return {
+      ...others,
+      rowKey,
+      rowSelection: {
+        type: multiple ? 'checkbox' : 'radio',
+        selectedRowKeys: rcSelectRows?.filter((item) => options?.[rowKey] !== item[rowKey]).map((item) => item[rowKey]),
+      },
+      onRowSelectionChange(selectedRowKeys, selectedRows) {
+        setSelectedRows?.(selectedRows);
+        onRowSelectionChange?.(selectedRowKeys, selectedRows);
+        onChange(toValueItem(selectedRows?.[0]) || null);
+        setVisible(false);
+      },
+    };
+  };
+  if (underFilter) {
+    return <Input {...props} />;
+  }
+  console.log(collectionField);
+  return (
+    <div style={{ width: '100%', overflow: 'auto' }}>
+      <AssociationField.FileSelector
+        toValueItem={toValueItem}
+        value={options}
+        quickUpload={fieldSchema['x-component-props']?.quickUpload !== false}
+        selectFile={
+          collectionField?.target && collectionField?.target !== 'attachments'
+            ? fieldSchema['x-component-props']?.selectFile !== false
+            : false
+        }
+        action={`${collectionField?.target || 'attachments'}:create`}
+        onSelect={handleSelect}
+        onChange={onChange}
+        disabled={disabled}
+      />
+      <ActionContextProvider
+        value={{
+          openMode: 'drawer',
+          visible: visibleSelector,
+          setVisible: setVisibleSelector,
+          modalProps: {
+            getContainer: others?.getContainer || modalProps?.getContainer,
+          },
+          formValueChanged: false,
+        }}
+      >
+        {collectionField?.target && collectionField?.target !== 'attachments' && (
+          <RecordPickerProvider {...pickerProps}>
+            <CollectionProvider_deprecated name={collectionField?.target} dataSource={'main'}>
+              <FormProvider>
+                <TableSelectorParamsProvider params={{}}>
+                  <SchemaComponentOptions scope={{ usePickActionProps, useTableSelectorProps }}>
+                    <RecursionField
+                      onlyRenderProperties
+                      basePath={field.address}
+                      schema={fieldSchema}
+                      filterProperties={(s) => {
+                        return s['x-component'] === 'AssociationField.Selector';
+                      }}
+                    />
+                  </SchemaComponentOptions>
+                </TableSelectorParamsProvider>
+              </FormProvider>
+            </CollectionProvider_deprecated>
+          </RecordPickerProvider>
+        )}
+      </ActionContextProvider>
+    </div>
+  );
+};
+
+const FileManageReadPretty = connect((props) => {
+  const { value } = props;
+  const fieldSchema = useFieldSchema();
+  const componentMode = fieldSchema?.['x-component-props']?.['componentMode'];
+  const { getField } = useCollection_deprecated();
+  const { getCollectionJoinField } = useCollectionManager_deprecated();
+  const collectionField = getField(fieldSchema.name) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  if (componentMode === 'url') {
+    return <EllipsisWithTooltip ellipsis>{value}</EllipsisWithTooltip>;
+  }
+  return (
+    <EllipsisWithTooltip ellipsis>{collectionField ? <Upload.ReadPretty {...props} /> : null}</EllipsisWithTooltip>
+  );
+});
+
+export const AttachmentUrl = connect(InnerAttachmentUrl, mapReadPretty(FileManageReadPretty));
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts
new file mode 100644
index 0000000000..412cd9c469
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts
@@ -0,0 +1,106 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { useFieldSchema } from '@formily/react';
+import { useCollectionField, useDesignable, useRequest } from '@nocobase/client';
+import { cloneDeep, uniqBy } from 'lodash';
+import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+
+function useStorageRules(storage) {
+  const name = storage ?? '';
+  const { loading, data } = useRequest<any>(
+    {
+      url: `storages:getBasicInfo/${name}`,
+    },
+    {
+      refreshDeps: [name],
+    },
+  );
+  return (!loading && data?.data) || null;
+}
+export function useAttachmentUrlFieldProps(props) {
+  const field = useCollectionField();
+  const rules = useStorageRules(field?.storage);
+  return {
+    ...props,
+    rules,
+    action: `${field.target}:create${field.storage ? `?attachmentField=${field.collectionName}.${field.name}` : ''}`,
+    toValueItem: (data) => {
+      return data?.thumbnailRule ? `${data?.url}${data?.thumbnailRule}` : data?.url;
+    },
+    getThumbnailURL: (file) => {
+      return file?.url;
+    },
+  };
+}
+
+export const useInsertSchema = (component) => {
+  const fieldSchema = useFieldSchema();
+  const { insertAfterBegin } = useDesignable();
+  const insert = useCallback(
+    (ss) => {
+      const schema = fieldSchema.reduceProperties((buf, s) => {
+        if (s['x-component'] === 'AssociationField.' + component) {
+          return s;
+        }
+        return buf;
+      }, null);
+      if (!schema) {
+        insertAfterBegin(cloneDeep(ss));
+      }
+    },
+    [component, fieldSchema, insertAfterBegin],
+  );
+  return insert;
+};
+
+export const useAttachmentTargetProps = () => {
+  const { t } = useTranslation();
+  // TODO(refactor): whitelist should be changed to storage property，url is signed by plugin-s3-pro, this enmus is from plugin-file-manager
+  const buildInStorage = ['local', 'ali-oss', 's3', 'tx-cos'];
+  return {
+    service: {
+      resource: 'collections',
+      params: {
+        filter: {
+          'options.template': 'file',
+        },
+        paginate: false,
+      },
+    },
+    manual: false,
+    fieldNames: {
+      label: 'title',
+      value: 'name',
+    },
+    mapOptions: (value) => {
+      if (value.name === 'attachments') {
+        return {
+          ...value,
+          title: t('Attachments'),
+        };
+      }
+      return value;
+    },
+    toOptionsItem: (data) => {
+      data.unshift({
+        name: 'attachments',
+        title: t('Attachments'),
+      });
+      return uniqBy(
+        data.filter((v) => v.name),
+        'name',
+      );
+    },
+    optionFilter: (option) => {
+      return !option.storage || buildInStorage.includes(option.storage);
+    },
+  };
+};
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/index.tsx b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/index.tsx
new file mode 100644
index 0000000000..c535c97f67
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/index.tsx
@@ -0,0 +1,38 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Plugin, lazy } from '@nocobase/client';
+import { AttachmentURLFieldInterface } from './interfaces/attachment-url';
+import { useAttachmentUrlFieldProps } from './hook';
+// import { AttachmentUrl } from './component/AttachmentUrl';
+const { AttachmentUrl } = lazy(() => import('./component/AttachmentUrl'), 'AttachmentUrl');
+
+import { attachmentUrlComponentFieldSettings } from './settings';
+export class PluginFieldAttachmentUrlClient extends Plugin {
+  async afterAdd() {
+    // await this.app.pm.add()
+  }
+
+  async beforeLoad() {}
+
+  // You can get and modify the app instance here
+  async load() {
+    this.app.dataSourceManager.addFieldInterfaces([AttachmentURLFieldInterface]);
+    this.app.addScopes({ useAttachmentUrlFieldProps });
+
+    this.app.addComponents({ AttachmentUrl });
+    this.app.schemaSettingsManager.add(attachmentUrlComponentFieldSettings);
+
+    // this.app.addProvider()
+    // this.app.addProviders()
+    // this.app.router.add()
+  }
+}
+
+export default PluginFieldAttachmentUrlClient;
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx
new file mode 100644
index 0000000000..781da59f6b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx
@@ -0,0 +1,79 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client';
+import { ISchema } from '@formily/react';
+import { useAttachmentTargetProps } from '../hook';
+import { tStr } from '../locale';
+
+const { defaultProps, operators } = interfacesProperties;
+
+export const defaultToolbar = [
+  'headings',
+  'bold',
+  'italic',
+  'strike',
+  'link',
+  'list',
+  'ordered-list',
+  'check',
+  'quote',
+  'line',
+  'code',
+  'inline-code',
+  'upload',
+  'fullscreen',
+];
+
+export class AttachmentURLFieldInterface extends CollectionFieldInterface {
+  name = 'attachmentURL';
+  type = 'object';
+  group = 'media';
+  title = tStr('Attachment (URL)');
+  default = {
+    type: 'string',
+    // name,
+    uiSchema: {
+      type: 'string',
+      // title,
+      'x-component': 'AttachmentUrl',
+      'x-use-component-props': 'useAttachmentUrlFieldProps',
+    },
+  };
+  availableTypes = ['string', 'text'];
+  properties = {
+    ...defaultProps,
+    target: {
+      required: true,
+      default: 'attachments',
+      type: 'string',
+      title: tStr('Which file collection should it be uploaded to'),
+      'x-decorator': 'FormItem',
+      'x-component': 'RemoteSelect',
+      'x-use-component-props': useAttachmentTargetProps,
+    },
+    targetKey: {
+      'x-hidden': true,
+      default: 'id',
+      type: 'string',
+    },
+  };
+  schemaInitialize(schema: ISchema, { block }) {
+    schema['x-component-props'] = schema['x-component-props'] || {};
+    schema['x-component-props']['mode'] = 'AttachmentUrl';
+    if (['Table', 'Kanban'].includes(block)) {
+      schema['x-component-props']['ellipsis'] = true;
+      schema['x-component-props']['size'] = 'small';
+    }
+  }
+  filterable = {
+    operators: operators.bigField,
+  };
+  titleUsable = true;
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/locale.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/locale.ts
new file mode 100644
index 0000000000..a26dd0158f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/locale.ts
@@ -0,0 +1,30 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// @ts-ignore
+import pkg from '../../package.json';
+import { useApp } from '@nocobase/client';
+import { useTranslation } from 'react-i18next';
+
+export const NAMESPACE = 'attachmentUrl';
+
+export function useT() {
+  const app = useApp();
+  return (str: string) => app.i18n.t(str, { ns: [pkg.name, 'client'] });
+}
+
+export function tStr(key: string) {
+  return `{{t(${JSON.stringify(key)}, { ns: ['${pkg.name}', 'client'], nsMode: 'fallback' })}}`;
+}
+
+export function useAttachmentUrlTranslation() {
+  return useTranslation([NAMESPACE, 'client'], {
+    nsMode: 'fallback',
+  });
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/schema.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/schema.ts
new file mode 100644
index 0000000000..f5ae80d0ce
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/schema.ts
@@ -0,0 +1,53 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export default {
+  Selector: {
+    type: 'void',
+    'x-component': 'AssociationField.Selector',
+    title: '{{ t("Select record") }}',
+    'x-component-props': {
+      className: 'nb-record-picker-selector',
+    },
+    properties: {
+      grid: {
+        type: 'void',
+        'x-component': 'Grid',
+        'x-initializer': 'popup:tableSelector:addBlock',
+        properties: {},
+      },
+      footer: {
+        'x-component': 'Action.Container.Footer',
+        'x-component-props': {},
+        properties: {
+          actions: {
+            type: 'void',
+            'x-component': 'ActionBar',
+            'x-component-props': {},
+            properties: {
+              submit: {
+                title: '{{ t("Submit") }}',
+                'x-action': 'submit',
+                'x-component': 'Action',
+                'x-use-component-props': 'usePickActionProps',
+                // 'x-designer': 'Action.Designer',
+                'x-toolbar': 'ActionSchemaToolbar',
+                'x-settings': 'actionSettings:submit',
+                'x-component-props': {
+                  type: 'primary',
+                  htmlType: 'submit',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/settings/index.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/settings/index.ts
new file mode 100644
index 0000000000..52463073c2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/client/settings/index.ts
@@ -0,0 +1,171 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Field } from '@formily/core';
+import { useField, useFieldSchema, useForm } from '@formily/react';
+import { useTranslation } from 'react-i18next';
+import { useColumnSchema, useIsFieldReadPretty, SchemaSettings, useDesignable } from '@nocobase/client';
+
+const fieldComponent: any = {
+  name: 'fieldComponent',
+  type: 'select',
+  useComponentProps() {
+    const { t } = useTranslation();
+    const field = useField<Field>();
+    const { fieldSchema: tableColumnSchema } = useColumnSchema();
+    const schema = useFieldSchema();
+    const fieldSchema = tableColumnSchema || schema;
+    const { dn } = useDesignable();
+
+    return {
+      title: t('Field component'),
+      options: [
+        { label: t('URL'), value: 'url' },
+        { label: t('Preview'), value: 'preview' },
+      ],
+      value: fieldSchema['x-component-props']['componentMode'] || 'preview',
+      onChange(componentMode) {
+        const schema = {
+          ['x-uid']: fieldSchema['x-uid'],
+        };
+        fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+        fieldSchema['x-component-props']['componentMode'] = componentMode;
+        schema['x-component-props'] = fieldSchema['x-component-props'];
+        field.componentProps = field.componentProps || {};
+        field.componentProps.componentMode = componentMode;
+        void dn.emit('patch', {
+          schema,
+        });
+        dn.refresh();
+      },
+    };
+  },
+  useVisible() {
+    const readPretty = useIsFieldReadPretty();
+    const { fieldSchema: tableColumnSchema } = useColumnSchema();
+    return readPretty;
+  },
+};
+
+export const attachmentUrlComponentFieldSettings = new SchemaSettings({
+  name: 'fieldSettings:component:AttachmentUrl',
+  items: [
+    {
+      name: 'quickUpload',
+      type: 'switch',
+      useComponentProps() {
+        const { t } = useTranslation();
+        const field = useField<Field>();
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        const schema = useFieldSchema();
+        const fieldSchema = tableColumnSchema || schema;
+        const { dn, refresh } = useDesignable();
+        return {
+          title: t('Quick upload'),
+          checked: fieldSchema['x-component-props']?.quickUpload !== (false as boolean),
+          onChange(value) {
+            const schema = {
+              ['x-uid']: fieldSchema['x-uid'],
+            };
+            field.componentProps.quickUpload = value;
+            fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+            fieldSchema['x-component-props'].quickUpload = value;
+            schema['x-component-props'] = fieldSchema['x-component-props'];
+            dn.emit('patch', {
+              schema,
+            });
+            refresh();
+          },
+        };
+      },
+      useVisible() {
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        const field = useField();
+        const form = useForm();
+        const isReadPretty = tableColumnSchema?.['x-read-pretty'] || field.readPretty || form.readPretty;
+        return !isReadPretty && !field.componentProps.underFilter;
+      },
+    },
+    {
+      name: 'selectFile',
+      type: 'switch',
+      useComponentProps() {
+        const { t } = useTranslation();
+        const field = useField<Field>();
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        const schema = useFieldSchema();
+        const fieldSchema = tableColumnSchema || schema;
+        const { dn, refresh } = useDesignable();
+        return {
+          title: t('Select file'),
+          checked: fieldSchema['x-component-props']?.selectFile !== (false as boolean),
+          onChange(value) {
+            const schema = {
+              ['x-uid']: fieldSchema['x-uid'],
+            };
+            field.componentProps.selectFile = value;
+            fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+            fieldSchema['x-component-props'].selectFile = value;
+            schema['x-component-props'] = fieldSchema['x-component-props'];
+            dn.emit('patch', {
+              schema,
+            });
+            refresh();
+          },
+        };
+      },
+      useVisible() {
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        const field = useField();
+        const form = useForm();
+        const isReadPretty = tableColumnSchema?.['x-read-pretty'] || field.readPretty || form.readPretty;
+        return !isReadPretty && !field.componentProps.underFilter;
+      },
+    },
+    fieldComponent,
+    {
+      name: 'size',
+      type: 'select',
+      useVisible() {
+        const readPretty = useIsFieldReadPretty();
+        const { fieldSchema: tableColumnSchema } = useColumnSchema();
+        return readPretty && !tableColumnSchema;
+      },
+      useComponentProps() {
+        const { t } = useTranslation();
+        const field = useField<Field>();
+        const fieldSchema = useFieldSchema();
+        const { dn } = useDesignable();
+        return {
+          title: t('Size'),
+          options: [
+            { label: t('Large'), value: 'large' },
+            { label: t('Default'), value: 'default' },
+            { label: t('Small'), value: 'small' },
+          ],
+          value: field?.componentProps?.size || 'default',
+          onChange(size) {
+            const schema = {
+              ['x-uid']: fieldSchema['x-uid'],
+            };
+            fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+            fieldSchema['x-component-props']['size'] = size;
+            schema['x-component-props'] = fieldSchema['x-component-props'];
+            field.componentProps = field.componentProps || {};
+            field.componentProps.size = size;
+            dn.emit('patch', {
+              schema,
+            });
+            dn.refresh();
+          },
+        };
+      },
+    },
+  ],
+});
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/index.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/index.ts
new file mode 100644
index 0000000000..be99a2ff1a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/index.ts
@@ -0,0 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export * from './server';
+export { default } from './server';
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/en-US.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/en-US.json
@@ -0,0 +1 @@
+{}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/zh-CN.json
new file mode 100644
index 0000000000..78def6ea14
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/locale/zh-CN.json
@@ -0,0 +1,4 @@
+{
+    "Which file collection should it be uploaded to":"上传到文件表",
+    "Attachment (URL)":"附件 (URL)"
+}
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/collections/.gitkeep b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/collections/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/index.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/index.ts
new file mode 100644
index 0000000000..be989de7c3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/index.ts
@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export { default } from './plugin';
diff --git a/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts
new file mode 100644
index 0000000000..372274c091
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts
@@ -0,0 +1,28 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Plugin } from '@nocobase/server';
+
+export class PluginFieldAttachmentUrlServer extends Plugin {
+  async afterAdd() {}
+
+  async beforeLoad() {}
+
+  async load() {}
+
+  async install() {}
+
+  async afterEnable() {}
+
+  async afterDisable() {}
+
+  async remove() {}
+}
+
+export default PluginFieldAttachmentUrlServer;
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/.npmignore b/packages/plugins/@nocobase/plugin-workflow-response-message/.npmignore
new file mode 100644
index 0000000000..65f5e8779f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/README.md b/packages/plugins/@nocobase/plugin-workflow-response-message/README.md
new file mode 100644
index 0000000000..8ced21e948
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/README.md
@@ -0,0 +1 @@
+# @nocobase/plugin-workflow-response-message
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/client.d.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/client.d.ts
new file mode 100644
index 0000000000..6c459cbac4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/client.js b/packages/plugins/@nocobase/plugin-workflow-response-message/client.js
new file mode 100644
index 0000000000..b6e3be70e6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/package.json b/packages/plugins/@nocobase/plugin-workflow-response-message/package.json
new file mode 100644
index 0000000000..98203111f7
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@nocobase/plugin-workflow-response-message",
+  "version": "1.7.0-beta.16",
+  "displayName": "Workflow: Response message",
+  "displayName.zh-CN": "工作流：响应消息",
+  "description": "Used for assemble response message and showing to client in form event and request interception workflows.",
+  "description.zh-CN": "用于在表单事件和请求拦截工作流中组装并向客户端显示响应消息。",
+  "main": "dist/server/index.js",
+  "homepage": "https://docs.nocobase.com/handbook/workflow-response-message",
+  "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow-response-message",
+  "peerDependencies": {
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x",
+    "@nocobase/utils": "1.x"
+  },
+  "keywords": [
+    "Workflow"
+  ],
+  "gitHead": "080fc78c1a744d47e010b3bbe5840446775800e4"
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/server.d.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/server.d.ts
new file mode 100644
index 0000000000..c41081ddc6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/server.js b/packages/plugins/@nocobase/plugin-workflow-response-message/server.js
new file mode 100644
index 0000000000..972842039a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/ResponseMessageInstruction.tsx b/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/ResponseMessageInstruction.tsx
new file mode 100644
index 0000000000..efdd6a7241
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/ResponseMessageInstruction.tsx
@@ -0,0 +1,87 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import React from 'react';
+import { InfoCircleOutlined } from '@ant-design/icons';
+import { Alert, Space } from 'antd';
+
+import {
+  Instruction,
+  RadioWithTooltip,
+  WorkflowVariableInput,
+  WorkflowVariableTextArea,
+} from '@nocobase/plugin-workflow/client';
+
+import { NAMESPACE } from '../locale';
+
+export default class extends Instruction {
+  title = `{{t("Response message", { ns: "${NAMESPACE}" })}}`;
+  type = 'response-message';
+  group = 'extended';
+  description = `{{t("Add response message, will be send to client when process of request ends.", { ns: "${NAMESPACE}" })}}`;
+  icon = (<InfoCircleOutlined />);
+  fieldset = {
+    message: {
+      type: 'string',
+      title: `{{t("Message content", { ns: "${NAMESPACE}" })}}`,
+      description: `{{t('Supports variables in template.', { ns: "${NAMESPACE}", name: '{{name}}' })}}`,
+      'x-decorator': 'FormItem',
+      'x-component': 'WorkflowVariableTextArea',
+    },
+    info: {
+      type: 'void',
+      'x-component': 'Space',
+      'x-component-props': {
+        direction: 'vertical',
+      },
+      properties: {
+        success: {
+          type: 'void',
+          'x-component': 'Alert',
+          'x-component-props': {
+            type: 'success',
+            showIcon: true,
+            description: `{{t('If the workflow ends normally, the response message will return a success status by default.', { ns: "${NAMESPACE}" })}}`,
+          },
+        },
+        failure: {
+          type: 'void',
+          'x-component': 'Alert',
+          'x-component-props': {
+            type: 'error',
+            showIcon: true,
+            description: `{{t('If you want to return a failure status, please add an "End Process" node downstream to terminate the workflow.', { ns: "${NAMESPACE}" })}}`,
+          },
+        },
+      },
+    },
+  };
+  scope = {};
+  components = {
+    RadioWithTooltip,
+    WorkflowVariableTextArea,
+    WorkflowVariableInput,
+    Alert,
+    Space,
+  };
+  isAvailable({ workflow, upstream, branchIndex }) {
+    return (
+      workflow.type === 'request-interception' || (['action', 'custom-action'].includes(workflow.type) && workflow.sync)
+    );
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/index.tsx b/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/index.tsx
new file mode 100644
index 0000000000..258f6c8d8b
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/client/index.tsx
@@ -0,0 +1,31 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Plugin } from '@nocobase/client';
+import WorkflowPlugin from '@nocobase/plugin-workflow/client';
+
+import ResponseMessageInstruction from './ResponseMessageInstruction';
+
+export class PluginWorkflowResponseMessageClient extends Plugin {
+  async load() {
+    const workflowPlugin = this.app.pm.get('workflow') as WorkflowPlugin;
+    workflowPlugin.registerInstruction('response-message', ResponseMessageInstruction);
+  }
+}
+
+export default PluginWorkflowResponseMessageClient;
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/index.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/index.ts
new file mode 100644
index 0000000000..7d69462f4f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/index.ts
@@ -0,0 +1,20 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export * from './server';
+export { default } from './server';
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/en-US.json
new file mode 100644
index 0000000000..11832d6610
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/en-US.json
@@ -0,0 +1,6 @@
+{
+  "Response message": "Response message",
+  "Add response message, will be send to client when process of request ends.": "Add response message, will be send to client when process of request ends.",
+  "Message content": "Message content",
+  "Supports variables in template.": "Supports variables in template."
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/index.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/index.ts
new file mode 100644
index 0000000000..543b392f21
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/index.ts
@@ -0,0 +1,25 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { i18n } from '@nocobase/client';
+
+export const NAMESPACE = '@nocobase/plugin-workflow-response-message';
+
+export function lang(key: string, options = {}) {
+  return i18n.t(key, { ...options, ns: NAMESPACE });
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/zh-CN.json
new file mode 100644
index 0000000000..c8b986cace
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/locale/zh-CN.json
@@ -0,0 +1,8 @@
+{
+  "Response message": "响应消息",
+  "Add response message, will be send to client when process of request ends.": "添加响应消息，将在请求处理结束时发送给客户端。",
+  "Message content": "消息内容",
+  "Supports variables in template.": "支持模板变量。",
+  "If the workflow ends normally, the response message will return a success status by default.": "如果工作流正常结束，响应消息默认返回成功状态。",
+  "If you want to return a failure status, please add an \"End Process\" node downstream to terminate the workflow.": "如果希望返回失败状态，请在下游添加“结束流程”节点终止工作流。"
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/Plugin.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/Plugin.ts
new file mode 100644
index 0000000000..cdd6eece72
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/Plugin.ts
@@ -0,0 +1,31 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Plugin } from '@nocobase/server';
+import PluginWorkflowServer from '@nocobase/plugin-workflow';
+
+import ResponseMessageInstruction from './ResponseMessageInstruction';
+
+export class PluginWorkflowResponseMessageServer extends Plugin {
+  async load() {
+    const workflowPlugin = this.app.pm.get(PluginWorkflowServer) as PluginWorkflowServer;
+    workflowPlugin.registerInstruction('response-message', ResponseMessageInstruction);
+  }
+}
+
+export default PluginWorkflowResponseMessageServer;
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/ResponseMessageInstruction.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/ResponseMessageInstruction.ts
new file mode 100644
index 0000000000..e277a44e35
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/ResponseMessageInstruction.ts
@@ -0,0 +1,55 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import { Instruction, Processor, JOB_STATUS, FlowNodeModel } from '@nocobase/plugin-workflow';
+
+interface Config {
+  message?: string;
+}
+
+export default class extends Instruction {
+  async run(node: FlowNodeModel, prevJob, processor: Processor) {
+    const { httpContext } = processor.options;
+
+    if (!httpContext) {
+      return {
+        status: JOB_STATUS.RESOLVED,
+        result: null,
+      };
+    }
+
+    if (!httpContext.state) {
+      httpContext.state = {};
+    }
+
+    if (!httpContext.state.messages) {
+      httpContext.state.messages = [];
+    }
+
+    const message = processor.getParsedValue(node.config.message, node.id);
+
+    if (message) {
+      httpContext.state.messages.push({ message });
+    }
+
+    return {
+      status: JOB_STATUS.RESOLVED,
+      result: message,
+    };
+  }
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts
new file mode 100644
index 0000000000..3d4c4caf10
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts
@@ -0,0 +1,346 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import Database from '@nocobase/database';
+import { MockServer } from '@nocobase/test';
+import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
+import { getApp } from '@nocobase/plugin-workflow-test';
+
+import Plugin from '..';
+
+describe('workflow > instructions > response-message', () => {
+  let app: MockServer;
+  let db: Database;
+  let PostRepo;
+  let WorkflowModel;
+  let workflow;
+  let users;
+  let userAgents;
+
+  beforeEach(async () => {
+    app = await getApp({
+      plugins: ['users', 'auth', 'error-handler', 'workflow-request-interceptor', Plugin],
+    });
+
+    db = app.db;
+
+    PostRepo = db.getCollection('posts').repository;
+
+    WorkflowModel = db.getModel('workflows');
+    workflow = await WorkflowModel.create({
+      enabled: true,
+      type: 'request-interception',
+      config: {
+        global: true,
+        actions: ['create'],
+        collection: 'posts',
+      },
+    });
+
+    const UserModel = db.getCollection('users').model;
+    users = await UserModel.bulkCreate([
+      { id: 2, nickname: 'a' },
+      { id: 3, nickname: 'b' },
+    ]);
+
+    userAgents = await Promise.all(users.map((user) => app.agent().login(user)));
+  });
+
+  afterEach(() => app.destroy());
+
+  describe('no end, pass flow', () => {
+    it('no message', async () => {
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(0);
+    });
+
+    it('has node, but null message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+
+    it('has node, but empty message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: '',
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+
+    it('single static message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toEqual([{ message: 'm1' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+
+    it('multiple static messages', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+      const n2 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm2',
+        },
+        upstreamId: n1.id,
+      });
+      await n1.setDownstream(n2);
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toEqual([{ message: 'm1' }, { message: 'm2' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(2);
+    });
+
+    it('single dynamic message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'new post "{{ $context.params.values.title }}" by {{ $context.user.nickname }}',
+        },
+      });
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body).toMatchObject({ data: { title: 't1' } });
+      expect(res1.body.messages).toEqual([{ message: `new post "t1" by ${users[0].nickname}` }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeDefined();
+      expect(post.title).toBe('t1');
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+  });
+
+  describe('end as success', () => {
+    it('no message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+
+      const posts = await PostRepo.find();
+      expect(posts.length).toBe(0);
+    });
+
+    it('single static message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+
+      const n2 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+        upstreamId: n1.id,
+      });
+
+      await n1.setDownstream(n2);
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toEqual([{ message: 'm1' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(2);
+    });
+  });
+
+  describe('end as failure', () => {
+    it('no message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.FAILED,
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(400);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toBeUndefined();
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.FAILED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(1);
+    });
+
+    it('single static message', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+
+      const n2 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.FAILED,
+        },
+        upstreamId: n1.id,
+      });
+
+      await n1.setDownstream(n2);
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+      });
+
+      expect(res1.status).toBe(400);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.errors).toEqual([{ message: 'm1' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.FAILED);
+      const jobs = await e1.getJobs();
+      expect(jobs.length).toBe(2);
+    });
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts
new file mode 100644
index 0000000000..a97be3e1d6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts
@@ -0,0 +1,185 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+import Database from '@nocobase/database';
+import { MockServer } from '@nocobase/test';
+import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
+import { getApp } from '@nocobase/plugin-workflow-test';
+
+import Plugin from '..';
+
+describe('workflow > multiple workflows', () => {
+  let app: MockServer;
+  let db: Database;
+  let PostRepo;
+  let WorkflowModel;
+  let workflow;
+  let users;
+  let userAgents;
+
+  beforeEach(async () => {
+    app = await getApp({
+      plugins: ['users', 'auth', 'error-handler', 'workflow-request-interceptor', Plugin],
+    });
+
+    db = app.db;
+
+    PostRepo = db.getCollection('posts').repository;
+
+    WorkflowModel = db.getModel('workflows');
+    workflow = await WorkflowModel.create({
+      enabled: true,
+      type: 'request-interception',
+      config: {
+        global: true,
+        actions: ['create'],
+        collection: 'posts',
+      },
+    });
+
+    const UserModel = db.getCollection('users').model;
+    users = await UserModel.bulkCreate([
+      { id: 2, nickname: 'a' },
+      { id: 3, nickname: 'b' },
+    ]);
+
+    userAgents = await Promise.all(users.map((user) => app.agent().login(user)));
+  });
+
+  afterEach(() => app.destroy());
+
+  describe('order', () => {
+    it('workflow 2 run first and pass, workflow 1 ends as success', async () => {
+      const n1 = await workflow.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+      const n2 = await workflow.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+        upstreamId: n1.id,
+      });
+      await n1.setDownstream(n2);
+
+      const w2 = await WorkflowModel.create({
+        enabled: true,
+        type: 'request-interception',
+        config: {
+          action: 'create',
+          collection: 'posts',
+        },
+      });
+
+      const n3 = await w2.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm2',
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+        triggerWorkflows: w2.key,
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toEqual([{ message: 'm2' }, { message: 'm1' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const [e1] = await workflow.getExecutions();
+      expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const j1s = await e1.getJobs();
+      expect(j1s.length).toBe(2);
+
+      const [e2] = await w2.getExecutions();
+      expect(e2.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const j2s = await e2.getJobs();
+      expect(j2s.length).toBe(1);
+    });
+
+    it('local workflow in trigger key order', async () => {
+      const w1 = await WorkflowModel.create({
+        enabled: true,
+        type: 'request-interception',
+        config: {
+          action: 'create',
+          collection: 'posts',
+        },
+      });
+
+      const n1 = await w1.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm1',
+        },
+      });
+
+      const w2 = await WorkflowModel.create({
+        enabled: true,
+        type: 'request-interception',
+        config: {
+          action: 'create',
+          collection: 'posts',
+        },
+      });
+
+      const n2 = await w2.createNode({
+        type: 'response-message',
+        config: {
+          message: 'm2',
+        },
+      });
+
+      const n3 = await w2.createNode({
+        type: 'end',
+        config: {
+          endStatus: JOB_STATUS.RESOLVED,
+        },
+        upstreamId: n2.id,
+      });
+
+      await n2.setDownstream(n3);
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+        triggerWorkflows: [w2.key, w1.key].join(),
+      });
+
+      expect(res1.status).toBe(200);
+      expect(res1.body.data).toBeUndefined();
+      expect(res1.body.messages).toEqual([{ message: 'm2' }]);
+
+      const post = await PostRepo.findOne();
+      expect(post).toBeNull();
+
+      const e1s = await w1.getExecutions();
+      expect(e1s.length).toBe(0);
+      const [e2] = await w2.getExecutions();
+      expect(e2.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const jobs = await e2.getJobs();
+      expect(jobs.length).toBe(2);
+    });
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/index.ts b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/index.ts
new file mode 100644
index 0000000000..b0c269d075
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow-response-message/src/server/index.ts
@@ -0,0 +1,19 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+
+export { default } from './Plugin';
diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json
index e5bc84504b..9822d8f2a1 100644
--- a/packages/presets/nocobase/package.json
+++ b/packages/presets/nocobase/package.json
@@ -32,8 +32,10 @@
     "@nocobase/plugin-data-source-main": "1.7.0-beta.16",
     "@nocobase/plugin-data-source-manager": "1.7.0-beta.16",
     "@nocobase/plugin-data-visualization": "1.7.0-beta.16",
+    "@nocobase/plugin-departments": "1.7.0-beta.16",
     "@nocobase/plugin-environment-variables": "1.7.0-beta.16",
     "@nocobase/plugin-error-handler": "1.7.0-beta.16",
+    "@nocobase/plugin-field-attachment-url": "1.7.0-beta.16",
     "@nocobase/plugin-field-china-region": "1.7.0-beta.16",
     "@nocobase/plugin-field-formula": "1.7.0-beta.16",
     "@nocobase/plugin-field-m2m-array": "1.7.0-beta.16",
@@ -75,6 +77,7 @@
     "@nocobase/plugin-workflow-notification": "1.7.0-beta.16",
     "@nocobase/plugin-workflow-parallel": "1.7.0-beta.16",
     "@nocobase/plugin-workflow-request": "1.7.0-beta.16",
+    "@nocobase/plugin-workflow-response-message": "1.7.0-beta.16",
     "@nocobase/plugin-workflow-sql": "1.7.0-beta.16",
     "@nocobase/server": "1.7.0-beta.16",
     "cronstrue": "^2.11.0",