Skip to content

Commit 588093d

Browse files
authored
Merge pull request lowcoder-org#555 from lowcoder-org/dev
Dev > Main 2.2.0
2 parents d4e82cf + eb24329 commit 588093d

File tree

146 files changed

+14135
-5206
lines changed

Some content is hidden

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

146 files changed

+14135
-5206
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ You can access Lowcoder from [cloud-hosted version](https://app.lowcoder.cloud/)
9090
## 💪 Contributing
9191
- Language support: If you have experience with a language that isn't currently supported by our product, send us a pull request.
9292
- Create and share components or demos: If you've created something that might be useful to others, add the link here.
93-
- [Frontend contributing guide](https://github.com/lowcoder-org/lowcoder/tree/develop/client)
93+
- [Frontend contributing guide](https://github.com/lowcoder-org/lowcoder/tree/main/client)
9494

9595
## 🥇 Sponsors
9696
Accelerate the growth of Lowcoder and unleash its potential with your Sponsorship – together, we're shaping the future of Lowcode for everyone!

client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.7
1+
2.2.0

client/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"test": "jest && yarn workspace lowcoder-comps test",
1818
"prepare": "yarn workspace lowcoder prepare",
1919
"build:core": "yarn workspace lowcoder-core build",
20-
"test:core": "yarn workspace lowcoder-core test"
20+
"test:core": "yarn workspace lowcoder-core test",
21+
"lint": "eslint . --fix"
2122
},
2223
"devDependencies": {
2324
"@babel/preset-env": "^7.20.2",

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": "0.0.18",
3+
"version": "0.0.21",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {
Lines changed: 140 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -1,150 +1,145 @@
11
export const en = {
2-
chart: {
3-
delete: "Delete",
4-
data: "Data",
5-
mode: "Mode",
6-
config: "Configuration",
7-
UIMode: "UI Mode",
8-
chartType: "Chart type",
9-
xAxis: "X-axis",
10-
chartSeries: "Chart series",
11-
customSeries: "Custom series",
12-
add: "Add",
13-
confirmDelete: "Confirm Delete: ",
14-
seriesName: "Series Name",
15-
dataColumns: "Data columns",
16-
title: "Title",
17-
xAxisDirection: "X axis direction",
18-
xAxisName: "X axis name",
19-
xAxisType: "X axis type",
20-
xAxisTypeTooltip:
21-
"By default, it will be automatically detected according to X-axis data. For the type description, please refer to: ",
22-
logBase: "LogBase",
23-
yAxisName: "Y axis name",
24-
yAxisType: "Y axis type",
25-
yAxisDataFormat: "Y axis data type",
26-
yAxisDataFormatTooltip: `Value indicates the value of each coordinate. Example: '{{value * 100 + "%"}}'`,
27-
basicBar: "Basic bar",
28-
stackedBar: "Stacked bar",
29-
barType: "Bar chart type",
30-
categoryAxis: "Category axis",
31-
valueAxis: "Value axis",
32-
timeAxis: "Time axis",
33-
logAxis: "Log axis",
34-
auto: "Default",
35-
legendPosition: "Legend position",
36-
basicLine: "Basic line",
37-
stackedLine: "Stacked line",
38-
areaLine: "Area line",
39-
smooth: "Smooth curve",
40-
lineType: "Line chart type",
41-
basicPie: "Basic pie",
42-
doughnutPie: "Doughnut pie",
43-
rosePie: "Rose pie",
44-
pieType: "Pie chart type",
45-
spending: "Spending",
46-
budget: "Budget",
47-
bar: "Bar chart",
48-
line: "Line chart",
49-
scatter: "Scatter chart",
50-
pie: "Pie chart",
51-
horizontal: "Horizontal",
52-
vertical: "Vertical",
53-
noData: "No data",
54-
unknown: "Unknown",
55-
select: "Select",
56-
unSelect: "Unselect",
57-
echartsOptionLabel: "Option",
58-
echartsOptionTooltip: "ECharts option",
59-
echartsOptionExamples: "ECharts examples",
60-
echartsMapOptionTooltip: "ECharts Map Option",
61-
echartsMapOptionExamples: "ECharts Map Examples",
62-
selectDesc: "Triggered when the user selects part of the data in the chart",
63-
unselectDesc: "Triggered when the user unselects part of the data in the chart",
64-
selectedPointsDesc: "Selected points",
65-
dataDesc: "The raw data used in the current chart",
66-
titleDesc: "Current chart title",
67-
scatterShape: "Scatter shape",
68-
circle: "Circle",
69-
rect: "Rect",
70-
triangle: "Triangle",
71-
diamond: "Diamond",
72-
pin: "Pin",
73-
arrow: "Arrow",
74-
pointColorLabel: "Point color",
75-
pointColorTooltip: `Set the point color according to the series name and current point value, optional variables: seriesName, value. Example: '{{value < 25000 ? "red" : "green"}}'`,
76-
mapReady: "Map Ready",
77-
mapReadyDesc: "Triggers when map is ready",
78-
zoomLevelChange: "Zoom Level Change",
79-
zoomLevelChangeDesc: "Triggers when map zoom level changed",
80-
centerPositionChange: "Center Position Change",
81-
centerPositionChangeDesc: "Triggers when map center position changed"
2+
"chart": {
3+
"delete": "Delete",
4+
"data": "Data",
5+
"mode": "Mode",
6+
"config": "Configuration",
7+
"UIMode": "UI Mode",
8+
"chartType": "Chart Type",
9+
"xAxis": "X-axis",
10+
"chartSeries": "Chart Series",
11+
"customSeries": "Custom Series",
12+
"add": "Add",
13+
"confirmDelete": "Confirm Delete: ",
14+
"seriesName": "Series Name",
15+
"dataColumns": "Data Columns",
16+
"title": "Title",
17+
"xAxisDirection": "X-axis Direction",
18+
"xAxisName": "X-axis Name",
19+
"xAxisType": "X-axis Type",
20+
"xAxisTypeTooltip": "Automatically detected based on X-axis data. For type description, refer to: ",
21+
"logBase": "Log Base",
22+
"yAxisName": "Y-axis Name",
23+
"yAxisType": "Y-axis Type",
24+
"yAxisDataFormat": "Y-axis Data Type",
25+
"yAxisDataFormatTooltip": "Indicates the value of each coordinate. Example: '{{value * 100 + \"%\"}}'",
26+
"basicBar": "Basic Bar",
27+
"stackedBar": "Stacked Bar",
28+
"barType": "Bar Chart Type",
29+
"categoryAxis": "Category Axis",
30+
"valueAxis": "Value Axis",
31+
"timeAxis": "Time Axis",
32+
"logAxis": "Log Axis",
33+
"auto": "Default",
34+
"legendPosition": "Legend Position",
35+
"basicLine": "Basic Line",
36+
"stackedLine": "Stacked Line",
37+
"areaLine": "Area Line",
38+
"smooth": "Smooth Curve",
39+
"lineType": "Line Chart Type",
40+
"basicPie": "Basic Pie",
41+
"doughnutPie": "Doughnut Pie",
42+
"rosePie": "Rose Pie",
43+
"pieType": "Pie Chart Type",
44+
"spending": "Spending",
45+
"budget": "Budget",
46+
"bar": "Bar Chart",
47+
"line": "Line Chart",
48+
"scatter": "Scatter Chart",
49+
"pie": "Pie Chart",
50+
"horizontal": "Horizontal",
51+
"vertical": "Vertical",
52+
"noData": "No Data",
53+
"unknown": "Unknown",
54+
"select": "Select",
55+
"unSelect": "Unselect",
56+
"echartsOptionLabel": "Option",
57+
"echartsOptionTooltip": "ECharts Option",
58+
"echartsOptionExamples": "ECharts Examples",
59+
"echartsMapOptionTooltip": "ECharts Map Option",
60+
"echartsMapOptionExamples": "ECharts Map Examples",
61+
"selectDesc": "Triggered when a user selects part of the data in the chart",
62+
"unselectDesc": "Triggered when a user unselects part of the data in the chart",
63+
"selectedPointsDesc": "Selected Points",
64+
"dataDesc": "JSON Data for the Chart",
65+
"titleDesc": "Current Chart Title",
66+
"scatterShape": "Scatter Shape",
67+
"circle": "Circle",
68+
"rect": "Rectangle",
69+
"triangle": "Triangle",
70+
"diamond": "Diamond",
71+
"pin": "Pin",
72+
"arrow": "Arrow",
73+
"pointColorLabel": "Point Color",
74+
"pointColorTooltip": "Set point color based on series name and value. Variables: seriesName, value. Example: '{{value < 25000 ? \"red\" : \"green\"}}'",
75+
"mapReady": "Map Ready",
76+
"mapReadyDesc": "Triggers when the map is ready",
77+
"zoomLevelChange": "Zoom Level Change",
78+
"zoomLevelChangeDesc": "Triggers when the map zoom level changes",
79+
"centerPositionChange": "Center Position Change",
80+
"centerPositionChangeDesc": "Triggers when the map center position changes"
8281
},
83-
imageEditor: {
84-
defaultSrc: "",
85-
save: "Save",
86-
saveDesc: "Save image",
87-
src: "Image source",
88-
name: "Image name",
89-
buttonText: "Button text",
90-
srcDesc: "Image source",
91-
nameDesc: "Image name",
92-
dataURIDesc: "Image data URI",
93-
dataDesc: "Image data",
94-
buttonTextDesc: "Button text",
82+
"imageEditor": {
83+
"defaultSrc": "",
84+
"save": "Save",
85+
"saveDesc": "Save Image",
86+
"src": "Image Source",
87+
"name": "Image Name",
88+
"buttonText": "Button Text",
89+
"srcDesc": "Image Source",
90+
"nameDesc": "Image Name",
91+
"dataURIDesc": "Image Data URI",
92+
"dataDesc": "Image Data",
93+
"buttonTextDesc": "Button Text"
9594
},
96-
calendar: {
97-
events: "Events data",
98-
editable: "Editable",
99-
defaultDate: "Default date",
100-
defaultDateTooltip: "The date that the calendar initially displays",
101-
defaultView: "Default view",
102-
defaultViewTooltip: "The view that the calendar initially displays",
103-
showEventTime: "Show event times",
104-
showEventTimeTooltip: "Whether to display the time text of the event",
105-
showWeekends: "Show weekends",
106-
showAllDay: "Show all-day",
107-
showAllDayTooltip: "Whether to display the all-day slot in the week and day views",
108-
dayMaxEvents: "Day max events",
109-
dayMaxEventsTooltip:
110-
"The maximum number of events to display in the month view per day, with 0 being limited to the height of the cell",
111-
eventMaxStack: "Event max stack",
112-
eventMaxStackTooltip:
113-
"The maximum number of events to stack horizontally in the week and day views, with 0 being no limit",
114-
selectInterval: "The interval selected on the calendar",
115-
selectEvent: "Selected event",
116-
changeSet:
117-
"The event object changed by dragging in the calendar, the key is the eventId, and the value is the event",
118-
headerBtnBackground: "Button background",
119-
btnText: "Button text",
120-
title: "Title",
121-
selectBackground: "Selected background",
122-
today: "Today",
123-
month: "Month",
124-
week: "Week",
125-
day: "Day",
126-
list: "List",
127-
monday: "Monday",
128-
tuesday: "Tuesday",
129-
wednesday: "Wednesday",
130-
thursday: "Thursday",
131-
friday: "Friday",
132-
saturday: "Saturday",
133-
sunday: "Sunday",
134-
startWeek: "Start from",
135-
creatEvent: "Create event",
136-
editEvent: "Edit event",
137-
eventName: "Event name",
138-
eventColor: "Event color",
139-
eventGroupId: "Group ID",
140-
groupIdTooltip:
141-
"Group ID is used to group different events, and events in the same group can be dragged and resized together.",
142-
more: "more",
143-
allDay: "All day",
144-
eventNameRequire: "Please enter Event name",
145-
eventId: "Event ID",
146-
eventIdRequire: "Please enter Event ID",
147-
eventIdTooltip: "Unique ID for each event",
148-
eventIdExist: "ID already exists",
95+
"calendar": {
96+
"events": "Events Data",
97+
"editable": "Editable",
98+
"defaultDate": "Default Date",
99+
"defaultDateTooltip": "Initial display date of the calendar",
100+
"defaultView": "Default View",
101+
"defaultViewTooltip": "Initial view of the calendar",
102+
"showEventTime": "Show Event Times",
103+
"showEventTimeTooltip": "Display event time text",
104+
"showWeekends": "Show Weekends",
105+
"showAllDay": "Show All-Day",
106+
"showAllDayTooltip": "Display all-day slot in week and day views",
107+
"dayMaxEvents": "Day Max Events",
108+
"dayMaxEventsTooltip": "Max events per day in month view, 0 for cell height limit",
109+
"eventMaxStack": "Event Max Stack",
110+
"eventMaxStackTooltip": "Max events to stack horizontally in week and day views, 0 for no limit",
111+
"selectInterval": "Selected Interval",
112+
"selectEvent": "Selected Event",
113+
"changeSet": "Changed Event Object",
114+
"headerBtnBackground": "Button Background",
115+
"btnText": "Button Text",
116+
"title": "Title",
117+
"selectBackground": "Selected Background",
118+
"today": "Today",
119+
"month": "Month",
120+
"week": "Week",
121+
"day": "Day",
122+
"list": "List",
123+
"monday": "Monday",
124+
"tuesday": "Tuesday",
125+
"wednesday": "Wednesday",
126+
"thursday": "Thursday",
127+
"friday": "Friday",
128+
"saturday": "Saturday",
129+
"sunday": "Sunday",
130+
"startWeek": "Start From",
131+
"creatEvent": "Create Event",
132+
"editEvent": "Edit Event",
133+
"eventName": "Event Name",
134+
"eventColor": "Event Color",
135+
"eventGroupId": "Group ID",
136+
"groupIdTooltip": "Group ID groups events for drag and resize together.",
137+
"more": "More",
138+
"allDay": "All Day",
139+
"eventNameRequire": "Enter Event Name",
140+
"eventId": "Event ID",
141+
"eventIdRequire": "Enter Event ID",
142+
"eventIdTooltip": "Unique ID for each event",
143+
"eventIdExist": "ID Exists"
149144
},
150145
};

client/packages/lowcoder-design/src/components/Section.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,5 +142,6 @@ export const sectionNames = {
142142
validation: trans("prop.validation"),
143143
layout: trans("prop.layout"),
144144
style: trans("prop.style"),
145+
data: trans("prop.data"),
145146
meetings : trans("prop.meetings"), // added by Falk Wolsky
146147
};

client/packages/lowcoder-design/src/i18n/design/locales/en.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export const en = {
2424
layout: "Layout",
2525
style: "Style",
2626
meetings : "Meeting Settings",
27+
data: "Data",
2728
},
2829
passwordInput: {
2930
label: "Password:",
Lines changed: 20 additions & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

client/packages/lowcoder-design/src/icons/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ export { ReactComponent as WarningWhiteIcon } from "./icon-warning-white.svg";
6464
export { ReactComponent as WarningIcon } from "./icon-warning.svg";
6565
export { ReactComponent as WidthDragIcon } from "./icon-widthDrag.svg";
6666
export { ReactComponent as ManyCheckboxIcon } from "./manyCheckbox.svg";
67+
export { ReactComponent as Layout } from "./icon-ShowLayout.svg";
6768
export { ReactComponent as Left } from "./icon-ShowLeft.svg";
6869
export { ReactComponent as Middle } from "./icon-ShowMiddle.svg";
6970
export { ReactComponent as Right } from "./icon-ShowRight.svg";
@@ -296,4 +297,5 @@ export { ReactComponent as CommentIcon } from "icons/icon-comment-comp.svg";
296297
export { ReactComponent as MentionIcon } from "icons/icon-mention-comp.svg";
297298
export { ReactComponent as AutoCompleteCompIcon } from "icons/icon-autocomplete-comp.svg";
298299
export { ReactComponent as WidthIcon } from "icons/icon-width.svg";
299-
export { ReactComponent as ResponsiveLayoutCompIcon } from "icons/icon-responsive-layout-comp.svg";
300+
export { ReactComponent as ResponsiveLayoutCompIcon } from "icons/icon-responsive-layout-comp.svg";
301+
export { ReactComponent as TextSizeIcon } from "./icon-text-size.svg";

client/packages/lowcoder-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-sdk",
3-
"version": "2.1.8",
3+
"version": "2.1.9",
44
"type": "module",
55
"files": [
66
"src",

client/packages/lowcoder/.eslintrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
"rules": {
55
// "react-hooks/exhaustive-deps": "off"
66
//"only-ascii/only-ascii": "error"
7+
"no-unused-vars": "warn",
8+
"import/no-unused-modules": [1, {"unusedExports": true}]
79
}
8-
}
10+
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy