+```ts
+{
+ name: 'posts',
+ fields: [
+ {type: 'string', name: 'title'},
+ {type: 'text', name: 'content'},
+ ],
+}
+```
-## 数据的存储 —— 结构和关系
+## Resourcer
-## 数据的行为 —— 操作和事件
+基于资源（resource）和操作方法（action）设计，将 REST 和 RPC 思想融合起来
-## 数据的形态 —— 页面和区块
\ No newline at end of file
+```ts
+{
+ name: 'posts',
+ actions: {
+ list: {
+ filter: {}, // 过滤
+ fields: [], // 输出哪些字段
+ sort: '-created_at', // 排序
+ page: 1,
+ perPage: 20,
+ // ...
+ },
+ get: {
+ filter: {},
+ fields: [],
+ // ...
+ },
+ create: {
+ fields: [],
+ values: {},
+ // ...
+ },
+ update: {
+ fields: [],
+ values: {},
+ // ...
+ },
+ destroy: {
+ filter: {},
+ // ...
+ },
+ },
+}
+```
+
+## UI Schema
+
+基于 Formily Schema 2.0
+
+```ts
+{
+ type: 'object',
+ // 'x-component': 'Form',
+ properties: {
+ title: {
+ type: 'string',
+ title: '标题',
+ 'x-component': 'Input',
+ },
+ content: {
+ type: 'string',
+ title: '标题',
+ 'x-component': 'Input.TextArea',
+ },
+ },
+}
+```
+
+更进一步，构建了整个 NocoBase 架构：
+
+
\ No newline at end of file
diff --git a/docs/cores/packages/blocks.md b/docs/cores/packages/blocks.md
deleted file mode 100644
index 8e91ae2755..0000000000
--- a/docs/cores/packages/blocks.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-title: '@nocobase/blocks'
-order: 6
----
-
-# @nocobase/blocks
-
-
-### BlockLoader 
+
### 微内核
@@ -41,11 +41,3 @@ NocoBase 采用微内核架构，框架只保留核心的概念，具体各类
- 直接写在代码里，多用于处理动态配置
- 保存在文件里，多用于系统表配置或纯开发配置
- 保存在数据表里，多用于业务表配置
-
-## 核心点在哪里？
-
-NocoBase 本质上是对数据的信息化处理，包括三点核心：
-
-- 数据的存储 —— 结构和关系
-- 数据的行为 —— 方法和事件
-- 数据的形态 —— 页面和区块
diff --git a/nodemon.json b/nodemon.json
new file mode 100644
index 0000000000..51695bfc20
--- /dev/null
+++ b/nodemon.json
@@ -0,0 +1,6 @@
+{
+ "watch": ["packages/", ".env"],
+ "ignore": ["packages/app"],
+ "ext": "ts",
+ "exec": "ts-node -r dotenv/config ./packages/api/src/index.ts"
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index a52ebf86ac..f57b61f0ec 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
"scripts": {
"bootstrap": "lerna bootstrap",
"clean": "lerna clean",
+ "start-server": "nodemon",
"start-docs": "dumi dev",
"build-docs": "dumi build",
"build2": "lerna run build",
@@ -44,6 +45,7 @@
"koa-bodyparser": "^4.3.0",
"lerna": "^3.22.0",
"mockjs": "^1.1.0",
+ "nodemon": "^2.0.12",
"pg": "^8.6.0",
"pg-hstore": "^2.3.3",
"prettier": "^2.3.0",
diff --git a/packages/api/package.json b/packages/api/package.json
index 4fbaa19193..8cd3a05ee9 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -19,7 +19,7 @@
"@nocobase/plugin-file-manager": "^0.4.0-alpha.7",
"@nocobase/plugin-pages": "^0.4.0-alpha.7",
"@nocobase/plugin-permissions": "^0.4.0-alpha.7",
- "@nocobase/plugin-routes": "^0.4.0-alpha.7",
+ "@nocobase/plugin-ui-router": "^0.4.0-alpha.7",
"@nocobase/plugin-ui-schema": "^0.4.0-alpha.7",
"@nocobase/plugin-users": "^0.4.0-alpha.7",
"@nocobase/server": "^0.4.0-alpha.7",
diff --git a/packages/api/src/app.ts b/packages/api/src/app.ts
index 53adaaa339..dedd4e86f4 100644
--- a/packages/api/src/app.ts
+++ b/packages/api/src/app.ts
@@ -39,7 +39,7 @@ const api = Api.create({
const plugins = [
'@nocobase/plugin-collections',
- '@nocobase/plugin-routes',
+ '@nocobase/plugin-ui-router',
'@nocobase/plugin-ui-schema',
// '@nocobase/plugin-action-logs',
// '@nocobase/plugin-pages',
diff --git a/packages/api/src/migrations/init.ts b/packages/api/src/migrations/init.ts
index 6b28fe18fb..64e596464f 100644
--- a/packages/api/src/migrations/init.ts
+++ b/packages/api/src/migrations/init.ts
@@ -27,25 +27,27 @@ import * as uiSchema from './ui-schema';
exact: true,
},
{
+ type: 'route',
path: '/admin/:name(.+)?',
component: 'AdminLayout',
title: `后台`,
uiSchema: uiSchema.menu,
},
{
+ type: 'route',
component: 'AuthLayout',
children: [
{
- name: 'login',
+ type: 'route',
path: '/login',
- component: 'DefaultPage',
+ component: 'RouteSchemaRenderer',
title: `登录`,
uiSchema: uiSchema.login,
},
{
- name: 'register',
+ type: 'route',
path: '/register',
- component: 'DefaultPage',
+ component: 'RouteSchemaRenderer',
title: `注册`,
uiSchema: uiSchema.register,
},
diff --git a/packages/api/src/migrations/ui-schema/login.ts b/packages/api/src/migrations/ui-schema/login.ts
index d06e4c780d..b69843ac97 100644
--- a/packages/api/src/migrations/ui-schema/login.ts
+++ b/packages/api/src/migrations/ui-schema/login.ts
@@ -2,7 +2,6 @@ import { ISchema } from '@formily/react';
export const login: ISchema = {
key: 'dtf9j0b8p9u',
- name: 'dtf9j0b8p9u',
type: 'object',
properties: {
email: {
diff --git a/packages/api/src/migrations/ui-schema/register.ts b/packages/api/src/migrations/ui-schema/register.ts
index a129f5e3a3..993d56a2fa 100644
--- a/packages/api/src/migrations/ui-schema/register.ts
+++ b/packages/api/src/migrations/ui-schema/register.ts
@@ -1,6 +1,5 @@
export const register = {
key: '46qlxqam3xk',
- name: '46qlxqam3xk',
type: 'object',
properties: {
username: {
diff --git a/packages/client/src/components/RouteSwitch/__tests__/RouteSwitch.test.tsx b/packages/client/src/components/RouteSwitch/__tests__/RouteSwitch.test.tsx
deleted file mode 100644
index 5e1384ddc9..0000000000
--- a/packages/client/src/components/RouteSwitch/__tests__/RouteSwitch.test.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import React from 'react';
-import renderer from 'react-test-renderer';
-import { MemoryRouter as Router, useParams, Link } from 'react-router-dom';
-import { RouteSwitch } from '../';
-
-const components = {
- Index: () =>