Skip to content

Commit c32959f

Browse files
FalkWolskyFalkWolsky
authored
Merge branch 'dev' into ee-setup
2 parents 8bb9189 + 7149282 commit c32959f

File tree

352 files changed

+89938
-2667
lines changed

Some content is hidden

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

352 files changed

+89938
-2667
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ application-dev-localhost.yaml
1717
.vscode/launch.json
1818
server/api-service/lowcoder-server/src/main/resources/application-local-dev.yaml
1919
translations/locales/node_modules/
20-
.vscode/settings.json
2120
server/api-service/lowcoder-server/src/main/resources/application-local-dev-ee.yaml

‎app.json

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,137 @@
3939
"LOWCODER_REDIS_URL": {
4040
"description": "Your Redis Database URL.",
4141
"required": false
42+
},
43+
"LOWCODER_MAX_REQUEST_SIZE": {
44+
"description": "Lowcoder max request size",
45+
"value": "20m",
46+
"required": false
47+
},
48+
"LOWCODER_MAX_QUERY_TIMEOUT": {
49+
"description": "Lowcoder max query timeout (in seconds)",
50+
"value": "120",
51+
"required": false
52+
},
53+
"LOWCODER_DEFAULT_QUERY_TIMEOUT": {
54+
"description": "Lowcoder default query timeout (in seconds)",
55+
"value": "10",
56+
"required": false
57+
},
58+
"LOWCODER_API_RATE_LIMIT": {
59+
"description": "Number of max Request per Second",
60+
"value": "100",
61+
"required": false
62+
},
63+
"LOWCODER_API_SERVICE_URL": {
64+
"description": "Lowcoder API service URL",
65+
"value": "http://localhost:8080",
66+
"required": false
67+
},
68+
"LOWCODER_NODE_SERVICE_URL": {
69+
"description": "Lowcoder Node service (js executor) URL",
70+
"value": "http://localhost:6060",
71+
"required": false
72+
},
73+
"LOWCODER_MAX_ORGS_PER_USER": {
74+
"description": "Default maximum organizations per user",
75+
"value": "100",
76+
"required": false
77+
},
78+
"LOWCODER_MAX_MEMBERS_PER_ORG": {
79+
"description": "Default maximum members per organization",
80+
"value": "1000",
81+
"required": false
82+
},
83+
"LOWCODER_MAX_GROUPS_PER_ORG": {
84+
"description": "Default maximum groups per organization",
85+
"value": "100",
86+
"required": false
87+
},
88+
"LOWCODER_MAX_APPS_PER_ORG": {
89+
"description": "Default maximum applications per organization",
90+
"value": "1000",
91+
"required": false
92+
},
93+
"LOWCODER_MAX_DEVELOPERS": {
94+
"description": "Default maximum developers",
95+
"value": "100",
96+
"required": false
97+
},
98+
"LOWCODER_WORKSPACE_MODE": {
99+
"description": "SAAS to activate, ENTERPRISE to switch off - Workspaces",
100+
"value": "SAAS",
101+
"required": false
102+
},
103+
"LOWCODER_EMAIL_SIGNUP_ENABLED": {
104+
"description": "Control if users create their own Workspace automatic when Sign Up",
105+
"value": "true",
106+
"required": false
107+
},
108+
"LOWCODER_CREATE_WORKSPACE_ON_SIGNUP": {
109+
"description": "IF LOWCODER_WORKSPACE_MODE = SAAS, controls if a own workspace is created for the user after sign up",
110+
"value": "true",
111+
"required": false
112+
},
113+
"LOWCODER_MARKETPLACE_PRIVATE_MODE": {
114+
"description": "Control if not to show Apps on the local Marketplace to anonymous users",
115+
"value": "true",
116+
"required": false
117+
},
118+
"LOWCODER_SUPERUSER_USERNAME": {
119+
"description": "Username of the Super-User of an Lowcoder Installation",
120+
"value": "admin@localhost",
121+
"required": false
122+
},
123+
"LOWCODER_SUPERUSER_PASSWORD": {
124+
"description": "Password of the Super-User, if not present or empty, it will be generated",
125+
"value": "`generated and printed into log file",
126+
"required": false
127+
},
128+
"LOWCODER_API_KEY_SECRET": {
129+
"description": "String to encrypt/sign API Keys that users may create",
130+
"required": false
131+
},
132+
"LOWCODER_ADMIN_SMTP_HOST": {
133+
"description": "SMTP Hostname of your Mail Relay Server",
134+
"required": false
135+
},
136+
"LOWCODER_ADMIN_SMTP_PORT": {
137+
"description": "Port number for the SMTP service",
138+
"value": "587",
139+
"required": false
140+
},
141+
"LOWCODER_ADMIN_SMTP_USERNAME": {
142+
"description": "Username for SMTP authentication",
143+
"required": false
144+
},
145+
"LOWCODER_ADMIN_SMTP_PASSWORD": {
146+
"description": "Password for SMTP authentication",
147+
"required": false
148+
},
149+
"LOWCODER_ADMIN_SMTP_AUTH": {
150+
"description": "Enable SMTP authentication",
151+
"value": "true",
152+
"required": false
153+
},
154+
"LOWCODER_ADMIN_SMTP_SSL_ENABLED": {
155+
"description": "Enable SSL encryption",
156+
"value": "false",
157+
"required": false
158+
},
159+
"LOWCODER_ADMIN_SMTP_STARTTLS_ENABLED": {
160+
"description": "Enable STARTTLS encryption",
161+
"value": "true",
162+
"required": false
163+
},
164+
"LOWCODER_ADMIN_SMTP_STARTTLS_REQUIRED": {
165+
"description": "Require STARTTLS encryption",
166+
"value": "true",
167+
"required": false
168+
},
169+
"LOWCODER_LOST_PASSWORD_EMAIL_SENDER": {
170+
"description": "\"from\" Email address of the password Reset Email Sender",
171+
"value": "service@lowcoder.cloud",
172+
"required": false
42173
}
43174
}
44175
}

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.1
1+
2.5.4

