Skip to content

Commit a646729

Browse files
bitwebsvcbitwebsvc
committed
Merge remote-tracking branch 'upstream/main' into feature/36-latest
2 parents d7b6fb5 + 73ad9ee commit a646729

File tree

577 files changed

+146154
-5673
lines changed

Some content is hidden

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

577 files changed

+146154
-5673
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ server/api-service/lowcoder-server/src/main/resources/application-local-dev.yaml
2121
translations/locales/node_modules/
2222
.vscode/settings.json
2323
deploy/docker/openflower-stacks/
24+
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.4.12
1+
2.6.0

‎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.4.12",
3+
"version": "2.6.0",
44
"type": "module",
55
"private": true,
66
"workspaces": [

‎client/packages/lowcoder-cli-template-typescript/package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-cli-template-typescript",
3-
"version": "0.0.20",
3+
"version": "0.0.22",
44
"type": "module",
55
"scripts": {
66
"start": "NODE_OPTIONS=--max_old_space_size=6144 vite",
@@ -22,7 +22,9 @@
2222
}
2323
},
2424
"dependencies": {
25+
"@observablehq/inspector": "^5.0.1",
2526
"@observablehq/runtime": "^4.8.2",
27+
"@observablehq/stdlib": "^5.8.8",
2628
"@types/react": "^18.2.45",
2729
"@types/react-dom": "^18.2.18",
2830
"lowcoder-cli": "^0.0.30",

‎client/packages/lowcoder-cli-template-typescript/src/vendors/Chart.jsx‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import React from 'react';
22
import PropTypes from 'prop-types'
3-
import { Runtime, Inspector } from '@observablehq/runtime';
3+
import { Runtime } from '@observablehq/runtime';
4+
import { Inspector } from "@observablehq/inspector";
5+
import { Library } from "@observablehq/stdlib";
6+
7+
const library = new Library();
48

59
function Chart(props) {
610
const [chartRef, setChartRef] = React.useState();
@@ -16,21 +20,20 @@ function Chart(props) {
1620
main.variable().define('translateXtoY', function() {
1721
return x => 50 * Math.sin((Math.PI / 50) * x - (1 / 2) * Math.PI) + 50;
1822
});
19-
main.variable().define('d3', ['require'], function(require) {
20-
return require('https://d3js.org/d3.v5.min.js');
23+
main.variable().define('d3', [], function() {
24+
return Library.require('https://d3js.org/d3.v5.min.js');
2125
});
2226

2327
// Define the HillChart class
24-
main.variable().define('HillChart', ['d3', 'DOM', 'translateXtoY'], function(d3, DOM, translateXtoY) {
28+
main.variable().define('HillChart', ['d3', 'translateXtoY'], function(d3, translateXtoY) {
2529
return class HillChart {
2630
constructor(chart_height, chart_width, items) {
2731
this.chart_height = chart_height;
2832
this.chart_width = chart_width;
2933
this.items = items;
30-
31-
this.svg = d3.select(DOM.svg(this.chart_width, this.chart_height)).attr('viewBox', `-20 -20 ${this.chart_width + 80} ${this.chart_height + 20}`);
34+
35+
this.svg = d3.select(library.DOM.svg(this.chart_width, this.chart_height)).attr('viewBox', `-20 -20 ${this.chart_width + 80} ${this.chart_height + 20}`);
3236
}
33-
3437

3538
render() {
3639
const xScale = d3

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"vite-plugin-svgr": "^2.2.2"
3939
},
4040
"devDependencies": {
41-
"@types/axios": "^0.14.0",
4241
"typescript": "^4.8.4"
4342
},
4443
"peerDependencies": {

‎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.4.19",
3+
"version": "2.6.1",
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: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ import {
1616
uiChildren,
1717
clickEvent,
1818
styleControl,
19-
EchartsStyle
19+
EchartDefaultTextStyle,
20+
EchartDefaultChartStyle,
21+
toArray
2022
} from "lowcoder-sdk";
2123
import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core";
2224
import { BarChartConfig } from "./chartConfigs/barChartConfig";
@@ -32,6 +34,8 @@ import { EChartsOption } from "echarts";
3234
import { i18nObjs, trans } from "i18n/comps";
3335
import { GaugeChartConfig } from "./chartConfigs/gaugeChartConfig";
3436
import { FunnelChartConfig } from "./chartConfigs/funnelChartConfig";
37+
import {EchartsTitleVerticalConfig} from "../chartComp/chartConfigs/echartsTitleVerticalConfig";
38+
import {EchartsTitleConfig} from "../chartComp/chartConfigs/echartsTitleConfig";
3539

3640
export const ChartTypeOptions = [
3741
{
@@ -237,7 +241,7 @@ const EchartsOptionComp = withType(EchartsOptionMap, "funnel");
237241
export type CharOptionCompType = keyof typeof ChartOptionMap;
238242

239243
export const chartUiModeChildren = {
240-
title: StringControl,
244+
title: withDefault(StringControl, trans("echarts.defaultTitle")),
241245
data: jsonControl(toJSONObjectArray, i18nObjs.defaultDataSource),
242246
xAxisKey: valueComp<string>(""), // x-axis, key from data
243247
xAxisDirection: dropdownControl(XAxisDirectionOptions, "horizontal"),
@@ -250,19 +254,31 @@ export const chartUiModeChildren = {
250254
};
251255

252256
let chartJsonModeChildren: any = {
257+
echartsData: jsonControl(toArray),
253258
echartsOption: jsonControl(toObject, i18nObjs.defaultEchartsJsonOption),
254259
echartsTitle: withDefault(StringControl, trans("echarts.defaultTitle")),
255260
echartsLegendConfig: EchartsLegendConfig,
256261
echartsLabelConfig: EchartsLabelConfig,
257262
echartsConfig: EchartsOptionComp,
258-
// style: styleControl(EchartsStyle, 'style'),
263+
echartsTitleVerticalConfig: EchartsTitleVerticalConfig,
264+
echartsTitleConfig:EchartsTitleConfig,
265+
266+
left:withDefault(NumberControl,trans('chart.defaultLeft')),
267+
right:withDefault(NumberControl,trans('chart.defaultRight')),
268+
top:withDefault(NumberControl,trans('chart.defaultTop')),
269+
bottom:withDefault(NumberControl,trans('chart.defaultBottom')),
270+
259271
tooltip: withDefault(BoolControl, true),
260272
legendVisibility: withDefault(BoolControl, true),
261273
}
262-
if (EchartsStyle) {
274+
if (EchartDefaultChartStyle && EchartDefaultTextStyle) {
263275
chartJsonModeChildren = {
264276
...chartJsonModeChildren,
265-
style: styleControl(EchartsStyle, 'style'),
277+
chartStyle: styleControl(EchartDefaultChartStyle, 'chartStyle'),
278+
titleStyle: styleControl(EchartDefaultTextStyle, 'titleStyle'),
279+
xAxisStyle: styleControl(EchartDefaultTextStyle, 'xAxis'),
280+
yAxisStyle: styleControl(EchartDefaultTextStyle, 'yAxisStyle'),
281+
legendStyle: styleControl(EchartDefaultTextStyle, 'legendStyle'),
266282
}
267283
}
268284

0 commit comments

Comments
 (0)