Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ospp 2024/003 react dsl #743

Merged
merged 9 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions .github/auto-labeler.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/auto-labeler.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/push-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: []
pull_request:
branches: [develop,main,ospp-2024/*]
branches: [develop,main]
wjywy marked this conversation as resolved.
Show resolved Hide resolved

jobs:
push-check:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ gantt
dateFormat YYYY-MM-DD
axisFormat %Y-%m-%d

1.0.0-beta.x version : 2023-09-25, 2024-05-20
1.0.0-rc version(refactor version) : 2024-10-01
1.0.0 version : 2024-11-01
1.0.0-beta.x version :active,2023-09-25, 2024-03-31
1.0.0-rc version : 2024-04-01, 2024-06-30
1.0.0 version : 2024-07-01, 2024-07-31

```

Expand Down
15 changes: 8 additions & 7 deletions README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,16 @@ $ pnpm install
$ pnpm dev
```

### 本地开发,直连本地的tiny-engine-webservice服务端
### 本地开发,直连本地的 tiny-engine-webservice 服务端

1. 启动 <a href="https://github.com/opentiny/tiny-engine-data-center/blob/main/README.md" target="_blank">tiny-engine-data-center</a>

2. 启动 <a href="https://github.com/opentiny/tiny-engine-webservice/blob/main/README.md" target="_blank">tiny-engine-webservice</a>

3. 修改 tiny-engine 项目 `packages/design-core/` 目录下 `vite.config.js` 中origin的值为自己本地webService项目的地址端口(webService端口默认为7011),如:
3. 修改 tiny-engine 项目 `packages/design-core/` 目录下 `vite.config.js` 中 origin 的值为自己本地 webService 项目的地址端口(webService 端口默认为 7011),如:

<img alt="修改端口" src="https://res.hc-cdn.com/lowcode-portal/1.1.55/img/docimg/backend_deploy_5.png">


### 物料同步[方案](https://opentiny.design/tiny-engine#/help-center/course/engine/56)

```sh
Expand Down Expand Up @@ -76,21 +75,23 @@ pnpm run build:plugin
pnpm run build:alpha 或 build:prod

```

构建后产物所在文件夹

```
tiny-engine/packages/design-core/dist/
```

## 里程碑

```mermaid
gantt
gantt
dateFormat YYYY-MM-DD
axisFormat %Y-%m-%d

1.0.0-beta.x version : 2023-09-25, 2024-05-20
1.0.0-rc version(refactor version) : 2024-10-01
1.0.0 version : 2024-11-01
1.0.0-beta.x version :active,2023-09-25, 2024-03-31
1.0.0-rc version : 2024-04-01, 2024-06-30
1.0.0 version : 2024-07-01, 2024-07-31

```

Expand Down
6 changes: 3 additions & 3 deletions mockServer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-mock",
"version": "1.0.6",
"version": "1.0.3",
"publishConfig": {
"access": "public"
},
Expand All @@ -26,7 +26,7 @@
},
"dependencies": {
"@opentiny/tiny-engine-dsl-react": "workspace:*",
"@opentiny/tiny-engine-dsl-vue": "^1.0.6",
"@opentiny/tiny-engine-dsl-vue": "workspace:*",
"@seald-io/nedb": "^4.0.2",
"fs-extra": "^11.1.1",
"glob": "^10.3.4",
Expand Down Expand Up @@ -67,4 +67,4 @@
"node": ">= 7.8.0",
"npm": ">= 4.2.0"
}
}
}
11 changes: 2 additions & 9 deletions mockServer/src/database/pages.db

Large diffs are not rendered by default.

85 changes: 6 additions & 79 deletions mockServer/src/mock/get/app-center/v1/apps/schema/918.json
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,11 @@
"componentsTree": [
{
"state": {
"dataDisk": [1, 2, 3]
"dataDisk": [
1,
2,
3
]
},
"methods": {},
"componentName": "Page",
Expand Down Expand Up @@ -1918,13 +1922,6 @@
"destructuring": true,
"version": "0.1.17"
},
{
"componentName": "TinyCheckbox",
"package": "@opentiny/vue",
"exportName": "Checkbox",
"destructuring": true,
"version": "3.14.0"
},
{
"componentName": "TinySelect",
"package": "@opentiny/vue",
Expand Down Expand Up @@ -1981,76 +1978,6 @@
"destructuring": true,
"version": "0.1.16"
},
{
"componentName": "TinyCollapse",
"package": "@opentiny/vue",
"exportName": "Collapse",
"destructuring": true,
"version": "3.14.0"
},
{
"componentName": "TinyCollapseItem",
"package": "@opentiny/vue",
"exportName": "CollapseItem",
"destructuring": true,
"version": "3.14.0"
},
{
"componentName": "TinyBreadcrumb",
"package": "@opentiny/vue",
"exportName": "Breadcrumb",
"destructuring": true,
"version": "3.14.0"
},
{
"componentName": "TinyBreadcrumbItem",
"package": "@opentiny/vue",
"exportName": "BreadcrumbItem",
"destructuring": true,
"version": "3.14.0"
},
{
"componentName": "ElInput",
"package": "element-plus",
"exportName": "ElInput",
"destructuring": true,
"version": "2.4.2"
},
{
"componentName": "ElButton",
"package": "element-plus",
"exportName": "ElButton",
"destructuring": true,
"version": "2.4.2"
},
{
"componentName": "ElForm",
"package": "element-plus",
"exportName": "ElForm",
"destructuring": true,
"version": "2.4.2"
},
{
"componentName": "ElFormItem",
"package": "element-plus",
"exportName": "ElFormItem",
"destructuring": true,
"version": "2.4.2"
},
{
"componentName": "ElTable",
"package": "element-plus",
"exportName": "ElTable",
"destructuring": true,
"version": "2.4.2"
},
{
"componentName": "ElTableColumn",
"package": "element-plus",
"exportName": "ElTableColumn",
"destructuring": true,
"version": "2.4.2"
},
{
"componentName": "PortalHome",
"main": "common/components/home",
Expand Down Expand Up @@ -2177,4 +2104,4 @@
"version": ""
},
"locale": "zh-cn"
}
}
Loading