‎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.5.1",
3+
"version": "2.5.10",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {

‎client/packages/lowcoder-comps/src/comps/basicChartComp/chartComp.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
echartsConfigOmitChildren,
3434
getEchartsConfig,
3535
getSelectedPoints,
36-
} from "comps/chartComp/chartUtils";
36+
} from "./chartUtils";
3737
import 'echarts-extension-gmap';
3838
import log from "loglevel";
3939

@@ -120,13 +120,16 @@ BasicChartTmpComp = withViewFn(BasicChartTmpComp, (comp) => {
120120
}, [onUIEvent]);
121121

122122
const echartsConfigChildren = _.omit(comp.children, echartsConfigOmitChildren);
123+
124+
const childrenProps = childrenToProps(echartsConfigChildren);
125+
123126
const option = useMemo(() => {
124127
return getEchartsConfig(
125-
childrenToProps(echartsConfigChildren) as ToViewReturn<typeof echartsConfigChildren>,
128+
childrenProps as ToViewReturn<typeof echartsConfigChildren>,
126129
chartSize,
127-
theme?.theme?.components?.candleStickChart || {},
130+
themeConfig
128131
);
129-
}, [chartSize, ...Object.values(echartsConfigChildren)]);
132+
}, [childrenProps, chartSize, ...Object.values(echartsConfigChildren)]);
130133

