diff --git a/README.md b/README.md index b603176f7..91c71b72f 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ You can access Lowcoder from [cloud-hosted version](https://app.lowcoder.cloud/) ## 💪 Contributing - Language support: If you have experience with a language that isn't currently supported by our product, send us a pull request. - Create and share components or demos: If you've created something that might be useful to others, add the link here. -- [Frontend contributing guide](https://github.com/lowcoder-org/lowcoder/tree/develop/client) +- [Frontend contributing guide](https://github.com/lowcoder-org/lowcoder/tree/main/client) ## 🥇 Sponsors Accelerate the growth of Lowcoder and unleash its potential with your Sponsorship – together, we're shaping the future of Lowcode for everyone! diff --git a/client/VERSION b/client/VERSION index 9671f9a9b..e3a4f1933 100644 --- a/client/VERSION +++ b/client/VERSION @@ -1 +1 @@ -2.1.7 \ No newline at end of file +2.2.0 \ No newline at end of file diff --git a/client/package.json b/client/package.json index f10da6f8c..6e4f7236c 100644 --- a/client/package.json +++ b/client/package.json @@ -17,7 +17,8 @@ "test": "jest && yarn workspace lowcoder-comps test", "prepare": "yarn workspace lowcoder prepare", "build:core": "yarn workspace lowcoder-core build", - "test:core": "yarn workspace lowcoder-core test" + "test:core": "yarn workspace lowcoder-core test", + "lint": "eslint . --fix" }, "devDependencies": { "@babel/preset-env": "^7.20.2", diff --git a/client/packages/lowcoder-comps/package.json b/client/packages/lowcoder-comps/package.json index f07a3e2f4..a427e7f0f 100644 --- a/client/packages/lowcoder-comps/package.json +++ b/client/packages/lowcoder-comps/package.json @@ -1,6 +1,6 @@ { "name": "lowcoder-comps", - "version": "0.0.18", + "version": "0.0.21", "type": "module", "license": "MIT", "dependencies": { diff --git a/client/packages/lowcoder-comps/src/i18n/comps/locales/en.ts b/client/packages/lowcoder-comps/src/i18n/comps/locales/en.ts index 5f363faee..9cac1339b 100644 --- a/client/packages/lowcoder-comps/src/i18n/comps/locales/en.ts +++ b/client/packages/lowcoder-comps/src/i18n/comps/locales/en.ts @@ -1,150 +1,145 @@ export const en = { - chart: { - delete: "Delete", - data: "Data", - mode: "Mode", - config: "Configuration", - UIMode: "UI Mode", - chartType: "Chart type", - xAxis: "X-axis", - chartSeries: "Chart series", - customSeries: "Custom series", - add: "Add", - confirmDelete: "Confirm Delete: ", - seriesName: "Series Name", - dataColumns: "Data columns", - title: "Title", - xAxisDirection: "X axis direction", - xAxisName: "X axis name", - xAxisType: "X axis type", - xAxisTypeTooltip: - "By default, it will be automatically detected according to X-axis data. For the type description, please refer to: ", - logBase: "LogBase", - yAxisName: "Y axis name", - yAxisType: "Y axis type", - yAxisDataFormat: "Y axis data type", - yAxisDataFormatTooltip: `Value indicates the value of each coordinate. Example: '{{value * 100 + "%"}}'`, - basicBar: "Basic bar", - stackedBar: "Stacked bar", - barType: "Bar chart type", - categoryAxis: "Category axis", - valueAxis: "Value axis", - timeAxis: "Time axis", - logAxis: "Log axis", - auto: "Default", - legendPosition: "Legend position", - basicLine: "Basic line", - stackedLine: "Stacked line", - areaLine: "Area line", - smooth: "Smooth curve", - lineType: "Line chart type", - basicPie: "Basic pie", - doughnutPie: "Doughnut pie", - rosePie: "Rose pie", - pieType: "Pie chart type", - spending: "Spending", - budget: "Budget", - bar: "Bar chart", - line: "Line chart", - scatter: "Scatter chart", - pie: "Pie chart", - horizontal: "Horizontal", - vertical: "Vertical", - noData: "No data", - unknown: "Unknown", - select: "Select", - unSelect: "Unselect", - echartsOptionLabel: "Option", - echartsOptionTooltip: "ECharts option", - echartsOptionExamples: "ECharts examples", - echartsMapOptionTooltip: "ECharts Map Option", - echartsMapOptionExamples: "ECharts Map Examples", - selectDesc: "Triggered when the user selects part of the data in the chart", - unselectDesc: "Triggered when the user unselects part of the data in the chart", - selectedPointsDesc: "Selected points", - dataDesc: "The raw data used in the current chart", - titleDesc: "Current chart title", - scatterShape: "Scatter shape", - circle: "Circle", - rect: "Rect", - triangle: "Triangle", - diamond: "Diamond", - pin: "Pin", - arrow: "Arrow", - pointColorLabel: "Point color", - pointColorTooltip: `Set the point color according to the series name and current point value, optional variables: seriesName, value. Example: '{{value < 25000 ? "red" : "green"}}'`, - mapReady: "Map Ready", - mapReadyDesc: "Triggers when map is ready", - zoomLevelChange: "Zoom Level Change", - zoomLevelChangeDesc: "Triggers when map zoom level changed", - centerPositionChange: "Center Position Change", - centerPositionChangeDesc: "Triggers when map center position changed" + "chart": { + "delete": "Delete", + "data": "Data", + "mode": "Mode", + "config": "Configuration", + "UIMode": "UI Mode", + "chartType": "Chart Type", + "xAxis": "X-axis", + "chartSeries": "Chart Series", + "customSeries": "Custom Series", + "add": "Add", + "confirmDelete": "Confirm Delete: ", + "seriesName": "Series Name", + "dataColumns": "Data Columns", + "title": "Title", + "xAxisDirection": "X-axis Direction", + "xAxisName": "X-axis Name", + "xAxisType": "X-axis Type", + "xAxisTypeTooltip": "Automatically detected based on X-axis data. For type description, refer to: ", + "logBase": "Log Base", + "yAxisName": "Y-axis Name", + "yAxisType": "Y-axis Type", + "yAxisDataFormat": "Y-axis Data Type", + "yAxisDataFormatTooltip": "Indicates the value of each coordinate. Example: '{{value * 100 + \"%\"}}'", + "basicBar": "Basic Bar", + "stackedBar": "Stacked Bar", + "barType": "Bar Chart Type", + "categoryAxis": "Category Axis", + "valueAxis": "Value Axis", + "timeAxis": "Time Axis", + "logAxis": "Log Axis", + "auto": "Default", + "legendPosition": "Legend Position", + "basicLine": "Basic Line", + "stackedLine": "Stacked Line", + "areaLine": "Area Line", + "smooth": "Smooth Curve", + "lineType": "Line Chart Type", + "basicPie": "Basic Pie", + "doughnutPie": "Doughnut Pie", + "rosePie": "Rose Pie", + "pieType": "Pie Chart Type", + "spending": "Spending", + "budget": "Budget", + "bar": "Bar Chart", + "line": "Line Chart", + "scatter": "Scatter Chart", + "pie": "Pie Chart", + "horizontal": "Horizontal", + "vertical": "Vertical", + "noData": "No Data", + "unknown": "Unknown", + "select": "Select", + "unSelect": "Unselect", + "echartsOptionLabel": "Option", + "echartsOptionTooltip": "ECharts Option", + "echartsOptionExamples": "ECharts Examples", + "echartsMapOptionTooltip": "ECharts Map Option", + "echartsMapOptionExamples": "ECharts Map Examples", + "selectDesc": "Triggered when a user selects part of the data in the chart", + "unselectDesc": "Triggered when a user unselects part of the data in the chart", + "selectedPointsDesc": "Selected Points", + "dataDesc": "JSON Data for the Chart", + "titleDesc": "Current Chart Title", + "scatterShape": "Scatter Shape", + "circle": "Circle", + "rect": "Rectangle", + "triangle": "Triangle", + "diamond": "Diamond", + "pin": "Pin", + "arrow": "Arrow", + "pointColorLabel": "Point Color", + "pointColorTooltip": "Set point color based on series name and value. Variables: seriesName, value. Example: '{{value < 25000 ? \"red\" : \"green\"}}'", + "mapReady": "Map Ready", + "mapReadyDesc": "Triggers when the map is ready", + "zoomLevelChange": "Zoom Level Change", + "zoomLevelChangeDesc": "Triggers when the map zoom level changes", + "centerPositionChange": "Center Position Change", + "centerPositionChangeDesc": "Triggers when the map center position changes" }, - imageEditor: { - defaultSrc: "", - save: "Save", - saveDesc: "Save image", - src: "Image source", - name: "Image name", - buttonText: "Button text", - srcDesc: "Image source", - nameDesc: "Image name", - dataURIDesc: "Image data URI", - dataDesc: "Image data", - buttonTextDesc: "Button text", + "imageEditor": { + "defaultSrc": "", + "save": "Save", + "saveDesc": "Save Image", + "src": "Image Source", + "name": "Image Name", + "buttonText": "Button Text", + "srcDesc": "Image Source", + "nameDesc": "Image Name", + "dataURIDesc": "Image Data URI", + "dataDesc": "Image Data", + "buttonTextDesc": "Button Text" }, - calendar: { - events: "Events data", - editable: "Editable", - defaultDate: "Default date", - defaultDateTooltip: "The date that the calendar initially displays", - defaultView: "Default view", - defaultViewTooltip: "The view that the calendar initially displays", - showEventTime: "Show event times", - showEventTimeTooltip: "Whether to display the time text of the event", - showWeekends: "Show weekends", - showAllDay: "Show all-day", - showAllDayTooltip: "Whether to display the all-day slot in the week and day views", - dayMaxEvents: "Day max events", - dayMaxEventsTooltip: - "The maximum number of events to display in the month view per day, with 0 being limited to the height of the cell", - eventMaxStack: "Event max stack", - eventMaxStackTooltip: - "The maximum number of events to stack horizontally in the week and day views, with 0 being no limit", - selectInterval: "The interval selected on the calendar", - selectEvent: "Selected event", - changeSet: - "The event object changed by dragging in the calendar, the key is the eventId, and the value is the event", - headerBtnBackground: "Button background", - btnText: "Button text", - title: "Title", - selectBackground: "Selected background", - today: "Today", - month: "Month", - week: "Week", - day: "Day", - list: "List", - monday: "Monday", - tuesday: "Tuesday", - wednesday: "Wednesday", - thursday: "Thursday", - friday: "Friday", - saturday: "Saturday", - sunday: "Sunday", - startWeek: "Start from", - creatEvent: "Create event", - editEvent: "Edit event", - eventName: "Event name", - eventColor: "Event color", - eventGroupId: "Group ID", - groupIdTooltip: - "Group ID is used to group different events, and events in the same group can be dragged and resized together.", - more: "more", - allDay: "All day", - eventNameRequire: "Please enter Event name", - eventId: "Event ID", - eventIdRequire: "Please enter Event ID", - eventIdTooltip: "Unique ID for each event", - eventIdExist: "ID already exists", + "calendar": { + "events": "Events Data", + "editable": "Editable", + "defaultDate": "Default Date", + "defaultDateTooltip": "Initial display date of the calendar", + "defaultView": "Default View", + "defaultViewTooltip": "Initial view of the calendar", + "showEventTime": "Show Event Times", + "showEventTimeTooltip": "Display event time text", + "showWeekends": "Show Weekends", + "showAllDay": "Show All-Day", + "showAllDayTooltip": "Display all-day slot in week and day views", + "dayMaxEvents": "Day Max Events", + "dayMaxEventsTooltip": "Max events per day in month view, 0 for cell height limit", + "eventMaxStack": "Event Max Stack", + "eventMaxStackTooltip": "Max events to stack horizontally in week and day views, 0 for no limit", + "selectInterval": "Selected Interval", + "selectEvent": "Selected Event", + "changeSet": "Changed Event Object", + "headerBtnBackground": "Button Background", + "btnText": "Button Text", + "title": "Title", + "selectBackground": "Selected Background", + "today": "Today", + "month": "Month", + "week": "Week", + "day": "Day", + "list": "List", + "monday": "Monday", + "tuesday": "Tuesday", + "wednesday": "Wednesday", + "thursday": "Thursday", + "friday": "Friday", + "saturday": "Saturday", + "sunday": "Sunday", + "startWeek": "Start From", + "creatEvent": "Create Event", + "editEvent": "Edit Event", + "eventName": "Event Name", + "eventColor": "Event Color", + "eventGroupId": "Group ID", + "groupIdTooltip": "Group ID groups events for drag and resize together.", + "more": "More", + "allDay": "All Day", + "eventNameRequire": "Enter Event Name", + "eventId": "Event ID", + "eventIdRequire": "Enter Event ID", + "eventIdTooltip": "Unique ID for each event", + "eventIdExist": "ID Exists" }, }; diff --git a/client/packages/lowcoder-design/src/components/Section.tsx b/client/packages/lowcoder-design/src/components/Section.tsx index da58f9588..e1c019bde 100644 --- a/client/packages/lowcoder-design/src/components/Section.tsx +++ b/client/packages/lowcoder-design/src/components/Section.tsx @@ -142,5 +142,6 @@ export const sectionNames = { validation: trans("prop.validation"), layout: trans("prop.layout"), style: trans("prop.style"), + data: trans("prop.data"), meetings : trans("prop.meetings"), // added by Falk Wolsky }; diff --git a/client/packages/lowcoder-design/src/i18n/design/locales/en.ts b/client/packages/lowcoder-design/src/i18n/design/locales/en.ts index 59e045b55..c6fa81f69 100644 --- a/client/packages/lowcoder-design/src/i18n/design/locales/en.ts +++ b/client/packages/lowcoder-design/src/i18n/design/locales/en.ts @@ -24,6 +24,7 @@ export const en = { layout: "Layout", style: "Style", meetings : "Meeting Settings", + data: "Data", }, passwordInput: { label: "Password:", diff --git a/client/packages/lowcoder-design/src/icons/icon-ShowLayout.svg b/client/packages/lowcoder-design/src/icons/icon-ShowLayout.svg new file mode 100644 index 000000000..c47960aba --- /dev/null +++ b/client/packages/lowcoder-design/src/icons/icon-ShowLayout.svg @@ -0,0 +1,20 @@ + + + diff --git a/client/packages/lowcoder-design/src/icons/icon-text-size.svg b/client/packages/lowcoder-design/src/icons/icon-text-size.svg new file mode 100644 index 000000000..86299a0c9 --- /dev/null +++ b/client/packages/lowcoder-design/src/icons/icon-text-size.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/packages/lowcoder-design/src/icons/index.ts b/client/packages/lowcoder-design/src/icons/index.ts index 4be847768..549d492df 100644 --- a/client/packages/lowcoder-design/src/icons/index.ts +++ b/client/packages/lowcoder-design/src/icons/index.ts @@ -64,6 +64,7 @@ export { ReactComponent as WarningWhiteIcon } from "./icon-warning-white.svg"; export { ReactComponent as WarningIcon } from "./icon-warning.svg"; export { ReactComponent as WidthDragIcon } from "./icon-widthDrag.svg"; export { ReactComponent as ManyCheckboxIcon } from "./manyCheckbox.svg"; +export { ReactComponent as Layout } from "./icon-ShowLayout.svg"; export { ReactComponent as Left } from "./icon-ShowLeft.svg"; export { ReactComponent as Middle } from "./icon-ShowMiddle.svg"; export { ReactComponent as Right } from "./icon-ShowRight.svg"; @@ -296,4 +297,5 @@ export { ReactComponent as CommentIcon } from "icons/icon-comment-comp.svg"; export { ReactComponent as MentionIcon } from "icons/icon-mention-comp.svg"; export { ReactComponent as AutoCompleteCompIcon } from "icons/icon-autocomplete-comp.svg"; export { ReactComponent as WidthIcon } from "icons/icon-width.svg"; -export { ReactComponent as ResponsiveLayoutCompIcon } from "icons/icon-responsive-layout-comp.svg"; \ No newline at end of file +export { ReactComponent as ResponsiveLayoutCompIcon } from "icons/icon-responsive-layout-comp.svg"; +export { ReactComponent as TextSizeIcon } from "./icon-text-size.svg"; \ No newline at end of file diff --git a/client/packages/lowcoder-sdk/package.json b/client/packages/lowcoder-sdk/package.json index 051c06a3c..bee4317a6 100644 --- a/client/packages/lowcoder-sdk/package.json +++ b/client/packages/lowcoder-sdk/package.json @@ -1,6 +1,6 @@ { "name": "lowcoder-sdk", - "version": "2.1.8", + "version": "2.1.9", "type": "module", "files": [ "src", diff --git a/client/packages/lowcoder/.eslintrc b/client/packages/lowcoder/.eslintrc index 53c7f2826..0cdf4f940 100644 --- a/client/packages/lowcoder/.eslintrc +++ b/client/packages/lowcoder/.eslintrc @@ -4,5 +4,7 @@ "rules": { // "react-hooks/exhaustive-deps": "off" //"only-ascii/only-ascii": "error" + "no-unused-vars": "warn", + "import/no-unused-modules": [1, {"unusedExports": true}] } -} +} \ No newline at end of file diff --git a/client/packages/lowcoder/index.html b/client/packages/lowcoder/index.html index 2a45e2639..c83e225aa 100644 --- a/client/packages/lowcoder/index.html +++ b/client/packages/lowcoder/index.html @@ -2,16 +2,11 @@
- - + + + +