Skip to content

Commit a235620

Browse files
committed
Merge branch 'guangcheng'
2 parents d62b663 + 628b45d commit a235620

File tree

11 files changed

+140
-136
lines changed

11 files changed

+140
-136
lines changed

docs/config/handbook.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ export default [
498498
link: '/handbook/data-modeling/collection-fields/advanced/json',
499499
},
500500
{
501-
title: 'Collection 选择器',
501+
title: 'Collection select',
502502
'title.zh-CN': '数据表选择器',
503503
'title.ja-JP': 'コレクションセレクター',
504504
link: '/handbook/data-modeling/collection-fields/advanced/collection-select',

docs/en-US/handbook/data-source-external-postgres/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ This plugin is a commercial plugin, which needs to be uploaded and activated thr
1414

1515
## Usage Instructions
1616

17-
Refer to the [Data Source / External Database](/handbook/data-source-manager/external-database) section.
17+
Refer to the [Data Source / External Database](/handbook/data-source-manager/external-database) section.
Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
# 数据源 - 人大金仓(KingbaseES
1+
# Data Source - KingbaseES Database
22

33
<PluginInfo licenseBundled="true" name="data-source-kingbase"></PluginInfo>
44

5-
## 介绍
5+
## Introduction
66

7-
使用 人大金仓(KingbaseES)数据库作为数据源,可以作为主数据库,也可以作为外部数据库使用。
7+
KingbaseES can be used as a data source, either as the primary database or an external database.
88

99
:::warning
10-
目前只支持 pg 模式运行的人大金仓(KingbaseES)数据库。
10+
Currently, only KingbaseES databases running in pg mode are supported.
1111
:::
1212

13-
## 安装
13+
## Installation
1414

15-
### 作为主数据库使用
15+
### Using as the Primary Database
1616

17-
安装流程参考 [安装概述](/welcome/getting-started/installation),区别主要在于环境变量。
17+
Refer to the [Installation Overview](/welcome/getting-started/installation) for the setup procedures, the difference is mainly due to the environment variables.
1818

19-
#### 环境变量
19+
#### Environment Variables
2020

21-
修改 .env 文件添加或修改以下相关环境变量配置
21+
Edit the .env file to add or modify the following environment variable configurations:
2222

2323
```bash
24-
# 用于获取商业插件
24+
# For accessing commercial plugins
2525
NOCOBASE_PKG_URL=https://pkg.nocobase.com/
26-
NOCOBASE_PKG_USERNAME=your-username # service platform username
27-
NOCOBASE_PKG_PASSWORD=your-password # service platform password
26+
NOCOBASE_PKG_USERNAME=your-username # Service platform username
27+
NOCOBASE_PKG_PASSWORD=your-password # Service platform password
2828

29-
# 根据实际情况调整 DB 相关参数
29+
# Adjust DB parameters as needed
3030
DB_DIALECT=kingbase
3131
DB_HOST=localhost
3232
DB_PORT=54321
@@ -35,7 +35,7 @@ DB_USER=nocobase
3535
DB_PASSWORD=nocobase
3636
```
3737

38-
#### Docker 版本
38+
#### Docker Installation
3939

4040
```yml
4141
version: "3"
@@ -51,32 +51,32 @@ networks:
5151
depends_on:
5252
- postgres
5353
environment:
54-
# 用于获取商业插件
54+
# For accessing commercial plugins
5555
- NOCOBASE_PKG_URL=https://pkg.nocobase.com/
56-
- NOCOBASE_PKG_USERNAME=your-username # service platform username
57-
- NOCOBASE_PKG_PASSWORD=your-password # service platform password
58-
# 应用的密钥,用于生成用户 token 等
59-
# 如果 APP_KEY 修改了,旧的 token 也会随之失效
60-
# 可以是任意随机字符串,并确保不对外泄露
56+
- NOCOBASE_PKG_USERNAME=your-username # Service platform username
57+
- NOCOBASE_PKG_PASSWORD=your-password # Service platform password
58+
# Application key for generating user tokens, etc.
59+
# Changing APP_KEY invalidates old tokens
60+
# Use a random string and keep it confidential
6161
- APP_KEY=your-secret-key
62-
# 数据库类型
62+
# Database type
6363
- DB_DIALECT=kingbase
64-
# 数据库主机,可以替换为已有的数据库服务器 IP
64+
# Database host, replace with existing database server IP if needed
6565
- DB_HOST=kingbase
66-
# 数据库名
66+
# Database name
6767
- DB_DATABASE=kingbase
68-
# 数据库用户
68+
# Database user
6969
- DB_USER=nocobase
70-
# 数据库密码
70+
# Database password
7171
- DB_PASSWORD=nocobase
72-
# 时区
72+
# Timezone
7373
- TZ=Asia/Shanghai
7474
volumes:
7575
- ./storage:/app/nocobase/storage
7676
ports:
7777
- "13000:80"
7878

79-
# 仅用于测试的 kingbase 服务
79+
# Kingbase service for testing purposes only
8080
kingbase:
8181
image: registry.cn-shanghai.aliyuncs.com/nocobase/kingbase:v009r001c001b0030_single_x86
8282
platform: linux/amd64
@@ -87,15 +87,15 @@ networks:
8787
volumes:
8888
- ./storage/db/kingbase:/home/kingbase/userdata
8989
environment:
90-
ENABLE_CI: no # 必须用是 no
90+
ENABLE_CI: no # Must be set to no
9191
DB_USER: nocobase
9292
DB_PASSWORD: nocobase
93-
DB_MODE: pg # 仅限于 pg
93+
DB_MODE: pg # pg only
9494
NEED_START: yes
9595
command: ["/usr/sbin/init"]
9696
```
9797
98-
#### 使用 create-nocobase-app 安装
98+
#### Installation Using create-nocobase-app
9999
100100
```bash
101101
yarn create nocobase-app my-nocobase-app -d kingbase \
@@ -107,30 +107,30 @@ yarn create nocobase-app my-nocobase-app -d kingbase \
107107
-e TZ=Asia/Shanghai
108108
```
109109

110-
### 作为外部数据库使用
110+
### Using as an External Database
111111

112-
修改 .env 文件,添加获取商业插件相关的环境变量
112+
Edit the .env file to add environment variables for accessing commercial plugins:
113113

114114
```bash
115-
# 用于获取商业插件
115+
# For accessing commercial plugins
116116
NOCOBASE_PKG_URL=https://pkg.nocobase.com/
117-
NOCOBASE_PKG_USERNAME=your-username # service platform username
118-
NOCOBASE_PKG_PASSWORD=your-password # service platform password
117+
NOCOBASE_PKG_USERNAME=your-username # Service platform username
118+
NOCOBASE_PKG_PASSWORD=your-password # Service platform password
119119
```
120120

121-
执行安装或升级命令
121+
Execute the installation or upgrade command
122122

123123
```bash
124124
yarn nocobase install
125125
# or
126126
yarn nocobase upgrade
127127
```
128128

129-
激活插件
129+
Activate the Plugin
130130

131131
![20241024121815](https://static-docs.nocobase.com/20241024121815.png)
132132

133-
## 使用手册
133+
## User Guide
134134

135-
- 主数据库:查阅 [使用手册](/handbook)
136-
- 外部数据库:查阅 [数据源 / 外部数据库](/handbook/data-source-manager/external-database)
135+
- Primary Database: Refer to the [handbook](/handbook)
136+
- External Database: See [Data Source / External Database](/handbook/data-source-manager/external-database)
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
# 数据表字段:附件(URL
1+
# Data Field: Attachment (URL)
22

33
<PluginInfo commercial="true" name="field-attachment-url"></PluginInfo>
44

5-
## 介绍
5+
## Introduction
66

7-
支持 URL 格式的附件。
7+
Supports attachments in URL format.
88

9-
## 安装
9+
## Installation
1010

11-
该插件为商业插件。
11+
This plugin is a commercial plugin.
1212

13-
## 使用手册
13+
## User Manual
1414

15-
### 字段配置
15+
### Field Configuration
1616

1717
![20241017092323](https://static-docs.nocobase.com/20241017092323.png)
1818

19-
### 外部数据源
19+
### External Data Source
2020

2121
![20241017092456](https://static-docs.nocobase.com/20241017092456.png)
2222

23-
### 界面
23+
### Interface
2424

25-
![20241017092759](https://static-docs.nocobase.com/20241017092759.png)
25+
![20241017092759](https://static-docs.nocobase.com/20241017092759.png)

0 commit comments

Comments
 (0)