131134
useEffect(() => {
132135
comp.children.mapInstance.dispatch(changeValueAction(null, false))

‎client/packages/lowcoder-comps/src/comps/basicChartComp/chartConstants.tsx

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import {
1616
uiChildren,
1717
clickEvent,
1818
styleControl,
19-
EchartsStyle
19+
EchartDefaultTextStyle,
20+
EchartDefaultChartStyle
2021
} from "lowcoder-sdk";
2122
import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core";
2223
import { BarChartConfig } from "./chartConfigs/barChartConfig";
@@ -32,6 +33,8 @@ import { EChartsOption } from "echarts";
3233
import { i18nObjs, trans } from "i18n/comps";
3334
import { GaugeChartConfig } from "./chartConfigs/gaugeChartConfig";
3435
import { FunnelChartConfig } from "./chartConfigs/funnelChartConfig";
36+
import {EchartsTitleVerticalConfig} from "../chartComp/chartConfigs/echartsTitleVerticalConfig";
37+
import {EchartsTitleConfig} from "../chartComp/chartConfigs/echartsTitleConfig";
3538

3639
export const ChartTypeOptions = [
3740
{
@@ -237,7 +240,7 @@ const EchartsOptionComp = withType(EchartsOptionMap, "funnel");
237240
export type CharOptionCompType = keyof typeof ChartOptionMap;
238241

239242
export const chartUiModeChildren = {
240-
title: StringControl,
243+
title: withDefault(StringControl, trans("echarts.defaultTitle")),
241244
data: jsonControl(toJSONObjectArray, i18nObjs.defaultDataSource),
242245
xAxisKey: valueComp<string>(""), // x-axis, key from data
243246
xAxisDirection: dropdownControl(XAxisDirectionOptions, "horizontal"),
@@ -255,14 +258,25 @@ let chartJsonModeChildren: any = {
255258
echartsLegendConfig: EchartsLegendConfig,
256259
echartsLabelConfig: EchartsLabelConfig,
257260
echartsConfig: EchartsOptionComp,
258-
// style: styleControl(EchartsStyle, 'style'),
261+
echartsTitleVerticalConfig: EchartsTitleVerticalConfig,
262+
echartsTitleConfig:EchartsTitleConfig,
263+
264+
left:withDefault(NumberControl,trans('chart.defaultLeft')),
265+
right:withDefault(NumberControl,trans('chart.defaultRight')),
266+
top:withDefault(NumberControl,trans('chart.defaultTop')),
267+
bottom:withDefault(NumberControl,trans('chart.defaultBottom')),
268+
259269
tooltip: withDefault(BoolControl, true),
260270
legendVisibility: withDefault(BoolControl, true),
261271
}
262-
if (EchartsStyle) {
272+
if (EchartDefaultChartStyle && EchartDefaultTextStyle) {
263273
chartJsonModeChildren = {
264274
...chartJsonModeChildren,
265-
style: styleControl(EchartsStyle, 'style'),
275+
chartStyle: styleControl(EchartDefaultChartStyle, 'chartStyle'),
276+
titleStyle: styleControl(EchartDefaultTextStyle, 'titleStyle'),
277+
xAxisStyle: styleControl(EchartDefaultTextStyle, 'xAxis'),
278+
yAxisStyle: styleControl(EchartDefaultTextStyle, 'yAxisStyle'),
279+
legendStyle: styleControl(EchartDefaultTextStyle, 'legendStyle'),
266280
}
267281
}
268282

‎client/packages/lowcoder-comps/src/comps/basicChartComp/chartPropertyView.tsx

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
} from "lowcoder-sdk";
1414
import { trans } from "i18n/comps";
1515
import { examplesUrl, mapExamplesUrl, mapOptionUrl, optionUrl } from "./chartConfigs/chartUrls";
16+
import {LegendConfig} from "./chartConfigs/legendConfig";
1617

1718
export function chartPropertyView(
1819
children: ChartCompChildrenType,
@@ -114,7 +115,14 @@ export function chartPropertyView(
114115
</div>
115116
</Section>
116117
<Section name={sectionNames.layout}>
118+
{children.echartsTitleConfig.getPropertyView()}
119+
{children.echartsTitleVerticalConfig.getPropertyView()}
120+
{children.legendConfig.getPropertyView()}
117121
{children.title.propertyView({ label: trans("chart.title") })}
122+
{children.left.propertyView({ label: trans("chart.left"), tooltip: trans("echarts.leftTooltip") })}
123+
{children.right.propertyView({ label: trans("chart.right"), tooltip: trans("echarts.rightTooltip") })}
124+
{children.top.propertyView({ label: trans("chart.top"), tooltip: trans("echarts.topTooltip") })}
125+
{children.bottom.propertyView({ label: trans("chart.bottom"), tooltip: trans("echarts.bottomTooltip") })}
118126
{children.chartConfig.children.compType.getView() !== "pie" && (
119127
<>
120128
{children.xAxisDirection.propertyView({
@@ -125,10 +133,24 @@ export function chartPropertyView(
125133
{children.yConfig.getPropertyView()}
126134
</>
127135
)}
128-
{children.legendConfig.getPropertyView()}
129136
{hiddenPropertyView(children)}
137+
{children.tooltip.propertyView({label: trans("echarts.tooltip"), tooltip: trans("echarts.tooltipTooltip")})}
138+
</Section>
139+
<Section name={sectionNames.chartStyle}>
140+
{children.chartStyle?.getPropertyView()}
141+
</Section>
142+
<Section name={sectionNames.titleStyle}>
143+
{children.titleStyle?.getPropertyView()}
144+
</Section>
145+
<Section name={sectionNames.xAxisStyle}>
146+
{children.xAxisStyle?.getPropertyView()}
147+
</Section>
148+
<Section name={sectionNames.yAxisStyle}>
149+
{children.yAxisStyle?.getPropertyView()}
150+
</Section>
151+
<Section name={sectionNames.legendStyle}>
152+
{children.legendStyle?.getPropertyView()}
130153
</Section>
131-
<Section name={sectionNames.style}>{children.chartConfig.getPropertyView()}</Section>
132154
</>
133155
);
134156

0 commit comments

Comments
 (0)