Merge pull request 'merge_from_origin' (#474) from merge_from_origin into @hera/dev

Reviewed-on: daoyoucloud/tachycode#474

CHANGELOG.md

@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [v0.20.0-alpha.16](https://github.com/nocobase/nocobase/compare/v0.20.0-alpha.15...v0.20.0-alpha.16) - 2024-03-23
+
+### Merged
+
+- refactor: view collection support filterTargetKey config [`#3767`](https://github.com/nocobase/nocobase/pull/3767)
+- fix: hide child when useVisible() is false [`#3803`](https://github.com/nocobase/nocobase/pull/3803)
+- fix(client): fix action designer error occured in custom form [`#3801`](https://github.com/nocobase/nocobase/pull/3801)
+- fix: through collection support search [`#3800`](https://github.com/nocobase/nocobase/pull/3800)
+- fix(subTable): fix sorting rule setting [`#3795`](https://github.com/nocobase/nocobase/pull/3795)
+- fix: load data source when data source load failed [`#3793`](https://github.com/nocobase/nocobase/pull/3793)
+- fix(acl): role menu loading status [`#3787`](https://github.com/nocobase/nocobase/pull/3787)
+- fix(acl): bug when adding users to roles [`#3783`](https://github.com/nocobase/nocobase/pull/3783)
+- fix: filter does not allow passing empty objects [`#3780`](https://github.com/nocobase/nocobase/pull/3780)
+- fix(acl): role menu list only displays one page [`#3775`](https://github.com/nocobase/nocobase/pull/3775)
+- feat(plugin-user): add model method desensitize() to filter hidden field [`#3768`](https://github.com/nocobase/nocobase/pull/3768)
+- fix(plugin-file-manager): fix storage locale on file template table header [`#3769`](https://github.com/nocobase/nocobase/pull/3769)
+- fix: first character entered in foreign key input is not displayed [`#3770`](https://github.com/nocobase/nocobase/pull/3770)
+
+### Commits
+
+- chore(versions): 😊 publish v0.20.0-alpha.16 [`71ec7ec`](https://github.com/nocobase/nocobase/commit/71ec7ece6a65fa00acd590ebb4a6de828fe01655)
+- chore: update changelog [`170d601`](https://github.com/nocobase/nocobase/commit/170d60158666efd1c75f7d273ddcf529d5ed3c88)
+- fix: manual e2e [`556152d`](https://github.com/nocobase/nocobase/commit/556152d7c22ce0e871d3ac244539db84f52c2fe7)
+
 ## [v0.20.0-alpha.15](https://github.com/nocobase/nocobase/compare/v0.20.0-alpha.14...v0.20.0-alpha.15) - 2024-03-20
 
 ### Merged

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "npmClientArgs": ["--ignore-engines"],

packages/core/acl/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "0.20.0-alpha.15",
+    "@nocobase/resourcer": "0.20.0-alpha.16",
-    "@nocobase/utils": "0.20.0-alpha.15",
+    "@nocobase/utils": "0.20.0-alpha.16",
     "minimatch": "^5.1.1"
   },
   "repository": {

packages/core/actions/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@nocobase/actions",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cache": "0.20.0-alpha.15",
+    "@nocobase/cache": "0.20.0-alpha.16",
-    "@nocobase/database": "0.20.0-alpha.15",
+    "@nocobase/database": "0.20.0-alpha.16",
-    "@nocobase/resourcer": "0.20.0-alpha.15"
+    "@nocobase/resourcer": "0.20.0-alpha.16"
   },
   "repository": {
     "type": "git",

packages/core/app/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@nocobase/app",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/database": "0.20.0-alpha.15",
+    "@nocobase/database": "0.20.0-alpha.16",
-    "@nocobase/preset-nocobase": "0.20.0-alpha.15",
+    "@nocobase/preset-nocobase": "0.20.0-alpha.16",
-    "@nocobase/server": "0.20.0-alpha.15"
+    "@nocobase/server": "0.20.0-alpha.16"
   },
   "devDependencies": {
-    "@nocobase/client": "0.20.0-alpha.15"
+    "@nocobase/client": "0.20.0-alpha.16"
   },
   "repository": {
     "type": "git",

packages/core/auth/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.20.0-alpha.15",
+    "@nocobase/actions": "0.20.0-alpha.16",
-    "@nocobase/cache": "0.20.0-alpha.15",
+    "@nocobase/cache": "0.20.0-alpha.16",
-    "@nocobase/database": "0.20.0-alpha.15",
+    "@nocobase/database": "0.20.0-alpha.16",
-    "@nocobase/resourcer": "0.20.0-alpha.15",
+    "@nocobase/resourcer": "0.20.0-alpha.16",
-    "@nocobase/utils": "0.20.0-alpha.15",
+    "@nocobase/utils": "0.20.0-alpha.16",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },

packages/core/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",

packages/core/cache/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cache",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",

packages/core/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "0.20.0-alpha.15",
+    "@nocobase/app": "0.20.0-alpha.16",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,7 +25,7 @@
     "tsx": "^4.6.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.20.0-alpha.15"
+    "@nocobase/devtools": "0.20.0-alpha.16"
   },
   "repository": {
     "type": "git",

packages/core/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -26,9 +26,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "0.20.0-alpha.15",
+    "@nocobase/evaluators": "0.20.0-alpha.16",
-    "@nocobase/sdk": "0.20.0-alpha.15",
+    "@nocobase/sdk": "0.20.0-alpha.16",
-    "@nocobase/utils": "0.20.0-alpha.15",
+    "@nocobase/utils": "0.20.0-alpha.16",
     "ahooks": "^3.7.2",
     "antd": "^5.12.8",
     "antd-style": "3.4.5",

packages/core/client/src/application/schema-initializer/components/SchemaInitializerSubMenu.tsx

@@ -72,7 +72,8 @@ export const SchemaInitializerMenu: FC<MenuProps> = (props) => {
 export const SchemaInitializerSubMenu: FC<SchemaInitializerSubMenuProps> = (props) => {
   const { children, title, name = uid(), onOpenChange, icon, ...others } = props;
   const compile = useCompile();
-  const childrenItems = useSchemaInitializerMenuItems(children, name);
+  const validChildren = children?.filter((item) => (item.useVisible ? item.useVisible() : true));
+  const childrenItems = useSchemaInitializerMenuItems(validChildren, name);
 
   const items = useMemo(() => {
     return [

packages/core/client/src/application/schema-settings/hooks/index.tsx

@@ -35,9 +35,9 @@ export function useSchemaSettingsRender<T = {}>(name: string, options?: UseSchem
   }
   return {
     exists: true,
-    render: (options2?: UseSchemaSettingsRenderOptions) => {
+    render: (options2: UseSchemaSettingsRenderOptions = {}) => {
-      const key = JSON.stringify(options) || '{}';
+      const key = JSON.stringify(options2);
-      if (renderCache.current[key]) {
+      if (key && renderCache.current[key]) {
         return renderCache.current[key];
       }
       return (renderCache.current[key] = React.createElement(SchemaSettingsWrapper, {

packages/core/client/src/application/schema-settings/types.ts

@@ -40,10 +40,6 @@ export interface SchemaSettingItemGroupType extends SchemaSettingsItemCommon<Sch
   type: 'itemGroup';
 }
 
-export interface SchemaSettingItemSubMenuType extends SchemaSettingsItemCommon<SchemaSettingsSubMenuProps> {
-  type: 'subMenu';
-}
-
 export interface SchemaSettingItemDividerProps extends SchemaSettingsItemCommon {
   type: 'divider';
 }
@@ -76,6 +72,10 @@ export type SchemaSettingItemActionModalType = SchemaSettingsItemCommon<SchemaSe
   type: 'actionModal';
 };
 
+export interface SchemaSettingItemSubMenuType extends SchemaSettingsItemCommon<SchemaSettingsSubMenuProps> {
+  type: 'subMenu';
+}
+
 export interface SchemaSettingItemComponentType<T = {}> extends SchemaSettingsItemCommon<T> {
   Component: string | ComponentType<T>;
 }
@@ -90,6 +90,7 @@ export type SchemaSettingItemAllBuiltType =
   | SchemaSettingItemModalType
   | SchemaSettingItemItemType
   | SchemaSettingItemSelectType
+  | SchemaSettingItemSubMenuType
   | SchemaSettingItemGroupType;
 
 export type SchemaSettingsItemType = SchemaSettingItemComponentType | SchemaSettingItemAllBuiltType;

packages/core/client/src/collection-manager/Configuration/components/index.tsx

@@ -325,6 +325,17 @@ export const ThroughCollection = observer(
         setInitialValue(option?.label || value);
       }
     }, []);
+    const handleSearch = (value: string) => {
+      if (value) {
+        const filteredOptions = options.filter((option) => {
+          return option.label.toLowerCase().includes(value.toLowerCase());
+        });
+        setOptions(filteredOptions);
+      } else {
+        const data = loadCollections();
+        setOptions(data);
+      }
+    };
     return (
       <div>
         <AutoComplete
@@ -333,9 +344,10 @@ export const ThroughCollection = observer(
           popupMatchSelectWidth={false}
           value={initialValue}
           options={options}
+          onSearch={handleSearch}
           onChange={(value, option) => {
             props?.onChange?.(value);
-            setInitialValue(option.label);
+            setInitialValue(option.label || value);
           }}
         />
       </div>

packages/core/client/src/collection-manager/hooks/useCollectionManager_deprecated.ts

@@ -108,7 +108,7 @@ export const useCollectionManager_deprecated = (dataSourceName?: string) => {
       if (!name) return [];
       const collection = getCm(customDataSource)?.getCollection<InheritanceCollectionMixin>(name);
       const res = collection?.getChildrenCollections(isSupportView);
-      return res;
+      return res || [];
     },
     [dm, getCm],
   );

packages/core/client/src/modules/blocks/data-blocks/details-single/ReadPrettyFormActionInitializers.tsx

@@ -1,5 +1,5 @@
-import { useCollection_deprecated } from '../../../../collection-manager/hooks/useCollection_deprecated';
 import { CompatibleSchemaInitializer } from '../../../../application/schema-initializer/CompatibleSchemaInitializer';
+import { useCollection_deprecated } from '../../../../collection-manager/hooks/useCollection_deprecated';
 
 const useVisibleCollection = () => {
   const collection = useCollection_deprecated();
@@ -76,7 +76,7 @@ export const readPrettyFormActionInitializers_deprecated = new CompatibleSchemaI
               'x-component': 'Action',
             };
           },
-          visible: useVisibleCollection,
+          useVisible: useVisibleCollection,
         },
         {
           name: 'customRequest',
@@ -156,7 +156,7 @@ export const readPrettyFormActionInitializers = new CompatibleSchemaInitializer(
                 'x-component': 'Action',
               };
             },
-            visible: useVisibleCollection,
+            useVisible: useVisibleCollection,
           },
           {
             name: 'customRequest',

packages/core/client/src/schema-settings/SchemaSettingsSortingRule.tsx

@@ -108,13 +108,17 @@ export const SchemaSettingsSortingRule = function SortRuleConfigure(props) {
         const sortArr = sort.map((item) => {
           return item.direction === 'desc' ? `-${item.field}` : item.field;
         });
-        _.set(field.componentProps, 'service.params.sort', sortArr);
+
+        // 把列中的所有 field 实例找出来，进行更新
+        field.query(new RegExp(`[0-9]+\\.${fieldSchema.name}$`)).forEach((item) => {
+          _.set(item, 'componentProps.service.params.sort', sortArr);
+        });
+        _.set(fieldSchema, 'x-component-props.service.params.sort', sortArr);
         props?.onSubmitCallBack?.(sortArr);
-        fieldSchema['x-component-props'] = field.componentProps;
         dn.emit('patch', {
           schema: {
             ['x-uid']: fieldSchema['x-uid'],
-            'x-component-props': field.componentProps,
+            'x-component-props': fieldSchema['x-component-props'],
           },
         });
       }}

packages/core/create-nocobase-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nocobase-app",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "main": "src/index.js",
   "license": "Apache-2.0",
   "dependencies": {

packages/core/data-source-manager/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.20.0-alpha.15",
+    "@nocobase/actions": "0.20.0-alpha.16",
-    "@nocobase/cache": "0.20.0-alpha.15",
+    "@nocobase/cache": "0.20.0-alpha.16",
-    "@nocobase/database": "0.20.0-alpha.15",
+    "@nocobase/database": "0.20.0-alpha.16",
-    "@nocobase/resourcer": "0.20.0-alpha.15",
+    "@nocobase/resourcer": "0.20.0-alpha.16",
-    "@nocobase/utils": "0.20.0-alpha.15",
+    "@nocobase/utils": "0.20.0-alpha.16",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },

packages/core/database/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.20.0-alpha.15",
+    "@nocobase/logger": "0.20.0-alpha.16",
-    "@nocobase/utils": "0.20.0-alpha.15",
+    "@nocobase/utils": "0.20.0-alpha.16",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",

packages/core/devtools/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/devtools",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "0.20.0-alpha.15",
+    "@nocobase/build": "0.20.0-alpha.16",
-    "@nocobase/client": "0.20.0-alpha.15",
+    "@nocobase/client": "0.20.0-alpha.16",
-    "@nocobase/test": "0.20.0-alpha.15",
+    "@nocobase/test": "0.20.0-alpha.16",
     "@types/koa": "^2.13.4",
     "@types/koa-bodyparser": "^4.3.4",
     "@types/lodash": "^4.14.177",

packages/core/evaluators/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/evaluators",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
     "@formulajs/formulajs": "4.2.0",
-    "@nocobase/utils": "0.20.0-alpha.15",
+    "@nocobase/utils": "0.20.0-alpha.16",
     "mathjs": "^10.6.0"
   },
   "repository": {

packages/core/logger/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "nocobase logging library",
   "license": "Apache-2.0",
   "main": "./lib/index.js",

packages/core/resourcer/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/utils": "0.20.0-alpha.15",
+    "@nocobase/utils": "0.20.0-alpha.16",
     "deepmerge": "^4.2.2",
     "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",

packages/core/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/sdk",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

packages/core/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "0.20.0-alpha.15",
+    "version": "0.20.0-alpha.16",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "Apache-2.0",
@@ -10,18 +10,18 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "0.20.0-alpha.15",
+        "@nocobase/acl": "0.20.0-alpha.16",
-        "@nocobase/actions": "0.20.0-alpha.15",
+        "@nocobase/actions": "0.20.0-alpha.16",
-        "@nocobase/auth": "0.20.0-alpha.15",
+        "@nocobase/auth": "0.20.0-alpha.16",
-        "@nocobase/cache": "0.20.0-alpha.15",
+        "@nocobase/cache": "0.20.0-alpha.16",
-        "@nocobase/data-source-manager": "0.20.0-alpha.15",
+        "@nocobase/data-source-manager": "0.20.0-alpha.16",
-        "@nocobase/database": "0.20.0-alpha.15",
+        "@nocobase/database": "0.20.0-alpha.16",
-        "@nocobase/evaluators": "0.20.0-alpha.15",
+        "@nocobase/evaluators": "0.20.0-alpha.16",
-        "@nocobase/logger": "0.20.0-alpha.15",
+        "@nocobase/logger": "0.20.0-alpha.16",
-        "@nocobase/resourcer": "0.20.0-alpha.15",
+        "@nocobase/resourcer": "0.20.0-alpha.16",
-        "@nocobase/sdk": "0.20.0-alpha.15",
+        "@nocobase/sdk": "0.20.0-alpha.16",
-        "@nocobase/telemetry": "0.20.0-alpha.15",
+        "@nocobase/telemetry": "0.20.0-alpha.16",
-        "@nocobase/utils": "0.20.0-alpha.15",
+        "@nocobase/utils": "0.20.0-alpha.16",
         "@types/decompress": "4.2.4",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",

packages/core/telemetry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/telemetry",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "nocobase telemetry library",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -11,7 +11,7 @@
     "directory": "packages/telemetry"
   },
   "dependencies": {
-    "@nocobase/utils": "0.20.0-alpha.15",
+    "@nocobase/utils": "0.20.0-alpha.16",
     "@opentelemetry/api": "^1.7.0",
     "@opentelemetry/instrumentation": "^0.46.0",
     "@opentelemetry/resources": "^1.19.0",

packages/core/test/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "0.20.0-alpha.15",
+    "@nocobase/server": "0.20.0-alpha.16",
     "@playwright/test": "^1.42.1",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",

packages/core/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",

packages/plugins/@nocobase/plugin-acl/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "权限控制",
   "description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",

packages/plugins/@nocobase/plugin-action-bulk-edit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-bulk-edit",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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",

packages/plugins/@nocobase/plugin-action-bulk-update/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-bulk-update",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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",

packages/plugins/@nocobase/plugin-action-duplicate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-duplicate",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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",

packages/plugins/@nocobase/plugin-action-print/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-action-print",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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",

packages/plugins/@nocobase/plugin-api-doc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-api-doc",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "displayName": "API documentation",
   "displayName.zh-CN": "API 文档",
   "description": "An OpenAPI documentation generator for NocoBase HTTP API.",

packages/plugins/@nocobase/plugin-api-keys/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：API 密钥",
   "description": "Allows users to use API key to access application's HTTP API",
   "description.zh-CN": "允许用户使用 API 密钥访问应用的 HTTP API",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/api-keys",

packages/plugins/@nocobase/plugin-audit-logs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-audit-logs",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "displayName": "Audit logs (deprecated)",
   "displayName.zh-CN": "审计日志（废弃）",
   "description": "This plugin is deprecated. There will be a new audit log plugin in the future.",

packages/plugins/@nocobase/plugin-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-auth",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/auth",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/auth",

packages/plugins/@nocobase/plugin-backup-restore/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "应用的备份与还原",
   "description": "Backup and restore applications for scenarios such as application replication, migration, and upgrades.",
   "description.zh-CN": "备份和还原应用，可用于应用的复制、迁移、升级等场景。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/backup-restore",

packages/plugins/@nocobase/plugin-calendar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-calendar",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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.",

packages/plugins/@nocobase/plugin-cas/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：CAS",
   "description": "CAS authentication.",
   "description.zh-CN": "通过 CAS 协议认证身份。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/auth-cas",

packages/plugins/@nocobase/plugin-charts/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "图表（废弃）",
   "description": "The plugin has been deprecated, please use the data visualization plugin instead.",
   "description.zh-CN": "已废弃插件，请使用数据可视化插件代替。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {

packages/plugins/@nocobase/plugin-china-region/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-china-region",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "displayName": "Administrative divisions of China",
   "displayName.zh-CN": "中国行政区划",
   "description": "Provides data and field type for administrative divisions of China.",

packages/plugins/@nocobase/plugin-client/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "WEB 客户端",
   "description": "Provides a client interface for the NocoBase server",
   "description.zh-CN": "为 NocoBase 服务端提供客户端界面",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {

packages/plugins/@nocobase/plugin-collection-manager/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as MySQL, PostgreSQL, SQLite and so on.",
   "description.zh-CN": "NocoBase 主数据库，支持 MySQL、PostgreSQL、SQLite 等关系型数据库。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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",

packages/plugins/@nocobase/plugin-custom-request/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-custom-request",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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",

packages/plugins/@nocobase/plugin-data-source-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-source-manager",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "main": "dist/server/index.js",
   "displayName": "Data source manager",
   "displayName.zh-CN": "数据源管理",

packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx

@@ -21,6 +21,7 @@ import {
   useResourceContext,
   useCancelAction,
 } from '@nocobase/client';
+import { NAMESPACE } from '../../locale';
 
 const getSchema = (schema: IField, record: any, compile, getContainer): ISchema => {
   if (!schema) {
@@ -56,6 +57,14 @@ const getSchema = (schema: IField, record: any, compile, getContainer): ISchema
         title: '{{ t("Edit collection") }}',
         properties: {
           ...omit(properties, 'category', 'inherits', 'moreOptions'),
+          filterTargetKey: {
+            title: `{{ t("Filter target key",{ ns: "${NAMESPACE}" }) }}`,
+            type: 'single',
+            'x-decorator': 'FormItem',
+            'x-component': 'Select',
+            enum: '{{filterTargetKeyOptions}}',
+            'x-visible': '{{isView}}',
+          },
           footer: {
             type: 'void',
             'x-component': 'Action.Drawer.Footer',
@@ -147,6 +156,12 @@ const EditCollectionAction = (props) => {
   const { t } = useTranslation();
   const compile = useCompile();
 
+  const filterTargetKeyOptions = record.fields?.map((item: any) => {
+    return {
+      label: item.uiSchema?.title ? compile(item.uiSchema.title) : item.name,
+      value: item.name,
+    };
+  });
   return (
     <RecordProvider record={record}>
       <ActionContextProvider value={{ visible, setVisible }}>
@@ -177,6 +192,8 @@ const EditCollectionAction = (props) => {
             useUpdateCollectionActionAndRefreshCM,
             useCancelAction,
             createOnly: false,
+            filterTargetKeyOptions,
+            isView: record.view,
             ...scope,
           }}
         />

packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RolesResourcesActions.tsx

@@ -51,9 +51,7 @@ export const RolesResourcesActions = connect((props) => {
     return action?.fields?.includes(fieldName);
   };
   const availableActionsWithFields = availableActions.filter((action) => action.allowConfigureFields);
-  const fieldPermissions = collectionFields
+  const fieldPermissions = collectionFields?.map((field) => {
-    ?.filter((field) => field.interface)
-    ?.map((field) => {
     const permission = { ...field };
     for (const action of availableActionsWithFields) {
       permission[action.name] = inAction(action.name, field.name);
@@ -83,8 +81,7 @@ export const RolesResourcesActions = connect((props) => {
   };
   const allChecked = {};
   for (const action of availableActionsWithFields) {
-    allChecked[action.name] =
+    allChecked[action.name] = collectionFields?.length === actionMap?.[action.name]?.fields?.length;
-      collectionFields?.filter((field) => field.interface)?.length === actionMap?.[action.name]?.fields?.length;
   }
   return (
     <div>
@@ -163,7 +160,7 @@ export const RolesResourcesActions = connect((props) => {
                 {
                   dataIndex: ['uiSchema', 'title'],
                   title: t('Field display name'),
-                  render: (value) => compile(value),
+                  render: (value, record) => compile(value) || record.name,
                 },
                 ...availableActionsWithFields.map((action) => {
                   const checked = allChecked?.[action.name];
@@ -185,7 +182,7 @@ export const RolesResourcesActions = connect((props) => {
                             actionMap[action.name] = item;
                             onChange(Object.values(actionMap));
                           }}
-                        />{' '}
+                        />
                         {compile(action.displayName)}
                       </>
                     ),

packages/plugins/@nocobase/plugin-data-source-manager/src/locale/zh-CN.json

@@ -29,5 +29,6 @@
   "Loaded": "已加载",
   "Reloading": "加载中",
   "Data source synchronization in progress": "数据源同步中",
-  "Data source synchronization successful": "数据源同步成功"
+  "Data source synchronization successful": "数据源同步成功",
+  "Filter target key":"筛选目标键"
 }

packages/plugins/@nocobase/plugin-data-source-manager/src/server/__tests__/data-sources.test.ts

@@ -342,9 +342,10 @@ describe('data source', async () => {
     expect(app.dataSourceManager.dataSources.get('mockInstance1')).not.toBeDefined();
   });
 
+  class MockCollectionManager extends CollectionManager {}
+
   describe('data source collections', () => {
     beforeEach(async () => {
-      class MockCollectionManager extends CollectionManager {}
       class MockDataSource extends DataSource {
         async load(): Promise<void> {
           this.collectionManager.defineCollection({
@@ -397,6 +398,7 @@ describe('data source', async () => {
       const listResp = await app.agent().resource('dataSources').list({
         appends: 'collections',
       });
+
       expect(listResp.status).toBe(200);
 
       const listEnabledResp = await app.agent().resource('dataSources').listEnabled({});
@@ -406,6 +408,41 @@ describe('data source', async () => {
       expect(item.collections).toBeDefined();
     });
 
+    it('should get data source with collections when data source load failed', async () => {
+      class MockDataSource2 extends DataSource {
+        async load(): Promise<void> {
+          throw new Error('load failed');
+        }
+
+        createCollectionManager(options?: any) {
+          return new MockCollectionManager();
+        }
+      }
+
+      app.dataSourceManager.factory.register('mock2', MockDataSource2);
+
+      await app.db.getRepository('dataSources').create({
+        values: {
+          key: 'mockInstance2',
+          type: 'mock2',
+          displayName: 'Mock 2',
+          options: {
+            password: '123456',
+          },
+        },
+      });
+
+      await waitSecond(1000);
+
+      const listResp = await app.agent().resource('dataSources').listEnabled({
+        appends: 'collections',
+      });
+
+      expect(listResp.status).toBe(200);
+
+      console.log(listResp.body.data);
+    });
+
     it('should get collections from datasource', async () => {
       const listResp = await app.agent().resource('dataSources').list();
       expect(listResp.status).toBe(200);

packages/plugins/@nocobase/plugin-data-source-manager/src/server/plugin.ts

@@ -159,15 +159,14 @@ export class PluginDataSourceManagerServer extends Plugin {
       const dataSource = app.dataSourceManager.dataSources.get(dataSourceModel.get('key'));
       const dataSourceStatus = plugin.dataSourceStatus[dataSourceModel.get('key')];
 
-      // @ts-ignore
-      const isDBInstance = !!dataSource.collectionManager.db;
-
       const item: any = {
         key: dataSourceModel.get('key'),
         displayName: dataSourceModel.get('displayName'),
         status: dataSourceStatus,
         type: dataSourceModel.get('type'),
-        isDBInstance,
+
+        // @ts-ignore
+        isDBInstance: !!dataSource?.collectionManager.db,
       };
 
       if (dataSourceStatus === 'loading-failed' || dataSourceStatus === 'reloading-failed') {

packages/plugins/@nocobase/plugin-data-visualization/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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.",

packages/plugins/@nocobase/plugin-disable-pm-add/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-disable-pm-add",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "main": "./dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "0.x",

packages/plugins/@nocobase/plugin-error-handler/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "错误处理器",
   "description": "Handling application errors and exceptions.",
   "description.zh-CN": "处理应用程序中的错误和异常。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {

packages/plugins/@nocobase/plugin-excel-formula-field/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-excel-formula-field",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",

packages/plugins/@nocobase/plugin-export/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "操作：导出记录",
   "description": "Export filtered records to excel, you can configure which fields to export.",
   "description.zh-CN": "导出筛选后的记录到 Excel 中，可以配置导出哪些字段。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-export",

packages/plugins/@nocobase/plugin-file-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",

packages/plugins/@nocobase/plugin-formula-field/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：公式",
   "description": "Configure and store the results of calculations between multiple field values in the same record, supporting both Math.js and Excel formula functions.",
   "description.zh-CN": "可以配置并存储同一条记录的多字段值之间的计算结果，支持 Math.js 和 Excel formula functions 两种引擎",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-formula",

packages/plugins/@nocobase/plugin-gantt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-gantt",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "displayName": "Block: Gantt",
   "displayName.zh-CN": "区块：甘特图",
   "description": "Provides Gantt block.",

packages/plugins/@nocobase/plugin-graph-collection-manager/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "可视化数据表管理",
   "description": "An ER diagram-like tool. Currently only the Master database is supported.",
   "description.zh-CN": "类似 ER 图的工具，目前只支持主数据库。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/graph-collection-manager",

packages/plugins/@nocobase/plugin-iframe-block/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "区块：iframe",
   "description": "Create an iframe block on the page to embed and display external web pages or content.",
   "description.zh-CN": "在页面上创建和管理iframe，用于嵌入和展示外部网页或内容。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/block-iframe",

packages/plugins/@nocobase/plugin-import/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "操作：导入记录",
   "description": "Import records using excel templates. You can configure which fields to import and templates will be generated automatically.",
   "description.zh-CN": "使用 Excel 模板导入数据，可以配置导入哪些字段，自动生成模板。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-import",

packages/plugins/@nocobase/plugin-kanban/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-kanban",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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",

packages/plugins/@nocobase/plugin-localization-management/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-localization-management",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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",

packages/plugins/@nocobase/plugin-logger/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "日志",
   "description": "Server-side logs, mainly including API request logs and system runtime logs, and allows to package and download log files.",
   "description.zh-CN": "服务端日志，主要包括接口请求日志和系统运行日志，并支持打包和下载日志文件。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/logger",

packages/plugins/@nocobase/plugin-map/package.json

@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-map",
   "displayName": "Block: Map",
   "displayName.zh-CN": "区块：地图",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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",

packages/plugins/@nocobase/plugin-math-formula-field/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数学公式字段",
   "description": "A powerful mathematical formula field plugin designed to provide flexible mathematical and formula calculation capabilities for databases or data management systems. It seamlessly integrates with various database systems such as MySQL, PostgreSQL, and offers an intuitive user interface for defining and executing mathematical formula fields.",
   "description.zh-CN": "一个功能强大的数学公式字段插件，旨在为数据库或数据管理系统提供灵活的数学计算和公式计算功能。它可以与各种数据库系统（如MySQL、PostgreSQL）无缝集成，并提供直观的用户界面来定义和执行数学公式字段。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {

packages/plugins/@nocobase/plugin-mobile-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-mobile-client",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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",

packages/plugins/@nocobase/plugin-mock-collections/package.json

@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-mock-collections",
   "displayName": "mock-collections",
   "description": "mock-collections",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "peerDependencies": {

packages/plugins/@nocobase/plugin-multi-app-manager/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用管理器",
   "description": "Dynamically create multiple apps without separate deployments.",
   "description.zh-CN": "无需单独部署即可动态创建多个应用。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/multi-app-manager",

packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用数据表共享",
   "description": "",
   "description.zh-CN": "",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "main": "./dist/server/index.js",
   "devDependencies": {
     "@formily/react": "2.x",

packages/plugins/@nocobase/plugin-notifications/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notifications",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",

packages/plugins/@nocobase/plugin-oidc/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：OIDC",
   "description": "OIDC (OpenID Connect) authentication.",
   "description.zh-CN": "通过 OIDC (OpenID Connect) 协议认证身份。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/auth-oidc",

packages/plugins/@nocobase/plugin-saml/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：SAML 2.0",
   "description": "SAML 2.0 authentication.",
   "description.zh-CN": "通过 SAML 2.0 协议认证身份。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/auth-saml",

packages/plugins/@nocobase/plugin-sample-hello/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-sample-hello",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "main": "./dist/server/index.js",
   "displayName": "Hello",
   "displayName.zh-CN": "Hello",

packages/plugins/@nocobase/plugin-sequence-field/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：自动编码",
   "description": "Automatically generate codes based on configured rules, supporting combinations of dates, numbers, and text.",
   "description.zh-CN": "根据配置的规则自动生成编码，支持日期、数字、文本的组合。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-sequence",

packages/plugins/@nocobase/plugin-sms-auth/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "认证：短信",
   "description": "SMS authentication.",
   "description.zh-CN": "通过短信验证码认证身份。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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",

packages/plugins/@nocobase/plugin-snapshot-field/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据表字段：关系快照",
   "description": "When adding a new record, create a snapshot for its relational record and save in the new record. The snapshot will not be updated when the relational record is updated.",
   "description.zh-CN": "在添加数据时，为它的关系数据创建快照，并保存在当前的数据中。关系数据更新时，快照不会更新。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/field-snapshot",

packages/plugins/@nocobase/plugin-system-settings/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "系统设置",
   "description": "Used to adjust the system title, logo, language, etc.",
   "description.zh-CN": "用于调整系统的标题、LOGO、语言等。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/system-settings",

packages/plugins/@nocobase/plugin-theme-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-theme-editor",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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",

packages/plugins/@nocobase/plugin-ui-routes-storage/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "路由管理",
   "description": "manage the routes of nocobase",
   "description.zh-CN": "管理页面路由。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {

packages/plugins/@nocobase/plugin-ui-schema-storage/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "UI schema 存储服务",
   "description": "Provides centralized UI schema storage service.",
   "description.zh-CN": "提供中心化的 UI schema 存储服务。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/ui-schema-storage",

packages/plugins/@nocobase/plugin-users/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "用户",
   "description": "Provides basic user model, as well as created by and updated by fields.",
   "description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/users",

packages/plugins/@nocobase/plugin-verification/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "验证码",
   "description": "verification setting.",
   "description.zh-CN": "验证码配置。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/verification",

packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：数据操作触发器",
   "description": "Bind action buttons to trigger workflow events when clicked.",
   "description.zh-CN": "可对数据操作按钮绑定，在点击后触发对应的工作流事件。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/plugins/workflow-action-trigger",

packages/plugins/@nocobase/plugin-workflow-aggregate/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：聚合查询节点",
   "description": "Used to aggregate data against the database in workflow, such as: statistics, sum, average, etc.",
   "description.zh-CN": "可用于在工作流中对数据库进行聚合查询，如：统计数量、求和、平均值等。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-aggregate",

packages/plugins/@nocobase/plugin-workflow-delay/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：延时节点",
   "description": "Could be used in workflow parallel branch for waiting other branches.",
   "description.zh-CN": "可用于工作流并行分支中等待其他分支执行完成。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-delay",

packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：动态表达式计算节点",
   "description": "Useful plugin for doing dynamic calculation based on expression collection records in workflow.",
   "description.zh-CN": "用于在工作流中进行基于数据行的动态表达式计算。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-dynamic-calculation",

packages/plugins/@nocobase/plugin-workflow-loop/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：循环节点",
   "description": "Used to repeat the sub-process processing of each value in an array, and can also be used for fixed times of sub-process processing.",
   "description.zh-CN": "用于对一个数组中的每个值进行重复的子流程处理，也可用于固定次数的重复子流程处理。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-loop",

packages/plugins/@nocobase/plugin-workflow-manual/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：人工处理节点",
   "description": "Could be used for workflows which some of decisions are made by users.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-manual",

packages/plugins/@nocobase/plugin-workflow-parallel/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：并行分支节点",
   "description": "Could be used for parallel execution of branch processes in the workflow.",
   "description.zh-CN": "用于在工作流中需要并行执行的分支流程。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-parallel",

packages/plugins/@nocobase/plugin-workflow-request/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：HTTP 请求节点",
   "description": "Send HTTP requests to any HTTP service for data interaction in workflow.",
   "description.zh-CN": "可用于在工作流中向任意 HTTP 服务发送请求，进行数据交互。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-request",

packages/plugins/@nocobase/plugin-workflow-sql/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：SQL 节点",
   "description": "Execute SQL statements in workflow.",
   "description.zh-CN": "可用于在工作流中对数据库执行任意 SQL 语句。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-sql",

packages/plugins/@nocobase/plugin-workflow-test/package.json

@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-workflow-test",
   "displayName": "Workflow: test kit",
   "displayName.zh-CN": "工作流：测试工具包",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "dist/server/index.js",
   "types": "./dist/server/index.d.ts",

packages/plugins/@nocobase/plugin-workflow/package.json

@@ -4,13 +4,13 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
   "description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.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": "0.20.0-alpha.15"
+    "@nocobase/plugin-workflow-test": "0.20.0-alpha.16"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",

packages/presets/nocobase/package.json

@@ -1,66 +1,66 @@
 {
   "name": "@nocobase/preset-nocobase",
-  "version": "0.20.0-alpha.15",
+  "version": "0.20.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./lib/server/index.js",
   "dependencies": {
     "@formily/json-schema": "2.x",
-    "@nocobase/plugin-acl": "0.20.0-alpha.15",
+    "@nocobase/plugin-acl": "0.20.0-alpha.16",
-    "@nocobase/plugin-action-bulk-edit": "0.20.0-alpha.15",
+    "@nocobase/plugin-action-bulk-edit": "0.20.0-alpha.16",
-    "@nocobase/plugin-action-bulk-update": "0.20.0-alpha.15",
+    "@nocobase/plugin-action-bulk-update": "0.20.0-alpha.16",
-    "@nocobase/plugin-action-duplicate": "0.20.0-alpha.15",
+    "@nocobase/plugin-action-duplicate": "0.20.0-alpha.16",
-    "@nocobase/plugin-action-print": "0.20.0-alpha.15",
+    "@nocobase/plugin-action-print": "0.20.0-alpha.16",
-    "@nocobase/plugin-api-doc": "0.20.0-alpha.15",
+    "@nocobase/plugin-api-doc": "0.20.0-alpha.16",
-    "@nocobase/plugin-api-keys": "0.20.0-alpha.15",
+    "@nocobase/plugin-api-keys": "0.20.0-alpha.16",
-    "@nocobase/plugin-audit-logs": "0.20.0-alpha.15",
+    "@nocobase/plugin-audit-logs": "0.20.0-alpha.16",
-    "@nocobase/plugin-auth": "0.20.0-alpha.15",
+    "@nocobase/plugin-auth": "0.20.0-alpha.16",
-    "@nocobase/plugin-backup-restore": "0.20.0-alpha.15",
+    "@nocobase/plugin-backup-restore": "0.20.0-alpha.16",
-    "@nocobase/plugin-calendar": "0.20.0-alpha.15",
+    "@nocobase/plugin-calendar": "0.20.0-alpha.16",
-    "@nocobase/plugin-cas": "0.20.0-alpha.15",
+    "@nocobase/plugin-cas": "0.20.0-alpha.16",
-    "@nocobase/plugin-charts": "0.20.0-alpha.15",
+    "@nocobase/plugin-charts": "0.20.0-alpha.16",
-    "@nocobase/plugin-china-region": "0.20.0-alpha.15",
+    "@nocobase/plugin-china-region": "0.20.0-alpha.16",
-    "@nocobase/plugin-client": "0.20.0-alpha.15",
+    "@nocobase/plugin-client": "0.20.0-alpha.16",
-    "@nocobase/plugin-collection-manager": "0.20.0-alpha.15",
+    "@nocobase/plugin-collection-manager": "0.20.0-alpha.16",
-    "@nocobase/plugin-custom-request": "0.20.0-alpha.15",
+    "@nocobase/plugin-custom-request": "0.20.0-alpha.16",
-    "@nocobase/plugin-data-source-manager": "0.20.0-alpha.15",
+    "@nocobase/plugin-data-source-manager": "0.20.0-alpha.16",
-    "@nocobase/plugin-data-visualization": "0.20.0-alpha.15",
+    "@nocobase/plugin-data-visualization": "0.20.0-alpha.16",
-    "@nocobase/plugin-error-handler": "0.20.0-alpha.15",
+    "@nocobase/plugin-error-handler": "0.20.0-alpha.16",
-    "@nocobase/plugin-export": "0.20.0-alpha.15",
+    "@nocobase/plugin-export": "0.20.0-alpha.16",
-    "@nocobase/plugin-file-manager": "0.20.0-alpha.15",
+    "@nocobase/plugin-file-manager": "0.20.0-alpha.16",
-    "@nocobase/plugin-formula-field": "0.20.0-alpha.15",
+    "@nocobase/plugin-formula-field": "0.20.0-alpha.16",
-    "@nocobase/plugin-gantt": "0.20.0-alpha.15",
+    "@nocobase/plugin-gantt": "0.20.0-alpha.16",
-    "@nocobase/plugin-graph-collection-manager": "0.20.0-alpha.15",
+    "@nocobase/plugin-graph-collection-manager": "0.20.0-alpha.16",
-    "@nocobase/plugin-iframe-block": "0.20.0-alpha.15",
+    "@nocobase/plugin-iframe-block": "0.20.0-alpha.16",
-    "@nocobase/plugin-import": "0.20.0-alpha.15",
+    "@nocobase/plugin-import": "0.20.0-alpha.16",
-    "@nocobase/plugin-kanban": "0.20.0-alpha.15",
+    "@nocobase/plugin-kanban": "0.20.0-alpha.16",
-    "@nocobase/plugin-localization-management": "0.20.0-alpha.15",
+    "@nocobase/plugin-localization-management": "0.20.0-alpha.16",
-    "@nocobase/plugin-logger": "0.20.0-alpha.15",
+    "@nocobase/plugin-logger": "0.20.0-alpha.16",
-    "@nocobase/plugin-map": "0.20.0-alpha.15",
+    "@nocobase/plugin-map": "0.20.0-alpha.16",
-    "@nocobase/plugin-mobile-client": "0.20.0-alpha.15",
+    "@nocobase/plugin-mobile-client": "0.20.0-alpha.16",
-    "@nocobase/plugin-mock-collections": "0.20.0-alpha.15",
+    "@nocobase/plugin-mock-collections": "0.20.0-alpha.16",
-    "@nocobase/plugin-multi-app-manager": "0.20.0-alpha.15",
+    "@nocobase/plugin-multi-app-manager": "0.20.0-alpha.16",
-    "@nocobase/plugin-multi-app-share-collection": "0.20.0-alpha.15",
+    "@nocobase/plugin-multi-app-share-collection": "0.20.0-alpha.16",
-    "@nocobase/plugin-oidc": "0.20.0-alpha.15",
+    "@nocobase/plugin-oidc": "0.20.0-alpha.16",
-    "@nocobase/plugin-saml": "0.20.0-alpha.15",
+    "@nocobase/plugin-saml": "0.20.0-alpha.16",
-    "@nocobase/plugin-sequence-field": "0.20.0-alpha.15",
+    "@nocobase/plugin-sequence-field": "0.20.0-alpha.16",
-    "@nocobase/plugin-sms-auth": "0.20.0-alpha.15",
+    "@nocobase/plugin-sms-auth": "0.20.0-alpha.16",
-    "@nocobase/plugin-snapshot-field": "0.20.0-alpha.15",
+    "@nocobase/plugin-snapshot-field": "0.20.0-alpha.16",
-    "@nocobase/plugin-system-settings": "0.20.0-alpha.15",
+    "@nocobase/plugin-system-settings": "0.20.0-alpha.16",
-    "@nocobase/plugin-theme-editor": "0.20.0-alpha.15",
+    "@nocobase/plugin-theme-editor": "0.20.0-alpha.16",
-    "@nocobase/plugin-ui-schema-storage": "0.20.0-alpha.15",
+    "@nocobase/plugin-ui-schema-storage": "0.20.0-alpha.16",
-    "@nocobase/plugin-users": "0.20.0-alpha.15",
+    "@nocobase/plugin-users": "0.20.0-alpha.16",
-    "@nocobase/plugin-verification": "0.20.0-alpha.15",
+    "@nocobase/plugin-verification": "0.20.0-alpha.16",
-    "@nocobase/plugin-workflow": "0.20.0-alpha.15",
+    "@nocobase/plugin-workflow": "0.20.0-alpha.16",
-    "@nocobase/plugin-workflow-action-trigger": "0.20.0-alpha.15",
+    "@nocobase/plugin-workflow-action-trigger": "0.20.0-alpha.16",
-    "@nocobase/plugin-workflow-aggregate": "0.20.0-alpha.15",
+    "@nocobase/plugin-workflow-aggregate": "0.20.0-alpha.16",
-    "@nocobase/plugin-workflow-delay": "0.20.0-alpha.15",
+    "@nocobase/plugin-workflow-delay": "0.20.0-alpha.16",
-    "@nocobase/plugin-workflow-dynamic-calculation": "0.20.0-alpha.15",
+    "@nocobase/plugin-workflow-dynamic-calculation": "0.20.0-alpha.16",
-    "@nocobase/plugin-workflow-loop": "0.20.0-alpha.15",
+    "@nocobase/plugin-workflow-loop": "0.20.0-alpha.16",
-    "@nocobase/plugin-workflow-manual": "0.20.0-alpha.15",
+    "@nocobase/plugin-workflow-manual": "0.20.0-alpha.16",
-    "@nocobase/plugin-workflow-parallel": "0.20.0-alpha.15",
+    "@nocobase/plugin-workflow-parallel": "0.20.0-alpha.16",
-    "@nocobase/plugin-workflow-request": "0.20.0-alpha.15",
+    "@nocobase/plugin-workflow-request": "0.20.0-alpha.16",
-    "@nocobase/plugin-workflow-sql": "0.20.0-alpha.15",
+    "@nocobase/plugin-workflow-sql": "0.20.0-alpha.16",
-    "@nocobase/server": "0.20.0-alpha.15",
+    "@nocobase/server": "0.20.0-alpha.16",
     "cronstrue": "^2.11.0"
   },
   "repository": {

yarn.lock

@@ -19425,7 +19425,7 @@ node-releases@^2.0.14:
 
 node-sql-parser@^4.11.0:
   version "4.18.0"
-  resolved "https://registry.npmmirror.com/node-sql-parser/-/node-sql-parser-4.18.0.tgz#516b6e633c55c5abbba1ca588ab372db81ae9318"
+  resolved "http://121.40.141.87:4873/node-sql-parser/-/node-sql-parser-4.18.0.tgz#516b6e633c55c5abbba1ca588ab372db81ae9318"
   integrity sha512-2YEOR5qlI1zUFbGMLKNfsrR5JUvFg9LxIRVE+xJe962pfVLH0rnItqLzv96XVs1Y1UIR8FxsXAuvX/lYAWZ2BQ==
   dependencies:
     big-integer "^1.6.48"