Skip to content

Commit 13ead68

Browse files
sseidesseide
committed
Merge branch 'dev' into openshift-compatibility
# Conflicts: # deploy/docker/api-service/entrypoint.sh
2 parents 190f715 + a69c927 commit 13ead68

File tree

700 files changed

+41418
-10808
lines changed

Some content is hidden

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

700 files changed

+41418
-10808
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ client/node_modules/
99
client/packages/lowcoder-plugin-demo/.yarn/install-state.gz
1010
client/packages/lowcoder-plugin-demo/yarn.lock
1111
client/packages/lowcoder-plugin-demo/.yarn/cache/@types-node-npm-16.18.68-56f72825c0-094ae9ed80.zip
12+
application-dev.yml

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Lowcoder wants to take a step forward. More specifically, Lowcoder is:
3232
- The only platform where you can build your own Meeting Tool - like Teams, Zoom or Google Meets, - just in the Lowcode way.
3333

3434
## 🪄 Features
35-
- **Visual UI builder** with 50+ built-in components. Save 90% of time to build apps.
35+
- **Visual UI builder** with 70+ built-in components. Save 90% of time to build apps.
3636
- **Modules** for reusable (!) component sets in the UI builder.
3737
- **Embed Lowcoder Apps as native parts of any Website** instead of iFrame (!). [Demo](https://github.com/lowcoder-org/lowcoder-sdk-demo)
3838
- **Video Meeting Components** to create your own individual Web-Meeting tool.
@@ -87,6 +87,8 @@ And we mean it... Day by day!
8787
## 💻 Deployment Options
8888
[![Deploy to AWS using Stitch](https://img.shields.io/badge/deploy_with-Stitch-%23E369F7?logo=amazonaws&color=%23E369F7)](https://deploy.stitch.tech/lowcoder/lowcoder)
8989

90+
[![Deploy in minutes on Elest.io](https://raw.githubusercontent.com/elestio-examples/element/main/deploy-on-elestio.png)](https://elest.io/open-source/lowcoder)
91+
9092
You can access Lowcoder from [cloud-hosted version](https://app.lowcoder.cloud/) at any time, or use the following resources for self-host Lowcoder on different platforms:
9193
- [Docker](https://docs.lowcoder.cloud/lowcoder-documentation/setup-and-run/self-hosting)
9294

‎client/config/test/jest.config.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,10 @@ export function currentDirName(importMetaUrl) {
66
return dirname(fileURLToPath(importMetaUrl));
77
}
88

9-
109
const globals = {};
1110
buildVars.forEach(({ name, defaultValue }) => {
1211
globals[name] = process.env[name] || defaultValue;
1312
});
14-
const edition = process.env.REACT_APP_EDITION;
15-
const isEEGlobal = edition === "enterprise-global";
16-
const isEE = edition === "enterprise" || isEEGlobal;
1713
const currentDir = currentDirName(import.meta.url);
1814

1915
export default {
@@ -22,8 +18,7 @@ export default {
2218
"react-markdown": path.resolve(currentDir, "./mocks/react-markdown.js"),
2319
"\\.md\\?url$": path.resolve(currentDir, "./mocks/markdown-url-module.js"),
2420
"^@lowcoder-ee(.*)$": path.resolve(
25-
currentDir,
26-
isEE ? "../../packages/lowcoder/src/ee/$1" : "../../packages/lowcoder/src/$1"
21+
currentDir, "../../packages/lowcoder/src/$1"
2722
),
2823
"lowcoder-sdk": path.resolve(currentDir, "../../packages/lowcoder/src/index.sdk"),
2924
},

‎client/package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"start": "yarn workspace lowcoder start",
1414
"start-win": "LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start",
1515
"start:ee": "REACT_APP_EDITION=enterprise yarn workspace lowcoder start",
16-
"start:ee-global": "REACT_APP_EDITION=enterprise-global yarn workspace lowcoder start",
1716
"build": "yarn node ./scripts/build.js",
1817
"test": "jest && yarn workspace lowcoder-comps test",
1918
"prepare": "yarn workspace lowcoder prepare",
@@ -35,6 +34,7 @@
3534
"@types/react-resizable": "^3.0.5",
3635
"@types/react-router-dom": "^5.3.2",
3736
"@types/shelljs": "^0.8.11",
37+
"@types/simplebar": "^5.3.3",
3838
"@types/stylis": "^4.0.2",
3939
"@types/tern": "0.23.4",
4040
"@types/ua-parser-js": "^0.7.36",
@@ -51,7 +51,6 @@
5151
"mq-polyfill": "^1.1.8",
5252
"prettier": "^3.1.0",
5353
"rimraf": "^3.0.2",
54-
"rollup": "^2.79.0",
5554
"shelljs": "^0.8.5",
5655
"svgo": "^3.0.0",
5756
"typescript": "^4.8.4",
@@ -75,10 +74,13 @@
7574
"@testing-library/react": "^14.1.2",
7675
"@testing-library/user-event": "^14.5.1",
7776
"@types/styled-components": "^5.1.34",
78-
"antd-mobile": "^5.28.0",
77+
"antd-mobile": "^5.34.0",
7978
"chalk": "4",
8079
"number-precision": "^1.6.0",
8180
"react-player": "^2.11.0",
81+
"resize-observer-polyfill": "^1.5.1",
82+
"rollup": "^4.13.0",
83+
"simplebar": "^6.2.5",
8284
"tui-image-editor": "^3.15.3"
8385
}
8486
}

‎client/packages/lowcoder-comps/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/lib
22
/node_modules
3+
/package
34
*.tgz

‎client/packages/lowcoder-comps/package.json

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "0.0.26",
3+
"version": "0.0.30",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {
@@ -10,11 +10,13 @@
1010
"@fullcalendar/interaction": "^6.1.6",
1111
"@fullcalendar/list": "^6.1.9",
1212
"@fullcalendar/moment": "^6.1.6",
13+
"@fullcalendar/multimonth": "^6.1.6",
1314
"@fullcalendar/react": "^6.1.6",
1415
"@fullcalendar/resource": "^6.1.11",
1516
"@fullcalendar/resource-timegrid": "^6.1.11",
1617
"@fullcalendar/resource-timeline": "^6.1.11",
1718
"@fullcalendar/timegrid": "^6.1.6",
19+
"@fullcalendar/timeline": "^6.1.6",
1820
"@types/react": "^18.2.45",
1921
"@types/react-dom": "^18.2.18",
2022
"big.js": "^6.2.1",
@@ -30,6 +32,14 @@
3032
"lowcoder": {
3133
"description": "",
3234
"comps": {
35+
"calendar": {
36+
"name": "Calendar",
37+
"icon": "./icons/icon-comp-calendar.svg",
38+
"layoutInfo": {
39+
"w": 15,
40+
"h": 60
41+
}
42+
},
3343
"chart": {
3444
"name": "Chart",
3545
"icon": "./icons/icon-chart.svg",
@@ -46,14 +56,6 @@
4656
"h": 40
4757
}
4858
},
49-
"calendar": {
50-
"name": "Calendar",
51-
"icon": "./icons/icon-comp-calendar.svg",
52-
"layoutInfo": {
53-
"w": 15,
54-
"h": 60
55-
}
56-
},
5759
"mermaid": {
5860
"name": "Mermaid",
5961
"icon": "./icons/mermaidchart.svg",

0 commit comments

Comments
 (0)