feat: @formily/* 统一成 @nocobase/schema，清理所有的 ts build 报错 (#566)

Co-authored-by: sealday <sealday@gmail.com> Reviewed-on: daoyoucloud/tachycode#566
2024-04-02 18:13:33 +08:00 · 2024-04-02 18:13:33 +08:00 · dbb1703dff
commit dbb1703dff
parent c2ea05e451
916 changed files with 3830 additions and 2866 deletions
--- a/package.json
+++ b/package.json
@ -45,7 +45,8 @@
    }
  },
  "dependencies": {
-    "pm2": "^5.2.0"
+    "pm2": "^5.2.0",
+    "rimraf": "^3.0.0"
  },
  "devDependencies": {
    "@changesets/cli": "^2.27.1",
@ -55,8 +56,9 @@
    "@nocobase/build": "workspace:*",
    "@nocobase/cli": "workspace:*",
    "@nocobase/preset-nocobase": "workspace:*",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
+    "@nocobase/test": "workspace:*",
+    "@types/react": "^18.2.73",
+    "@types/react-dom": "^18.2.23",
    "auto-changelog": "^2.4.0",
    "axios": "^1.6.2",
    "commander": "^9.2.0",
@ -69,10 +71,10 @@
    "prettier-plugin-sql": "^0.17.0",
    "pretty-format": "^24.0.0",
    "pretty-quick": "^3.1.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
    "tsx": "^4.6.2",
-    "typescript": "5.1.3",
+    "typescript": "5.4.3",
    "umi": "^4.0.69"
  },
  "packageManager": "pnpm@8.15.5",
@ -86,18 +88,28 @@
  },
  "pnpm": {
    "overrides": {
+      "@formily/core": "2.2.27",
+      "@formily/grid": "2.2.27",
+      "@formily/json-schema": "2.2.27",
+      "@formily/path": "2.2.27",
+      "@formily/react": "2.2.27",
+      "@formily/reactive": "2.2.27",
+      "@formily/reactive-react": "2.2.27",
+      "@formily/shared": "2.2.27",
+      "@formily/validator": "2.2.27",
      "@types/node": "^20.12.2",
-      "@types/react": "^17.0.0",
-      "@types/react-dom": "^17.0.0",
+      "@types/react": "18.2.73",
+      "@types/react-dom": "18.2.23",
      "@typescript-eslint/parser": "^6.2.0",
-      "antd": "5.12.8",
+      "antd": "5.16.0",
      "nwsapi": "2.2.7",
      "prettier": "^3.1.1",
-      "react": "^18.0.0",
-      "react-dom": "^18.0.0",
+      "react": "18.2.0",
+      "react-dom": "18.2.0",
      "react-router": "^6.11.2",
      "react-router-dom": "^6.11.2",
-      "tsx": "^4.6.2"
+      "tsx": "^4.6.2",
+      "typescript": "5.4.3"
    }
  },
  "licenses": [
--- a/packages/core/acl/package.json
+++ b/packages/core/acl/package.json
@ -17,5 +17,8 @@
    "lodash": "4.17.21",
    "minimatch": "^5.1.1"
  },
+  "devDependencies": {
+    "@types/lodash": "4.17.0"
+  },
  "gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1"
 }
--- a/packages/core/app/src/config/cache.ts
+++ b/packages/core/app/src/config/cache.ts
@ -15,4 +15,4 @@ export const cacheManager = {
        }
      : {}),
  },
-} as CacheManagerOptions;
+};
--- a/packages/core/build/package.json
+++ b/packages/core/build/package.json
@ -32,7 +32,7 @@
    "gulp-typescript": "6.0.0-alpha.1",
    "tar": "^6.2.0",
    "tsup": "7.2.0",
-    "typescript": "5.1.3",
+    "typescript": "5.4.3",
    "update-notifier": "3.0.0",
    "vite": "^5.0.0",
    "vite-plugin-css-injected-by-js": "^3.2.1",
--- a/packages/core/build/src/buildPlugin.ts
+++ b/packages/core/build/src/buildPlugin.ts
@ -39,6 +39,7 @@ const external = [
  '@nocobase/logger',
  '@nocobase/resourcer',
  '@nocobase/sdk',
+  '@nocobase/schema',
  '@nocobase/server',
  '@nocobase/test',
  '@nocobase/utils',
--- a/packages/core/cache/src/bloom-filter/redis-bloom-filter.ts
+++ b/packages/core/cache/src/bloom-filter/redis-bloom-filter.ts
@ -1,4 +1,5 @@
-import { RedisStore } from 'cache-manager-redis-yet';
+import type { RedisStore } from 'cache-manager-redis-yet';
+import type { RedisClientType } from 'redis';
 import { BloomFilter } from '.';
 import { Cache } from '../cache';

--- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-parent-record.tsx
+++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-parent-record.tsx
@ -1,7 +1,7 @@
 import React from 'react';
 import { Table, TableProps } from 'antd';
 import { SchemaComponent, UseDataBlockProps, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';

 import { createApp } from '../../../data-source/demos/createApp';

--- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx
+++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx
@ -1,7 +1,7 @@
 import React from 'react';
 import { Select, Table, TableProps } from 'antd';
 import { SchemaComponent, UseDataBlockProps, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';

 import { createApp } from '../../../data-source/demos/createApp';
 import useUrlState from '@ahooksjs/use-url-state';
--- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-create.tsx
+++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-create.tsx
@ -1,7 +1,7 @@
 import React, { FC } from 'react';
 import { Button, Form, FormProps, Input, InputNumber, notification } from 'antd';
 import { SchemaComponent, useDataBlockResource, withDynamicSchemaProps } from '@nocobase/client';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';

 import { createApp } from '../../../data-source/demos/createApp';

--- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-get-and-update.tsx
+++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-get-and-update.tsx
@ -7,7 +7,7 @@ import {
  useCollectionRecordData,
  withDynamicSchemaProps,
 } from '@nocobase/client';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';
 import useUrlState from '@ahooksjs/use-url-state';

 import { createApp } from '../../../data-source/demos/createApp';
--- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-record-and-update.tsx
+++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-record-and-update.tsx
@ -8,7 +8,7 @@ import {
  useCollectionRecordData,
  withDynamicSchemaProps,
 } from '@nocobase/client';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';

 import { createApp } from '../../../data-source/demos/createApp';

--- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-table-list.tsx
+++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-table-list.tsx
@ -1,7 +1,7 @@
 import React from 'react';
 import { Table, TableProps } from 'antd';
 import { SchemaComponent, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';

 import { createApp } from '../../../data-source/demos/createApp';

--- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/complete-demo.tsx
+++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/complete-demo.tsx
@ -17,8 +17,8 @@ import {

 import { createApp } from '../../../data-source/demos/createApp';
 import { Table, TableProps } from 'antd';
-import { ISchema } from '@formily/json-schema';
-import { observer, useFieldSchema } from '@formily/react';
+import { ISchema } from '@nocobase/schema';
+import { observer, useFieldSchema } from '@nocobase/schema';

 const schema: ISchema = {
  type: 'void',
--- a/packages/core/client/docs/en-US/core/data-block/demos/settings/demo1.tsx
+++ b/packages/core/client/docs/en-US/core/data-block/demos/settings/demo1.tsx
@ -9,7 +9,7 @@ import {

 import { createApp } from '../../../data-source/demos/createApp';
 import { Table, TableProps } from 'antd';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';

 const schema: ISchema = {
  type: 'void',
--- a/packages/core/client/docs/en-US/core/data-source/demos/collection-field/demo1.tsx
+++ b/packages/core/client/docs/en-US/core/data-source/demos/collection-field/demo1.tsx
@ -1,4 +1,4 @@
-import { ISchema, observer, useForm } from '@formily/react';
+import { ISchema, observer, useForm } from '@nocobase/schema';
 import {
  Action,
  Application,
--- a/packages/core/client/docs/en-US/core/data-source/demos/collection-field/demo2.tsx
+++ b/packages/core/client/docs/en-US/core/data-source/demos/collection-field/demo2.tsx
@ -1,4 +1,4 @@
-import { ISchema, observer } from '@formily/react';
+import { ISchema, observer } from '@nocobase/schema';
 import {
  Application,
  CollectionProvider,
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-basic.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-basic.tsx
@ -9,8 +9,8 @@ import {
  useSchemaInitializerItem,
  useSchemaInitializerRender,
 } from '@nocobase/client';
-import { observer, useField, useFieldSchema } from '@formily/react';
-import { Field } from '@formily/core';
+import { observer, useField, useFieldSchema } from '@nocobase/schema';
+import { Field } from '@nocobase/schema';

 const Hello = observer(() => {
  const field = useField<Field>();
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-component.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-component.tsx
@ -9,8 +9,8 @@ import {
  useSchemaInitializerItem,
  useSchemaInitializerRender,
 } from '@nocobase/client';
-import { observer, useField, useFieldSchema } from '@formily/react';
-import { Field } from '@formily/core';
+import { observer, useField, useFieldSchema } from '@nocobase/schema';
+import { Field } from '@nocobase/schema';
 import { Avatar } from 'antd';

 const Hello = observer(() => {
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-components-item.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-components-item.tsx
@ -11,7 +11,7 @@ import {
 } from '@nocobase/client';
 import React from 'react';
 import { appOptions } from './schema-initializer-common';
-import { useFieldSchema } from '@formily/react';
+import { useFieldSchema } from '@nocobase/schema';

 const Demo = () => {
  const { insert } = useSchemaInitializer();
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-components-select.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-components-select.tsx
@ -4,7 +4,7 @@
 import { Grid, SchemaInitializer, Application, SchemaInitializerSelect, useDesignable } from '@nocobase/client';
 import React from 'react';
 import { appOptions } from './schema-initializer-common';
-import { useFieldSchema } from '@formily/react';
+import { useFieldSchema } from '@nocobase/schema';

 const OpenModeSelect = () => {
  const fieldSchema = useFieldSchema();
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-items.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-items.tsx
@ -11,8 +11,8 @@ import {
  useSchemaInitializerItem,
  useSchemaInitializerRender,
 } from '@nocobase/client';
-import { observer, useField, useFieldSchema } from '@formily/react';
-import { Field } from '@formily/core';
+import { observer, useField, useFieldSchema } from '@nocobase/schema';
+import { Field } from '@nocobase/schema';
 import { ButtonProps, ListProps, List, Card } from 'antd';

 const Hello = observer(() => {
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-popover.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-popover.tsx
@ -7,8 +7,8 @@ import {
  useDesignable,
  useSchemaInitializerRender,
 } from '@nocobase/client';
-import { observer, useField, useFieldSchema } from '@formily/react';
-import { Field } from '@formily/core';
+import { observer, useField, useFieldSchema } from '@nocobase/schema';
+import { Field } from '@nocobase/schema';
 import { Button } from 'antd';

 const Hello = observer(() => {
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-render.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-render.tsx
@ -9,8 +9,8 @@ import {
  useSchemaInitializerItem,
  useSchemaInitializerRender,
 } from '@nocobase/client';
-import { observer, useField, useFieldSchema } from '@formily/react';
-import { Field } from '@formily/core';
+import { observer, useField, useFieldSchema } from '@nocobase/schema';
+import { Field } from '@nocobase/schema';

 const Hello = observer(() => {
  const field = useField<Field>();
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-action-modal.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-action-modal.tsx
@ -11,7 +11,7 @@ import {
  useDesignable,
 } from '@nocobase/client';
 import { appOptions } from './schema-settings-common';
-import { ISchema, useField } from '@formily/react';
+import { ISchema, useField } from '@nocobase/schema';

 export const SchemaSettingsBlockTitleItem = function BlockTitleItem() {
  const filed = useField();
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-item.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-item.tsx
@ -4,7 +4,7 @@
 import React, { FC, useState } from 'react';
 import { Application, SchemaSettings, SchemaSettingsItem, useDesignable } from '@nocobase/client';
 import { appOptions } from './schema-settings-common';
-import { observer, useField } from '@formily/react';
+import { observer, useField } from '@nocobase/schema';
 import { Button, Input, Space } from 'antd';

 const MarkdownEdit = () => {
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-modal.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-modal.tsx
@ -1,7 +1,7 @@
 /**
 * defaultShowCode: true
 */
