Skip to content

Commit e52b215

Browse files
FalkWolskyFalkWolsky
authored
Merge branch 'dev' into ee-setup
2 parents 133f944 + 9ea5e96 commit e52b215

File tree

119 files changed

+18865
-13732
lines changed

Some content is hidden

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

119 files changed

+18865
-13732
lines changed

‎README.md

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,32 @@
77
<p>
88
Create software applications (internal and customer-facing!) and Meeting/Collaboration tools for your Company and your Customers with minimal coding experience.
99
</p>
10-
<h3 style="margin-top: 0">Lowcoder is the best Retool, Appsmith or Tooljet Alternative.</h3>
10+
<h3 style="margin-top: 0">We think, Lowcoder is simply better than Retool, Appsmith Tooljet, Outsystems or Mendix.</h3>
1111
</div>
12+
---
1213

13-
<img src="https://1167272343-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FjNgeI0mUzgw6Re92iTOw%2Fuploads%2FnwXJC1XBqP2MvTQitPyo%2FApp%20Editor%20%7C%20Main%20Screeen%20clean.png?alt=media&token=e5fba81b-82a7-4c0e-a15d-baa781d5b13a"/>
14-
14+
## 🎥 Lowcoder Intro Video
15+
<div align="center">
16+
<a href="https://www.youtube.com/watch?v=AQo0iFWUWiU" target="_blank">
17+
<img src="https://img.youtube.com/vi/AQo0iFWUWiU/maxresdefault.jpg" alt="Lowcoder Intro Video" width="100%">
18+
</a>
19+
<p><i>Click the image above to watch the video on YouTube</i> 📺</p>
20+
</div>
1521

22+
---
1623
## 📢 Use Lowcoder in 3 steps
1724
1. Connect to any data sources or APIs.
18-
2. Build flexible and responsive UI with 100+ components and free layout / design possibilities.
25+
2. Build flexible and responsive UI with 120+ components and free layout / design possibilities.
1926
3. Share with colleagues and customers.
2027

2128
## 💡 Why Lowcoder
2229
One platform for everything instead so many different softwares. (like Website Builders, CMS, CRM, POS, ERP, Dashboards & Data Story Visualization, Collaboration Tools).
2330

2431
It's cumbersome to create a single app. You had to design user interfaces, write code in multiple languages and frameworks, and understand how all of that code works together.
2532

26-
NewGen Lowcode Platforms like Retool and others are great for their simplicity and flexibility - like Lowcoder too, but they can also be limited in different ways, especially when it comes to "external" applications for everyone.
33+
NewGen Lowcode Platforms like Retool and others are great for their simplicity and flexibility - like Lowcoder too, but they can also be limited in different ways, especially when it comes to "external" applications for everyone - because their pricing focusses to internal apps and "pay per User".
2734

