+
+
+
+
+
+
+
+ );
+});
+
+const Page = observer((props) => {
+ return {fieldSchema.name}
+{props.children}
+ {props.children}
;
+});
+
+export default () => {
+ return (
+
+ {props.children}
+
+ );
+}
+
+const Block = observer((props) => {
+ const field = useField();
+ const fieldSchema = useFieldSchema();
+ return (
+
+ Block {fieldSchema.name}{' '}
+
+ Drag
+
+
+ Hello, world!
; + +const schema = { + type: 'void', + name: 'hello', + 'x-component': 'Hello', +}; + +export default () => { + return ( +{props.value}
+};
+
+const SingleText = connect(
+ Input,
+ mapProps((props, field) => {
+ return {
+ ...props,
+ suffix: '后缀',
+ }
+ }),
+ mapReadPretty(ReadPretty),
+);
+
+const schema = {
+ type: 'object',
+ properties: {
+ t1: {
+ type: 'string',
+ default: 'hello t1',
+ 'x-component': 'SingleText',
+ },
+ t2: {
+ type: 'string',
+ default: 'hello t2',
+ 'x-component': 'SingleText',
+ 'x-pattern': 'readPretty',
+ },
+ }
+};
+
+export default () => {
+ return (
+ UsedObserver: {form.values.t1}
+});
+
+const NotUsedObserver = (props) => {
+ const form = useForm();
+ return NotUsedObserver: {form.values.t1}
+};
+
+const schema = {
+ type: 'object',
+ properties: {
+ t1: {
+ type: 'string',
+ 'x-component': 'SingleText',
+ },
+ t2: {
+ type: 'string',
+ 'x-component': 'UsedObserver',
+ },
+ t3: {
+ type: 'string',
+ 'x-component': 'NotUsedObserver',
+ },
+ }
+};
+
+const components = {
+ SingleText,
+ UsedObserver,
+ NotUsedObserver
+};
+
+export default () => {
+ return (
+ Hello, {props.children}!
; +const World = () => world; + +const schema = { + type: 'object', + name: 'hello', + 'x-component': 'Hello', + properties: { + world: { + type: 'string', + 'x-component': 'World', + }, + }, +}; + +export default () => { + return ( +Hello, {props.children}!
; +const World = () => world; + +const schema = { + type: 'object', + properties: { + title1: { + type: 'void', + 'x-content': 'Void schema', + }, + void: { + type: 'void', + name: 'hello', + 'x-component': 'Hello', + properties: { + world: { + type: 'void', + 'x-component': 'World', + }, + }, + }, + title2: { + type: 'void', + 'x-content': 'Object schema', + }, + object: { + type: 'object', + name: 'hello', + 'x-component': 'Hello', + properties: { + world: { + type: 'string', + 'x-component': 'World', + }, + }, + }, + title3: { + type: 'void', + 'x-content': 'Array schema', + }, + array: { + type: 'array', + name: 'hello', + 'x-component': 'Hello', + properties: { + world: { + type: 'string', + 'x-component': 'World', + }, + }, + }, + title4: { + type: 'void', + 'x-content': 'String schema', + }, + string: { + type: 'string', + name: 'hello', + 'x-component': 'Hello', + properties: { + world: { + type: 'string', + 'x-component': 'World', + }, + }, + }, + } +}; + +export default () => { + return ( +-
+ {field.value?.map((item, index) => {
+ // 只有一个元素
+ return
-
+ {field.value?.map((item, index) => {
+ // array 元素是 object
+ return (
+
+
+
+
+
+
+
+
+ );
+});
+
+const Page = observer((props) => {
+ return {fieldSchema.name}
+{props.children}
+ {props.children}
;
+});
+
+export default () => {
+ return (
+ Hello, world!
+``` + +## children 组件可以写在 properties 里 + +```ts +{ + type: 'void', + 'x-component': 'div', + 'x-component-props': { className: 'form-item' }, + properties: { + title: { + type: 'string', + 'x-component': 'input', + }, + }, +} +``` + +JSX 等同于 + +```tsx | pure +
+
+
+```
+
+## decorator 的巧妙用法
+
+decorator + component 的组合，可以将两个组件放在一个 schema 节点里，降低 schema 结构复杂度，提高组件的复用率。
+
+例如表单场景里，可以将 FormItem 组件与任意字段组件组合，在这里 FormItem 就是 Decorator。
+
+```ts
+{
+ type: 'void',
+ ['x-component']: 'div',
+ properties: {
+ title: {
+ type: 'string',
+ 'x-decorator': 'FormItem',
+ 'x-component': 'Input',
+ },
+ content: {
+ type: 'string',
+ 'x-decorator': 'FormItem',
+ 'x-component': 'Input.TextArea',
+ },
+ },
+}
+```
+
+JSX 等同于
+
+```tsx | pure
+
+
+
+
+
+
+
+```
+
+也可以提供一个 CardItem 组件，用于包裹所有区块，这样所有区块就都是 Card 包裹的了。
+
+```ts
+{
+ type: 'void',
+ ['x-component']: 'div',
+ properties: {
+ title: {
+ type: 'string',
+ 'x-decorator': 'CardItem',
+ 'x-component': 'Table',
+ },
+ content: {
+ type: 'string',
+ 'x-decorator': 'CardItem',
+ 'x-component': 'Kanban',
+ },
+ },
+}
+```
+
+JSX 等同于
+
+```tsx | pure
+
+
+
+
+
+
+
+```
+
+## 组件的展示状态
+
+- `'x-display': 'visible'`：显示组件
+- `'x-display': 'hidden'`：隐藏组件，数据不隐藏
+- `'x-display': 'none'`：隐藏组件，数据也隐藏
+
+### `'x-display': 'visible'`
+
+```ts
+{
+ type: 'void',
+ 'x-component': 'div',
+ 'x-component-props': { className: 'form-item' },
+ properties: {
+ title: {
+ type: 'string',
+ 'x-component': 'input',
+ 'x-display': 'visible'
+ },
+ },
+}
+```
+
+JSX 等同于
+
+```tsx | pure
+
+
+
+```
+
+### `'x-display': 'hidden'`
+
+```ts
+{
+ type: 'void',
+ 'x-component': 'div',
+ 'x-component-props': { className: 'form-item' },
+ properties: {
+ title: {
+ type: 'string',
+ 'x-component': 'input',
+ 'x-display': 'hidden'
+ },
+ },
+}
+```
+
+JSX 等同于
+
+```tsx | pure
+
+ {/* 此处不输出 input 组件，对应的 name=title 的字段模型还存在 */}
+
+```
+
+### `'x-display': 'none'`
+
+```ts
+{
+ type: 'void',
+ 'x-component': 'div',
+ 'x-component-props': { className: 'form-item' },
+ properties: {
+ title: {
+ type: 'string',
+ 'x-component': 'input',
+ 'x-display': 'none'
+ },
+ },
+}
+```
+
+JSX 等同于
+
+```tsx | pure
+
+ {/* 此处不输出 input 组件，对应的 name=title 的字段模型也不存在了 */}
+
+```
+
+## 组件的显示模式
+
+用于字段组件，有三种显示模式：
+
+- `'x-pattern': 'editable'` 可编辑
+- `'x-pattern': 'disabled'` 不可编辑
+- `'x-pattern': 'readPretty'` 友好阅读
+
+如单行文本 `
+
+
+```
+
+### `'x-pattern': 'disabled'`
+
+```ts
+const schema = {
+ name: 'test',
+ type: 'void',
+ 'x-component': 'div',
+ 'x-component-props': { className: 'form-item' },
+ properties: {
+ title: {
+ type: 'string',
+ default: 'Hello',
+ 'x-component': 'SingleText',
+ 'x-pattern': 'disabled'
+ },
+ },
+};
+```
+
+JSX 等价于
+
+```tsx | pure
+
+
+
+```
+
+### `'x-pattern': 'readPretty'`
+
+```ts
+const schema = {
+ name: 'test',
+ type: 'void',
+ 'x-component': 'div',
+ 'x-component-props': { className: 'form-item' },
+ properties: {
+ title: {
+ type: 'string',
+ default: 'Hello',
+ 'x-component': 'SingleText',
+ 'x-pattern': 'readPretty',
+ },
+ },
+};
+```
+
+JSX 等价于
+
+```tsx | pure
+
+
+```
diff --git a/docs/zh-CN/development/index.md b/docs/zh-CN/development/index.md
new file mode 100644
index 000000000..a7e2e46eb
--- /dev/null
+++ b/docs/zh-CN/development/index.md
@@ -0,0 +1,42 @@
+# 概述
+
+## 基本概念
+
+NocoBase 的核心是一个基于微内核、插件化设计的开发框架。在此基础上天热的支持任意的扩展开发。
+
+## 特性
+
+## 扩展能力
+
+基于 NocoBase 的微内核设计，在很多模块都考虑相应合理的可扩展性，并向外部暴露了一些扩展点。例如：
+
+* 数据库字段类型
+* 已有数据库表的字段
+* 通用操作和对特定的资源的操作
+* 针对资源和操作的预处理和后处理
+* 字段的前端展示组件
+* 页面的区块类型
+* 用户插件的登入认证方法
+* 工作流插件的节点类型和触发类型
+* ……
+
+在具体业务中可以根据需求基于以上扩展点进行相应的扩展。
+
+## 插件生命周期
+
+### 下载
+
+### 注册
+
+### 安装
+
+### 启用
+
+### 加载
+
+### 停用
+
+### 卸载
+
+## 学习路线
+
diff --git a/docs/zh-CN/development/plugin-development/client/overview.md b/docs/zh-CN/development/plugin-development/client/overview.md
deleted file mode 100644
index 4bba659eb..000000000
--- a/docs/zh-CN/development/plugin-development/client/overview.md
+++ /dev/null
@@ -1 +0,0 @@
-# Overview
\ No newline at end of file
diff --git a/docs/zh-CN/development/plugin-development/client/providers/antd.md b/docs/zh-CN/development/plugin-development/client/providers/antd.md
deleted file mode 100644
index a80a47303..000000000
--- a/docs/zh-CN/development/plugin-development/client/providers/antd.md
+++ /dev/null
@@ -1 +0,0 @@
-# Ant Design
\ No newline at end of file
diff --git a/docs/zh-CN/development/plugin-development/client/providers/api-client.md b/docs/zh-CN/development/plugin-development/client/providers/api-client.md
deleted file mode 100644
index 235b800a3..000000000
--- a/docs/zh-CN/development/plugin-development/client/providers/api-client.md
+++ /dev/null
@@ -1 +0,0 @@
-# APIClient
diff --git a/docs/zh-CN/development/plugin-development/client/providers/china-region.md b/docs/zh-CN/development/plugin-development/client/providers/china-region.md
deleted file mode 100644
index 3706bbe44..000000000
--- a/docs/zh-CN/development/plugin-development/client/providers/china-region.md
+++ /dev/null
@@ -1 +0,0 @@
-# ChianRegion
\ No newline at end of file
diff --git a/docs/zh-CN/development/plugin-development/client/providers/route-switch.md b/docs/zh-CN/development/plugin-development/client/providers/route-switch.md
deleted file mode 100644
index 3bfc5a330..000000000
--- a/docs/zh-CN/development/plugin-development/client/providers/route-switch.md
+++ /dev/null
@@ -1 +0,0 @@
-# RouteSwitch
\ No newline at end of file
diff --git a/docs/zh-CN/development/plugin-development/client/providers/schema-component.md b/docs/zh-CN/development/plugin-development/client/providers/schema-component.md
deleted file mode 100644
index 90d3aa4d8..000000000
--- a/docs/zh-CN/development/plugin-development/client/providers/schema-component.md
+++ /dev/null
@@ -1 +0,0 @@
-# SchemaComponent
diff --git a/docs/zh-CN/development/plugin-development/client/providers/schema-initializer.md b/docs/zh-CN/development/plugin-development/client/providers/schema-initializer.md
deleted file mode 100644
index bd2e33b59..000000000
--- a/docs/zh-CN/development/plugin-development/client/providers/schema-initializer.md
+++ /dev/null
@@ -1 +0,0 @@
-# SchemaInitializer
diff --git a/docs/zh-CN/development/plugin-development/index.md b/docs/zh-CN/development/plugin-development/index.md
deleted file mode 100644
index b8be99be8..000000000
--- a/docs/zh-CN/development/plugin-development/index.md
+++ /dev/null
@@ -1 +0,0 @@
-# 快速入门
diff --git a/docs/zh-CN/development/plugin-development/server/cli.md b/docs/zh-CN/development/plugin-development/server/cli.md
deleted file mode 100644
index db3cc6737..000000000
--- a/docs/zh-CN/development/plugin-development/server/cli.md
+++ /dev/null
@@ -1 +0,0 @@
-# CLI
\ No newline at end of file
diff --git a/docs/zh-CN/development/plugin-development/server/database.md b/docs/zh-CN/development/plugin-development/server/database.md
deleted file mode 100644
index 4a79ce0cd..000000000
--- a/docs/zh-CN/development/plugin-development/server/database.md
+++ /dev/null
@@ -1 +0,0 @@
-# Database
\ No newline at end of file
diff --git a/docs/zh-CN/development/plugin-development/server/events.md b/docs/zh-CN/development/plugin-development/server/events.md
deleted file mode 100644
index b649f948c..000000000
--- a/docs/zh-CN/development/plugin-development/server/events.md
+++ /dev/null
@@ -1 +0,0 @@
-# Event
\ No newline at end of file
diff --git a/docs/zh-CN/development/plugin-development/server/middleware.md b/docs/zh-CN/development/plugin-development/server/middleware.md
deleted file mode 100644
index c5033ed0e..000000000
--- a/docs/zh-CN/development/plugin-development/server/middleware.md
+++ /dev/null
@@ -1 +0,0 @@
-# Middleware
\ No newline at end of file
diff --git a/docs/zh-CN/development/plugin-development/server/overview.md b/docs/zh-CN/development/plugin-development/server/overview.md
deleted file mode 100644
index 4bba659eb..000000000
--- a/docs/zh-CN/development/plugin-development/server/overview.md
+++ /dev/null
@@ -1 +0,0 @@
-# Overview
\ No newline at end of file
diff --git a/docs/zh-CN/development/plugin-development/server/plugin-manager.md b/docs/zh-CN/development/plugin-development/server/plugin-manager.md
deleted file mode 100644
index b98d016d5..000000000
--- a/docs/zh-CN/development/plugin-development/server/plugin-manager.md
+++ /dev/null
@@ -1 +0,0 @@
-# PluginManager
\ No newline at end of file
diff --git a/docs/zh-CN/development/plugin-development/server/resourcer.md b/docs/zh-CN/development/plugin-development/server/resourcer.md
deleted file mode 100644
index 5c0d22865..000000000
--- a/docs/zh-CN/development/plugin-development/server/resourcer.md
+++ /dev/null
@@ -1 +0,0 @@
-# Resource & Action
\ No newline at end of file
diff --git a/docs/zh-CN/development/pre-release/build.md b/docs/zh-CN/development/pre-release/build.md
new file mode 100644
index 000000000..1294b9a65
--- /dev/null
+++ b/docs/zh-CN/development/pre-release/build.md
@@ -0,0 +1 @@
+# Building
\ No newline at end of file
diff --git a/docs/zh-CN/development/pre-release/test.md b/docs/zh-CN/development/pre-release/test.md
new file mode 100644
index 000000000..94cfd7d77
--- /dev/null
+++ b/docs/zh-CN/development/pre-release/test.md
@@ -0,0 +1 @@
+# Testing
\ No newline at end of file
diff --git a/docs/zh-CN/translations.md b/docs/zh-CN/development/translations.md
similarity index 99%
rename from docs/zh-CN/translations.md
rename to docs/zh-CN/development/translations.md
index d86c39a93..bfed7c89d 100644
--- a/docs/zh-CN/translations.md
+++ b/docs/zh-CN/development/translations.md
@@ -15,7 +15,7 @@ https://github.com/nocobase/nocobase/tree/main/packages/core/client/src/locale
请复制 en_US.ts，命名为想要新增的语言的名字，然后对其中的字符串进行翻译。翻译完成之后，请通过 pull request 提交给 NocoBase，我们将会把它加入语言列表。之后你将在系统配置中看到新增的语言，在这里你可以配置需要显示哪些语言供用户选择。
-Hello
+
+
下面的表格中列出了 Language Culture Name, Locale File Name, Display Name.
@@ -156,4 +156,4 @@ https://github.com/nocobase/nocobase/tree/main/packages/core/client/src/locale
| ur-PK | ur_PK.ts | Urdu - Pakistan |
| Cy-uz-UZ | Cy_uz_UZ.ts | Uzbek (Cyrillic) - Uzbekistan |
| Lt-uz-UZ | Lt_uz_UZ.ts | Uzbek (Latin) - Uzbekistan |
-| vi-VN | vi_VN.ts | Vietnamese - Vietnam |
\ No newline at end of file
+| vi-VN | vi_VN.ts | Vietnamese - Vietnam |
diff --git a/docs/zh-CN/development/your-fisrt-plugin.md b/docs/zh-CN/development/your-fisrt-plugin.md
new file mode 100644
index 000000000..e5f70f515
--- /dev/null
+++ b/docs/zh-CN/development/your-fisrt-plugin.md
@@ -0,0 +1,96 @@
+# 编写第一个插件
+
+在此之前，需要先安装好 NocoBase：
+
+- create-nocobase-app 安装
+- Git 源码安装
+
+相关安装、启动命令如下：
+
+```bash
+cd my-nocobase-app
+yarn install
+yarn nocobase install
+yarn dev
+```
+
+插件开发和调试，需要在开发环境并通过 `yarn dev` 启动。做好准备之后，我们就可以开始 NocoBase 的插件开发之旅了。
+
+## 创建插件
+
+首先，你可以通过 CLI 快速的创建一个初始化的插件，命令如下：
+
+```bash
+yarn pm create hello
+```
+
+新建的插件，会放置在 `packages/plugins/hello` 目录下。
+
+## 插件目录结构
+
+```ts
+|- /hello
+ |- /src
+ |- /client
+ |- /server
+ |- client.d.ts
+ |- client.js
+ |- package.json
+ |- server.d.ts
+ |- server.js
+```
+
+## 编写插件
+
+插件的主体文件在 `packages/plugins/hello/src/server/plugin.ts`，修改为：
+
+```ts
+import { InstallOptions, Plugin } from '@nocobase/server';
+
+export class Hello extends Plugin {
+ initialize() {
+ // TODO
+ }
+
+ beforeLoad() {
+ // TODO
+ }
+
+ async load() {
+ // TODO
+ // Visit: http://localhost:13000/api/hello:get
+ this.app.resource({
+ name: 'hello',
+ actions: {
+ async get(ctx, next) {
+ ctx.body = `Hello plugin1!`;
+ next();
+ },
+ },
+ });
+ this.app.acl.allow('hello', 'get');
+ }
+
+ async install(options: InstallOptions) {
+ // TODO
+ }
+}
+
+export default Hello;
+```
+
+## 注册插件
+
+```bash
+yarn pm add hello
+```
+
+## 激活插件
+
+```bash
+yarn pm enable hello
+```
+
+## 体验插件功能
+
+访问地址 http://localhost:13000/api/hello:get
diff --git a/docs/zh-CN/faq.md b/docs/zh-CN/faq.md
deleted file mode 100644
index 80cba6c74..000000000
--- a/docs/zh-CN/faq.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# 常见问题
-
diff --git a/docs/zh-CN/getting-started/deployment.md b/docs/zh-CN/getting-started/deployment.md
new file mode 100644
index 000000000..7ae584f53
--- /dev/null
+++ b/docs/zh-CN/getting-started/deployment.md
@@ -0,0 +1,2 @@
+# 部署
+
diff --git a/docs/zh-CN/getting-started/installation/docker-compose.md b/docs/zh-CN/getting-started/installation/docker-compose.md
index 7caf32113..8cc6ceb4f 100644
--- a/docs/zh-CN/getting-started/installation/docker-compose.md
+++ b/docs/zh-CN/getting-started/installation/docker-compose.md
@@ -1,4 +1,11 @@
-# Docker 安装 (👍 推荐)
+---
+group:
+ path: /getting-started/installation/docker-compose
+ title: Docker 安装 (👍 推荐)
+ order: 1
+---
+
+# Docker 安装
## 0. 先决条件
diff --git a/docs/zh-CN/getting-started/installation/overview.md b/docs/zh-CN/getting-started/installation/index.md
similarity index 76%
rename from docs/zh-CN/getting-started/installation/overview.md
rename to docs/zh-CN/getting-started/installation/index.md
index 6940b17b5..1a5e732a2 100644
--- a/docs/zh-CN/getting-started/installation/overview.md
+++ b/docs/zh-CN/getting-started/installation/index.md
@@ -4,9 +4,9 @@
NocoBase 支持三种安装方式：
-- [Docker 安装（推荐）](./docker-compose.md)
-- [create-nocobase-app 安装](./create-nocobase-app.md)
-- [Git 源码安装](./git-clone.md)
+- [Docker 安装（推荐）](./installation/docker-compose.md)
+- [create-nocobase-app 安装](./installation/create-nocobase-app.md)
+- [Git 源码安装](./installation/git-clone.md)
## 如何选择
diff --git a/docs/zh-CN/why.md b/docs/zh-CN/introduction/features.md
similarity index 86%
rename from docs/zh-CN/why.md
rename to docs/zh-CN/introduction/features.md
index f0e31b0e0..9c7b194ae 100644
--- a/docs/zh-CN/why.md
+++ b/docs/zh-CN/introduction/features.md
@@ -1,4 +1,4 @@
-# 与众不同之处
+# 功能特色
## 1. “数据结构”与“使用界面”分离
@@ -6,12 +6,12 @@
NocoBase 采用数据结构与使用界面分离的设计思路，可以为数据表创建任意数量、任意形态的区块（数据视图），每个区块里可以定义不同的样式、文案、操作。这样既兼顾了无代码的简单操作，又具备了原生开发的灵活性。
-
+
## 2. “配置”与“使用”融为一体
NocoBase 可以开发复杂和有特色的业务系统，但这并意味着需要复杂和专业的操作。只需一次点击，就可以在使用界面上显示出配置选项，这意味着具备系统配置权限的管理员可以用所见即所得的操作方式，直接配置用户的使用界面。
-
+
## 3. 功能即插件
diff --git a/docs/zh-CN/user-manual/introduction/important-features/2.collection-block.png b/docs/zh-CN/introduction/features/2.collection-block.png
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/important-features/2.collection-block.png
rename to docs/zh-CN/introduction/features/2.collection-block.png
diff --git a/docs/zh-CN/user-manual/introduction/important-features/2.user-root.gif b/docs/zh-CN/introduction/features/2.user-root.gif
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/important-features/2.user-root.gif
rename to docs/zh-CN/introduction/features/2.user-root.gif
diff --git a/docs/zh-CN/index.md b/docs/zh-CN/introduction/index.md
similarity index 99%
rename from docs/zh-CN/index.md
rename to docs/zh-CN/introduction/index.md
index 1bcd92e73..73a017609 100644
--- a/docs/zh-CN/index.md
+++ b/docs/zh-CN/introduction/index.md
@@ -1,4 +1,4 @@
-# 介绍
+# 概述
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started.md b/docs/zh-CN/introduction/quickstart.md
similarity index 82%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started.md
rename to docs/zh-CN/introduction/quickstart.md
index b49157e82..559eaff19 100644
--- a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started.md
+++ b/docs/zh-CN/introduction/quickstart.md
@@ -31,27 +31,27 @@
接下来，点击“数据表配置”按钮，进入数据表配置界面，创建第一个 Collection `Customers`。
-
+
然后点击“字段配置”，为`Customers` 添加 name 字段，它是单行文本类型。
-
+
用同样的方法，为`Customers` 添加 Birthday、Gender、Phone，它们分别是日期类型、单项选择类型、手机号码类型。
-
+
用同样的方法，创建 Collection `Products`、`Orders`、`Order List` 以及它们的字段。
-
+
其中，对于关系字段，我们要选择正确的类型，从而建立数据表之间的关联。我们以`Orders`为例，创建 Customer 字段，选择 **多对一** 关系，关联到`Customers`。
-
+
创建关系字段后，我们可以在被关联的 Collection 里看到自动生成的反向关联字段。比如在`Customers`中看到自动生成的 Orders 字段，这样我们在`Customers`的区块里可以调用`Orders`的数据。
-
+
将数据表和字段创建完成后，我们开始制作界面。
@@ -61,11 +61,11 @@
点击界面配置按钮，进入界面配置模式。在界面配置模式下，我们可以添加菜单项，添加页面，在页面内布置区块。
-
+
点击添加菜单项，添加菜单分组 “Customers” 和 “Orders & Products” ，然后添加子菜单页面 “All Orders” 和 “Products”。
-
+
添加完菜单和页面之后，我们可以在页面内添加和配置区块了。
@@ -75,16 +75,16 @@ NocoBase 目前支持表格、看板、日历、表单、详情等类型的区
我们在“所有订单”页面，添加一个表格区块，数据源选择 Collection `Orders` ，并为这个表格区块配置需要显示的列。
-
+
给这个表格区块配置操作，包括筛选、添加、删除、查看、编辑。
-
+
为新增、编辑、查看等操作配置表单和详情区块。
-
+
然后，用同样的方法，在 Products 和 Customers 页面布置表格区块。完成后，退出界面配置模式，进入使用模式，一个简单的订单管理系统就完成了。
-
+
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.action-block.gif b/docs/zh-CN/introduction/quickstart/1.action-block.gif
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.action-block.gif
rename to docs/zh-CN/introduction/quickstart/1.action-block.gif
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.action.gif b/docs/zh-CN/introduction/quickstart/1.action.gif
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.action.gif
rename to docs/zh-CN/introduction/quickstart/1.action.gif
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.auto.relation.jpg b/docs/zh-CN/introduction/quickstart/1.auto.relation.jpg
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.auto.relation.jpg
rename to docs/zh-CN/introduction/quickstart/1.auto.relation.jpg
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.block.gif b/docs/zh-CN/introduction/quickstart/1.block.gif
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.block.gif
rename to docs/zh-CN/introduction/quickstart/1.block.gif
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.collections.jpg b/docs/zh-CN/introduction/quickstart/1.collections.jpg
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.collections.jpg
rename to docs/zh-CN/introduction/quickstart/1.collections.jpg
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.customers.gif b/docs/zh-CN/introduction/quickstart/1.customers.gif
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.customers.gif
rename to docs/zh-CN/introduction/quickstart/1.customers.gif
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.customers.gif.gif b/docs/zh-CN/introduction/quickstart/1.customers.gif.gif
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.customers.gif.gif
rename to docs/zh-CN/introduction/quickstart/1.customers.gif.gif
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.editor.gif b/docs/zh-CN/introduction/quickstart/1.editor.gif
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.editor.gif
rename to docs/zh-CN/introduction/quickstart/1.editor.gif
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.fields.jpg b/docs/zh-CN/introduction/quickstart/1.fields.jpg
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.fields.jpg
rename to docs/zh-CN/introduction/quickstart/1.fields.jpg
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.finished.gif b/docs/zh-CN/introduction/quickstart/1.finished.gif
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.finished.gif
rename to docs/zh-CN/introduction/quickstart/1.finished.gif
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.menu.gif b/docs/zh-CN/introduction/quickstart/1.menu.gif
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.menu.gif
rename to docs/zh-CN/introduction/quickstart/1.menu.gif
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.relation.jpg b/docs/zh-CN/introduction/quickstart/1.relation.jpg
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/1.relation.jpg
rename to docs/zh-CN/introduction/quickstart/1.relation.jpg
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/2.field.gif b/docs/zh-CN/introduction/quickstart/2.field.gif
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/2.field.gif
rename to docs/zh-CN/introduction/quickstart/2.field.gif
diff --git a/docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/2.field.gif.gif b/docs/zh-CN/introduction/quickstart/2.field.gif.gif
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/5-minutes-to-get-started/2.field.gif.gif
rename to docs/zh-CN/introduction/quickstart/2.field.gif.gif
diff --git a/docs/zh-CN/roadmap.md b/docs/zh-CN/introduction/roadmap.md
similarity index 100%
rename from docs/zh-CN/roadmap.md
rename to docs/zh-CN/introduction/roadmap.md
diff --git a/docs/zh-CN/thanks.md b/docs/zh-CN/introduction/thanks.md
similarity index 100%
rename from docs/zh-CN/thanks.md
rename to docs/zh-CN/introduction/thanks.md
diff --git a/docs/zh-CN/user-manual/introduction/why-nocobase.md b/docs/zh-CN/introduction/when.md
similarity index 100%
rename from docs/zh-CN/user-manual/introduction/why-nocobase.md
rename to docs/zh-CN/introduction/when.md
diff --git a/docs/zh-CN/user-manual/advanced-guide/actions.md b/docs/zh-CN/manual/actions.md
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/actions.md
rename to docs/zh-CN/manual/actions.md
diff --git a/docs/zh-CN/user-manual/advanced-guide/blocks.md b/docs/zh-CN/manual/blocks.md
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/blocks.md
rename to docs/zh-CN/manual/blocks.md
diff --git a/docs/zh-CN/user-manual/advanced-guide/blocks/6.block-add.jpg b/docs/zh-CN/manual/blocks/6.block-add.jpg
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/blocks/6.block-add.jpg
rename to docs/zh-CN/manual/blocks/6.block-add.jpg
diff --git a/docs/zh-CN/user-manual/advanced-guide/blocks/6.block-content 1.gif b/docs/zh-CN/manual/blocks/6.block-content 1.gif
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/blocks/6.block-content 1.gif
rename to docs/zh-CN/manual/blocks/6.block-content 1.gif
diff --git a/docs/zh-CN/user-manual/advanced-guide/blocks/6.block-content.gif b/docs/zh-CN/manual/blocks/6.block-content.gif
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/blocks/6.block-content.gif
rename to docs/zh-CN/manual/blocks/6.block-content.gif
diff --git a/docs/zh-CN/user-manual/advanced-guide/blocks/6.block.jpg b/docs/zh-CN/manual/blocks/6.block.jpg
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/blocks/6.block.jpg
rename to docs/zh-CN/manual/blocks/6.block.jpg
diff --git a/docs/zh-CN/user-manual/advanced-guide/blocks/6.collection-setting.gif b/docs/zh-CN/manual/blocks/6.collection-setting.gif
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/blocks/6.collection-setting.gif
rename to docs/zh-CN/manual/blocks/6.collection-setting.gif
diff --git a/docs/zh-CN/user-manual/advanced-guide/collections.md b/docs/zh-CN/manual/collections.md
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/collections.md
rename to docs/zh-CN/manual/collections.md
diff --git a/docs/zh-CN/user-manual/advanced-guide/collections/4.collections.gif b/docs/zh-CN/manual/collections/4.collections.gif
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/collections/4.collections.gif
rename to docs/zh-CN/manual/collections/4.collections.gif
diff --git a/docs/zh-CN/user-manual/advanced-guide/file-storages.md b/docs/zh-CN/manual/file-storages.md
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/file-storages.md
rename to docs/zh-CN/manual/file-storages.md
diff --git a/docs/zh-CN/user-manual/advanced-guide/file-storages/8.storage.gif b/docs/zh-CN/manual/file-storages/8.storage.gif
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/file-storages/8.storage.gif
rename to docs/zh-CN/manual/file-storages/8.storage.gif
diff --git a/docs/zh-CN/user-manual/advanced-guide/functional-zoning.md b/docs/zh-CN/manual/functional-zoning.md
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/functional-zoning.md
rename to docs/zh-CN/manual/functional-zoning.md
diff --git a/docs/zh-CN/user-manual/advanced-guide/functional-zoning/3.zone.jpg b/docs/zh-CN/manual/functional-zoning/3.zone.jpg
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/functional-zoning/3.zone.jpg
rename to docs/zh-CN/manual/functional-zoning/3.zone.jpg
diff --git a/docs/zh-CN/user-manual/advanced-guide/language-settings.md b/docs/zh-CN/manual/language-settings.md
similarity index 82%
rename from docs/zh-CN/user-manual/advanced-guide/language-settings.md
rename to docs/zh-CN/manual/language-settings.md
index 555b26cb3..b895be85d 100644
--- a/docs/zh-CN/user-manual/advanced-guide/language-settings.md
+++ b/docs/zh-CN/manual/language-settings.md
@@ -14,8 +14,8 @@ yarn nocobase install --lang=zh-CN
安装之后，可以在 System settings 里修改 Enabled languages。
-
+
如果启用了多个语言，用户可以在个人中心设置自己的语言环境。
-
+
diff --git a/docs/zh-CN/user-manual/advanced-guide/menus.md b/docs/zh-CN/manual/menus.md
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/menus.md
rename to docs/zh-CN/manual/menus.md
diff --git a/docs/zh-CN/user-manual/advanced-guide/menus/5.menu-add.jpg b/docs/zh-CN/manual/menus/5.menu-add.jpg
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/menus/5.menu-add.jpg
rename to docs/zh-CN/manual/menus/5.menu-add.jpg
diff --git a/docs/zh-CN/user-manual/advanced-guide/menus/5.menu-edit.jpg b/docs/zh-CN/manual/menus/5.menu-edit.jpg
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/menus/5.menu-edit.jpg
rename to docs/zh-CN/manual/menus/5.menu-edit.jpg
diff --git a/docs/zh-CN/user-manual/advanced-guide/plugins.md b/docs/zh-CN/manual/plugins.md
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/plugins.md
rename to docs/zh-CN/manual/plugins.md
diff --git a/docs/zh-CN/user-manual/advanced-guide/plugins/Workflow 7229c53cffc8429dbf7acb58cac90a76.md b/docs/zh-CN/manual/plugins/Workflow 7229c53cffc8429dbf7acb58cac90a76.md
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/plugins/Workflow 7229c53cffc8429dbf7acb58cac90a76.md
rename to docs/zh-CN/manual/plugins/Workflow 7229c53cffc8429dbf7acb58cac90a76.md
diff --git a/docs/zh-CN/user-manual/advanced-guide/roles-permissions.md b/docs/zh-CN/manual/roles-permissions.md
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/roles-permissions.md
rename to docs/zh-CN/manual/roles-permissions.md
diff --git a/docs/zh-CN/user-manual/advanced-guide/system-settings.md b/docs/zh-CN/manual/system-settings.md
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/system-settings.md
rename to docs/zh-CN/manual/system-settings.md
diff --git a/docs/zh-CN/user-manual/advanced-guide/system-settings/9.system.gif b/docs/zh-CN/manual/system-settings/9.system.gif
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/system-settings/9.system.gif
rename to docs/zh-CN/manual/system-settings/9.system.gif
diff --git a/docs/zh-CN/user-manual/advanced-guide/tabs.md b/docs/zh-CN/manual/tabs.md
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/tabs.md
rename to docs/zh-CN/manual/tabs.md
diff --git a/docs/zh-CN/user-manual/advanced-guide/tabs/7.tabs-2.gif b/docs/zh-CN/manual/tabs/7.tabs-2.gif
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/tabs/7.tabs-2.gif
rename to docs/zh-CN/manual/tabs/7.tabs-2.gif
diff --git a/docs/zh-CN/user-manual/advanced-guide/tabs/7.tabs.gif b/docs/zh-CN/manual/tabs/7.tabs.gif
similarity index 100%
rename from docs/zh-CN/user-manual/advanced-guide/tabs/7.tabs.gif
rename to docs/zh-CN/manual/tabs/7.tabs.gif
diff --git a/docs/zh-CN/release-notes.md b/docs/zh-CN/release-notes.md
deleted file mode 100644
index 23deb8ce2..000000000
--- a/docs/zh-CN/release-notes.md
+++ /dev/null
@@ -1,382 +0,0 @@
-# 更新日志
-
-## 2022/08/15 ~ v0.7.4-alpha.7
-
-### Details
-
-- fix(collection-manager): update collection without fields
-
-## 2022/08/12 ~ v0.7.4-alpha.4
-
-### New features
-
-- Field default value
-
-### Details
-
-- fix(database): error getting db version number
-- fix: record provider required for read pretty
-- fix: sync table sort to export (#723)
-- feat: full version of the NocoBase dockerfile (#719)
-- feat: add examples
-- chore: update node ci
-- fix(plugin-workflow): fix extend collection (#708)
-- fix: DB_TABLE_PREFIX doesn't get applied (#710)
-- feat: default value (#679)
-- fix: required field delete submit error (#688) (#694)
-
-## 2022/07/28 ~ v0.7.4-alpha.1
-
-### Details
-
-- fix: append roles to current user (#695)
-- fix(client): required for the sub-table field
-- fix: date format (#686)
-- test(plugin-workflow): skip prompt tests (#692)
-- fix: accuracy of percent (#685)
-- fix: the database only supports MySQL 8.0.17 and above, SQLite 3.x and PostgreSQL 10+
-- fix(plugin-workflow): adjust await sleep time for test cases (#691)
-- feat(plugin-workflow): add assignees config for prompt instruction (#690)
-- fix: role export button display (#616) (#666)
-- fix: uid validate (#681)
-- feat(client): tab icon
-- fix(plugin-error-handler): no error message
-- fix(client): fieldNames of RecordPicker
-- fix: hide password
-- refactor: replace react-drag-listview with @dnd-kit/sortable (#660)
-- refactor(plugin-users): improve extendibility of middlewares (#677)
-- feat: o2m delete not refresh (#646)
-- feat: kanban add description (#659)
-- fix: field loss enum (#667)
-- feat: add ui editor hot key Ctrl+Shift+U (#675)
-- fix: calendar change field error (#626) (#671)
-- chore: fix eslint not work (#670)
-- feat: number precision (#661)
-- feat: nginx config (#664)
-- feat: form item designer form switch issue (#656)
-- fix: wrong operator
-
-## 2022/07/20 ~ v0.7.3-alpha.1
-
-### New features
-
-- Form validation
-- Actions: Print, Refresh
-
-### Details
-
-- fix(client): hide modal header
-- feat: customizable jwt expiration date
-- feat: print action (#652)
-- feat: restore action-hooks (#655)
-- feat: collections & fields pagination issue (#653)
-- fix(core): change proxied agent methods to native (#654)
-- feat: remove table field details actions (#638)
-- fix: link to default value (#641)
-- fix(client): build error
-- fix: localStorage is not defined
-- feat: support for displaying relational table fields in details or form blocks (#635)
-- fix: record picker cannot select from different pages (#623)
-- feat(client): plugin toolbar icons and translations
-- fix: dragging an element to the left, right, or bottom would cause the element to disappear (#620)
-- feat: table action add reload button (#630)
-- feat: improve language settings (#627)
-- feat: field assignment for custom actions supports string variables (#597)
-- fix(client): blocks are deleted when they are dragged below the current block
-- fix: skip recursive remove on grid component (#621)
-- feat: fix time and collection pagination (#618)
-- feat: recordblockinitializers fields pick (#558)
-- fix: incorrectly :active background (#607)
-- fix: obo table selector (#613)
-- feat: form validator (#569)
-- fix: table selector (#612)
-
-## 2022/07/07 ~ v0.7.2-alpha.2
-
-- fix(g2plot): import all plots
-- fix: field permissions cannot be saved (#605)
-- fix(plugin-workflow): fix revision bug (#603)
-- fix(plugin-workflow): fix select value (#600)
-- fix(plugin-workflow): fix CollectionFieldSelect component (#598)
-- feat(plugin-workflow): add association select in calculation (#584)
-- feat: function for chart data request
-- fix(cli): remove process.env.NODE_OPTIONS
-
-## 2022/07/05 ~ v0.7.2-alpha.1
-
-### New features
-
-- Fields: 整数字段
-- Blocks: 支持在区块里显示关系表的字段
-- Plugins: 筛选条件支持变量
-
-### Breaking changes
-
-- 新版本关系默认不建立外键约束，旧版本升级后会删除掉所有已创建的外键约束
-- 之前使用 yarn create 安装的 NocoBase 应用，需要重新 yarn create，再执行 `yarn nocobase upgrade --raw`
-
-### Details
-
-- fix: drop all foreign keys (#576)
-- fix(plugin-workflow): fix collection trigger config (#575)
-- fix: improve filter item styling
-- fix(collection-manager): missing collection manager context
-- feat: filter with variable (#574)
-- feat(cli): check database version before installation (#572)
-- fix(client): comment out useless code
-- fix(cli): app start before sync and upgrade
-- feat(client): integer field
-- fix(database): index invalid (#564)
-- fix: export association table data (#561)
-- fix(client): maximum call stack size exceeded (#554)
-- refactor(plugin-workflow): move client files into plugin (#556)
-- fix(database): constraints default to false (#550)
-- fix(client): cannot read properties of undefined (reading 'split')
-- fix(workflow): merge workflow providers
-- fix(workflow): load workflow after application initialization
-- fix(plugin-workflow): fix select width (#552)
-- feat: compatible with old kanban (#553)
-- fix(client): consider explicitly re-exporting to resolve the ambiguity
-- feat: display association fields (#512)
-- Fix(plugin workflow) (#549)
-- fix: update mysql port (#548)
-- fix: export of relation blocks (#546)
-- fix(plugin-workflow): clear options when change collection (#547)
-- feat(plugin-workflow): add race mode (#542)
-- fix(client): change toArr to _.castArray in select component (#543)
-
-## 2022/06/26 ~ v0.7.1-alpha.7
-
-### New features
-
-- Fields: 公式、表关系(o2o, o2m, m2o, m2m)
-- Blocks: 图表(g2plot)
-- Plugins: 操作记录, 导出, 工作流(定时任务)
-
-### Breaking changes
-
-- 百分比字段存储原始数值。 比如，旧版本将 1% 存储为 1，新版本将 1% 存储为 0.01
-- 去掉子表格字段，并使用一对多字段代替
-- 如果之前是使用 yarn create 安装的 NocoBase 应用，需要重新 yarn create，再执行 yarn nocobase upgrade
-
-### Details
-
-- fix(cli): upgrade from docker
-- chore(create-nocobase-app): fix some bugs (#538)
-- feat: relationship fields are loaded on demand
-- fix: destroy collection fields (#536)
-- feat(plugin-workflow): add delay node type (#532)
-- refactor: client application (#533)
-- fix: missing transaction (#531)
-- fix: add ellipsis property to record picker (#527)
-- fix: remove pattern without form item (#528)
-- fix(client): update only fields in the form
-- fix(client): remove z-index
-- fix(plugin-workflow): set current when update (#526)
-- fix(client): non-empty judgment
-- fix: order nulls last (#519)
-- fix(client): close the pop-up after request
-- fix: action loading, refresh context, form submit and validate (#523)
-- fix: field pattern (#520)
-- fix(plugin-workflow): fix searchable select min-width (#524)
-- fix: template with fields only (#517)
-- fix(plugin-workflow): fix update workflow current property (#521)
-- feat: improve chart component
-- refactor(plugin-workflow): abstract to classes (#515)
-- feat: column sortable and form item pattern (#518)
-- feat(client): display option value
-- feat(client): hide drawer header
-- fix(audit-logs): operator does not exist: character varying = integer
-- fix(custom-request): support string/json templates (#514)
-- fix(cli): missing await
-- feat: add block title (#513)
-- fix: remove collections & fields from db (#511)
-- fix(cli): upgrade error in node v14
-- feat: improve migrations (#510)
-- fix(client): improve datepicker component, date with time zone, gmt support
-- fix: datepicker with timezone
-- fix(client): consolidate usage of date/time as UTC in transfering (#509)
-- fix: formula bug
-- fix: default exportable fields (#506)
-- fix(audit-logs): sort by createdAt
-- fix(plugin-export): allow to configure in acl
-- fix: sign in/sign up with enter key
-- fix(client): percent precision
-- feat: association field block (#493)
-- feat: plugin export (#479)
-- fix: create or delete collection error (#501)
-- feat: update collections & fields (#500)
-- fix: rollback when field creation fails (#498)
-- fix(client): set `dropdownMatchSelectWidth` to false globally (#497)
-- fix(client): no-key warning in user menu items (#496)
-- Feat(plugin workflow): cron field for schedule trigger configuration (#495)
-- feat: audit logs (#494)
-- fix(client): language settings
-- feat(client): improve locale
-- refactor(plugin-workflow): add revision column to execution (#491)
-- fix(plugin-multi-app-manager): fix pg cannot create database block tests
-- refactor(database): hook proxy (#402)
-- feat: chart blocks (#484)
-- refactor(plugin workflow): support number in repeat config for schedule
-- chore(debug): add debug config (#475)
-- fix: has one bug
-- feat: relationships (#473)
-- fix(plugin-workflow): fix collection trigger transaction (#474)
-- fix(plugin-workflow): temporary solution for collection trigger conditions
-- fix: markdown component (#469)
-- fix: formula field and percent field (#467)
-- fix(plugin-workflow): fix update workflow action (#464)
-- fix(acl): skip when field does not exist
-- fix: update formula field and percent field (#461)
-- fix(client): export useSignin and useSignup
-- fix(ci): node_version = 14
-- fix(cli): yarn install --production error
-- fix(client): build error
-- feat: add formula field type (#457)
-- fix: the details of the associated data in the subtable are not displayed
-- fix(plugin-workflow): fix languages (#451)
-- fix: afterSync hook not triggered (#450)
-
-## 2022/06/01 ~ v0.7.0-alpha.83
-
-- fix: default value of time zone
-- fix(database): add timezone support
-- docs(various): Improve readability (#447)
-- fix(client): datetime with timezone
-- feat(plugin-file-manager): record the creator of the attachment
-- feat: custom request (#439)
-- feat(plugin workflow): schedule trigger (#438)
-- feat(database): db migrator (#432)
-- fix(client): select component cannot be opened in sub-table block (#431)
-- fix: error message "error:0308010C:digital envelope routines::unsupported
-- docs(github): change to markdown format (#430)
-- fix(cli): typo (#429)
-
-### New Features
-
-- Core: db migrator
-
-## 2022/05/26 ~ v0.7.0-alpha.82
-
-- feat(client,sdk): improve api client
-
-### Breaking changes
-
-There are major changes to the `APIClient` API, see details [JavaScript SDK](./development/http-api/javascript-sdk.md)
-
-## 2022/05/25 ~ v0.7.0-alpha.81
-
-- feat: add create-plugin command (#423)
-- fix: "typescript": "4.5.5"
-- docs: update documentation
-- fix(client): filter menu item schema by permissions
-- fix(database): cannot read properties of null (reading 'substring')
-- fix(client): add description
-- fix(client): clone schema before insert
-- feat(client): add a description to the junction collection field
-- fix(devtools): unexpected token '.'
-
-## 2022/05/24 ~ v0.7.0-alpha.78
-
-- fix(client): add RemoteDocumentTitleProvider
-- fix(client): incomplete calendar events
-- fix(plugin-users): add translations (#416)
-
-## 2022/05/23 ~ v0.7.0-alpha.62
-
-- feat(docs): add alert message
-- fix(create-nocobase-app): storage path error
-- fix(client): improve translation
-- fix(cli): nocobase test command --db-clean option is invalid
-- refactor(plugin-workflow): change column type of executed from boolean to integer (#411)
-
-## 2022/05/22 ~ v0.7.0-alpha.58
-
-- fix: 204 no content response (#378)
-- feat: destroy association field after target collection destroy (#376)
-- fix(type): use sequelize native Transactionable instead of TransactionAble (#410)
-- fix(plugin-workflow): remove previous listeners when collection changed in config (#409)
-- fix(plugin-acl): missing pagination parameters (#394)
-- feat(client): add custom action (#396)
-- refactor(plugin-workflow): multiple instances and event management (fix #384) (#408)
-- feat(cli): --db-sync options
-- fix(client): pagination dropdown menu is blocked (#398)
-- feat: display version number (#386)
-- fix: missing isTruly/isFalsy filter operators (#390)
-- fix(client): reset page number to first page (#399)
-
-## 2022/05/19 ~ v0.7.0-alpha.57
-
-### 新功能
-
-- 打包工具 `@nocobase/build`
-- cli 工具 `@nocobase/cli`
-- devtools 包 `@nocobase/devtools`
-- JavaScript 版本的 SDK `@nocobase/sdk`
-- 全新的文档（v0.7）
-
-### 问题修复和改进
-
-- 将 NocoBase 无代码平台插件放到一起 `@nocobase/preset-nocobase`
-- 改进 create 脚手架 `create-nocobase-app`
-- 官网文档主题 `dumi-theme-nocobase`
-
-### Breaking changes
-
-📢 在此之前创建的项目需要重新创建。
-
-## 2022/05/14 ~ v0.7.0-alpha.34
-
-- feat: add plugins:getPinned action api
-- Fix(plugin workflow): fix cannot get job result properties (#382)
-- feat: exist on server start throw error (#374)
-- chore: application options (#375)
-- fix: not in operator with null value record (#377)
-
-## 2022/05/13 ~ v0.7.0-alpha.33
-
-- fix: link-to field data scope error (#1337)
-- feat(plugin workflow): revisions (#379)
-- fix(database): fix option-parser include list index (#371)
-- fix(plugin-workflow): fix duplicated description in fields values (#368)
-- fix(database): fix type and transaction in repository (#366)
-- fix(plugin workflow): fix transaction of execution (#364)
-
-## 2022/05/05 ~ v0.7.0-alpha.30
-
-- fix(client): upgrade formily packages
-- fix(client): setFormValueChanged must be defined
-
-## 2022/05/01 ~ v0.7.0-alpha.27
-
-- fix: use wrapper when greater than one column
-- fix: props for CreateFormBlockInitializers
-- fix: add schema initializer icon
-- fix: plugin workflow (#349)
-- fix: db:sync not working (#348)
-- fix(plugin-workflow): fix trigger bind logic to avoid duplication (#347)
-- Fix(plugin workflow) (#346)
-- fix: action open mode
-- Fix: menu url style (#344)
-- feat: action loading
-- fix: compile the label field
-- fix: invalid drag and drop sort
-
-## 2022/04/25 ~ v0.7.0-alpha.16
-
-- fix: cannot find module mkdirp (#330)
-- Fix(plugin workflow): UX issues (#329)
-- fix(plugin-file-manager): test failed
-- fix(app-server): dist options
-
-## 2022/04/25 ~ v0.7.0-alpha.0
-
-- 内测版
-
-## 2021/10/07 ~ v0.5.0
-
-- 第二个预览版
-
-## 2021/04/07 ~ v0.4.0
-
-- 第一个预览版
diff --git a/docs/zh-CN/user-manual/introduction/important-features.md b/docs/zh-CN/user-manual/introduction/important-features.md
deleted file mode 100644
index 77a203858..000000000
--- a/docs/zh-CN/user-manual/introduction/important-features.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# NocoBase 特色
-
-## 1. “数据结构”与“使用界面”分离
-
-多数以表单、表格或者流程驱动的无代码产品都是在使用界面上直接创建数据结构，比如 Airtable 在表格里新增一列就是新增一个字段。这样的好处是使用简单，不足是功能和灵活性受限，难以满足较复杂场景的需求。
-
-NocoBase 采用数据结构与使用界面分离的设计思路，可以为数据表创建任意数量、任意形态的区块（数据视图），每个区块里可以定义不同的样式、文案、操作。这样既兼顾了无代码的简单操作，又具备了原生开发的灵活性。
-
-
-
-## 2. “系统配置”与“系统使用”分离
-
-NocoBase 用来开发相对复杂的业务系统。在这些场景中，我们希望系统开发者与系统使用者是不同的角色。使用者看到的是一个成熟的、经过精心设计的系统，就像原生开发出来的产品一样，而不是僵化的、可以自由拖拽的、随时修改的系统；而开发者则可以采用所见即所得的方式快速开发系统。
-
-
-
-## 3. 功能即插件
-
-NocoBase 采用插件化架构，所有新功能都可以通过开发和安装插件来实现。未来我们将搭建插件市场，扩展功能就像在手机上安装 APP 一样简单。
\ No newline at end of file
diff --git a/docs/zh-CN/who.md b/docs/zh-CN/who.md
deleted file mode 100644
index 27b169efd..000000000
--- a/docs/zh-CN/who.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# 适用场景
-
-如果你有以下需求，NocoBase 就是为你设计的：
-
-- 开发组织内部管理系统
-- 通过无代码开发，满足大部分业务需求
-- 无代码开发在操作上足够简单，满足非开发人员；在功能上足够灵活，接近原生开发
-- 可以非常方便的进行扩展开发
-- 私有部署，掌控全部代码和数据
-- 可免费使用，也可以付费获得更多技术支持
diff --git a/packages/core/database/src/database.ts b/packages/core/database/src/database.ts
index bccbdb53c..2d30d4b2d 100644
--- a/packages/core/database/src/database.ts
+++ b/packages/core/database/src/database.ts
@@ -1,4 +1,4 @@
-import { applyMixins, AsyncEmitter } from '@nocobase/utils';
+import { applyMixins, AsyncEmitter, requireModule } from '@nocobase/utils';
import merge from 'deepmerge';
import { EventEmitter } from 'events';
import glob from 'glob';
@@ -222,7 +222,7 @@ export class Database extends EventEmitter implements AsyncEmitter {
filename = filename.substring(0, filename.lastIndexOf('.')) || filename;
this.migrations.add({
name: namespace ? `${namespace}/${filename}` : filename,
- migration: this.requireModule(file),
+ migration: requireModule(file),
context,
});
}
@@ -232,16 +232,6 @@ export class Database extends EventEmitter implements AsyncEmitter {
return dialect.includes(this.sequelize.getDialect());
}
- private requireModule(module: any) {
- if (typeof module === 'string') {
- module = require(module);
- }
- if (typeof module !== 'object') {
- return module;
- }
- return module.__esModule ? module.default : module;
- }
-
/**
* Add collection to database
* @param options
diff --git a/packages/core/dumi-theme-nocobase/src/components/SlugList.less b/packages/core/dumi-theme-nocobase/src/components/SlugList.less
index 3bcebf847..159c4664b 100755
--- a/packages/core/dumi-theme-nocobase/src/components/SlugList.less
+++ b/packages/core/dumi-theme-nocobase/src/components/SlugList.less
@@ -12,7 +12,10 @@ ul[role='slug-list'] {
}
&[data-depth='3'] {
- padding-left: 12px;
+ padding-left: 24px;
+ }
+ &[data-depth='4'] {
+ padding-left: 48px;
}
}
}
diff --git a/packages/core/dumi-theme-nocobase/src/components/SlugList.tsx b/packages/core/dumi-theme-nocobase/src/components/SlugList.tsx
index 6323b1cf9..bc23c90fa 100755
--- a/packages/core/dumi-theme-nocobase/src/components/SlugList.tsx
+++ b/packages/core/dumi-theme-nocobase/src/components/SlugList.tsx
@@ -1,12 +1,12 @@
+import { AnchorLink } from 'dumi/theme';
import type { FC } from 'react';
import React from 'react';
-import { AnchorLink } from 'dumi/theme';
import './SlugList.less';
const SlugsList: FC<{ slugs: any; className?: string }> = ({ slugs, ...props }) => (
-
{slugs
- .filter(({ depth }) => depth > 1 && depth < 4)
+ .filter(({ depth }) => depth > 1 && depth < 5)
.map(slug => (
-
diff --git a/packages/core/dumi-theme-nocobase/src/style/layout.less b/packages/core/dumi-theme-nocobase/src/style/layout.less index f145eecf2..e5ee57097 100755 --- a/packages/core/dumi-theme-nocobase/src/style/layout.less +++ b/packages/core/dumi-theme-nocobase/src/style/layout.less @@ -1,7 +1,7 @@ @import './markdown.less'; @import './variables.less'; -@s-toc-width: 136px; +@s-toc-width: 276px; body { margin: 0; diff --git a/packages/core/server/src/application.ts b/packages/core/server/src/application.ts index 5292b6018..d66adc7a7 100644 --- a/packages/core/server/src/application.ts +++ b/packages/core/server/src/application.ts @@ -19,7 +19,6 @@ import { InstallOptions, PluginManager } from './plugin-manager'; const packageJson = require('../package.json'); export type PluginConfiguration = string | [string, any]; -export type PluginsConfigurations = Array ; export interface ResourcerOptions { prefix?: string; @@ -33,7 +32,7 @@ export interface ApplicationOptions { dataWrapping?: boolean; registerActions?: boolean; i18n?: i18n | InitOptions; - plugins?: PluginsConfigurations; + plugins?: PluginConfiguration[]; } export interface DefaultState { @@ -240,7 +239,7 @@ export class Application exten return this.pm.add(pluginClass, options); } - loadPluginConfig(pluginsConfigurations: PluginsConfigurations) { + loadPluginConfig(pluginsConfigurations: PluginConfiguration[]) { for (let pluginConfiguration of pluginsConfigurations) { if (typeof pluginConfiguration == 'string') { pluginConfiguration = [pluginConfiguration, {}];