Skip to content

Commit 6192bb5

Browse files
Merge branch 'opentiny:develop' into feat/model
2 parents eeb5e6d + 7cce9b6 commit 6192bb5

174 files changed

Lines changed: 5399 additions & 742 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env.local

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ SQL_HOST=localhost
22
SQL_PORT=3306
33
SQL_USER=root
44
SQL_PASSWORD=admin
5-
SQL_DATABASE=tiny_engine
5+
SQL_DATABASE=tiny_engine
6+
7+
backend_url=http://localhost:9090/material-center/api/component/bundle/create

.github/auto-labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ labels:
1010
sync: true
1111
matcher:
1212
title: '^.+!:|#breaking'
13-
body: '#breaking'
13+
body: '## Does this PR introduce a breaking change\?\s+- \[[xX]\] *Yes'
1414
- label: 'enhancement'
1515
sync: true
1616
matcher:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $ npm install -g pnpm
3939

4040
```sh
4141
# Create low-code platform
42-
$ npx @opentiny/engine-cli create-platform <name>
42+
$ npx @opentiny/tiny-engine-cli@latest create-platform <name>
4343
# Enter the low-code platform directory
4444
$ cd <name>
4545
# Install dependencies

README.zh-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $ npm install -g pnpm
3939

4040
```sh
4141
# 创建低代码平台
42-
$ npx @opentiny/engine-cli create-platform <name>
42+
$ npx @opentiny/tiny-engine-cli@latest create-platform <name>
4343
# 进入低代码平台
4444
$ cd <name>
4545
# 安装依赖

designer-demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "designer-demo",
33
"private": true,
4-
"version": "2.7.0",
4+
"version": "2.8.0",
55
"type": "module",
66
"scripts": {
77
"dev": "cross-env vite",

designer-demo/public/mock/bundle.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9781,6 +9781,7 @@
97819781
}
97829782
},
97839783
{
9784+
"version": "3.20.0",
97849785
"icon": "grid",
97859786
"name": {
97869787
"zh_CN": "表格"

designer-demo/src/composable/http/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const preResponse = (res) => {
4646
return Promise.reject(res.data.error)
4747
}
4848

49-
return res.data?.data
49+
return res.data?.data || res.data
5050
}
5151

5252
const openLogin = () => {
63.8 KB
Loading
40.5 KB
Loading
34.5 KB
Loading

0 commit comments

Comments
 (0)