28-
Lowcoder wants to take a step forward. More specifically, Lowcoder is:
35+
With Lowcoder we did a step forward. More specifically, Lowcoder is:
2936
- An all-in-one IDE to create internal or customer-facing (external) apps.
3037
- A place to create, build and share building blocks of web applications and whole websites.
3138
- The tool and community to support your business, and lower the cost and time to develop interactive applications.
@@ -34,9 +41,9 @@ Lowcoder wants to take a step forward. More specifically, Lowcoder is:
3441
- The only platform which has extensibility plugin architecture [Check Community Contributions](https://www.npmjs.com/search?q=lowcoder-comp)
3542

3643
## 🪄 Features
37-
- **Visual UI builder** with 100+ built-in components. Save 90% of time to build apps.
44+
- **Visual UI builder** with 120+ built-in components. Save 90% of time to build apps.
3845
- **Modules** for reusable (!) embedable component sets in the UI builder.
39-
- **Embed Lowcoder Apps as native parts of any Website** instead of iFrame (!). [Demo](https://lowcoder.cloud/about), [Docu](https://docs.lowcoder.cloud/lowcoder-documentation/lowcoder-extension/native-embed-sdk)
46+
- **Embed Lowcoder Apps as native parts of any Website** instead of iFrame (!). [Demo](http://demo-lowcoder.42web.io/ecommerce/), [Docu](https://docs.lowcoder.cloud/lowcoder-documentation/lowcoder-extension/native-embed-sdk)
4047
- **Video Meeting Components** to create your own individual Web-Meeting tool.
4148
- **Query Library** for reusable data queries of your data sources.
4249
- **Custom components** to develop own components and use them in the UI builder.
@@ -107,7 +114,3 @@ Accelerate the growth of Lowcoder and unleash its potential with your Sponsorshi
107114
[Be a Sponsor](https://github.com/sponsors/lowcoder-org)
108115

109116
Like ... [@Darkjamin](https://github.com/Darkjamin), [@spacegoats-io](https://github.com/spacegoats-io), [@Jomedya](https://github.com/Jomedya), [@CHSchuepfer](https://github.com/CHSchuepfer), Thank you very much!!
110-
111-
## Intro Video
112-
113-
[![Watch the video](https://i.ytimg.com/vi/s4ltAqS0hzM/maxresdefault.jpg?sqp=-oaymwEmCIAKENAF8quKqQMa8AEB-AH-CYAC0AWKAgwIABABGD0gSShyMA8=&rs=AOn4CLAlPOIFdtauythoBKNPXhi6XGwlDQ)](https://youtu.be/s4ltAqS0hzM?feature=shared)

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.0
1+
2.6.3

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-frontend",
3-
"version": "2.6.0",
3+
"version": "2.6.3",
44
"type": "module",
55
"private": true,
66
"workspaces": [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "2.6.1",
3+
"version": "2.6.3",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {

‎client/packages/lowcoder-comps/src/comps/basicChartComp/chartUtils.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,11 @@ export function getEchartsConfig(
146146
mapOptions,
147147
showCharts,
148148
} = props;
149+
let newMapOptions: any = {...mapOptions};
150+
newMapOptions.series = [{...newMapOptions.series[0]}];
151+
if(props.echartsData && props.echartsData.length > 0) newMapOptions.series[0].data = props.echartsData;
149152

150-
const echartsOption = mapOptions && showCharts ? mapOptions : {};
153+
const echartsOption = newMapOptions && showCharts ? newMapOptions : {};
151154
return {
152155
gmap: {
153156
center: [mapCenterLng, mapCenterLat],

‎client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartConstants.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,10 @@ export const chartUiModeChildren = {
251251
};
252252

253253
let chartJsonModeChildren: any = {
254-
echartsData: jsonControl(toArray),
254+
echartsData: jsonControl(toArray, i18nObjs.defaultCandleStickChartOption.data),
255255
echartsOption: jsonControl(toObject, i18nObjs.defaultCandleStickChartOption),
256256
echartsTitle: withDefault(StringControl, trans("candleStickChart.defaultTitle")),
257+
echartsTitleData: jsonControl(toArray, i18nObjs.defaultCandleStickChartOption.xAxis.data),
257258
echartsTitleVerticalConfig: EchartsTitleVerticalConfig,
258259
echartsLabelConfig: EchartsLabelConfig,
259260
echartsTitleConfig:EchartsTitleConfig,

‎client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartPropertyView.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export function candleStickChartPropertyView(
1818
<Section name={trans("chart.config")}>
1919
{children.echartsData.propertyView({ label: trans("chart.data") })}
2020
{children.echartsTitleConfig.getPropertyView()}
21+
{children.echartsTitleData.propertyView({ label: trans("chart.xAxisLabels"), tooltip: trans("chart.xAxisLabelsTooltip") })}
2122
{children.echartsTitleVerticalConfig.getPropertyView()}
2223
{children.echartsTitle.propertyView({ label: trans("candleStickChart.title"), tooltip: trans("echarts.titleTooltip") })}
2324
{children.left.propertyView({ label: trans("candleStickChart.left"), tooltip: trans("echarts.leftTooltip") })}

‎client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export function getEchartsConfig(
187187
},
188188
xAxis: props?.echartsOption && {
189189
type: 'category',
190-
data: props?.echartsData.xAxis && props?.echartsData.xAxis.data || props?.echartsOption.xAxis && props?.echartsOption.xAxis.data,
190+
data: props?.echartsTitleData.length && props?.echartsTitleData || props?.echartsData.xAxis && props?.echartsData.xAxis.data || props?.echartsOption.xAxis && props?.echartsOption.xAxis.data,
191191
splitArea: !props?.axisFlagVisibility && {
192192
show: true,
193193
areaStyle: {

‎client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartConstants.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ export const chartUiModeChildren = {
256256
};
257257

258258
let chartJsonModeChildren: any = {
259-
echartsData: jsonControl(toArray),
259+
echartsData: jsonControl(toArray, i18nObjs.defaultFunnelChartOption.data),
260260
echartsOption: jsonControl(toObject, i18nObjs.defaultFunnelChartOption),
261261
echartsTitle: withDefault(StringControl, trans("funnelChart.defaultTitle")),
262262
echartsTitleVerticalConfig: EchartsTitleVerticalConfig,

‎client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartConstants.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,9 @@ export const chartUiModeChildren = {
254254
};
255255

256256
let chartJsonModeChildren: any = {
257-
echartsData: jsonControl(toArray),
257+
echartsCategories: jsonControl(toArray, i18nObjs.defaultGraphChartOption.categories),
258+
echartsLinks: jsonControl(toArray, i18nObjs.defaultGraphChartOption.links),
259+
echartsNodes: jsonControl(toArray, i18nObjs.defaultGraphChartOption.nodes),
258260
echartsOption: jsonControl(toObject, i18nObjs.defaultGraphChartOption),
259261
echartsTitle: withDefault(StringControl, trans("graphChart.defaultTitle")),
260262
echartsLegendConfig: EchartsLegendConfig,

0 commit comments

Comments
 (0)