-import { ISchema } from '@formily/react';
+import { ISchema } from '@nocobase/schema';
 import {
  Application,
  FormItem,
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-select.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-select.tsx
@ -4,7 +4,7 @@
 import React, { FC } from 'react';
 import { Application, SchemaSettings, SchemaSettingsSelectItem, useDesignable } from '@nocobase/client';
 import { appOptions } from './schema-settings-common';
-import { observer, useField } from '@formily/react';
+import { observer, useField } from '@nocobase/schema';
 import { Table } from 'antd';

 const PageSize = () => {
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-switch.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-switch.tsx
@ -4,7 +4,7 @@
 import React, { FC } from 'react';
 import { Application, SchemaSettings, SchemaSettingsSwitchItem, useDesignable } from '@nocobase/client';
 import { appOptions } from './schema-settings-common';
-import { observer, useField } from '@formily/react';
+import { observer, useField } from '@nocobase/schema';
 import { Form, Input } from 'antd';

 const FormItemRequired = () => {
--- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-render.tsx
+++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-render.tsx
@ -1,4 +1,4 @@
-import { ISchema, useField, useFieldSchema } from '@formily/react';
+import { ISchema, useField, useFieldSchema } from '@nocobase/schema';
 import {
  Application,
  CardItem,
--- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/association-table-list-and-parent-record.tsx
+++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/association-table-list-and-parent-record.tsx
@ -1,7 +1,7 @@
 import React from 'react';
 import { Table, TableProps } from 'antd';
 import { SchemaComponent, UseDataBlockProps, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';

 import { createApp } from '../../../data-source/demos/createApp';

--- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx
+++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx
@ -1,7 +1,7 @@
 import React from 'react';
 import { Select, Table, TableProps } from 'antd';
 import { SchemaComponent, UseDataBlockProps, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';

 import { createApp } from '../../../data-source/demos/createApp';
 import useUrlState from '@ahooksjs/use-url-state';
--- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-create.tsx
+++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-create.tsx
@ -1,7 +1,7 @@
 import React, { FC } from 'react';
 import { Button, Form, FormProps, Input, InputNumber, notification } from 'antd';
 import { SchemaComponent, useDataBlockResource, withDynamicSchemaProps } from '@nocobase/client';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';

 import { createApp } from '../../../data-source/demos/createApp';

--- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-get-and-update.tsx
+++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-get-and-update.tsx
@ -7,7 +7,7 @@ import {
  useCollectionRecordData,
  withDynamicSchemaProps,
 } from '@nocobase/client';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';
 import useUrlState from '@ahooksjs/use-url-state';

 import { createApp } from '../../../data-source/demos/createApp';
--- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-record-and-update.tsx
+++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-record-and-update.tsx
@ -8,7 +8,7 @@ import {
  useCollectionRecordData,
  withDynamicSchemaProps,
 } from '@nocobase/client';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';

 import { createApp } from '../../../data-source/demos/createApp';

--- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-table-list.tsx
+++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-table-list.tsx
@ -1,7 +1,7 @@
 import React from 'react';
 import { Table, TableProps } from 'antd';
 import { SchemaComponent, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';

 import { createApp } from '../../../data-source/demos/createApp';

--- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/complete-demo.tsx
+++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/complete-demo.tsx
@ -17,8 +17,8 @@ import {

 import { createApp } from '../../../data-source/demos/createApp';
 import { Table, TableProps } from 'antd';
-import { ISchema } from '@formily/json-schema';
-import { observer, useFieldSchema } from '@formily/react';
+import { ISchema } from '@nocobase/schema';
+import { observer, useFieldSchema } from '@nocobase/schema';

 const schema: ISchema = {
  type: 'void',
--- a/packages/core/client/docs/zh-CN/core/data-block/demos/settings/demo1.tsx
+++ b/packages/core/client/docs/zh-CN/core/data-block/demos/settings/demo1.tsx
@ -9,7 +9,7 @@ import {

 import { createApp } from '../../../data-source/demos/createApp';
 import { Table, TableProps } from 'antd';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';

 const schema: ISchema = {
  type: 'void',
--- a/packages/core/client/docs/zh-CN/core/data-source/demos/collection-field/demo1.tsx
+++ b/packages/core/client/docs/zh-CN/core/data-source/demos/collection-field/demo1.tsx
@ -1,4 +1,4 @@
-import { ISchema, observer, useForm } from '@formily/react';
+import { ISchema, observer, useForm } from '@nocobase/schema';
 import {
  Action,
  Application,
--- a/packages/core/client/docs/zh-CN/core/data-source/demos/collection-field/demo2.tsx
+++ b/packages/core/client/docs/zh-CN/core/data-source/demos/collection-field/demo2.tsx
@ -1,4 +1,4 @@
-import { ISchema, observer } from '@formily/react';
+import { ISchema, observer } from '@nocobase/schema';
 import {
  Application,
  CollectionProvider,
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-basic.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-basic.tsx
@ -9,8 +9,8 @@ import {
  useSchemaInitializerItem,
  useSchemaInitializerRender,
 } from '@nocobase/client';
-import { observer, useField, useFieldSchema } from '@formily/react';
-import { Field } from '@formily/core';
+import { observer, useField, useFieldSchema } from '@nocobase/schema';
+import { Field } from '@nocobase/schema';

 const Hello = observer(() => {
  const field = useField<Field>();
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-component.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-component.tsx
@ -9,8 +9,8 @@ import {
  useSchemaInitializerItem,
  useSchemaInitializerRender,
 } from '@nocobase/client';
-import { observer, useField, useFieldSchema } from '@formily/react';
-import { Field } from '@formily/core';
+import { observer, useField, useFieldSchema } from '@nocobase/schema';
+import { Field } from '@nocobase/schema';
 import { Avatar } from 'antd';

 const Hello = observer(() => {
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-components-item.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-components-item.tsx
@ -11,7 +11,7 @@ import {
 } from '@nocobase/client';
 import React from 'react';
 import { appOptions } from './schema-initializer-common';
-import { useFieldSchema } from '@formily/react';
+import { useFieldSchema } from '@nocobase/schema';

 const Demo = () => {
  const { insert } = useSchemaInitializer();
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-components-select.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-components-select.tsx
@ -4,7 +4,7 @@
 import { Grid, SchemaInitializer, Application, SchemaInitializerSelect, useDesignable } from '@nocobase/client';
 import React from 'react';
 import { appOptions } from './schema-initializer-common';
-import { useFieldSchema } from '@formily/react';
+import { useFieldSchema } from '@nocobase/schema';

 const OpenModeSelect = () => {
  const fieldSchema = useFieldSchema();
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-items.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-items.tsx
@ -11,8 +11,8 @@ import {
  useSchemaInitializerItem,
  useSchemaInitializerRender,
 } from '@nocobase/client';
-import { observer, useField, useFieldSchema } from '@formily/react';
-import { Field } from '@formily/core';
+import { observer, useField, useFieldSchema } from '@nocobase/schema';
+import { Field } from '@nocobase/schema';
 import { ButtonProps, ListProps, List, Card } from 'antd';

 const Hello = observer(() => {
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-popover.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-popover.tsx
@ -7,8 +7,8 @@ import {
  useDesignable,
  useSchemaInitializerRender,
 } from '@nocobase/client';
-import { observer, useField, useFieldSchema } from '@formily/react';
-import { Field } from '@formily/core';
+import { observer, useField, useFieldSchema } from '@nocobase/schema';
+import { Field } from '@nocobase/schema';
 import { Button } from 'antd';

 const Hello = observer(() => {
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-render.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-render.tsx
@ -9,8 +9,8 @@ import {
  useSchemaInitializerItem,
  useSchemaInitializerRender,
 } from '@nocobase/client';
-import { observer, useField, useFieldSchema } from '@formily/react';
-import { Field } from '@formily/core';
+import { observer, useField, useFieldSchema } from '@nocobase/schema';
+import { Field } from '@nocobase/schema';

 const Hello = observer(() => {
  const field = useField<Field>();
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-action-modal.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-action-modal.tsx
@ -11,7 +11,7 @@ import {
  useDesignable,
 } from '@nocobase/client';
 import { appOptions } from './schema-settings-common';
-import { ISchema, useField } from '@formily/react';
+import { ISchema, useField } from '@nocobase/schema';

 export const SchemaSettingsBlockTitleItem = function BlockTitleItem() {
  const filed = useField();
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-item.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-item.tsx
@ -4,7 +4,7 @@
 import React, { FC, useState } from 'react';
 import { Application, SchemaSettings, SchemaSettingsItem, useDesignable } from '@nocobase/client';
 import { appOptions } from './schema-settings-common';
-import { observer, useField } from '@formily/react';
+import { observer, useField } from '@nocobase/schema';
 import { Button, Input, Space } from 'antd';

 const MarkdownEdit = () => {
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-modal.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-modal.tsx
@ -1,7 +1,7 @@
 /**
 * defaultShowCode: true
 */
-import { ISchema } from '@formily/react';
+import { ISchema } from '@nocobase/schema';
 import {
  Application,
  FormItem,
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-select.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-select.tsx
@ -4,7 +4,7 @@
 import React, { FC } from 'react';
 import { Application, SchemaSettings, SchemaSettingsSelectItem, useDesignable } from '@nocobase/client';
 import { appOptions } from './schema-settings-common';
-import { observer, useField } from '@formily/react';
+import { observer, useField } from '@nocobase/schema';
 import { Table } from 'antd';

 const PageSize = () => {
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-switch.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-switch.tsx
@ -4,7 +4,7 @@
 import React, { FC } from 'react';
 import { Application, SchemaSettings, SchemaSettingsSwitchItem, useDesignable } from '@nocobase/client';
 import { appOptions } from './schema-settings-common';
-import { observer, useField } from '@formily/react';
+import { observer, useField } from '@nocobase/schema';
 import { Form, Input } from 'antd';

 const FormItemRequired = () => {
--- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-render.tsx
+++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-render.tsx
@ -1,4 +1,4 @@
-import { ISchema, useField, useFieldSchema } from '@formily/react';
+import { ISchema, useField, useFieldSchema } from '@nocobase/schema';
 import {
  Application,
  CardItem,
--- a/packages/core/client/package.json
+++ b/packages/core/client/package.json
@ -8,7 +8,7 @@
  "dependencies": {
    "@ahooksjs/use-url-state": "3.5.1",
    "@ant-design/cssinjs": "^1.11.1",
-    "@ant-design/icons": "^5.1.4",
+    "@ant-design/icons": "^5.3.6",
    "@ant-design/pro-layout": "^7.16.11",
    "@antv/g2plot": "^2.4.18",
    "@ctrl/tinycolor": "^3.6.0",
@ -19,20 +19,12 @@
    "@dnd-kit/utilities": "^3.2.2",
    "@emotion/css": "^11.7.1",
    "@formily/antd-v5": "^1.1.9",
-    "@formily/core": "^2.2.27",
-    "@formily/grid": "^2.2.27",
-    "@formily/json-schema": "^2.2.27",
-    "@formily/path": "^2.2.27",
-    "@formily/react": "^2.2.27",
-    "@formily/reactive": "^2.2.27",
-    "@formily/reactive-react": "^2.2.27",
-    "@formily/shared": "^2.2.27",
-    "@formily/validator": "^2.2.27",
    "@nocobase/evaluators": "workspace:*",
+    "@nocobase/schema": "workspace:*",
    "@nocobase/sdk": "workspace:*",
    "@nocobase/utils": "workspace:*",
    "ahooks": "^3.7.2",
-    "antd": "^5.12.8",
+    "antd": "5.16.0",
    "antd-style": "3.4.5",
    "axios": "^1.6.2",
    "classnames": "^2.3.1",
@ -71,6 +63,7 @@
  },
  "devDependencies": {
    "@testing-library/react": "^14.0.0",
+    "@types/lodash": "^4.17.0",
    "@types/markdown-it": "12.2.3",
    "@types/markdown-it-highlightjs": "3.3.1",
    "@types/react-big-calendar": "^1.6.4",
--- a/packages/core/client/src/acl/ACLProvider.tsx
+++ b/packages/core/client/src/acl/ACLProvider.tsx
@ -1,5 +1,5 @@
-import { Field } from '@formily/core';
-import { Schema, useField, useFieldSchema } from '@formily/react';
+import { Field } from '@nocobase/schema';
+import { Schema, useField, useFieldSchema } from '@nocobase/schema';
 import React, { createContext, useContext, useEffect } from 'react';
 import { Navigate } from 'react-router-dom';
 import { omit } from 'lodash';
--- a/packages/core/client/src/acl/ACLShortcut.tsx
+++ b/packages/core/client/src/acl/ACLShortcut.tsx
@ -1,5 +1,5 @@
-import { ISchema } from '@formily/react';
-import { uid } from '@formily/shared';
+import { ISchema } from '@nocobase/schema';
+import { uid } from '@nocobase/schema';
 import { Card } from 'antd';
 import React from 'react';
 import { SchemaComponent } from '../schema-component';
--- a/packages/core/client/src/acl/Configuration/RoleConfigure.tsx
+++ b/packages/core/client/src/acl/Configuration/RoleConfigure.tsx
@ -1,5 +1,5 @@
-import { onFieldChange } from '@formily/core';
-import { connect } from '@formily/react';
+import { onFieldChange } from '@nocobase/schema';
+import { connect } from '@nocobase/schema';
 import { Checkbox } from 'antd';
 import uniq from 'lodash/uniq';
 import React, { useContext } from 'react';
--- a/packages/core/client/src/acl/Configuration/RolesResourcesActions.tsx
+++ b/packages/core/client/src/acl/Configuration/RolesResourcesActions.tsx
@ -1,6 +1,6 @@
 import { FormItem, FormLayout } from '@formily/antd-v5';
-import { ArrayField } from '@formily/core';
-import { connect, useField, useForm } from '@formily/react';
+import { ArrayField } from '@nocobase/schema';
+import { connect, useField, useForm } from '@nocobase/schema';
 import { Checkbox, Table, Tag } from 'antd';
 import { isEmpty } from 'lodash';
 import React, { createContext } from 'react';
--- a/packages/core/client/src/acl/Configuration/ScopeSelect.tsx
+++ b/packages/core/client/src/acl/Configuration/ScopeSelect.tsx
@ -1,4 +1,4 @@
-import { createForm } from '@formily/core';
+import { createForm } from '@nocobase/schema';
 import React, { createContext, useContext, useMemo, useState } from 'react';
 import { FormProvider, SchemaComponent } from '../../schema-component';
 import { scopesSchema } from './schemas/scopes';
--- a/packages/core/client/src/acl/Configuration/StrategyActions.tsx
+++ b/packages/core/client/src/acl/Configuration/StrategyActions.tsx
@ -1,5 +1,5 @@
-import { ArrayField } from '@formily/core';
-import { connect, useField } from '@formily/react';
+import { ArrayField } from '@nocobase/schema';
+import { connect, useField } from '@nocobase/schema';
 import { Checkbox, Select, Table, Tag } from 'antd';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
--- a/packages/core/client/src/acl/Configuration/schemas/roleCollections.ts
+++ b/packages/core/client/src/acl/Configuration/schemas/roleCollections.ts
@ -1,5 +1,5 @@
-import { ISchema } from '@formily/react';
-import { uid } from '@formily/shared';
+import { ISchema } from '@nocobase/schema';
+import { uid } from '@nocobase/schema';
 import { useRoleResourceValues } from './useRoleResourceValues';
 import { useSaveRoleResourceAction } from './useSaveRoleResourceAction';

--- a/packages/core/client/src/acl/Configuration/schemas/roles.ts
+++ b/packages/core/client/src/acl/Configuration/schemas/roles.ts
@ -1,5 +1,5 @@
-import { ISchema } from '@formily/react';
-import { uid } from '@formily/shared';
+import { ISchema } from '@nocobase/schema';
+import { uid } from '@nocobase/schema';
 import pick from 'lodash/pick';
 import { useEffect } from 'react';
 import { useRequest } from '../../../api-client';
--- a/packages/core/client/src/acl/Configuration/schemas/scopes.ts
+++ b/packages/core/client/src/acl/Configuration/schemas/scopes.ts
@ -1,4 +1,4 @@
-import { ISchema } from '@formily/react';
+import { ISchema } from '@nocobase/schema';
 import { useContext, useEffect } from 'react';
 import { useFormBlockContext } from '../../../block-provider';
 import { useFilterOptions } from '../../../schema-component';
--- a/packages/core/client/src/acl/Configuration/schemas/useSaveRoleResourceAction.ts
+++ b/packages/core/client/src/acl/Configuration/schemas/useSaveRoleResourceAction.ts
@ -1,4 +1,4 @@
-import { useForm } from '@formily/react';
+import { useForm } from '@nocobase/schema';
 import { useActionContext, useAPIClient, useRecord, useResourceActionContext } from '../../../';

 export const useSaveRoleResourceAction = () => {
--- a/packages/core/client/src/api-client/context.ts
+++ b/packages/core/client/src/api-client/context.ts
@ -1,4 +1,4 @@
-import { createContext } from 'react';
+import React, { createContext } from 'react';
 import { APIClient } from './APIClient';

 export const APIClientContext = createContext<APIClient>(new APIClient());
--- a/packages/core/client/src/api-client/demos/demo3.tsx
+++ b/packages/core/client/src/api-client/demos/demo3.tsx
@ -1,4 +1,4 @@
-import { uid } from '@formily/shared';
+import { uid } from '@nocobase/schema';
 import { APIClient, APIClientProvider, useAPIClient, useRequest } from '@nocobase/client';
 import { Button, Input, Space, Table } from 'antd';
 import MockAdapter from 'axios-mock-adapter';
--- a/packages/core/client/src/api-client/hooks/useRequest.ts
+++ b/packages/core/client/src/api-client/hooks/useRequest.ts
@ -1,4 +1,4 @@
-import { merge } from '@formily/shared';
+import { merge } from '@nocobase/schema';
 import { useRequest as useReq, useSetState } from 'ahooks';
 import { Options, Result } from 'ahooks/es/useRequest/src/types';
 import { AxiosRequestConfig } from 'axios';
--- a/packages/core/client/src/application/Application.tsx
+++ b/packages/core/client/src/application/Application.tsx
@ -1,4 +1,4 @@
-import { define, observable } from '@formily/reactive';
+import { define, observable } from '@nocobase/schema';
 import { APIClientOptions, getSubAppName } from '@nocobase/sdk';
 import { i18n as i18next } from 'i18next';
 import get from 'lodash/get';
--- a/packages/core/client/src/application/WebSocketClient.ts
+++ b/packages/core/client/src/application/WebSocketClient.ts
@ -1,4 +1,4 @@
-import { define, observable } from '@formily/reactive';
+import { define, observable } from '@nocobase/schema';
 import { getSubAppName } from '@nocobase/sdk';
 import { Application } from './Application';

--- a/packages/core/client/src/application/tests/SchemaToolbar.test.tsx
+++ b/packages/core/client/src/application/tests/SchemaToolbar.test.tsx
@ -2,7 +2,7 @@ import React from 'react';
 import { fireEvent, render, screen, waitFor } from '@nocobase/test/client';
 import { SchemaToolbarProvider, useSchemaToolbar, useSchemaToolbarRender } from '../schema-toolbar';
 import { SchemaComponent, SchemaComponentProvider, SortableContext, SortableProvider } from '../../schema-component';
-import { useFieldSchema } from '@formily/react';
+import { useFieldSchema } from '@nocobase/schema';
 import { Application, ApplicationContext } from '@nocobase/client';

 describe('SchemaToolbar', () => {
--- a/packages/core/client/src/application/components/AppComponent.tsx
+++ b/packages/core/client/src/application/components/AppComponent.tsx
@ -1,4 +1,4 @@
-import { observer } from '@formily/reactive-react';
+import { observer } from '@nocobase/schema';
 import React, { FC, useCallback, useEffect } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 import type { Application } from '../Application';
--- a/packages/core/client/src/application/hoc/withDynamicSchemaProps.tsx
+++ b/packages/core/client/src/application/hoc/withDynamicSchemaProps.tsx
@ -1,4 +1,4 @@
-import { useExpressionScope } from '@formily/react';
+import { useExpressionScope } from '@nocobase/schema';
 import { merge, omit } from 'lodash';
 import React, { ComponentType, useMemo } from 'react';
 import { useDesignable } from '../../schema-component';
--- a/packages/core/client/src/application/schema-initializer/components/SchemaInitializerActionModal.tsx
+++ b/packages/core/client/src/application/schema-initializer/components/SchemaInitializerActionModal.tsx
@ -1,4 +1,4 @@
-import { useForm } from '@formily/react';
+import { useForm } from '@nocobase/schema';
 import React, { FC, useCallback, useMemo } from 'react';
 import { useActionContext, SchemaComponent } from '../../../schema-component';
 import { useSchemaInitializerItem } from '../context';
--- a/packages/core/client/src/application/schema-initializer/components/SchemaInitializerItem.tsx
+++ b/packages/core/client/src/application/schema-initializer/components/SchemaInitializerItem.tsx
@ -1,4 +1,4 @@
-import { uid } from '@formily/shared';
+import { uid } from '@nocobase/schema';
 import classNames from 'classnames';
 import React, { ReactNode, memo, useMemo } from 'react';
 import { Icon } from '../../../icon';
--- a/packages/core/client/src/application/schema-initializer/components/SchemaInitializerSubMenu.tsx
+++ b/packages/core/client/src/application/schema-initializer/components/SchemaInitializerSubMenu.tsx
@ -1,6 +1,6 @@
 import Icon, { RightOutlined } from '@ant-design/icons';
 import { css } from '@emotion/css';
-import { uid } from '@formily/shared';
+import { uid } from '@nocobase/schema';
 import { Menu, MenuProps, theme } from 'antd';
 import React, { FC, ReactNode, useMemo } from 'react';
 import { useCompile } from '../../../schema-component';
--- a/packages/core/client/src/application/schema-initializer/hoc/index.tsx
+++ b/packages/core/client/src/application/schema-initializer/hoc/index.tsx
@ -1,4 +1,4 @@
-import { ISchema, observer } from '@formily/react';
+import { ISchema, observer } from '@nocobase/schema';
 import { ConfigProvider, Popover, theme } from 'antd';
 import React, { ComponentType, useCallback, useMemo, useState } from 'react';

--- a/packages/core/client/src/application/schema-initializer/types.ts
+++ b/packages/core/client/src/application/schema-initializer/types.ts
@ -1,4 +1,4 @@
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';
 import { ButtonProps, PopoverProps } from 'antd';
 import { ComponentType, ReactNode } from 'react';
 import type {
--- a/packages/core/client/src/application/schema-settings/components/SchemaSettingsWrapper.tsx
+++ b/packages/core/client/src/application/schema-settings/components/SchemaSettingsWrapper.tsx
@ -5,7 +5,7 @@ import { SchemaSettingsChildren } from './SchemaSettingsChildren';
 import { SchemaSettingsIcon } from './SchemaSettingsIcon';
 import React from 'react';
 import { useDesignable } from '../../../schema-component';
-import { useField, useFieldSchema } from '@formily/react';
+import { useField, useFieldSchema } from '@nocobase/schema';

 /**
 * @internal
--- a/packages/core/client/src/application/schema-settings/hooks/index.tsx
+++ b/packages/core/client/src/application/schema-settings/hooks/index.tsx
@ -4,8 +4,8 @@ import { SchemaSettingOptions } from '../types';
 import React from 'react';
 import { SchemaSettingsWrapper } from '../components';
 import { SchemaSettingsProps } from '../../../schema-settings';
-import { Schema } from '@formily/json-schema';
-import { GeneralField } from '@formily/core';
+import { Schema } from '@nocobase/schema';
+import { GeneralField } from '@nocobase/schema';
 import { Designable } from '../../../schema-component';

 type UseSchemaSettingsRenderOptions<T = {}> = Omit<SchemaSettingOptions<T>, 'name' | 'items'> &
--- a/packages/core/client/src/application/schema-toolbar/hooks/index.tsx
+++ b/packages/core/client/src/application/schema-toolbar/hooks/index.tsx
@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import { ISchema } from '@formily/json-schema';
+import { ISchema } from '@nocobase/schema';
 import { useComponent, useDesignable } from '../../../schema-component';
 import { SchemaToolbar, SchemaToolbarProps } from '../../../schema-settings/GeneralSchemaDesigner';

--- a/packages/core/client/src/application/utils/globalDeps.ts
+++ b/packages/core/client/src/application/utils/globalDeps.ts
@ -7,17 +7,18 @@ import * as dndKitSortable from '@dnd-kit/sortable';
 import * as dndKitUtilities from '@dnd-kit/utilities';
 import * as emotionCss from '@emotion/css';
 import * as formilyAntdV5 from '@formily/antd-v5';
-import * as formilyCore from '@formily/core';
-import * as formilyJsonSchema from '@formily/json-schema';
-import * as formilyPath from '@formily/path';
-import * as formilyReact from '@formily/react';
-import * as formilyJsonReactive from '@formily/reactive';
-import * as formilyReactiveReact from '@formily/reactive-react';
-import * as formilyShared from '@formily/shared';
-import * as formilyValidator from '@formily/validator';
+import * as formilyCore from '@nocobase/schema';
+import * as formilyJsonSchema from '@nocobase/schema';
+import * as formilyPath from '@nocobase/schema';
+import * as formilyReact from '@nocobase/schema';
+import * as formilyJsonReactive from '@nocobase/schema';
+import * as formilyReactiveReact from '@nocobase/schema';
+import * as formilyShared from '@nocobase/schema';
+import * as formilyValidator from '@nocobase/schema';
 import * as nocobaseEvaluators from '@nocobase/evaluators/client';
 import * as nocobaseClientUtils from '@nocobase/utils/client';
 import * as nocobaseSDK from '@nocobase/sdk';
+import * as nocobaseSchema from '@nocobase/schema';
 import { dayjs } from '@nocobase/utils/client';
 import * as ahooks from 'ahooks';
 import * as antd from 'antd';
@ -77,6 +78,7 @@ export function defineGlobalDeps(requirejs: RequireJS) {
  requirejs.define('@nocobase/evaluators', () => nocobaseEvaluators);
  requirejs.define('@nocobase/evaluators/client', () => nocobaseEvaluators);
  requirejs.define('@nocobase/sdk', () => nocobaseSDK);
+  requirejs.define('@nocobase/schema', () => nocobaseSchema);

  // dnd-kit 相关
  requirejs.define('@dnd-kit/accessibility', () => dndKitAccessibility);
--- a/packages/core/client/src/block-provider/BlockProvider.tsx
+++ b/packages/core/client/src/block-provider/BlockProvider.tsx
@ -1,6 +1,6 @@
 import { css } from '@emotion/css';
-import { Field, GeneralField } from '@formily/core';
-import { RecursionField, useField, useFieldSchema } from '@formily/react';
+import { Field, GeneralField } from '@nocobase/schema';
+import { RecursionField, useField, useFieldSchema } from '@nocobase/schema';
 import { Col, Row } from 'antd';
 import merge from 'deepmerge';
 import template from 'lodash/template';
--- a/packages/core/client/src/block-provider/DetailsBlockProvider.tsx
+++ b/packages/core/client/src/block-provider/DetailsBlockProvider.tsx
@ -1,5 +1,5 @@
-import { createForm } from '@formily/core';
-import { useField } from '@formily/react';
+import { createForm } from '@nocobase/schema';
+import { useField } from '@nocobase/schema';
 import { Spin } from 'antd';
 import _ from 'lodash';
 import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
--- a/packages/core/client/src/block-provider/FormBlockProvider.tsx
+++ b/packages/core/client/src/block-provider/FormBlockProvider.tsx
@ -1,5 +1,5 @@
-import { createForm } from '@formily/core';
-import { RecursionField, Schema, useField, useFieldSchema } from '@formily/react';
+import { createForm } from '@nocobase/schema';
+import { RecursionField, Schema, useField, useFieldSchema } from '@nocobase/schema';
 import { Spin } from 'antd';
 import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
 import { useCollection_deprecated } from '../collection-manager';
--- a/packages/core/client/src/block-provider/FormFieldProvider.tsx
+++ b/packages/core/client/src/block-provider/FormFieldProvider.tsx
@ -1,6 +1,6 @@
-import { createForm, onFormValuesChange } from '@formily/core';
-import { useField } from '@formily/react';
-import { autorun } from '@formily/reactive';
+import { createForm, onFormValuesChange } from '@nocobase/schema';
+import { useField } from '@nocobase/schema';
+import { autorun } from '@nocobase/schema';
 import { forEach } from '@nocobase/utils/client';
 import { Spin } from 'antd';
 import React, { createContext, useContext, useEffect, useMemo } from 'react';
--- a/packages/core/client/src/block-provider/TableBlockProvider.tsx
+++ b/packages/core/client/src/block-provider/TableBlockProvider.tsx
@ -1,5 +1,5 @@
-import { createForm } from '@formily/core';
-import { FormContext, useField, useFieldSchema } from '@formily/react';
+import { createForm } from '@nocobase/schema';
+import { FormContext, useField, useFieldSchema } from '@nocobase/schema';
 import React, { createContext, useContext, useMemo, useState } from 'react';
 import { useCollectionManager_deprecated } from '../collection-manager';
 import { FixedBlockWrapper, SchemaComponentOptions } from '../schema-component';
--- a/packages/core/client/src/block-provider/TableFieldProvider.tsx
+++ b/packages/core/client/src/block-provider/TableFieldProvider.tsx
@ -1,5 +1,5 @@
-import { ArrayField, Field } from '@formily/core';
-import { useField, useFieldSchema } from '@formily/react';
+import { ArrayField, Field } from '@nocobase/schema';
+import { useField, useFieldSchema } from '@nocobase/schema';
 import React, { createContext, useContext, useEffect } from 'react';
 import { APIClient } from '../api-client';
 import { BlockProvider, useBlockRequestContext } from './BlockProvider';
--- a/packages/core/client/src/block-provider/TableSelectorProvider.tsx
+++ b/packages/core/client/src/block-provider/TableSelectorProvider.tsx
@ -1,5 +1,5 @@
-import { ArrayField } from '@formily/core';
-import { Schema, useField, useFieldSchema } from '@formily/react';
+import { ArrayField } from '@nocobase/schema';
+import { Schema, useField, useFieldSchema } from '@nocobase/schema';
 import _ from 'lodash';
 import uniq from 'lodash/uniq';
 import React, { createContext, useContext, useEffect, useState } from 'react';
--- a/packages/core/client/src/block-provider/hooks/index.ts
+++ b/packages/core/client/src/block-provider/hooks/index.ts
@ -1,6 +1,6 @@
-import { Field, Form } from '@formily/core';
-import { SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@formily/react';
-import { untracked } from '@formily/reactive';
+import { Field, Form } from '@nocobase/schema';
+import { SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@nocobase/schema';
+import { untracked } from '@nocobase/schema';
 import { isURL, parse } from '@nocobase/utils/client';
 import { App, message } from 'antd';
 import _ from 'lodash';
--- a/packages/core/client/src/block-provider/hooks/useParsedFilter.ts
+++ b/packages/core/client/src/block-provider/hooks/useParsedFilter.ts
@ -1,4 +1,4 @@
-import { reaction } from '@formily/reactive';
+import { reaction } from '@nocobase/schema';
 import { flatten, getValuesByPath } from '@nocobase/utils/client';
 import _ from 'lodash';
 import { useEffect, useState } from 'react';
--- a/packages/core/client/src/china-region/index.tsx
+++ b/packages/core/client/src/china-region/index.tsx
@ -1,5 +1,5 @@
-import { ArrayField } from '@formily/core';
-import { useField } from '@formily/react';
+import { ArrayField } from '@nocobase/schema';
+import { useField } from '@nocobase/schema';
 import { error } from '@nocobase/utils/client';
 import React from 'react';
 import { SchemaComponentOptions } from '..';
--- a/packages/core/client/src/collection-manager/Configuration/AddCollectionAction.tsx
+++ b/packages/core/client/src/collection-manager/Configuration/AddCollectionAction.tsx
@ -1,7 +1,7 @@
 import { DownOutlined, PlusOutlined } from '@ant-design/icons';
 import { ArrayTable } from '@formily/antd-v5';
-import { ISchema, useField, useForm } from '@formily/react';
-import { uid } from '@formily/shared';
+import { ISchema, useField, useForm } from '@nocobase/schema';
+import { uid } from '@nocobase/schema';
 import { Button, Dropdown, MenuProps } from 'antd';
 import { cloneDeep } from 'lodash';
 import React, { useMemo, useState } from 'react';
--- a/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx
+++ b/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx
@ -1,7 +1,7 @@
 import { PlusOutlined } from '@ant-design/icons';
 import { ArrayTable } from '@formily/antd-v5';
-import { useField, useForm } from '@formily/react';
-import { uid } from '@formily/shared';
+import { useField, useForm } from '@nocobase/schema';
+import { uid } from '@nocobase/schema';
 import { Button, Dropdown, MenuProps } from 'antd';
 import { cloneDeep } from 'lodash';
 import React, { useCallback, useMemo, useState } from 'react';
--- a/packages/core/client/src/collection-manager/Configuration/AddSubFieldAction.tsx
+++ b/packages/core/client/src/collection-manager/Configuration/AddSubFieldAction.tsx
@ -1,7 +1,7 @@
 import { PlusOutlined } from '@ant-design/icons';
 import { ArrayTable } from '@formily/antd-v5';
-import { ISchema } from '@formily/react';
-import { uid } from '@formily/shared';
+import { ISchema } from '@nocobase/schema';
+import { uid } from '@nocobase/schema';
 import { Button, Dropdown, MenuProps } from 'antd';
 import { cloneDeep } from 'lodash';
 import React, { useMemo, useState } from 'react';
--- a/packages/core/client/src/collection-manager/Configuration/DeleteCollectionAction.tsx
+++ b/packages/core/client/src/collection-manager/Configuration/DeleteCollectionAction.tsx
@ -1,6 +1,6 @@
 import { DeleteOutlined, ExclamationCircleFilled } from '@ant-design/icons';
 import { css } from '@emotion/css';
-import { useForm } from '@formily/react';
+import { useForm } from '@nocobase/schema';
 import { Button, message } from 'antd';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
--- a/packages/core/client/src/collection-manager/Configuration/EditCollectionAction.tsx
+++ b/packages/core/client/src/collection-manager/Configuration/EditCollectionAction.tsx
@ -1,6 +1,6 @@
 import { ArrayTable } from '@formily/antd-v5';
-import { ISchema, useForm } from '@formily/react';
-import { uid } from '@formily/shared';
+import { ISchema, useForm } from '@nocobase/schema';
+import { uid } from '@nocobase/schema';
 import cloneDeep from 'lodash/cloneDeep';
 import omit from 'lodash/omit';
 import React, { useEffect, useState } from 'react';
--- a/packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx
+++ b/packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx
@ -1,6 +1,6 @@
 import { ArrayTable } from '@formily/antd-v5';
-import { ISchema, useForm } from '@formily/react';
-import { uid } from '@formily/shared';
+import { ISchema, useForm } from '@nocobase/schema';
+import { uid } from '@nocobase/schema';
 import cloneDeep from 'lodash/cloneDeep';
 import omit from 'lodash/omit';
 import set from 'lodash/set';
--- a/packages/core/client/src/collection-manager/Configuration/EditSubFieldAction.tsx
+++ b/packages/core/client/src/collection-manager/Configuration/EditSubFieldAction.tsx
@ -1,6 +1,6 @@
 import { ArrayTable } from '@formily/antd-v5';
-import { ISchema, useForm } from '@formily/react';
-import { uid } from '@formily/shared';
+import { ISchema, useForm } from '@nocobase/schema';
+import { uid } from '@nocobase/schema';
 import cloneDeep from 'lodash/cloneDeep';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
--- a/packages/core/client/src/collection-manager/Configuration/OverridingCollectionField.tsx
+++ b/packages/core/client/src/collection-manager/Configuration/OverridingCollectionField.tsx
@ -1,6 +1,6 @@
 import { ArrayTable } from '@formily/antd-v5';
-import { ISchema, useForm } from '@formily/react';
-import { uid } from '@formily/shared';
+import { ISchema, useForm } from '@nocobase/schema';
+import { uid } from '@nocobase/schema';
 import { omit, set } from 'lodash';
 import cloneDeep from 'lodash/cloneDeep';
 import React, { useMemo, useState } from 'react';
--- a/packages/core/client/src/collection-manager/Configuration/SyncFieldsAction.tsx
+++ b/packages/core/client/src/collection-manager/Configuration/SyncFieldsAction.tsx
@ -1,7 +1,7 @@
 import { PlusOutlined } from '@ant-design/icons';
 import { ArrayTable } from '@formily/antd-v5';
-import { useField, useForm } from '@formily/react';
-import { uid } from '@formily/shared';
+import { useField, useForm } from '@nocobase/schema';
+import { uid } from '@nocobase/schema';
 import { Button } from 'antd';
 import { cloneDeep } from 'lodash';
 import React, { useState } from 'react';
--- a/packages/core/client/src/collection-manager/Configuration/SyncSQLFieldsAction.tsx
+++ b/packages/core/client/src/collection-manager/Configuration/SyncSQLFieldsAction.tsx
@ -1,8 +1,8 @@
 import { SyncOutlined } from '@ant-design/icons';
 import { FormLayout } from '@formily/antd-v5';
-import { createForm } from '@formily/core';
-import { useField, useForm } from '@formily/react';
-import { uid } from '@formily/shared';
+import { createForm } from '@nocobase/schema';
+import { useField, useForm } from '@nocobase/schema';
+import { uid } from '@nocobase/schema';
 import { Button } from 'antd';
 import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
--- a/Show More
+++ b/Show More